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/CHANGELOG.md b/CHANGELOG.md index 105dc08..06b0e55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ # Change Log +## 8.1.0 + +* Updated README +* Updated logo +* Updated to `analyzer` 6.2.x +* Updated to support Dart SDK 3.1.3 + ## 8.0.0 -* Required SDK > 3.0.x +* Required Dart SDK > 3.0.x +* Updated to `analyzer` 5.0.x ## 7.0.0 @@ -10,7 +18,7 @@ ## 6.0.0 -* Updated SDK to 2.16.x +* Updated Dart SDK to 2.16.x ## 5.0.0 @@ -20,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 @@ -32,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 a07a507..aeb81bd 100644 --- a/bin/angel3.dart +++ b/bin/angel3.dart @@ -7,16 +7,9 @@ import 'package:args/command_runner.dart'; import 'package:angel3_cli/angel3_cli.dart'; import 'package:io/ansi.dart'; -final String DOCTOR = 'doctor'; - void main(List args) async { - var runner = CommandRunner( - 'angel3', - asciiArt + - '\n\n' + - 'Command-line tools for the Angel3 framework.' + - '\n\n' + - 'https://angel3-framework.web.app'); + var runner = CommandRunner('angel3', + '$asciiArt\n\nCommand-line tools for the Angel3 framework.\n\nhttps://angel3-framework.web.app'); runner.argParser .addFlag('verbose', help: 'Print verbose output.', negatable: false); diff --git a/lib/src/commands/init.dart b/lib/src/commands/init.dart index 8bca097..2f8be7a 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 84923c3..0070441 100644 --- a/lib/src/commands/rename.dart +++ b/lib/src/commands/rename.dart @@ -225,7 +225,7 @@ class RenamingVisitor extends RecursiveAstVisitor { @override void visitLibraryDirective(LibraryDirective node) { - var name = node.name.name; + var name = node.name2?.name ?? ''; if (name.startsWith(oldName)) { replace[[node.offset, node.end]] = diff --git a/lib/src/commands/service_generators/file_service.dart b/lib/src/commands/service_generators/file_service.dart index e4e2fa5..ee8b804 100644 --- a/lib/src/commands/service_generators/file_service.dart +++ b/lib/src/commands/service_generators/file_service.dart @@ -41,7 +41,7 @@ class FileServiceGenerator extends ServiceGenerator { return refer('JsonFileService').newInstance([ refer('dbDirectory') .property('childFile') - .call([literal(pluralize(lower) + '_db.json')]) + .call([literal('${pluralize(lower)}_db.json')]) ]); } } diff --git a/pubspec.yaml b/pubspec.yaml index c64f1f9..a7ae303 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,12 +1,12 @@ name: angel3_cli -version: 8.0.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: '>=3.0.0 <4.0.0' dependencies: - analyzer: ^5.13.0 + analyzer: ^6.2.0 args: ^2.4.0 code_builder: ^4.5.0 dart_style: ^2.3.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 diff --git a/test/replace_name.dart b/test/replace_name.dart index a037115..67df9d6 100644 --- a/test/replace_name.dart +++ b/test/replace_name.dart @@ -42,7 +42,7 @@ void main() async { var contents = lineList.fold('', (prev, cur) { var updatedCur = updateImport(cur, oldName, newName); updatedCur = updateMustacheBinding(updatedCur, oldName, newName); - return prev + '\n' + updatedCur; + return '$prev\n$updatedCur'; }); await file.writeAsString(fmt.format(contents));