Merge remote-tracking branch 'origin/dart3a' into dart3a

tekartik · Nov 17, 2023 · c68b82b · c68b82b
2 parents b9c607b + 22ab19b
commit c68b82b
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 24 deletions.
diff --git a/packages/process_run/CHANGELOG.md b/packages/process_run/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.13.3-1
+
+* Fix finding `flutter` on windows in unit tests
+
 ## 0.13.2
 
 * Export `stringToArguments` in `shell.dart`

diff --git a/packages/process_run/lib/src/shell_utils.dart b/packages/process_run/lib/src/shell_utils.dart
@@ -214,36 +214,89 @@ List<String> shellSplit(String command) =>
 String shellJoin(List<String> parts) =>
     parts.map((part) => shellArgument(part)).join(' ');
 
-/// Find command in path
-String? findExecutableSync(String command, List<String?> paths) {
-  for (var path in paths) {
-    var commandPath = absolute(normalize(join(path!, command)));
+String? _findExecutableInPath(String command, String path) {
+  var commandPath = absolute(normalize(join(path, command)));
 
-    if (Platform.isWindows) {
-      for (var ext in windowsPathExts) {
-        var commandPathWithExt = '$commandPath$ext';
-        if (File(commandPathWithExt).existsSync()) {
-          return normalize(commandPathWithExt);
-        }
+  if (Platform.isWindows) {
+    for (var ext in windowsPathExts) {
+      var commandPathWithExt = '$commandPath$ext';
+      if (File(commandPathWithExt).existsSync()) {
+        return normalize(commandPathWithExt);
       }
-      // Try without extension
-      if (File(commandPath).existsSync()) {
+    }
+    // Try without extension
+    if (File(commandPath).existsSync()) {
+      return commandPath;
+    }
+  } else {
+    var stats = File(commandPath).statSync();
+    if (stats.type == FileSystemEntityType.file ||
+        stats.type == FileSystemEntityType.link) {
+      // Check executable permission
+      if (stats.mode & 0x49 != 0) {
+        // binary 001001001
+        // executable
         return commandPath;
       }
-    } else {
-      var stats = File(commandPath).statSync();
-      if (stats.type == FileSystemEntityType.file ||
-          stats.type == FileSystemEntityType.link) {
-        // Check executable permission
-        if (stats.mode & 0x49 != 0) {
-          // binary 001001001
-          // executable
-          return commandPath;
-        }
-      }
     }
   }
+  return null;
+}
 
+/// Find command in path
+String? findExecutableSync(String command, List<String?> paths) {
+  for (var path in paths) {
+    var executable = _findExecutableInPath(command, path!);
+    if (executable != null) {
+      return executable;
+    }
+  }
+
+  // Special case for flutter happen when running from test
+  // On windows the executable might be in flutter
+  // executable: C:\opt\app\flutter\stable\flutter\bin\cache\artifacts\engine\windows-x64\flutter_tester.exe
+  // Try without extension
+  if (command == 'flutter') {
+    // print('executable: ${Platform.executable}');
+    return _findFlutterExecutableInParents(Platform.executable);
+  }
+
+  return null;
+}
+
+bool _isFlutterRoot(String path) {
+  try {
+    // "version" file contains: 3.13.0
+    if (!File(join(path, 'version')).existsSync()) {
+      return false;
+    }
+    // bin/flutter(.exe)
+    if (_findExecutableInPath('flutter', join(path, 'bin')) == null) {
+      return false;
+    }
+
+    return true;
+  } catch (_) {}
+  return false;
+}
+
+///
+/// checking recursively the parent for any hg or git directory
+///
+String? _findFlutterExecutableInParents(String path) {
+  path = normalize(absolute(path));
+  String parent;
+  while (true) {
+    if (_isFlutterRoot(path)) {
+      return _findExecutableInPath('flutter', join(path, 'bin'));
+    }
+
+    parent = dirname(path);
+    if (parent == path) {
+      break;
+    }
+    path = parent;
+  }
   return null;
 }
 

diff --git a/packages/process_run/pubspec.yaml b/packages/process_run/pubspec.yaml
@@ -1,5 +1,5 @@
 name: process_run
-version: 0.13.2
+version: 0.13.3-1
 description: Process run helpers for Linux/Win/Mac and which like feature for finding executables.
 homepage: https://github.com/tekartik/process_run.dart/blob/master/packages/process_run