Merge branch 'main' into fix_#699

.github/workflows/test.yml

@@ -61,7 +61,6 @@ jobs:
 
   test-os:
     name: Test on ${{ matrix.os }}
-    needs: test
     timeout-minutes: 30
     runs-on: ${{ matrix.os }}
     strategy:

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.1.6
+
+- Improved messages when nested .fvmrc file is found.
+- Better error handling for .git directory check.
+
 ## 3.1.5
 
 * Improved mirror creation logging

lib/src/services/flutter_service.dart

@@ -198,8 +198,8 @@ class FlutterService extends ContextService {
       throw Exception('Git cache directory does not exist');
     }
 
-    final gitDir = await GitDir.fromExisting(context.gitCachePath);
     try {
+      final gitDir = await GitDir.fromExisting(context.gitCachePath);
       final result = await gitDir.runCommand(
         ['rev-parse', '--short', '--verify', ref],
       );

lib/src/workflows/resolve_dependencies.workflow.dart

@@ -27,6 +27,14 @@ Future<void> resolveDependenciesWorkflow(
     return;
   }
 
+  if (!project.hasPubspec) {
+    logger
+      ..info('Skipping "pub get" because no pubspec.yaml found.')
+      ..spacer;
+
+    return;
+  }
+
   final progress = logger.progress('Resolving dependencies...');
 
   // Try to resolve offline

lib/src/workflows/use_version.workflow.dart

@@ -33,12 +33,25 @@ Future<void> useVersionWorkflow({
 }) async {
   // If project use check that is Flutter project
   if (!project.hasPubspec && !force) {
-    logger
-      ..spacer
-      ..info('No pubspec.yaml detected in this directory');
-    final proceed = logger.confirm('Would you like to continue?');
+    if (project.hasConfig) {
+      if (project.path != ctx.workingDirectory) {
+        logger
+          ..spacer
+          ..info('Using $kFvmConfigFileName in ${project.path}')
+          ..spacer
+          ..info(
+            'If this is incorrect either use the --force flag or remove the $kFvmConfigFileName and the $kFvmDirName directory.',
+          )
+          ..spacer;
+      }
+    } else {
+      logger
+        ..spacer
+        ..info('No pubspec.yaml detected in this directory');
+      final proceed = logger.confirm('Would you like to continue?');
 
-    if (!proceed) exit(ExitCode.success.code);
+      if (!proceed) exit(ExitCode.success.code);
+    }
   }
 
   logger
@@ -111,12 +124,6 @@ Future<void> _checkGitignore(Project project, {required bool force}) async {
   final updateGitIgnore = project.config?.updateGitIgnore ?? true;
 
   logger.detail('Update gitignore: $updateGitIgnore');
-  if (!await GitDir.isGitDir(project.path)) {
-    logger.warn(
-      'Project is not a git repository. \n But will set .gitignore as IDEs may use it,'
-      'to determine what to index and display on searches,',
-    );
-  }
 
   if (!updateGitIgnore) {
     logger.detail(
@@ -131,6 +138,12 @@ Future<void> _checkGitignore(Project project, {required bool force}) async {
   final ignoreFile = project.gitIgnoreFile;
 
   if (!ignoreFile.existsSync()) {
+    if (!await GitDir.isGitDir(project.path)) {
+      logger.warn(
+        'Project is not a git repository. \n But will set .gitignore as IDEs may use it,'
+        'to determine what to index and display on searches,',
+      );
+    }
     ignoreFile.createSync(recursive: true);
   }
 

pubspec.yaml

@@ -1,7 +1,7 @@
 name: fvm
 description: A simple cli to manage Flutter SDK versions per project. Support
   channels, releases, and local cache for fast switching between versions.
-version: 3.1.5
+version: 3.1.6
 homepage: https://github.com/leoafarias/fvm
 
 environment: