ember-cli-rails 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0375a7a477a2b32d5c0dd2b1d89e99d8115d76ff
-  data.tar.gz: 8e6d4ad0336ef0698c375fa4f5d9446a43e14aca
+  metadata.gz: 99dc36789be1f062b68a2b4341cbadbf6b97f0b2
+  data.tar.gz: 02ab4e4d1976191469d1f2405b808fd47f399117
 SHA512:
-  metadata.gz: cc9cdbcba58c5b17af2b553f06cf6f19372669485f4c791b64155b5b2074a93f9f632e5b435b57db2cdc85d8e54645f96ee183f1cffd7756563e5dbf0108139d
-  data.tar.gz: 81452d07ba9111c3731b71d1a7e11d1cc29177451019dcc3a58793d477c6bebadc24e63ad1b6a183e944ac5fd78ad9758a6f28d779ff5ff4ac7af1a83ecf379a
+  metadata.gz: 1d036b60998244ef267913027b2049fc5ce8865b202fbf67a13b79fe8fb434b0af7257c788e8be33a2c11c20ab667fecaf6194e588e02e936caf599b76df09f1
+  data.tar.gz: 80bfd0e5c8d4a294fe85d9e80de7a64e513659f5b723505e619924947c1ee1dd166ad11cc2b6d9ff9b4dabcf75a4b621f5b13d1d801f5deaffeb412ff3aca174

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 master
 ------
 
+0.5.7
+-----
+
+* Improve command failure reporting. [#324]
+* Use latest EmberCLI-generated asset files. [#316]
+* Delete previous build output on application boot instead of on process exit.
+  [#308]
+
+[#324]: https://github.com/thoughtbot/ember-cli-rails/pull/324
+[#316]: https://github.com/thoughtbot/ember-cli-rails/pull/316
+[#308]: https://github.com/thoughtbot/ember-cli-rails/pull/308
+
 0.5.6
 -----
 

data/README.md

@@ -63,7 +63,7 @@ c.app :frontend, path: "~/projects/my-ember-app"
 * generate a new Ember project:
 
 ```bash
-$ ember new frontend
+$ ember new frontend --skip-git
 ```
 
 **Initializer options**
@@ -92,7 +92,7 @@ Be sure that the addon's [`MAJOR` and `MINOR` version][semver] matches the gem's
 `MAJOR` and `MINOR` versions.
 
 For instance, if you're using the `0.5.x` version of the gem, specify
-`~> 0.5.0` ion in your Ember app's `package.json`:
+`~> 0.5.0` in your Ember app's `package.json`:
 
 ```json
 {
@@ -178,6 +178,15 @@ class ApplicationController < ActionController::Base
 end
 ```
 
+**NOTE**
+
+When specifying a controller of your own, make sure [the controller is a
+descendant of `ApplicationController`][#321], and [`ApplicationController` is a
+descendant of `ActionController::Base`][#320].
+
+[#320]: https://github.com/thoughtbot/ember-cli-rails/issues/320
+[#321]: https://github.com/thoughtbot/ember-cli-rails/issues/321
+
 ### Rendering the EmberCLI generated JS and CSS
 
 In addition to rendering the EmberCLI generated `index.html`, you can inject the
@@ -189,6 +198,10 @@ In addition to rendering the EmberCLI generated `index.html`, you can inject the
 <%= include_ember_stylesheet_tags :frontend %>
 ```
 
+**NOTE**
+
+These helpers are only available for Rails versions `>= 4.0`.
+
 ### Multiple Ember CLI apps
 
 In the initializer you may specify multiple Ember CLI apps, each of which can be
@@ -242,19 +255,6 @@ module.exports = function(environment) {
 }
 ```
 
-Finally, configure each app's `router.js` file so that `rootURL` refers to the
-new `baseURL`:
-
-```javascript
-/* app/frontend/app/router.js */
-var Router = Ember.Router.extend({
-  rootURL:  config.baseURL, // add this line
-  location: config.locationType
-});
-```
-
-Repeat the process for `admin_panel/app/router.js`.
-
 ## CSRF Tokens
 
 Your Rails controllers, by default, are expecting a valid authenticity token to be submitted with non-`GET` requests.
@@ -523,10 +523,14 @@ jQuery and Handlebars are the main use cases for this flag.
 This project supports:
 
 * Ruby versions `>= 2.1.0`
-* Rails `3.2.x` and `>=4.1.x`.
+* Rails versions `3.2.x` and `>=4.1.x`.
+
+[Rendering EmberCLI-generated assets through Sprockets](asset-helpers) is
+**NOT** supported for Rails `3.2.x`.
 
 To learn more about supported versions and upgrades, read the [upgrading guide].
 
+[asset-helpers]: #rendering-the-embercli-generated-js-and-css
 [upgrading guide]: /UPGRADING.md
 
 ## Contributing

data/app/helpers/ember_rails_helper.rb

@@ -2,11 +2,7 @@ require "ember_cli/capture"
 
 module EmberRailsHelper
   def include_ember_index_html(name, &block)
-    warn <<-MSG.strip_heredoc
-      The `include_ember_index_html` helper has been deprecated.
-
-      Rename all invocations to `render_ember_app`
-    MSG
+    Warnings.warn_include_index_html
 
     render_ember_app(name, &block)
   end
@@ -20,10 +16,44 @@ module EmberRailsHelper
   end
 
   def include_ember_script_tags(name, **options)
-    javascript_include_tag(*EmberCli[name].sprockets.assets, options)
+    Warnings.warn_asset_helper
+
+    javascript_include_tag(*EmberCli[name].sprockets.javascript_assets, options)
   end
 
   def include_ember_stylesheet_tags(name, **options)
-    stylesheet_link_tag(*EmberCli[name].sprockets.assets, options)
+    Warnings.warn_asset_helper
+
+    stylesheet_link_tag(*EmberCli[name].sprockets.stylesheet_assets, options)
+  end
+
+  module Warnings
+    def self.warn_include_index_html
+      warn <<-MSG.strip_heredoc
+        The `include_ember_index_html` helper has been deprecated.
+
+        Rename all invocations to `render_ember_app`
+      MSG
+    end
+
+    def self.warn_asset_helper
+      if Rails::VERSION::MAJOR < 4
+        warn <<-MSG.strip_heredoc
+          `ember-cli-rails` no longer supports Sprockets-based helpers for Rails
+          versions below 4.0.
+
+          Replace usage of
+            * `include_ember_script_tags`
+            * `include_ember_stylesheet_tags`
+
+          with `render_ember_app` invocations.
+
+          To learn more, please read:
+
+          * https://github.com/thoughtbot/ember-cli-rails#configuring-the-ember-controller
+          * https://github.com/thoughtbot/ember-cli-rails/pull/316
+        MSG
+      end
+    end
   end
 end

data/lib/ember-cli-rails.rb

@@ -32,7 +32,7 @@ module EmberCli
   def enable!
     @enabled ||= begin
       Rails.configuration.assets.paths << root.join("assets").to_s
-      at_exit{ cleanup }
+      cleanup
       true
     end
   end
@@ -53,7 +53,7 @@ module EmberCli
   end
 
   def root
-    @root ||= Rails.root.join("tmp", "ember-cli-#{uid}")
+    @root ||= tmp.join("ember-cli-#{uid}")
   end
 
   def env
@@ -64,12 +64,20 @@ module EmberCli
 
   private
 
-  def uid
-    @uid ||= SecureRandom.uuid
+  def cleanup
+    previous_builds.each(&:rmtree)
   end
 
-  def cleanup
-    root.rmtree if root.exist?
+  def previous_builds
+    Pathname.glob(tmp.join("ember-cli-*"))
+  end
+
+  def tmp
+    Rails.root.join("tmp")
+  end
+
+  def uid
+    @uid ||= SecureRandom.uuid
   end
 
   def each_app

data/lib/ember_cli/assets.rb

@@ -0,0 +1,66 @@
+module EmberCli
+  class Assets
+    def initialize(app_name:, ember_app_name:, manifest:)
+      @app_name = app_name
+      @ember_app_name = ember_app_name
+      @manifest = manifest
+    end
+
+    def javascripts
+      if empty_manifest?
+        fallback_assets
+      else
+        [
+          latest_matching(%r{#{app_name}/assets/vendor(.*)\.js\z}),
+          latest_matching(%r{#{app_name}/assets/#{ember_app_name}(.*)\.js\z}),
+        ]
+      end
+    end
+
+    def stylesheets
+      if empty_manifest?
+        fallback_assets
+      else
+        [
+          latest_matching(%r{#{app_name}/assets/vendor(.*)\.css\z}),
+          latest_matching(%r{#{app_name}/assets/#{ember_app_name}(.*)\.css\z}),
+        ]
+      end
+    end
+
+    private
+
+    attr_reader :app_name, :ember_app_name, :manifest
+
+    def fallback_assets
+      ["#{app_name}/assets/vendor", "#{app_name}/assets/#{ember_app_name}"]
+    end
+
+    def empty_manifest?
+      files.empty?
+    end
+
+    def latest_matching(regex)
+      asset, = assets.detect { |(_, digest)| digest == latest_file_for(regex) }
+
+      asset
+    end
+
+    def latest_file_for(regex)
+      file, = files.
+        select { |key, _| key =~ regex }.
+        sort_by { |_, data| data["mtime"] }.
+        last
+
+      file
+    end
+
+    def assets
+      manifest.assets
+    end
+
+    def files
+      manifest.files
+    end
+  end
+end

data/lib/ember_cli/missing_manifest.rb

@@ -0,0 +1,11 @@
+module EmberCli
+  class MissingManifest
+    def files
+      {}
+    end
+
+    def assets
+      {}
+    end
+  end
+end

data/lib/ember_cli/path_set.rb

@@ -1,16 +1,5 @@
 module EmberCli
   class PathSet
-    def self.define_path(name, &definition)
-      define_method name do
-        ivar = "@_#{name}_path"
-        if instance_variable_defined?(ivar)
-          instance_variable_get(ivar)
-        else
-          instance_exec(&definition).tap{ |value| instance_variable_set ivar, value }
-        end
-      end
-    end
-
     def initialize(app:, rails_root:, ember_cli_root:, environment:, configuration:)
       @app = app
       @configuration = configuration
@@ -19,7 +8,7 @@ module EmberCli
       @ember_cli_root = ember_cli_root
     end
 
-    define_path :root do
+    def root
       path = app_options.fetch(:path){ default_root }
       pathname = Pathname.new(path)
       if pathname.absolute?
@@ -29,81 +18,89 @@ module EmberCli
       end
     end
 
-    define_path :tmp do
-      root.join("tmp").tap(&:mkpath)
+    def tmp
+      @tmp ||= root.join("tmp").tap(&:mkpath)
     end
 
-    define_path :log do
-      rails_root.join("log", "ember-#{app_name}.#{environment}.log")
+    def log
+      @log ||= rails_root.join("log", "ember-#{app_name}.#{environment}.log")
     end
 
-    define_path :dist do
-      ember_cli_root.join("apps", app_name).tap(&:mkpath)
+    def dist
+      @dist ||= ember_cli_root.join("apps", app_name).tap(&:mkpath)
     end
 
-    define_path :assets do
-      ember_cli_root.join("assets").tap(&:mkpath)
+    def assets
+      @assets ||= ember_cli_root.join("assets").tap(&:mkpath)
     end
 
-    define_path :app_assets do
-      assets.join(app_name)
+    def app_assets
+      @app_assets ||= assets.join(app_name)
     end
 
-    define_path :applications do
-      rails_root.join("public", "_apps").tap(&:mkpath)
+    def applications
+      @applications ||= rails_root.join("public", "_apps").tap(&:mkpath)
     end
 
-    define_path :gemfile do
-      root.join("Gemfile")
+    def gemfile
+      @gemfile ||= root.join("Gemfile")
     end
 
-    define_path :package_json_file do
-      root.join("package.json")
+    def package_json_file
+      @package_json_file ||= root.join("package.json")
     end
 
-    define_path :ember do
-      root.join("node_modules", ".bin", "ember").tap do |path|
-        unless path.executable?
-          fail DependencyError.new <<-MSG.strip_heredoc
-            No `ember-cli` executable found for `#{app_name}`.
+    def ember
+      @ember ||= begin
+        root.join("node_modules", ".bin", "ember").tap do |path|
+          unless path.executable?
+            fail DependencyError.new <<-MSG.strip_heredoc
+              No `ember-cli` executable found for `#{app_name}`.
 
-            Install it:
+              Install it:
 
-                $ cd #{root}
-                $ npm install
-          MSG
+                  $ cd #{root}
+                  $ npm install
+            MSG
+          end
         end
       end
     end
 
-    define_path :lockfile do
-      tmp.join("build.lock")
+    def lockfile
+      @lockfile ||= tmp.join("build.lock")
     end
 
-    define_path :build_error_file do
-      tmp.join("error.txt")
+    def build_error_file
+      @build_error_file ||= tmp.join("error.txt")
     end
 
-    define_path :bower do
-      app_options.fetch(:bower_path) { configuration.bower_path }.tap do |path|
-        unless Pathname(path).executable?
-          fail DependencyError.new <<-MSG.strip_heredoc
-          Bower is required by EmberCLI
+    def bower
+      @bower ||= begin
+        bower_path = app_options.fetch(:bower_path) { configuration.bower_path }
+
+        bower_path.tap do |path|
+          unless Pathname(path).executable?
+            fail DependencyError.new <<-MSG.strip_heredoc
+            Bower is required by EmberCLI
 
-          Install it with:
+            Install it with:
 
-              $ npm install -g bower
-          MSG
+                $ npm install -g bower
+            MSG
+          end
         end
       end
     end
 
-    define_path :npm do
-      app_options.fetch(:npm_path) { configuration.npm_path }
+    def npm
+      @npm ||= app_options.fetch(:npm_path) { configuration.npm_path }
     end
 
-    define_path :bundler do
-      app_options.fetch(:bundler_path) { configuration.bundler_path }
+    def bundler
+      @bundler ||= app_options.fetch(:bundler_path) do
+        configuration.bundler_path
+      end
     end
 
     private

data/lib/ember_cli/runner.rb

@@ -0,0 +1,30 @@
+require "open3"
+
+module EmberCli
+  class Runner
+    def initialize(env: {}, out:, err:, options: {})
+      @env = env
+      @out = out
+      @err = err
+      @options = options
+    end
+
+    def run!(command)
+      output, status = Open3.capture2e(@env, command, @options)
+
+      @out.write(output)
+
+      unless status.success?
+        @err.write <<-MSG.strip_heredoc
+          ERROR: Failed command: `#{command}`
+          OUTPUT:
+            #{output}
+        MSG
+
+        exit 1
+      end
+
+      true
+    end
+  end
+end

data/lib/ember_cli/shell.rb

@@ -1,4 +1,5 @@
 require "ember_cli/command"
+require "ember_cli/runner"
 
 module EmberCli
   class Shell
@@ -13,7 +14,7 @@ module EmberCli
     end
 
     def compile
-      silence_build { exec ember.build }
+      exec ember.build
     end
 
     def build_and_watch
@@ -50,18 +51,17 @@ module EmberCli
     attr_reader :ember, :env, :options, :paths
 
     def spawn(command)
-      Kernel.spawn(env, command, process_options) || exit(1)
+      Kernel.spawn(env, command, chdir: paths.root.to_s, out: paths.log.to_s) ||
+        exit(1)
     end
 
     def exec(command)
-      Kernel.system(env, command, process_options) || exit(1)
-    end
-
-    def process_options
-      {
-        chdir: paths.root.to_s,
-        out: paths.log.to_s,
-      }
+      Runner.new(
+        options: { chdir: paths.root.to_s },
+        out: paths.log,
+        err: $stderr,
+        env: env,
+      ).run!(command)
     end
 
     def running?
@@ -77,13 +77,5 @@ module EmberCli
     def detach
       Process.detach pid
     end
-
-    def silence_build(&block)
-      if ENV.fetch("EMBER_CLI_RAILS_VERBOSE") { EmberCli.env.production? }
-        yield
-      else
-        silence_stream(STDOUT, &block)
-      end
-    end
   end
 end

data/lib/ember_cli/sprockets.rb

@@ -1,10 +1,14 @@
+require "sprockets"
 require "ember_cli/errors"
 require "non-stupid-digest-assets"
 require "ember_cli/html_page"
+require "ember_cli/missing_manifest"
+require "ember_cli/assets"
 
 module EmberCli
   class Sprockets
     class AssetPipelineError < BuildError; end
+
     def initialize(app)
       @app = app
     end
@@ -24,14 +28,26 @@ module EmberCli
       html_page.render
     end
 
-    def assets
-      ["#{app.name}/assets/vendor", "#{app.name}/assets/#{ember_app_name}"]
+    def javascript_assets
+      assets.javascripts
+    end
+
+    def stylesheet_assets
+      assets.stylesheets
     end
 
     private
 
     attr_reader :app
 
+    def assets
+      Assets.new(
+        app_name: app.name,
+        ember_app_name: ember_app_name,
+        manifest: rails_manifest,
+      )
+    end
+
     def ember_app_name
       @ember_app_name ||= app.options.fetch(:name) { package_json.fetch(:name) }
     end
@@ -41,6 +57,14 @@ module EmberCli
         JSON.parse(app.paths.package_json_file.read).with_indifferent_access
     end
 
+    def rails_manifest
+      if Rails.application.respond_to?(:assets_manifest)
+        Rails.application.assets_manifest
+      else
+        MissingManifest.new
+      end
+    end
+
     def asset_matcher
       %r{\A#{app.name}/}
     end

data/lib/ember_cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCli
-  VERSION = "0.5.6".freeze
+  VERSION = "0.5.7".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -91,6 +91,7 @@ files:
 - app/views/ember_cli/ember/index.html.erb
 - lib/ember-cli-rails.rb
 - lib/ember_cli/app.rb
+- lib/ember_cli/assets.rb
 - lib/ember_cli/build_monitor.rb
 - lib/ember_cli/capture.rb
 - lib/ember_cli/command.rb
@@ -101,8 +102,10 @@ files:
 - lib/ember_cli/errors.rb
 - lib/ember_cli/helpers.rb
 - lib/ember_cli/html_page.rb
+- lib/ember_cli/missing_manifest.rb
 - lib/ember_cli/path_set.rb
 - lib/ember_cli/route_helpers.rb
+- lib/ember_cli/runner.rb
 - lib/ember_cli/shell.rb
 - lib/ember_cli/sprockets.rb
 - lib/ember_cli/version.rb