refactor: runCommand should just return stdout instead of Process (#9)

irondash · May 10, 2024 · 998a178 · 998a178
1 parent b34b9e4
commit 998a178
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/native_doctor/lib/src/android_sdk.dart b/native_doctor/lib/src/android_sdk.dart
@@ -20,15 +20,14 @@ class AndroidSdkInfo {
     final flutterCommand = flutterRoot != null
         ? path.join(flutterRoot, 'bin', 'flutter')
         : 'flutter';
-    final result = await runCommand(
+    final json = await runCommand(
       flutterCommand,
       [
         'config',
         '--machine',
       ],
       logger: logger,
     );
-    final json = result.stdout as String;
     final decoded = jsonDecode(json) as Map<String, dynamic>;
     final javaHome = decoded['jdk-dir'] as String?;
     final sdk = decoded['android-sdk'] as String?;

diff --git a/native_doctor/lib/src/checkers/ndk.dart b/native_doctor/lib/src/checkers/ndk.dart
@@ -214,7 +214,7 @@ class NdkToolchainChecker extends ToolchainChecker {
         logger: doctor.verboseLogger,
       );
       latestVersion = findBestNdkKversion(
-        sdkManagerOutput: list.stdout,
+        sdkManagerOutput: list,
         minimumVersion: minimumVersion!,
       );
       if (latestVersion == null) {

diff --git a/native_toolchain_rust_common/lib/src/command.dart b/native_toolchain_rust_common/lib/src/command.dart
@@ -53,7 +53,7 @@ class CommandFailedException implements Exception {
   }
 }
 
-Future<ProcessResult> runCommand(
+Future<String> runCommand(
   String executable,
   List<String> arguments, {
   String? workingDirectory,
@@ -85,6 +85,6 @@ Future<ProcessResult> runCommand(
       result: res,
     );
   } else {
-    return res;
+    return res.stdout as String;
   }
 }
diff --git a/rustup/lib/src/installer.dart b/rustup/lib/src/installer.dart
@@ -19,7 +19,7 @@ abstract class RustupInstaller {
     String? cargoHome,
     String? rustupHome,
   }) async {
-    final process = await runCommand(
+    await runCommand(
       _scriptPath(),
       [
         '--default-toolchain',
@@ -33,10 +33,6 @@ abstract class RustupInstaller {
       },
       logger: _logger,
     );
-    final exitCode = process.exitCode;
-    if (exitCode != 0) {
-      throw Exception('Failed to install rustup');
-    }
   }
 
   Future<void> dispose();

diff --git a/rustup/lib/src/rustup.dart b/rustup/lib/src/rustup.dart
@@ -60,8 +60,7 @@ class Rustup {
     // To list all non-custom toolchains, we need to filter out lines that
     // don't start with "stable", "beta", or "nightly".
     Pattern nonCustom = RegExp(r"^(stable|beta|nightly)");
-    final lines = res.stdout
-        .toString()
+    final lines = res
         .split('\n')
         .where((e) => e.isNotEmpty && e.startsWith(nonCustom))
         .map(extractToolchainName)
@@ -81,7 +80,7 @@ class Rustup {
     return runCommand(['self', 'uninstall', '-y']);
   }
 
-  Future<ProcessResult> runCommand(
+  Future<String> runCommand(
     List<String> arguments, {
     Map<String, String>? environment,
     Logger? logger,
@@ -274,7 +273,7 @@ class RustupToolchain {
 
   Future<Version> rustVersion() async {
     final res = await rustup.runCommand(['run', name, 'rustc', '--version']);
-    final versionString = res.stdout.toString().split(' ')[1];
+    final versionString = res.split(' ')[1];
     return Version.parse(versionString);
   }
 
@@ -301,7 +300,7 @@ class RustupToolchain {
       name,
       '--installed',
     ]);
-    final lines = res.stdout.toString().split('\n').where((e) => e.isNotEmpty);
+    final lines = res.toString().split('\n').where((e) => e.isNotEmpty);
     return lines
         .map((e) => RustTarget.fromTriple(e))
         .whereNotNull()