From 0df215730011ac40fb35fd022c16fbf17cd29ceb Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 3 Jun 2017 22:19:44 -0400
Subject: [PATCH] 1.0.12

---
 .idea/angel_cli.iml                    |  4 +++-
 .idea/runConfigurations/build_dart.xml |  7 +++++++
 lib/src/commands/init.dart             | 10 ++++++++--
 lib/src/commands/start.dart            |  3 ++-
 lib/src/pubspec.update.g.dart          |  2 +-
 pubspec.yaml                           |  2 +-
 6 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 .idea/runConfigurations/build_dart.xml

diff --git a/.idea/angel_cli.iml b/.idea/angel_cli.iml
index 0a2188d..0f3fa76 100644
--- a/.idea/angel_cli.iml
+++ b/.idea/angel_cli.iml
@@ -9,10 +9,12 @@
       <excludeFolder url="file://$MODULE_DIR$/packages" />
       <excludeFolder url="file://$MODULE_DIR$/sample_project/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/sample_project/bin/packages" />
+      <excludeFolder url="file://$MODULE_DIR$/sample_project/build" />
       <excludeFolder url="file://$MODULE_DIR$/sample_project/packages" />
       <excludeFolder url="file://$MODULE_DIR$/sample_project/test/packages" />
       <excludeFolder url="file://$MODULE_DIR$/sample_project/test/services/packages" />
       <excludeFolder url="file://$MODULE_DIR$/sample_project/tool/packages" />
+      <excludeFolder url="file://$MODULE_DIR$/sample_project/web/images/packages" />
       <excludeFolder url="file://$MODULE_DIR$/sample_project/web/packages" />
       <excludeFolder url="file://$MODULE_DIR$/temp" />
       <excludeFolder url="file://$MODULE_DIR$/tmp" />
@@ -20,7 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Dart SDK" level="application" />
+    <orderEntry type="library" name="Dart SDK" level="project" />
     <orderEntry type="library" name="Dart Packages" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/runConfigurations/build_dart.xml b/.idea/runConfigurations/build_dart.xml
new file mode 100644
index 0000000..1bf4884
--- /dev/null
+++ b/.idea/runConfigurations/build_dart.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="build.dart" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/tool/build.dart" />
+    <option name="workingDirectory" value="$PROJECT_DIR$" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/lib/src/commands/init.dart b/lib/src/commands/init.dart
index 59f435b..7b01a35 100644
--- a/lib/src/commands/init.dart
+++ b/lib/src/commands/init.dart
@@ -142,10 +142,16 @@ class InitCommand extends Command {
     }
   }
 
-  _pubGet(Directory projectDir) async {
+  static String resolvePub() {
     var exec = new File(Platform.resolvedExecutable);
     var pubPath = exec.parent.uri.resolve('pub').path;
-    if (Platform.isWindows) pubPath = pubPath.replaceAll(_leadingSlashes, '');
+    if (Platform.isWindows) pubPath = pubPath.replaceAll(_leadingSlashes, '') + '.bat';
+    pubPath = Uri.decodeFull(pubPath);
+    return pubPath;
+  }
+
+  _pubGet(Directory projectDir) async {
+    var pubPath = resolvePub();
     print('Running pub at "$pubPath"...');
     var pub = await Process.start(pubPath, ["get"],
         workingDirectory: projectDir.absolute.path);
diff --git a/lib/src/commands/start.dart b/lib/src/commands/start.dart
index f9af79b..3d1580a 100644
--- a/lib/src/commands/start.dart
+++ b/lib/src/commands/start.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:args/command_runner.dart';
 import 'package:watcher/watcher.dart';
 import 'package:yaml/yaml.dart';
+import 'init.dart';
 
 Process server;
 bool watching = false;
@@ -76,7 +77,7 @@ class StartCommand extends Command {
       if (scriptsNode != null && scriptsNode.containsKey('start')) {
         try {
           var scripts =
-              await Process.start('pub', ['global', 'run', 'scripts', 'start']);
+              await Process.start(InitCommand.resolvePub(), ['global', 'run', 'scripts', 'start']);
           listen(scripts.stdout, stdout);
           listen(scripts.stderr, stderr);
           int code = await scripts.exitCode;
diff --git a/lib/src/pubspec.update.g.dart b/lib/src/pubspec.update.g.dart
index 5e85f7e..04cc778 100644
--- a/lib/src/pubspec.update.g.dart
+++ b/lib/src/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, 0, 11);
+final Version PACKAGE_VERSION = new Version(1, 0, 12);
 Future<Version> 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 bbb0ff9..a499da4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ author: "Tobe O <thosakwe@gmail.com>"
 description: "Command-line tools for the Angel framework."
 homepage: "https://github.com/angel-dart/angel_cli"
 name: "angel_cli"
-version: 1.0.11
+version: 1.0.12
 dependencies: 
   # analyzer: "^0.29.0"
   args: "^0.13.7"