ember-cli-rails 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff30b30d60cf45b946c688fc355c29c2ac79e1a5
-  data.tar.gz: 89d52810daf83b9b675f8a59f83aef69dfb76370
+  metadata.gz: b6f1ecfa7b10f43b47a13ba32488120646db7e4e
+  data.tar.gz: 24f6c8380556baec9fe584b07a325154150b3466
 SHA512:
-  metadata.gz: f0353db532b3c66bd5bc9183a40ea5399c44e35ed7343f285488a1803b85c980cbf4b76b7ac8b6f085e173e857dd1e23a4c3a2835a5964f07819d2936d3dc2f4
-  data.tar.gz: 7ff75f83a0be222d214d878356621b4dc27c9c4da9af965654c0937090bc134c67411eb675d1657c61ed5e978aad46825c289a6874105771c77d738f62c40759
+  metadata.gz: 586309531996485760e27515c587694ba551dd04d73d23e9bb0ec94f0716d95956c596d136dc8bfac347e32fe723b709a6ef955c631dab4d530ddf6d1d9d692e
+  data.tar.gz: c68bdcebcbcf4af6c1f477041ca1b91a19b2b677d70d81ca1d2edffb000832165e34407990f01cb2a6f6eb5f879b191d6aea42165d1257ddf099ef9ef3675727

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 master
 ------
 
+0.8.6
+-----
+
+* Don't require `bower` installation if `bower.json` is missing [#532]
+
+[#532]: https://github.com/thoughtbot/ember-cli-rails/pull/532
+
 0.8.5
 -----
 

data/README.md

@@ -270,7 +270,8 @@ To configure your EmberCLI-Rails applications for Heroku:
 1. Execute `rails generate ember:heroku`.
 1. Commit the newly generated files.
 1. [Add the NodeJS buildpack][buildpack] and configure NPM to include the
-   `bower` dependency's executable file.
+   `bower` dependency's executable file (if your build process requires
+   `bower`).
 
 ```sh
 $ heroku buildpacks:clear
@@ -328,11 +329,16 @@ contains the directory or directories that contain the `bower` and `npm`
 executables.
 
 #### For faster deployments
-Place the following in your deploy/<environment>.rb
+
+Place the following in your `deploy/<environment>.rb`
+
 ```ruby
 set :linked_dirs, %w{<ember-app-name>/node_modules <ember-app-name>/bower_components}
 ```
-to avoid rebuilding all the node modules and bower components with every deploy. Replace `<ember-app-name>` with the name of your ember app (default is `frontend`).
+
+to avoid rebuilding all the node modules and bower components with every deploy.
+Replace `<ember-app-name>` with the name of your ember app (default is
+`frontend`).
 
 ## Override
 

data/lib/ember_cli/path_set.rb

@@ -35,6 +35,10 @@ module EmberCli
       @gemfile ||= root.join("Gemfile")
     end
 
+    def bower_json
+      ember_cli_root.join("bower.json")
+    end
+
     def ember
       @ember ||= begin
         root.join("node_modules", "ember-cli", "bin", "ember").tap do |path|
@@ -46,6 +50,7 @@ module EmberCli
 
                   $ cd #{root}
                   $ #{package_manager} install
+
             MSG
           end
         end
@@ -62,16 +67,15 @@ module EmberCli
 
     def bower
       @bower ||= begin
-        bower_path = app_options.fetch(:bower_path) { which("bower") }
-
-        bower_path.tap do |path|
-          unless Pathname(path.to_s).executable?
+        path_for_executable("bower").tap do |bower_path|
+          if bower_json.exist? && (bower_path.blank? || !bower_path.executable?)
             fail DependencyError.new <<-MSG.strip_heredoc
-            Bower is required by EmberCLI
+                Bower is required by EmberCLI
+
+                Install it with:
 
-            Install it with:
+                    $ npm install -g bower
 
-                $ npm install -g bower
             MSG
           end
         end
@@ -83,12 +87,12 @@ module EmberCli
     end
 
     def npm
-      @npm ||= app_options.fetch(:npm_path) { which("npm") }
+      @npm ||= path_for_executable("npm")
     end
 
     def yarn
       if yarn?
-        @yarn ||= app_options.fetch(:yarn_path) { which("yarn") }
+        @yarn ||= path_for_executable("yarn")
       end
     end
 
@@ -97,17 +101,25 @@ module EmberCli
     end
 
     def tee
-      @tee ||= app_options.fetch(:tee_path) { which("tee") }
+      @tee ||= path_for_executable("tee")
     end
 
     def bundler
-      @bundler ||= app_options.fetch(:bundler_path) { which("bundler") }
+      @bundler ||= path_for_executable("bundler")
     end
 
     private
 
     attr_reader :app, :ember_cli_root, :environment, :rails_root
 
+    def path_for_executable(command)
+      path = app_options.fetch("#{command}_path") { which(command) }
+
+      if path.present?
+        Pathname.new(path)
+      end
+    end
+
     def package_manager
       if yarn?
         "yarn"
@@ -125,7 +137,7 @@ module EmberCli
     end
 
     def app_options
-      app.options
+      app.options.with_indifferent_access
     end
 
     def which(executable)

data/lib/ember_cli/shell.rb

@@ -41,13 +41,15 @@ module EmberCli
         clean_ember_dependencies!
       end
 
-      if paths.yarn
+      if paths.yarn.present? && Pathname.new(paths.yarn).executable?
         run! "#{paths.yarn} install"
       else
         run! "#{paths.npm} prune && #{paths.npm} install"
       end
 
-      run! "#{paths.bower} prune && #{paths.bower} install"
+      if paths.bower_json.exist?
+        run! "#{paths.bower} prune && #{paths.bower} install"
+      end
     end
 
     def test

data/lib/ember_cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCli
-  VERSION = "0.8.5".freeze
+  VERSION = "0.8.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ember-cli-rails-assets