ember-cli-rails 0.0.18 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02bdcb704d9cf103835f4d33f06a395b154e6f83
-  data.tar.gz: be0455d38e0af37abe4ce06880974c16fb2edbf5
+  metadata.gz: a08a5e8f40b04f129a52111debe85c7ba3d18020
+  data.tar.gz: 1ccad7df9c3612812095e776becf4cf87314e1d0
 SHA512:
-  metadata.gz: b2f69ab85c0197d8581541bd4cd020f1e579ae34d40c27a5a16a8d5d9177cbb98550ac9687a712c917447cf3833deb15de3d9f25f479768b9f64be9c0204ed14
-  data.tar.gz: 22c0988bc923d89e60fd9ee0252ccb230a277e3fb38d5b37e9999fbf49f0a8e0494819e7f7c8ea9353b5b2b5d0f59e501263bf7744fd81549f82f14182face3d
+  metadata.gz: 465c7fecc91622ee2c8cbf9b01b4f1012c3e411628d06fe5f5845eb146aa6df635051d90ce9d36158db3fac29bbd8de3693aa47c3fda58813d5c818229e41ee8
+  data.tar.gz: ea65b28b73265023bc0325a7c39de2e168fd71158f5dfdc471597e7fae6d6819e8fae90ccbb81ddf1b93247be2f47f86f638e960d98f3a95dd1c5ee13b39651d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.1.0
+-----
+
+* Expose rake task for `npm install` [#59](https://github.com/rwz/ember-cli-rails/pull/59)
+* Detect and raise EmberCLI build errors [#23](https://github.com/rwz/ember-cli-rails/pull/23)
+
 0.0.18
 ------
 

data/README.md

@@ -64,7 +64,7 @@ Once you've updated your initializer to taste, you need to install the
 For each of your EmberCLI applications install the addon with:
 
 ```sh
-npm install --save-dev ember-cli-rails-addon@0.0.8
+npm install --save-dev ember-cli-rails-addon@0.0.9
 ```
 
 And that's it!
@@ -145,7 +145,7 @@ polluting your git history. Note that for this to work, you must have
 building Ember CLI will not be enabled.
 
 
-#### Ember Depdencies
+#### Ember Dependencies
 
 Ember has several dependencies. Some of these dependencies might already be
 present in your asset list. For example jQuery is bundled in `jquery-rails` gem.

data/lib/ember-cli-rails.rb

@@ -33,6 +33,11 @@ module EmberCLI
     end
   end
 
+  def install_dependencies!
+    prepare!
+    each_app &:install_dependencies
+  end
+
   def run!
     prepare!
     each_app &:run

data/lib/ember-cli/app.rb

@@ -2,9 +2,11 @@ require "timeout"
 
 module EmberCLI
   class App
-    ADDON_VERSION = "0.0.8"
+    ADDON_VERSION = "0.0.9"
     EMBER_CLI_VERSION = "~> 0.1.5"
 
+    class BuildError < StandardError; end
+
     attr_reader :name, :options, :pid
 
     def initialize(name, options={})
@@ -14,6 +16,11 @@ module EmberCLI
     def compile
       prepare
       silence_stream(STDOUT){ exec command }
+      check_for_build_error!
+    end
+
+    def install_dependencies
+      exec "#{npm_path} install"
     end
 
     def run
@@ -38,7 +45,7 @@ module EmberCLI
 
     def wait
       Timeout.timeout(build_timeout) do
-        sleep 0.1 while lockfile.exist?
+        wait_for_build_complete_or_error
       end
     rescue Timeout::Error
       suggested_timeout = build_timeout + 5
@@ -78,7 +85,7 @@ module EmberCLI
     private
 
     delegate :match_version?, :non_production?, to: Helpers
-    delegate :tee_path, to: :configuration
+    delegate :tee_path, :npm_path, to: :configuration
     delegate :configuration, to: :EmberCLI
 
     def build_timeout
@@ -89,10 +96,33 @@ module EmberCLI
       tmp_path.join("build.lock")
     end
 
+    def check_for_build_error!
+      raise_build_error! if build_error_file.exist?
+    end
+
+    def build_error_file
+      tmp_path.join("error.txt")
+    end
+
+    def reset_build_error!
+      build_error_file.delete if build_error?
+    end
+
+    def build_error?
+      build_error_file.exist?
+    end
+
+    def raise_build_error!
+      error = BuildError.new("EmberCLI app #{name.inspect} has failed to build")
+      error.set_backtrace build_error_file.read.split(?\n)
+      fail error
+    end
+
     def prepare
       @prepared ||= begin
         check_addon!
         check_ember_cli_version!
+        reset_build_error!
         FileUtils.touch lockfile
         symlink_to_assets_root
         add_assets_to_precompile_list
@@ -215,5 +245,13 @@ module EmberCLI
         Kernel.public_send(method_name, env_hash, cmd, err: :out)
       end
     end
+
+    def wait_for_build_complete_or_error
+      loop do
+        check_for_build_error!
+        break unless lockfile.exist?
+        sleep 0.1
+      end
+    end
   end
 end

data/lib/ember-cli/configuration.rb

@@ -17,6 +17,10 @@ module EmberCLI
       @tee_path = Helpers.which("tee")
     end
 
+    def npm_path
+      @npm_path ||= Helpers.which("npm")
+    end
+
     def build_timeout
       @build_timeout ||= 5
     end

data/lib/ember-cli/helpers.rb

@@ -28,7 +28,7 @@ module EmberCLI
     def override_assets_precompile_task!
       Rake.application.instance_eval do
         @tasks["assets:precompile:original"] = @tasks.delete("assets:precompile")
-        Rake::Task.define_task "assets:precompile", [:assets, :precompile] => :environment do
+        Rake::Task.define_task "assets:precompile", [:assets, :precompile] => "ember-cli:install_dependencies" do
           EmberCLI.compile!
           Rake::Task["assets:precompile:original"].execute
         end

data/lib/ember-cli/railtie.rb

@@ -16,6 +16,7 @@ module EmberCLI
 
     rake_tasks do
       require "sprockets/rails/task"
+      load "tasks/ember-cli.rake"
       Helpers.override_assets_precompile_task!
     end
   end

data/lib/ember-cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCLI
-  VERSION = "0.0.18".freeze
+  VERSION = "0.1.0".freeze
 end

data/lib/tasks/ember-cli.rake

@@ -0,0 +1,6 @@
+namespace "ember-cli" do
+  desc "Installs each EmberCLI app's dependencies"
+  task install_dependencies: :environment do
+    EmberCLI.install_dependencies!
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.1.0
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -61,6 +61,7 @@ files:
 - lib/generators/ember-cli/init/USAGE
 - lib/generators/ember-cli/init/init_generator.rb
 - lib/generators/ember-cli/init/templates/initializer.rb
+- lib/tasks/ember-cli.rake
 homepage: https://github.com/rwz/ember-cli-rails
 licenses:
 - MIT