ember-cli-rails 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa89f6f26b26bbf222e7881b397422868795a55c
-  data.tar.gz: 3d2b5205aa404925fa0a76fabae819646b9298f8
+  metadata.gz: 7f0547176e2856d0b34ef53d83724a6d5dbdb741
+  data.tar.gz: 5edaffcc86f429e1dcdc2085414fa4824b78b795
 SHA512:
-  metadata.gz: 2a92409bab6abf2f119b3ae5ce064f33eb452cc1abc486a805fb57f759b83df1a0257a5a3432d86daf257e6d07048244b266c806e5f03208e4b82ed1a9275edf
-  data.tar.gz: 8ad3eb7eef5f6084ca30a583a5f9407e99702b491d92e1c00bb05e7f79236b9d3a5cd5dde83a822ebbfe416cb5f4131216da5e2b8fa65e9eda85b69d9c2dc2aa
+  metadata.gz: fec38204f90ffac056042df6d658a11e4099ff29b45b4702bfb48e002e7114818772d6ed6f4f6b92e57f159cebe1b96b8c0c7fbe28f20f831df31d94eb693a39
+  data.tar.gz: cc713397c80da2e9d4b1449666707fe5d247cc9ad282ff9fa41958b67e9abdf07736487663d06185de073853dd9a9300593b568ff2d74eb33d23704737fff612

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 master
 ------
 
+0.7.2
+-----
+
+* Enhance `rake ember:install` to fully reinstall if necessary. [#396]
+* `EmberCli::Deploy::File` serves assets with Rails' `static_cache_control`
+  value. [#403]
+
+[#396]: https://github.com/thoughtbot/ember-cli-rails/pull/396
+[#403]: https://github.com/thoughtbot/ember-cli-rails/pull/403
+
 0.7.1
 -----
 

data/README.md

@@ -203,8 +203,22 @@ As long as your [CDN is configured to pull from your Rails application][dns-cdn]
 
 ### Deployment Strategies
 
-By default, EmberCLI-Rails will serve the `index.html` file that `ember build`
-produces.
+By default, EmberCLI-Rails uses a file-based deployment strategy that depends on
+the output of `ember build`.
+
+Using this deployment strategy, Rails will serve the `index.html` file and other
+assets that `ember build` produces.
+
+These EmberCLI-generated assets are served with the same `Cache-Control` headers
+as Rails' other static files:
+
+```rb
+# config/environments/production.rb
+Rails.application.configure do
+  # serve static files with cache headers set to expire in 1 year
+  config.static_cache_control = "public, max-age=31622400"
+end
+```
 
 If you need to override this behavior (for instance, if you're using
 [`ember-cli-deploy`'s "Lightning Fast Deployment"][lightning] strategy in
@@ -237,14 +251,15 @@ Specifying a deployment strategy is only supported for applications that use the
 
 To configure your EmberCLI-Rails applications for Heroku:
 
-1. Execute `rails generate ember: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.
 
 ```sh
 $ heroku buildpacks:clear
-$ heroku buildpacks:add --index 1 https://github.com/heroku/heroku-buildpack-nodejs
-$ heroku buildpacks:add --index 2 https://github.com/heroku/heroku-buildpack-ruby
+$ heroku buildpacks:add --index 1 heroku/nodejs
+$ heroku buildpacks:add --index 2 heroku/ruby
 $ heroku config:set NPM_CONFIG_PRODUCTION=false
 $ heroku config:unset SKIP_EMBER
 ```

data/lib/ember_cli/deploy/file.rb

@@ -13,7 +13,7 @@ module EmberCli
       end
 
       def to_rack
-        Rack::File.new(app.dist_path.to_s)
+        Rack::File.new(app.dist_path.to_s, rack_headers)
       end
 
       def index_html
@@ -28,6 +28,12 @@ module EmberCli
 
       attr_reader :app
 
+      def rack_headers
+        {
+          "Cache-Control" => Rails.configuration.static_cache_control,
+        }
+      end
+
       def check_for_error_and_raise!
         app.check_for_errors!
 

data/lib/ember_cli/path_set.rb

@@ -78,10 +78,18 @@ module EmberCli
       end
     end
 
+    def bower_components
+      @bower_components ||= root.join("bower_components")
+    end
+
     def npm
       @npm ||= app_options.fetch(:npm_path) { which("npm") }
     end
 
+    def node_modules
+      @node_modules ||= root.join("node_modules")
+    end
+
     def tee
       @tee ||= app_options.fetch(:tee_path) { which("tee") }
     end

data/lib/ember_cli/runner.rb

@@ -9,11 +9,17 @@ module EmberCli
       @options = options
     end
 
-    def run!(command)
+    def run(command)
       output, status = Open3.capture2e(@env, command, @options)
 
       @out.write(output)
 
+      [output, status]
+    end
+
+    def run!(command)
+      output, status = run(command)
+
       unless status.success?
         @err.write <<-MSG.strip_heredoc
           ERROR: Failed command: `#{command}`
@@ -21,7 +27,7 @@ module EmberCli
             #{output}
         MSG
 
-        exit 1
+        exit status.exitstatus
       end
 
       true

data/lib/ember_cli/shell.rb

@@ -14,7 +14,7 @@ module EmberCli
     end
 
     def compile
-      exec ember.build
+      run! ember.build
     end
 
     def build_and_watch
@@ -34,15 +34,19 @@ module EmberCli
 
     def install
       if paths.gemfile.exist?
-        exec "#{paths.bundler} install"
+        run! "#{paths.bundler} install"
       end
 
-      exec "#{paths.npm} prune && #{paths.npm} install"
-      exec "#{paths.bower} prune && #{paths.bower} install"
+      if invalid_ember_dependencies?
+        clean_ember_dependencies!
+      end
+
+      run! "#{paths.npm} prune && #{paths.npm} install"
+      run! "#{paths.bower} prune && #{paths.bower} install"
     end
 
     def test
-      exec ember.test
+      run! ember.test
     end
 
     private
@@ -50,6 +54,25 @@ module EmberCli
     attr_accessor :pid
     attr_reader :ember, :env, :options, :paths
 
+    delegate :run, :run!, to: :runner
+
+    def invalid_ember_dependencies?
+      !run("#{paths.ember} version")
+    rescue DependencyError
+      false
+    end
+
+    def clean_ember_dependencies!
+      ember_dependency_directories.select(&:exist?).each(&:rmtree)
+    end
+
+    def ember_dependency_directories
+      [
+        paths.node_modules,
+        paths.bower_components,
+      ]
+    end
+
     def spawn(command)
       Kernel.spawn(
         env,
@@ -59,13 +82,13 @@ module EmberCli
       ) || exit(1)
     end
 
-    def exec(command)
+    def runner
       Runner.new(
         options: { chdir: paths.root.to_s },
         out: paths.log,
         err: $stderr,
         env: env,
-      ).run!(command)
+      )
     end
 
     def running?

data/lib/ember_cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCli
-  VERSION = "0.7.1".freeze
+  VERSION = "0.7.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ember-cli-rails-assets