Better env var logging on doctor command

leoafarias · Oct 4, 2023 · b601c7b · b601c7b
1 parent 28c578c
commit b601c7b
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 19 deletions.
diff --git a/lib/src/commands/doctor_command.dart b/lib/src/commands/doctor_command.dart
@@ -47,9 +47,7 @@ class DoctorCommand extends BaseCommand {
   void printFVMDetails(FVMContext context) {}
   void _printProject(Project project) {
     logger.info('Project:');
-    final table = createTable()
-      ..insertColumn(header: 'Project', alignment: TextAlignment.left)
-      ..insertColumn(header: project.name, alignment: TextAlignment.left);
+    final table = createTable(['Project', project.name]);
 
     table.insertRows([
       ['Directory', project.path],
@@ -85,9 +83,7 @@ class DoctorCommand extends BaseCommand {
     logger
       ..spacer
       ..info('IDEs:');
-    final table = createTable()
-      ..insertColumn(header: 'IDEs', alignment: TextAlignment.left)
-      ..insertColumn(header: '', alignment: TextAlignment.left);
+    final table = createTable(['IDEs', 'Value']);
 
     table.insertRow([kVsCode]);
     // Check for .vscode directory
@@ -152,22 +148,39 @@ class DoctorCommand extends BaseCommand {
     logger.write(table.toString());
   }
 
-  void _printEnvironmentDetails(String? flutterWhich, String? dartWhich) {
+  void _printEnvironmentDetails(
+    String? flutterWhich,
+    String? dartWhich,
+  ) {
     logger
       ..spacer
       ..info('Environment:');
-    final table = createTable()
-      ..insertColumn(
-          header: 'Environment Detail', alignment: TextAlignment.left)
-      ..insertColumn(header: 'Path/Value', alignment: TextAlignment.left);
+
+    var table = createTable(
+      ['Environment Variables', 'Value'],
+    );
+
+    table.insertRows([
+      ['Flutter PATH', flutterWhich ?? 'Not found'],
+      ['Dart PATH', dartWhich ?? 'Not found'],
+    ]);
+
+    for (var key in ConfigKeys.values) {
+      table.insertRow([key.envKey, ctx.environment[key.envKey] ?? 'N/A']);
+    }
+
+    table.insertRows([
+      ['Flutter PATH', flutterWhich ?? 'Not found'],
+      ['Dart PATH', dartWhich ?? 'Not found'],
+    ]);
+
+    logger.write(table.toString());
+
+    table = createTable(
+      ['Platform', 'Value'],
+    );
 
     table.insertRows([
-      ['Flutter Path', flutterWhich ?? 'Not found'],
-      ['Dart Path', dartWhich ?? 'Not found'],
-      [
-        ConfigKeys.cachePath.envKey,
-        ctx.environment[ConfigKeys.cachePath.envKey] ?? 'Not set'
-      ],
       ['OS', '${Platform.operatingSystem} ${Platform.operatingSystemVersion}'],
       ['Dart Locale', Platform.localeName],
       ['Dart runtime', Platform.version],

diff --git a/lib/src/utils/console_utils.dart b/lib/src/utils/console_utils.dart
@@ -4,12 +4,20 @@ import 'package:fvm/src/models/cache_flutter_version_model.dart';
 import '../../exceptions.dart';
 import '../services/logger_service.dart';
 
-Table createTable() {
-  return Table()
+Table createTable([List<String> columns = const []]) {
+  final table = Table()
     ..borderColor = ConsoleColor.white
     ..borderType = BorderType.grid
     ..borderStyle = BorderStyle.square
     ..headerStyle = FontStyle.bold;
+
+  for (final column in columns) {
+    table.insertColumn(
+      header: column,
+      alignment: TextAlignment.left,
+    );
+  }
+  return table;
 }
 
 /// Allows to select from cached sdks.