diff --git a/lib/src/commands/install.dart b/lib/src/commands/install.dart index b2097c6b..689e2393 100644 --- a/lib/src/commands/install.dart +++ b/lib/src/commands/install.dart @@ -69,6 +69,7 @@ class InstallCommand extends Command { if (!await packageDir.exists()) throw 'No add-on named "$packageName" is installed. You might need to run `angel install --update`.'; + print('Installing $packageName...'); Map values = { 'project_name': pubspec.name, @@ -77,9 +78,30 @@ class InstallCommand extends Command { List globs = []; + var projectPubspec = await PubSpec.load(packageDir); + var deps = projectPubspec.dependencies.keys + .map((k) { + var dep = projectPubspec.dependencies[k]; + if (dep is HostedReference) + return new MakerDependency( + k, dep.versionConstraint.toString()); + return null; + }) + .where((d) => d != null) + .toList(); + + deps.addAll(projectPubspec.devDependencies.keys.map((k) { + var dep = projectPubspec.devDependencies[k]; + if (dep is HostedReference) + return new MakerDependency(k, dep.versionConstraint.toString(), + dev: true); + return null; + }).where((d) => d != null)); + + await depend(deps); + var promptFile = new File.fromUri(packageDir.uri.resolve('angel_cli.yaml')); - var projectPubspec = await PubSpec.load(packageDir); if (await promptFile.exists()) { var contents = await promptFile.readAsString(); @@ -120,27 +142,6 @@ class InstallCommand extends Command { } } } - - var deps = projectPubspec.dependencies.keys - .map((k) { - var dep = projectPubspec.dependencies[k]; - if (dep is HostedReference) - return new MakerDependency( - k, dep.versionConstraint.toString()); - return null; - }) - .where((d) => d != null) - .toList(); - - deps.addAll(projectPubspec.devDependencies.keys.map((k) { - var dep = projectPubspec.devDependencies[k]; - if (dep is HostedReference) - return new MakerDependency(k, dep.versionConstraint.toString(), - dev: true); - return null; - }).where((d) => d != null)); - - await depend(deps); } Future merge(Directory src, Directory dst, String prefix) async { diff --git a/lib/src/commands/pubspec.update.g.dart b/lib/src/commands/pubspec.update.g.dart index a4c53ba2..b4406c45 100644 --- a/lib/src/commands/pubspec.update.g.dart +++ b/lib/src/commands/pubspec.update.g.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:http/src/base_client.dart' as http; import 'package:pub_semver/pub_semver.dart'; -final Version PACKAGE_VERSION = new Version(1, 2, 0, build: '1'); +final Version PACKAGE_VERSION = new Version(1, 2, 0, build: '3'); Future fetchCurrentVersion(http.BaseClient client) async { var response = await client.get('https://pub.dartlang.org/api/packages/angel_cli'); diff --git a/pubspec.yaml b/pubspec.yaml index 50231b9b..9cebff70 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ author: "Tobe O " description: "Command-line tools for the Angel framework." homepage: "https://github.com/angel-dart/angel_cli" name: "angel_cli" -version: 1.2.0+1 +version: 1.2.0+3 dependencies: # analyzer: "^0.29.0" args: ^0.13.4