diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 5d196f0..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index 060200d..4969970 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ ## File-based project format: *.iws +.DS_Store ## Plugin-specific files: diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c180d1..06b0e55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,27 +1,24 @@ # Change Log -## 7.1.0 +## 8.1.0 -* Required Dart >= 2.18.x -* Updated `analyzer` to 5.x.x +* Updated README +* Updated logo +* Updated to `analyzer` 6.2.x +* Updated to support Dart SDK 3.1.3 + +## 8.0.0 + +* Required Dart SDK > 3.0.x +* Updated to `analyzer` 5.0.x ## 7.0.0 -* Required Dart >= 2.17.x -* Updated packages versions - -## 6.1.0 - -* Updated to `analyzer` 4.x.x -* Updated to `lints` 2.x.x - -## 6.0.1 - -* Added `angel3-orm-mysql` template for ORM support for MariaDB and MySQL +* Skipped release ## 6.0.0 -* Required Dart >= 2.16.x +* Updated Dart SDK to 2.16.x ## 5.0.0 @@ -31,7 +28,7 @@ * Changed `pub` to `dart pub` * Changed `pub build` to `dart build` -* Updated SDK to 2.14.0 +* Updated Dart SDK to 2.14.0 ## 3.2.0 @@ -43,7 +40,7 @@ ## 3.1.0 -* Upgraded to support `analyzer` 2.0.0 major release +* Upgraded to support `analyzer` 2.0.0 ## 3.0.1 diff --git a/README.md b/README.md index 699e6ad..69d47d6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Angel3 CLI +# Angel3 Command Line Interface -[![Screenshot of Terminal](screenshots/angel3-screenshot.png)](https://github.com/dukefirehawk/angel3-cli) +[![Angel3 Logo](angel3_logo.svg)](https://github.com/dukefirehawk/angel3-cli) ![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_cli?include_prereleases) [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) @@ -22,12 +22,6 @@ Release version: dart pub global activate angel3_cli ``` -Development version: - -```bash -dart pub global activate --source git https://github.com/dukefirehawk/angel3-cli -``` - ## Help For information on the available options: @@ -35,3 +29,5 @@ For information on the available options: ```bash angel3 help ``` + +[![Screenshot of Terminal](screenshots/angel3-screenshot.png)](https://github.com/dukefirehawk/angel3-cli) diff --git a/angel3_logo.svg b/angel3_logo.svg new file mode 100644 index 0000000..ea984e5 --- /dev/null +++ b/angel3_logo.svg @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + A + 3 + + + diff --git a/archived/logo128.svg b/archived/logo128.svg new file mode 100644 index 0000000..7d2a815 --- /dev/null +++ b/archived/logo128.svg @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + A + 3 + + diff --git a/archived/logo3.xcf b/archived/logo3.xcf new file mode 100644 index 0000000..abff3b6 Binary files /dev/null and b/archived/logo3.xcf differ diff --git a/bin/angel3.dart b/bin/angel3.dart index db4f353..aeb81bd 100644 --- a/bin/angel3.dart +++ b/bin/angel3.dart @@ -7,8 +7,6 @@ import 'package:args/command_runner.dart'; import 'package:angel3_cli/angel3_cli.dart'; import 'package:io/ansi.dart'; -//const String doctor = 'doctor'; - void main(List args) async { var runner = CommandRunner('angel3', '$asciiArt\n\nCommand-line tools for the Angel3 framework.\n\nhttps://angel3-framework.web.app'); diff --git a/lib/src/commands/init.dart b/lib/src/commands/init.dart index 466cae0..440a553 100644 --- a/lib/src/commands/init.dart +++ b/lib/src/commands/init.dart @@ -243,9 +243,10 @@ class InitCommand extends Command { var gitDir = Directory.fromUri(projectDir.uri.resolve('.git')); if (await gitDir.exists()) await gitDir.delete(recursive: true); } catch (e) { - await boilerplateDir.delete(recursive: true).catchError((e) { - print('Got error: ${e.error}'); - }); + await boilerplateDir.delete(recursive: true); + //await boilerplateDir.delete(recursive: true).catchError((e) { + // print('Got error: ${e.error}'); + //}); if (e is! String) { print(red.wrap('$ballot Could not initialize Angel3 project.')); diff --git a/lib/src/commands/rename.dart b/lib/src/commands/rename.dart index 7fbbb3f..0070441 100644 --- a/lib/src/commands/rename.dart +++ b/lib/src/commands/rename.dart @@ -225,13 +225,11 @@ class RenamingVisitor extends RecursiveAstVisitor { @override void visitLibraryDirective(LibraryDirective node) { - var name = node.name2?.name; + var name = node.name2?.name ?? ''; - if (name != null) { - if (name.startsWith(oldName)) { - replace[[node.offset, node.end]] = - 'library ${name.replaceFirst(oldName, newName)};'; - } + if (name.startsWith(oldName)) { + replace[[node.offset, node.end]] = + 'library ${name.replaceFirst(oldName, newName)};'; } } diff --git a/lib/src/commands/service_generators/custom.dart b/lib/src/commands/service_generators/custom.dart index 7d70c43..3e1b62e 100644 --- a/lib/src/commands/service_generators/custom.dart +++ b/lib/src/commands/service_generators/custom.dart @@ -2,6 +2,10 @@ import 'package:code_builder/code_builder.dart'; import 'generator.dart'; class CustomServiceGenerator extends ServiceGenerator { + bool get createsModel => false; + + bool get createsValidator => false; + const CustomServiceGenerator() : super('Custom'); @override diff --git a/lib/src/commands/service_generators/generator.dart b/lib/src/commands/service_generators/generator.dart index 6cd76ae..4eba968 100644 --- a/lib/src/commands/service_generators/generator.dart +++ b/lib/src/commands/service_generators/generator.dart @@ -8,23 +8,6 @@ class ServiceGenerator { List get dependencies => []; - /* - @deprecated - bool get createsModel => true; - - @deprecated - bool get createsValidator => true; - - @deprecated - bool get exportedInServiceLibrary => true; - - @deprecated - bool get injectsSingleton => false; - - @deprecated - bool get shouldRunBuild => false; - */ - bool get goesFirst => false; void applyToLibrary(LibraryBuilder library, String name, String lower) {} diff --git a/lib/src/commands/service_generators/map.dart b/lib/src/commands/service_generators/map.dart index e6482a5..4004bac 100644 --- a/lib/src/commands/service_generators/map.dart +++ b/lib/src/commands/service_generators/map.dart @@ -4,6 +4,8 @@ import 'package:code_builder/code_builder.dart'; class MapServiceGenerator extends ServiceGenerator { const MapServiceGenerator() : super('In-Memory'); + bool get createsModel => false; + @override Expression createInstance(LibraryBuilder library, MethodBuilder methodBuilder, String name, String lower) { diff --git a/lib/src/commands/service_generators/mongo.dart b/lib/src/commands/service_generators/mongo.dart index 9ce01b2..af6c39e 100644 --- a/lib/src/commands/service_generators/mongo.dart +++ b/lib/src/commands/service_generators/mongo.dart @@ -8,7 +8,9 @@ class MongoServiceGenerator extends ServiceGenerator { @override List get dependencies => - const [MakerDependency('angel3_mongo', '^7.0.0')]; + const [MakerDependency('angel3_mongo', '^4.0.0')]; + + bool get createsModel => false; @override void applyToConfigureServer( diff --git a/lib/src/commands/service_generators/rethink.dart b/lib/src/commands/service_generators/rethink.dart index 097bea8..b25bae1 100644 --- a/lib/src/commands/service_generators/rethink.dart +++ b/lib/src/commands/service_generators/rethink.dart @@ -10,6 +10,8 @@ class RethinkServiceGenerator extends ServiceGenerator { List get dependencies => const [MakerDependency('angel3_rethink', '^4.0.0')]; + bool get createsModel => false; + @override void applyToConfigureServer( LibraryBuilder library, diff --git a/pubspec.yaml b/pubspec.yaml index 2189e06..a7ae303 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,27 +1,27 @@ name: angel3_cli -version: 7.1.0 +version: 8.1.0 description: Command line tools for the Angel3 framework, including scaffolding. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel3-cli environment: - sdk: '>=2.18.0 <3.0.0' + sdk: '>=3.0.0 <4.0.0' dependencies: - analyzer: ^5.2.0 - args: ^2.1.1 - code_builder: ^4.0.0 - dart_style: ^2.0.1 - glob: ^2.0.1 - http: ^0.13.3 + analyzer: ^6.2.0 + args: ^2.4.0 + code_builder: ^4.5.0 + dart_style: ^2.3.0 + glob: ^2.1.0 + http: ^1.0.0 io: ^1.0.0 inflection3: ^0.5.3+2 mustache_template: ^2.0.0 path: ^1.8.0 prompts: ^2.0.0 - pubspec_parse: ^1.0.0 - quiver: ^3.0.1 - recase: ^4.0.0 + pubspec_parse: ^1.2.0 + quiver: ^3.2.0 + recase: ^4.1.0 shutdown: ^0.4.3 - watcher: ^1.0.0 + watcher: ^1.1.0 yaml: ^3.1.0 dev_dependencies: lints: ^2.0.0 diff --git a/screenshots/screenshot.png b/screenshots/screenshot.png deleted file mode 100644 index fe8c965..0000000 Binary files a/screenshots/screenshot.png and /dev/null differ