ember-cli-rails 0.8.7 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9ebe9447a282f4d2c08c1c4fd374a753bc41a3e
-  data.tar.gz: e2086dd52187c9cc7baf2a76c4384ce3a3eb9202
+  metadata.gz: 66a6b948a0cc20a4a451f0765f34143b6c25c878
+  data.tar.gz: bc90703a1cf03404bad413c8114c2976f9e4d956
 SHA512:
-  metadata.gz: 9f7031cc499fdc978795be3c7dd4f570149f9f4412e02df6d4aeff86f78433beb3cf1ceca3ad32bcdd731496869dfd6594f637f907d32b9359c2bb3e31642f27
-  data.tar.gz: 1bcf390dfb8923794cfd4f17d135754d7d51acf8f7661b82db16ded3b6354593643df82cacffc86b7dac1341234da7013139dfd63a58f080b2b986e33a82f5ea
+  metadata.gz: 7b4334c4774fde5f7640736250b69e60fc9875e18eb9c573d16f770b16ae7032cff847c9e0e3c90141c116e9e3bd5d07f8cbbfaca8708ae654190f5bfa9c3e41
+  data.tar.gz: 949d2dc2b36e751a22ecc56252361d2758b9febbd3821fa62f570e311a45d8c5e78c9fdbd50435f1c2a55b179cfac73b4ecbe2f4a466e8c3622021c5a9d069ee

data/CHANGELOG.md

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

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|
@@ -64,7 +68,7 @@ module EmberCli
     def bower
       @bower ||= begin
         path_for_executable("bower").tap do |bower_path|
-          if bower_path.blank? || !bower_path.executable?
+          if bower_json.exist? && (bower_path.blank? || !bower_path.executable?)
             fail DependencyError.new <<-MSG.strip_heredoc
                 Bower is required by EmberCLI
 

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! "[ -f bower.json ] && #{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.7".freeze
+  VERSION = "0.9.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.9.0
 platform: ruby
 authors:
 - Pavel Pravosud