🔊 Better stdouts

packages/command/bin/flutter_gen_command.dart

@@ -3,7 +3,8 @@ import 'dart:io';
 import 'package:args/args.dart';
 import 'package:flutter_gen_core/flutter_generator.dart';
 import 'package:flutter_gen_core/utils/cast.dart';
-import 'package:flutter_gen_core/utils/version.dart';
+import 'package:flutter_gen_core/version.gen.dart';
+
 
 void main(List<String> args) {
   final parser = ArgParser();
@@ -42,7 +43,7 @@ void main(List<String> args) {
       stdout.writeln(parser.usage);
       return;
     } else if (results.wasParsed('version')) {
-      stdout.writeln(flutterGenVersion);
+      stdout.writeln('FlutterGen v$packageVersion');
       return;
     }
   } on FormatException catch (e) {

packages/command/test/flutter_gen_command_test.dart

@@ -1,9 +1,10 @@
 import 'dart:io' show Platform;
 
-import 'package:flutter_gen_core/utils/version.dart';
+import 'package:flutter_gen_core/version.gen.dart';
 import 'package:test/test.dart';
 import 'package:test_process/test_process.dart';
 
+
 final separator = Platform.pathSeparator;
 
 void main() {
@@ -14,7 +15,7 @@ void main() {
     );
     expect(
       await process.stdout.next,
-      equals('$flutterGenVersion Loading ...'),
+      equals('[FlutterGen] v$packageVersion Loading ...'),
     );
     await process.shouldExit(0);
   });
@@ -26,7 +27,7 @@ void main() {
     );
     expect(
       await process.stdout.next,
-      equals('$flutterGenVersion Loading ...'),
+      equals('[FlutterGen] v$packageVersion Loading ...'),
     );
     await process.shouldExit(0);
   });
@@ -48,7 +49,7 @@ void main() {
       'dart',
       ['bin/flutter_gen_command.dart', '--version'],
     );
-    expect(await process.stdout.next, equals(flutterGenVersion));
+    expect(await process.stdout.next, equals('[FlutterGen] v$packageVersion'));
     await process.shouldExit(0);
   });
 

packages/core/lib/flutter_generator.dart

@@ -55,7 +55,7 @@ class FlutterGenerator {
       final colorsPath =
           normalize(join(pubspecFile.parent.path, output, colorsName));
       writer(generated, colorsPath);
-      stdout.writeln('Generated: $colorsPath');
+      stdout.writeln('[FlutterGen] Generated: $colorsPath');
     }
 
     if (flutterGen.assets.enabled && flutter.assets.isNotEmpty) {
@@ -66,7 +66,7 @@ class FlutterGenerator {
       final assetsPath =
           normalize(join(pubspecFile.parent.path, output, assetsName));
       writer(generated, assetsPath);
-      stdout.writeln('Generated: $assetsPath');
+      stdout.writeln('[FlutterGen] Generated: $assetsPath');
     }
 
     if (flutterGen.fonts.enabled && flutter.fonts.isNotEmpty) {
@@ -77,9 +77,9 @@ class FlutterGenerator {
       final fontsPath =
           normalize(join(pubspecFile.parent.path, output, fontsName));
       writer(generated, fontsPath);
-      stdout.writeln('Generated: $fontsPath');
+      stdout.writeln('[FlutterGen] Generated: $fontsPath');
     }
 
-    stdout.writeln('FlutterGen finished.');
+    stdout.writeln('[FlutterGen] Finished generating.');
   }
 }

packages/core/lib/settings/config.dart

@@ -4,7 +4,7 @@ import 'package:flutter_gen_core/settings/config_default.dart';
 import 'package:flutter_gen_core/settings/pubspec.dart';
 import 'package:flutter_gen_core/utils/error.dart';
 import 'package:flutter_gen_core/utils/map.dart';
-import 'package:flutter_gen_core/utils/version.dart';
+import 'package:flutter_gen_core/version.gen.dart';
 import 'package:path/path.dart';
 import 'package:yaml/yaml.dart';
 
@@ -20,9 +20,7 @@ Config loadPubspecConfig(File pubspecFile, {File? buildFile}) {
     join(basename(pubspecFile.parent.path), basename(pubspecFile.path)),
   );
 
-  stdout.writeln(
-    '$flutterGenVersion Loading ...',
-  );
+  stdout.writeln('[FlutterGen] v$packageVersion Loading ...');
 
   final defaultMap = loadYaml(configDefaultYamlContent) as Map?;
 
@@ -31,23 +29,35 @@ Config loadPubspecConfig(File pubspecFile, {File? buildFile}) {
 
   var mergedMap = mergeMap([defaultMap, pubspecMap]);
   stdout.writeln(
-    'Reading FlutterGen options from $pubspecLocaleHint',
+    '[FlutterGen] Reading options from $pubspecLocaleHint',
   );
 
-  if (buildFile != null && buildFile.existsSync()) {
-    final buildContent = buildFile.readAsStringSync();
-    final rawMap = loadYaml(buildContent) as Map?;
-    final builders = rawMap?['targets']?[r'$default']?['builders'];
-    final optionBuildMap = (builders?['flutter_gen_runner'] ??
-        builders?['flutter_gen'])?['options'];
-    if (optionBuildMap is YamlMap) {
-      final buildMap = {'flutter_gen': optionBuildMap};
-      mergedMap = mergeMap([mergedMap, buildMap]);
-      final buildLocaleHint = normalize(
-        join(basename(buildFile.parent.path), basename(buildFile.path)),
-      );
-      stdout.writeln(
-        'Reading FlutterGen options from $buildLocaleHint',
+  if (buildFile != null) {
+    if (buildFile.existsSync()) {
+      final buildContent = buildFile.readAsStringSync();
+      final rawMap = loadYaml(buildContent) as Map?;
+      final builders = rawMap?['targets']?[r'$default']?['builders'];
+      final optionBuildMap = (builders?['flutter_gen_runner'] ??
+          builders?['flutter_gen'])?['options'];
+      if (optionBuildMap is YamlMap && optionBuildMap.isNotEmpty) {
+        final buildMap = {'flutter_gen': optionBuildMap};
+        mergedMap = mergeMap([mergedMap, buildMap]);
+        final buildLocaleHint = normalize(
+          join(basename(buildFile.parent.path), basename(buildFile.path)),
+        );
+        stdout.writeln(
+          '[FlutterGen] Reading options from $buildLocaleHint',
+        );
+      } else {
+        stderr.writeln(
+          '[FlutterGen] Specified ${buildFile.path} as input but the file '
+          'does not contain valid options, ignoring...',
+        );
+      }
+    } else {
+      stderr.writeln(
+        '[FlutterGen] Specified ${buildFile.path} as input but the file '
+        'does not exists.',
       );
     }
   }

packages/core/test/assets_gen_test.dart

@@ -230,8 +230,20 @@ void main() {
       'Assets on pubspec_assets.yaml and override with build_runner_assets.yaml ',
       () async {
         const pubspec = 'test_resources/pubspec_assets.yaml';
-        const build = 'test_resources/build_runnfer_assets.yaml';
-        const fact = 'test_resources/actual_data/build_assets.gen.dart';
+        const build = 'test_resources/build_runner_assets.yaml';
+        const fact = 'test_resources/actual_data/build_runner_assets.gen.dart';
+        const generated = 'test_resources/lib/build_gen/assets.gen.dart';
+
+        await expectedAssetsGen(pubspec, generated, fact, build: build);
+      },
+    );
+
+    test(
+      'Assets on pubspec_assets.yaml and override with build_empty.yaml ',
+      () async {
+        const pubspec = 'test_resources/pubspec_assets.yaml';
+        const build = 'test_resources/build_empty.yaml';
+        const fact = 'test_resources/actual_data/build_empty.gen.dart';
         const generated = 'test_resources/lib/build_gen/assets.gen.dart';
 
         await expectedAssetsGen(pubspec, generated, fact, build: build);