Test coverage

README.md

@@ -70,7 +70,7 @@ Install Klutter as dependency as described [here](#Installation).
 Initialize Klutter in your project by running:
 
 ```shell  
-flutter pub run klutter:consumer init
+dart run klutter:kradle init
 ```  
 
 The init task will set up Klutter for both Android and iOS.
@@ -79,7 +79,7 @@ Klutter plugins can be added by running the add command.
 <B>Example</B>:</br> Add the library 'awesome_plugin' to your project:
 
 ```shell  
-flutter pub run klutter:consumer add lib=awesome_plugin 
+dart run klutter:kradle add lib=awesome_plugin 
 ```  
 
 <b>Background</b></br>

lib/src/cli/cli.dart

@@ -89,7 +89,7 @@ Future<String> execute(TaskName taskName, Context context,
         .nok;
   }
 
-  final t = task.taskName;
+  final t = task.taskName.name;
   var o = "";
 
   context.taskOptions.forEach((key, value) {

lib/src/cli/task.dart

@@ -39,13 +39,19 @@ abstract class Task<T> {
   /// Execute the task.
   Future<TaskResult<T>> execute(Context context) async {
     try {
-      final output = await toBeExecuted(context, _getOptions(context));
+      final output = await executeOrThrow(context);
       return TaskResult(isOk: true, output: output);
     } on KlutterException catch (e) {
       return TaskResult(isOk: false, message: e.cause);
     }
   }
 
+  /// Execute the task and return instance of [T] or throw
+  /// [KlutterException] if unsuccessful.
+  Future<T> executeOrThrow(Context context) async {
+    return await toBeExecuted(context, _getOptions(context));
+  }
+
   /// The validated options.
   ///
   /// Returns a map with each option having a value either

lib/src/cli/task_project_create.dart

@@ -27,7 +27,11 @@ import "context.dart";
 /// Task
 class CreateProject extends Task {
   /// Create new Task.
-  CreateProject({Executor? executor, GetFlutterSDK? getFlutterSDK})
+  CreateProject(
+      {Executor? executor,
+      GetFlutterSDK? getFlutterSDK,
+      AddLibrary? addLibrary,
+      ProjectInit? projectInit})
       : super(TaskName.create, {
           TaskOption.name: const PluginNameOption(),
           TaskOption.group: const GroupNameOption(),
@@ -40,10 +44,14 @@ class CreateProject extends Task {
         }) {
     _executor = executor ?? Executor();
     _getFlutterSDK = getFlutterSDK ?? GetFlutterSDK();
+    _projectInit = projectInit ?? ProjectInit();
+    _addLibrary = addLibrary ?? AddLibrary();
   }
 
   late final Executor _executor;
   late final GetFlutterSDK _getFlutterSDK;
+  late final ProjectInit _projectInit;
+  late final AddLibrary _addLibrary;
 
   @override
   Future<void> toBeExecuted(
@@ -59,12 +67,9 @@ class CreateProject extends Task {
     final dist = toFlutterDistributionOrThrow(
         version: flutterVersion, pathToRoot: pathToRoot);
 
-    final result = await _getFlutterSDK.execute(context);
-    final flutter = result.output
-            ?.resolveFile("flutter/bin/flutter".normalize)
-            .absolutePath ??
-        (throw KlutterException(result.message ?? "failed to get flutter sdk"));
-
+    final result = await _getFlutterSDK.executeOrThrow(context);
+    final flutter =
+        result.resolveFile("flutter/bin/flutter".normalize).absolutePath;
     final root = await createFlutterProjectOrThrow(
       executor: _executor,
       pathToFlutter: flutter,
@@ -118,27 +123,16 @@ class CreateProject extends Task {
       ..workingDirectory = exampleFolder
       ..run();
 
-    final initContext = context.copyWith(taskOptions: {
+    await _projectInit.executeOrThrow(context.copyWith(taskOptions: {
       TaskOption.root: root.absolutePath,
       TaskOption.bom: bomVersion,
       TaskOption.flutter: flutterSDK,
-    });
-
-    final init = await ProjectInit().execute(initContext);
-    if (!init.isOk) {
-      throw KlutterException(init.message ?? "project init failed");
-    }
+    }));
 
-    final addContext = context.copyWith(taskOptions: {
+    await _addLibrary.executeOrThrow(context.copyWith(taskOptions: {
       TaskOption.root: exampleFolder.absolutePath,
       TaskOption.lib: name,
-    });
-
-    final addLibrary = await AddLibrary().execute(addContext);
-    if (!addLibrary.isOk) {
-      throw KlutterException(
-          addLibrary.message ?? "adding library to example project failed");
-    }
+    }));
 
     exampleFolder
       ..deleteTestFolder

pubspec.yaml

@@ -12,8 +12,8 @@ environment:
 
 dependencies:
   dart_style: ^2.2.4 # can be bumped when min SDK is 2.19.0
-  meta: ^1.9.1
   interact: ^2.2.0
+  meta: ^1.9.1
 
 dev_dependencies:
   coverage: ^1.6.4

resources/create_tar_resources.sh

@@ -0,0 +1 @@
+tar -cvf resources.tar.gz gradle.properties gradle-wrapper.jar gradle-wrapper.properties gradlew gradlew.bat kradle.env kradle.yaml

resources/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

resources/gradle.properties

@@ -0,0 +1,11 @@
+#Gradle
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+
+#Kotlin
+kotlin.code.style=official
+
+#Android
+android.useAndroidX=true
+
+#MPP
+kotlin.mpp.stability.nowarn=true

resources/gradlew

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"