diff --git a/README.md b/README.md index 0137fbe..be4d76a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Screenshot of Terminal](screenshots/angel3-screenshot.png)](https://github.com/dukefirehawk/angel3-cli) -[![version](https://img.shields.io/badge/pub-v3.0.0-brightgreen)](https://pub.dartlang.org/angel3_cli) +[![version](https://img.shields.io/badge/pub-v3.0.1-brightgreen)](https://pub.dartlang.org/angel3_cli) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) [![Gitter](https://img.shields.io/gitter/room/angel_dart/discussion)](https://gitter.im/angel_dart/discussion) diff --git a/bin/angel3.dart b/bin/angel3.dart index b1ce6c6..35f19f8 100644 --- a/bin/angel3.dart +++ b/bin/angel3.dart @@ -11,7 +11,7 @@ final String DOCTOR = 'doctor'; void main(List args) async { var runner = CommandRunner( - 'angel', + 'angel3', asciiArt + '\n\n' + 'Command-line tools for the Angel3 framework.' + diff --git a/lib/src/commands/make/controller.dart b/lib/src/commands/make/controller.dart index 08aae5b..9692ca9 100644 --- a/lib/src/commands/make/controller.dart +++ b/lib/src/commands/make/controller.dart @@ -39,7 +39,7 @@ class ControllerCommand extends Command { } var deps = [ - const MakerDependency('angel_framework', '^2.0.0') + const MakerDependency('angel3_framework', '^4.1.0') ]; //${pubspec.name}.src.models.${rc.snakeCase} @@ -47,12 +47,12 @@ class ControllerCommand extends Command { var rc = ReCase(name!); var controllerLib = Library((controllerLib) { if (argResults!['websocket'] as bool) { - deps.add(const MakerDependency('angel_websocket', '^2.0.0')); + deps.add(const MakerDependency('angel3_websocket', '^4.0.0')); controllerLib.directives - .add(Directive.import('package:angel_websocket/server.dart')); + .add(Directive.import('package:angel3_websocket/server.dart')); } else { controllerLib.directives.add( - Directive.import('package:angel_framework/angel_framework.dart')); + Directive.import('package:angel3_framework/angel3_framework.dart')); } controllerLib.body.add(Class((clazz) { diff --git a/lib/src/commands/make/migration.dart b/lib/src/commands/make/migration.dart index 2d20c59..442919e 100644 --- a/lib/src/commands/make/migration.dart +++ b/lib/src/commands/make/migration.dart @@ -35,13 +35,13 @@ class MigrationCommand extends Command { name = prompts.get('Name of model class'); } - var deps = [const MakerDependency('angel_migration', '^2.0.0')]; + var deps = [const MakerDependency('angel3_migration', '^4.0.0')]; var rc = ReCase(name!); var migrationLib = Library((migrationLib) { migrationLib ..directives.add(Directive.import( - 'package:angel_migration.dart/angel_migration.dart')) + 'package:angel3_migration.dart/angel3_migration.dart')) ..body.add(Class((migrationClazz) { migrationClazz ..name = '${rc.pascalCase}Migration' diff --git a/lib/src/commands/make/model.dart b/lib/src/commands/make/model.dart index 0a63ff4..0eb0286 100644 --- a/lib/src/commands/make/model.dart +++ b/lib/src/commands/make/model.dart @@ -41,7 +41,7 @@ class ModelCommand extends Command { } var deps = [ - const MakerDependency('angel_model', '^1.0.0'), + const MakerDependency('angel3_model', '^3.0.0'), ]; var rc = ReCase(name!); @@ -49,7 +49,7 @@ class ModelCommand extends Command { var modelLib = Library((modelLib) { if (argResults!['orm'] as bool && argResults!['migration'] as bool) { modelLib.directives.addAll([ - Directive.import('package:angel_migration/angel_migration.dart'), + Directive.import('package:angel3_migration/angel3_migration.dart'), ]); } @@ -59,10 +59,10 @@ class ModelCommand extends Command { if (needsSerialize) { modelLib.directives.add( - Directive.import('package:angel_serialize/angel_serialize.dart')); - deps.add(const MakerDependency('angel_serialize', '^2.0.0')); - deps.add(const MakerDependency('angel_serialize_generator', '^2.0.0')); - deps.add(const MakerDependency('build_runner', '^1.0.0')); + Directive.import('package:angel3_serialize/angel3_serialize.dart')); + deps.add(const MakerDependency('angel3_serialize', '^4.0.0')); + deps.add(const MakerDependency('angel3_serialize_generator', '^4.0.0')); + deps.add(const MakerDependency('build_runner', '^2.0.0')); } // else { @@ -73,9 +73,9 @@ class ModelCommand extends Command { if (argResults!['orm'] as bool) { modelLib.directives.addAll([ - Directive.import('package:angel_orm/angel_orm.dart'), + Directive.import('package:angel3_orm/angel3_orm.dart'), ]); - deps.add(const MakerDependency('angel_orm', '^2.0.0')); + deps.add(const MakerDependency('angel3_orm', '^4.0.0')); } modelLib.body.addAll([ diff --git a/lib/src/commands/make/plugin.dart b/lib/src/commands/make/plugin.dart index 6011180..4f20e88 100644 --- a/lib/src/commands/make/plugin.dart +++ b/lib/src/commands/make/plugin.dart @@ -35,7 +35,7 @@ class PluginCommand extends Command { } var deps = [ - const MakerDependency('angel_framework', '^2.0.0') + const MakerDependency('angel3_framework', '^4.1.0') ]; var rc = ReCase(name!); @@ -57,7 +57,7 @@ class PluginCommand extends Command { return ''' library ${pubspec.name}.src.config.plugins.${rc.snakeCase}; -import 'package:angel_framework/angel_framework.dart'; +import 'package:angel3_framework/angel3_framework.dart'; AngelConfigurer ${rc.camelCase}() { return (Angel app) async { diff --git a/lib/src/commands/make/service.dart b/lib/src/commands/make/service.dart index 1168f08..3974fcb 100644 --- a/lib/src/commands/make/service.dart +++ b/lib/src/commands/make/service.dart @@ -41,7 +41,7 @@ class ServiceCommand extends Command { } var deps = [ - const MakerDependency('angel_framework', '^2.0.0') + const MakerDependency('angel3_framework', '^4.1.0') ]; // '${pubspec.name}.src.services.${rc.snakeCase}' @@ -64,10 +64,10 @@ class ServiceCommand extends Command { if (generator.goesFirst) { generator.applyToLibrary(serviceLib, name, rc.snakeCase); serviceLib.directives.add( - Directive.import('package:angel_framework/angel_framework.dart')); + Directive.import('package:angel3_framework/angel3_framework.dart')); } else { serviceLib.directives.add( - Directive.import('package:angel_framework/angel_framework.dart')); + Directive.import('package:angel3_framework/angel3_framework.dart')); generator.applyToLibrary(serviceLib, name, rc.snakeCase); } diff --git a/lib/src/commands/make/test.dart b/lib/src/commands/make/test.dart index 3ab6479..dd432b2 100644 --- a/lib/src/commands/make/test.dart +++ b/lib/src/commands/make/test.dart @@ -38,9 +38,9 @@ class TestCommand extends Command { } var deps = [ - const MakerDependency('angel_framework', '^2.0.0'), - const MakerDependency('angel_test', '^2.0.0', dev: true), - const MakerDependency('test', '^1.0.0', dev: true), + const MakerDependency('angel3_framework', '^4.1.0'), + const MakerDependency('angel3_test', '^4.0.0', dev: true), + const MakerDependency('test', '^1.17.0', dev: true), ]; var rc = ReCase(name!); @@ -85,15 +85,15 @@ class TestCommand extends Command { return ''' import 'dart:io'; import 'package:${pubspec.name}/${pubspec.name}.dart' as ${pubspec.name}; -import 'package:angel_framework/angel_framework.dart'; -import 'package:angel_test/angel_test.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:angel3_test/angel3_test.dart'; import 'package:test/test.dart'; main() async { TestClient client; setUp(() async { - var app = new Angel(); + var app = Angel(); await app.configure(${pubspec.name}.configureServer); client = await connectTo(app); }); diff --git a/pubspec.yaml b/pubspec.yaml index 49f0d53..ebd3b15 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_cli -version: 3.0.0 +version: 3.0.1 description: Command line tools for the Angel3 framework, including scaffolding. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel3-cli diff --git a/screenshots/angel3-screenshot.png b/screenshots/angel3-screenshot.png index 70ca1d2..0e0f9b2 100644 Binary files a/screenshots/angel3-screenshot.png and b/screenshots/angel3-screenshot.png differ