Test coverage, code cleanup, formatting.

Author: buijs-dev

bin/kradle.dart

@@ -48,10 +48,10 @@ Future<void> main(List<String> args) async {
     print(taskService.displayKradlewHelpText);
   } else if (taskName == null) {
     print("received unknown task name: $firstArgument");
-    print("use kradlew help for more information");
+    print("use kradle help for more information");
   } else if (taskOptions == null) {
     print("received invalid task options: $args");
-    print("use kradlew help for more information");
+    print("use kradle help for more information");
   } else {
     print(await execute(Context(
       workingDirectory: Directory.current,

lib/src/cli/task_get_flutter.dart

@@ -18,6 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+import "dart:ffi";
 import "dart:io";
 
 import "package:meta/meta.dart";
@@ -103,6 +104,36 @@ class GetFlutterSDK extends Task<Directory> {
           "Failed to determine download URL for Flutter SDK: ${dist.prettyPrintedString}"));
 }
 
+/// Find applicable [FlutterDistribution] for the current
+/// [OperatingSystem] and [Architecture] or throw [KlutterException].
+FlutterDistribution toFlutterDistributionOrThrow(
+    {required VerifiedFlutterVersion version,
+    required String pathToRoot,
+    PlatformWrapper? platformWrapper}) {
+  final p = platformWrapper ?? platform;
+  OperatingSystem? os;
+
+  if (version.os != null) {
+    os = version.os;
+  } else if (p.isWindows) {
+    os = OperatingSystem.windows;
+  } else if (p.isMacos) {
+    os = OperatingSystem.macos;
+  } else if (p.isLinux) {
+    os = OperatingSystem.linux;
+  } else {
+    throw KlutterException(
+        "Current OS is not supported (supported: macos, windows or linux): ${Platform.operatingSystem}");
+  }
+
+  final arch = version.arch ??
+      (Abi.current().toString().contains("arm")
+          ? Architecture.arm64
+          : Architecture.x64);
+
+  return FlutterDistribution(version: version.version, os: os!, arch: arch);
+}
+
 Map<FlutterDistribution, String> get _compatibleFlutterVersions {
   final dist = [
     _windows(

lib/src/common/executor.dart

@@ -19,9 +19,9 @@
 // SOFTWARE.
 
 import "dart:io";
-import "package:klutter/klutter.dart";
 
 import "exception.dart";
+import "utilities.dart";
 
 /// Wrapper for using the commandline.
 class Executor {

lib/src/common/project.dart

@@ -18,13 +18,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import "dart:ffi";
 import "dart:io";
 
-import "../../klutter.dart";
-import "environment.dart";
-import "exception.dart";
-import "utilities.dart";
+import "common.dart";
 
 /// Create and/or append the .klutter-plugins file to register a Klutter plugin.
 ///
@@ -163,36 +159,6 @@ String findDependencyPath({
   return cachePath.normalize;
 }
 
-/// Find applicable [FlutterDistribution] for the current
-/// [OperatingSystem] and [Architecture] or throw [KlutterException].
-FlutterDistribution toFlutterDistributionOrThrow(
-    {required VerifiedFlutterVersion version,
-    required String pathToRoot,
-    PlatformWrapper? platformWrapper}) {
-  final p = platformWrapper ?? platform;
-  OperatingSystem? os;
-
-  if (version.os != null) {
-    os = version.os;
-  } else if (p.isWindows) {
-    os = OperatingSystem.windows;
-  } else if (p.isMacos) {
-    os = OperatingSystem.macos;
-  } else if (p.isLinux) {
-    os = OperatingSystem.linux;
-  } else {
-    throw KlutterException(
-        "Current OS is not supported (supported: macos, windows or linux): ${Platform.operatingSystem}");
-  }
-
-  final arch = version.arch ??
-      (Abi.current().toString().contains("arm")
-          ? Architecture.arm64
-          : Architecture.x64);
-
-  return FlutterDistribution(version: version.version, os: os!, arch: arch);
-}
-
 extension on String {
   /// Create a path to the root-project/.klutter-plugins file.
   /// If the file does not exist create it.

pubspec.yaml

@@ -4,6 +4,9 @@ version: 3.0.0
 homepage: https://buijs.dev
 repository: https://github.com/buijs-dev/klutter-dart
 
+executables:
+  kradle:
+
 environment:
   sdk: ">=2.17.6 <4.0.0"
 

test/src/cli/task_get_flutter_test.dart

@@ -76,9 +76,32 @@ void main() {
     expect(task.requiresDownload(realDirectory, false), false);
     expect(task.requiresDownload(realDirectory, true), true);
   });
+
+  test(
+      "Verify toFlutterDistributionOrThrow throws exception for unsupported platform",
+      () {
+    expect(
+        () => toFlutterDistributionOrThrow(
+            platformWrapper: UnknownPlatform(),
+            pathToRoot: Directory.systemTemp.resolveFolder("foo").absolutePath,
+            version: const VerifiedFlutterVersion(
+                Version(major: 1, minor: 1, patch: 1))),
+        throwsA(predicate((e) => e is KlutterException)));
+  });
 }
 
 Context context(Map<TaskOption, String> options) => Context(
     taskName: TaskName.get,
     workingDirectory: Directory.current,
     taskOptions: options);
+
+class UnknownPlatform extends PlatformWrapper {
+  @override
+  bool get isWindows => false;
+
+  @override
+  bool get isMacos => false;
+
+  @override
+  bool get isLinux => false;
+}

test/src/common/project_test.dart

@@ -282,28 +282,5 @@ void main() {
         "${s}foo${s}bar$s.pub-cache${s}hosted${s}pub.dartlang.org${s}awesome_plugin${s}android${s}klutter");
   });
 
-  test(
-      "Verify toFlutterDistributionOrThrow throws exception for unsupported platform",
-      () {
-    expect(
-        () => toFlutterDistributionOrThrow(
-            platformWrapper: UnknownPlatform(),
-            pathToRoot: Directory.systemTemp.resolveFolder("foo").absolutePath,
-            version: const VerifiedFlutterVersion(
-                Version(major: 1, minor: 1, patch: 1))),
-        throwsA(predicate((e) => e is KlutterException)));
-  });
-
   tearDownAll(() => root.deleteSync(recursive: true));
 }
-
-class UnknownPlatform extends PlatformWrapper {
-  @override
-  bool get isWindows => false;
-
-  @override
-  bool get isMacos => false;
-
-  @override
-  bool get isLinux => false;
-}