Merge branch 'main' into luan.new-template

Author: luanpotter

lib/commands/create_command.dart

@@ -24,6 +24,7 @@ Future<void> createCommand(ArgResults command) async {
     'Choose a name for your project: ',
     desc: 'Note: this must be a valid dart identifier (no dashes). '
         'For example: my_game',
+    validate: (it) => !it.contains('-') && it != 'test',
   );
 
   final org = getString(
@@ -34,6 +35,7 @@ Future<void> createCommand(ArgResults command) async {
     desc: 'Note: this is a dot separated list of "packages", '
         'normally in reverse domain notation. '
         'For example: org.flame_engine.games',
+    validate: (it) => !it.contains('-'),
   );
 
   final versions = FlameVersionManager.singleton.versions;

lib/commands/version_command.dart

@@ -1,20 +1,11 @@
-import 'dart:io';
-
-import 'package:ignite_cli/utils.dart';
+import 'package:ignite_cli/version.g.dart';
 import 'package:process_run/process_run.dart';
-import 'package:yaml/yaml.dart';
 
 Future<void> versionCommand() async {
   print(r'$ ignite --version:');
-  print(await getVersionFromPubspec());
+  print(igniteVersion);
   print('');
   await runExecutableArguments('dart', ['--version'], verbose: true);
   print('');
   await runExecutableArguments('flutter', ['--version'], verbose: true);
-}
-
-Future<String> getVersionFromPubspec() async {
-  final f = File(getBundledFile('pubspec.yaml'));
-  final yaml = loadYaml(await f.readAsString()) as Map;
-  return yaml['version'] as String;
-}
+}

lib/utils.dart

@@ -17,6 +17,7 @@ String getString(
   String message, {
   required bool isInteractive,
   String? desc,
+  bool Function(String)? validate,
 }) {
   var value = results[name] as String?;
   if (!isInteractive) {
@@ -29,7 +30,7 @@ String getString(
     if (desc != null) {
       stdout.write(ansi.darkGray.wrap('\n$desc\u{1B}[1A\r'));
     }
-    value = prompts.get(message, validate: (it) => !it.contains('-'));
+    value = prompts.get(message, validate: validate);
     if (desc != null) {
       stdout.write('\r\u{1B}[K');
     }

lib/version.g.dart

@@ -0,0 +1,3 @@
+// This file is generated. Do not manually edit.
+String igniteVersion = '0.6.0';
+

scripts/build.sh

@@ -1,5 +1,7 @@
 #!/bin/bash -xe
 
+./scripts/generate-version.sh
+
 # TODO(luan): use a wildcard once supported
 function bundle {
     dart run mason_cli:mason bundle $1 -t dart -o lib/templates/bricks/

scripts/generate-version.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -xe
+
+version=`cat pubspec.yaml | grep 'version: ' | cut -d ' ' -f 2`
+contents="// This file is generated. Do not manually edit.\nString igniteVersion = '$version';\n"
+echo "$contents" | sed 's/\\n/\n/g' > lib/version.g.dart

scripts/test.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -xe
+
+./scripts/build.sh
+./scripts/analyze.sh
+(cd test ; ./run.sh)