ember-cli-rails 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c875893e377992ea0a7935ecff7b435f27f3dd8a
-  data.tar.gz: 20a40093eb23312813a4932a4471d4464e4c651e
+  metadata.gz: f36a51e987ca3f318c486ebb3827e3b033eea0f0
+  data.tar.gz: a3b9cd8366e58423d70eab4de81d042f55fc86c7
 SHA512:
-  metadata.gz: a39aafa84caed46cd0007c4214e73d68268066a6be1c10a9ed0a9f164c461c68f54600beecbae9c2b14703aaca02f29f25e0546335fc3a484089278468250fc7
-  data.tar.gz: a07e683152ffe4fb647baad272dda0535eabc8b2aaafb95468a31ca664d8d43ab2cb7ae4671ef57f41bef5171238610b1a3660300ddfddf3a67a4cfde7be587d
+  metadata.gz: 15b9f51c70c042c3eb3b7ff915cbf1269a8ebc23bf76c1d30d56242d645a19775596f3086dd02ac5a0923a40a2223db10c6d0e20b84cee0bad80c417d3a26733
+  data.tar.gz: 52e7f0822e858e957e4a72277a0e6645eaf9fea6b00c803e52e7673e531edd96e52a5f5f78a562a63876f24be4195e73ca87d1f61f6b952ed947667b4d320d40

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 master
 ------
 
+0.7.0
+-----
+
+* Introduce the `deploy` configuration option.
+* Translate Rails environments other than `test` or `development` to
+  `production`, unless an `EMBER_ENV` is specified. [#366]
+
+[#366]: https://github.com/thoughtbot/ember-cli-rails/pull/366
+
 0.6.1
 -----
 

data/README.md

@@ -201,6 +201,38 @@ As long as your [CDN is configured to pull from your Rails application][dns-cdn]
 
 [dns-cdn]: https://robots.thoughtbot.com/dns-cdn-origin
 
+### Deployment Strategies
+
+By default, EmberCLI-Rails will serve the `index.html` file that `ember build`
+produces.
+
+If you need to override this behavior (for instance, if you're using
+[`ember-cli-deploy`'s "Lightning Fast Deployment"][lightning] strategy in
+`production`), you can specify the strategy's class in the initializer:
+
+```rb
+EmberCli.configure do |config|
+  config.app :frontend, deploy: { production: EmberCli::Deploy::Redis }
+end
+```
+
+This example configures the `frontend` Ember application to retrieve the
+index's HTML from an [`ember-cli-deploy-redis`][ember-cli-deploy-redis]
+-populated Redis entry using the
+[`ember-cli-rails-deploy-redis`][ember-cli-rails-deploy-redis] gem.
+
+If you're deploying HTML with a custom strategy in `development` or `test`,
+disable EmberCLI-Rails' build step by setting `ENV["SKIP_EMBER"] = true`.
+
+**NOTE:**
+
+Specifying a deployment strategy is only supported for applications that use the
+`mount_ember_app` and `render_ember_app` helpers.
+
+[ember-cli-deploy-redis]: https://github.com/ember-cli-deploy/ember-cli-deploy-redis
+[ember-cli-rails-deploy-redis]: https://github.com/seanpdoyle/ember-cli-rails-deploy-redis
+[lightning]: https://github.com/ember-cli-deploy/ember-cli-deploy-lightning-pack
+
 ### Heroku
 
 To configure your EmberCLI-Rails applications for Heroku:
@@ -492,6 +524,22 @@ EmberCLI runners to clobber each others' work][#94].
 [Unicorn]: https://rubygems.org/gems/unicorn
 [#94]: https://github.com/thoughtbot/ember-cli-rails/issues/94#issuecomment-77627453
 
+## `SKIP_EMBER`
+
+If set on the environment, `SKIP_EMBER` will configure `ember-cli-rails` to skip
+the build step entirely. This is useful if you're using an alternative
+deployment strategy in the `test` or `development` environment. By default,
+`ember-cli-rails` will skip the build step in `production`-like environments.
+
+## `EMBER_ENV`
+
+If set on the environment, the value of `EMBER_ENV` will be passed to the
+`ember` process as the value of the `--environment` flag.
+
+If `EMBER_ENV` is unspecified, the current Rails environment will be passed to
+the `ember` process, with the exception of non-standard Rails environments,
+which will be replaced with `production`.
+
 ## `RAILS_ENV`
 
 While being managed by EmberCLI Rails, EmberCLI process will have

data/lib/ember-cli-rails.rb

@@ -1,16 +1,13 @@
 require "fileutils"
-require "ember_cli/engine"
 require "ember-cli-rails-assets"
+require "ember_cli/engine"
+require "ember_cli/configuration"
+require "ember_cli/helpers"
 require "ember_cli/errors"
 
 module EmberCli
   extend self
 
-  autoload :App,           "ember_cli/app"
-  autoload :Configuration, "ember_cli/configuration"
-  autoload :Helpers,       "ember_cli/helpers"
-  autoload :PathSet,       "ember_cli/path_set"
-
   def configure
     yield configuration
   end
@@ -53,7 +50,7 @@ module EmberCli
   end
 
   def env
-    @env ||= Helpers.current_environment.inquiry
+    @env ||= Helpers.current_environment
   end
 
   delegate :apps, to: :configuration

data/lib/ember_cli/app.rb

@@ -1,6 +1,8 @@
-require "ember_cli/shell"
 require "html_page/renderer"
+require "ember_cli/path_set"
+require "ember_cli/shell"
 require "ember_cli/build_monitor"
+require "ember_cli/deploy/file"
 
 module EmberCli
   class App
@@ -11,7 +13,6 @@ module EmberCli
       @options = options
       @paths = PathSet.new(
         app: self,
-        configuration: EmberCli.configuration,
         environment: Rails.env,
         rails_root: Rails.root,
         ember_cli_root: EmberCli.root,
@@ -42,31 +43,25 @@ module EmberCli
     end
 
     def build
-      if development?
-        build_and_watch
-      elsif test?
-        compile
+      unless EmberCli.skip?
+        if development?
+          build_and_watch
+        elsif test?
+          compile
+        end
+
+        @build.wait!
       end
-
-      @build.wait!
     end
 
     def index_html(head:, body:)
-      if index_file.exist?
-        html = HtmlPage::Renderer.new(
-          head: head,
-          body: body,
-          content: index_file.read,
-        )
-
-        html.render
-      else
-        @build.check!
+      html = HtmlPage::Renderer.new(
+        head: head,
+        body: body,
+        content: deploy.index_html,
+      )
 
-        raise BuildError.new <<-MSG
-          EmberCLI failed to generate an `index.html` file.
-        MSG
-      end
+      html.render
     end
 
     def install_dependencies
@@ -79,12 +74,36 @@ module EmberCli
       @shell.test
     end
 
+    def check_for_errors!
+      @build.check!
+    end
+
     private
 
-    delegate :development?, :test?, to: :env
+    def development?
+      env.to_s == "development"
+    end
+
+    def test?
+      env.to_s == "test"
+    end
+
+    def deploy
+      deploy_strategy.new(self)
+    end
+
+    def deploy_strategy
+      strategy = options.fetch(:deploy, {})
+
+      if strategy.respond_to?(:fetch)
+        strategy.fetch(rails_env, EmberCli::Deploy::File)
+      else
+        strategy
+      end
+    end
 
-    def index_file
-      paths.index_file
+    def rails_env
+      Rails.env.to_s.to_sym
     end
 
     def env
@@ -104,7 +123,7 @@ module EmberCli
     end
 
     def excluded_ember_deps
-      Array.wrap(options[:exclude_ember_deps]).join(?,)
+      Array.wrap(options[:exclude_ember_deps]).join("?")
     end
 
     def env_hash

data/lib/ember_cli/configuration.rb

@@ -1,9 +1,12 @@
 require "singleton"
+require "ember_cli/app"
 
 module EmberCli
   class Configuration
     include Singleton
 
+    attr_accessor :watcher
+
     def app(name, **options)
       app = App.new(name, options)
       apps.store(name, app)
@@ -12,23 +15,5 @@ module EmberCli
     def apps
       @apps ||= HashWithIndifferentAccess.new
     end
-
-    def bower_path
-      @bower_path ||= Helpers.which("bower")
-    end
-
-    def npm_path
-      @npm_path ||= Helpers.which("npm")
-    end
-
-    def tee_path
-      @tee_path ||= Helpers.which("tee")
-    end
-
-    def bundler_path
-      @bundler_path ||= Helpers.which("bundler")
-    end
-
-    attr_accessor :watcher
   end
 end

data/lib/ember_cli/deploy/file.rb

@@ -0,0 +1,35 @@
+require "ember_cli/errors"
+
+module EmberCli
+  module Deploy
+    class File
+      def initialize(app)
+        @app = app
+      end
+
+      def index_html
+        if index_file.exist?
+          index_file.read
+        else
+          check_for_error_and_raise!
+        end
+      end
+
+      private
+
+      attr_reader :app
+
+      def check_for_error_and_raise!
+        app.check_for_errors!
+
+        raise BuildError.new <<-MSG
+          EmberCLI failed to generate an `index.html` file.
+        MSG
+      end
+
+      def index_file
+        app.dist_path.join("index.html")
+      end
+    end
+  end
+end

data/lib/ember_cli/helpers.rb

@@ -3,7 +3,7 @@ module EmberCli
     extend self
 
     def which(cmd)
-      exts = ENV.fetch("PATHEXT", ?;).split(?;, -1).uniq
+      exts = ENV.fetch("PATHEXT", ";").split(";", -1).uniq
 
       ENV.fetch("PATH").split(File::PATH_SEPARATOR).each do |path|
         exts.each do |ext|
@@ -16,26 +16,16 @@ module EmberCli
     end
 
     def current_environment
-      rails_config_for(:ember_cli_rails_mode){ default_environment }.to_s
+      ENV.fetch("EMBER_ENV") { default_environment }
     end
 
     private
 
     def default_environment
-      if Rails.env.test?
-        "test"
-      elsif Rails.env.production? || !rails_config_for(:consider_all_requests_local)
-        "production"
-      else
-        "development"
-      end
-    end
-
-    def rails_config_for(key)
-      if Rails.configuration.respond_to?(key)
-        Rails.configuration.public_send(key)
+      if Rails.env.match(/test|development/)
+        Rails.env
       else
-        yield
+        "production"
       end
     end
   end

data/lib/ember_cli/path_set.rb

@@ -1,8 +1,9 @@
+require "ember_cli/helpers"
+
 module EmberCli
   class PathSet
-    def initialize(app:, rails_root:, ember_cli_root:, environment:, configuration:)
+    def initialize(app:, rails_root:, ember_cli_root:, environment:)
       @app = app
-      @configuration = configuration
       @rails_root = rails_root
       @environment = environment
       @ember_cli_root = ember_cli_root
@@ -18,10 +19,6 @@ module EmberCli
       end
     end
 
-    def index_file
-      dist.join("index.html")
-    end
-
     def tmp
       @tmp ||= root.join("tmp").tap(&:mkpath)
     end
@@ -65,7 +62,7 @@ module EmberCli
 
     def bower
       @bower ||= begin
-        bower_path = app_options.fetch(:bower_path) { configuration.bower_path }
+        bower_path = app_options.fetch(:bower_path) { which("bower") }
 
         bower_path.tap do |path|
           unless Pathname(path).executable?
@@ -82,24 +79,32 @@ module EmberCli
     end
 
     def npm
-      @npm ||= app_options.fetch(:npm_path) { configuration.npm_path }
+      @npm ||= app_options.fetch(:npm_path) { which("npm") }
     end
 
     def tee
-      @tee ||= app_options.fetch(:tee_path) { configuration.tee_path }
+      @tee ||= app_options.fetch(:tee_path) { which("tee") }
     end
 
     def bundler
-      @bundler ||= app_options.fetch(:bundler_path) do
-        configuration.bundler_path
-      end
+      @bundler ||= app_options.fetch(:bundler_path) { which("bundler") }
     end
 
     private
 
-    attr_reader :app, :configuration, :ember_cli_root, :environment, :rails_root
+    attr_reader :app, :ember_cli_root, :environment, :rails_root
 
-    delegate :name, :options, to: :app, prefix: true
+    def app_name
+      app.name
+    end
+
+    def app_options
+      app.options
+    end
+
+    def which(executable)
+      Helpers.which(executable)
+    end
 
     def logs
       rails_root.join("log").tap(&:mkpath)

data/lib/ember_cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCli
-  VERSION = "0.6.1".freeze
+  VERSION = "0.7.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ember-cli-rails-assets
@@ -94,6 +94,7 @@ files:
 - lib/ember_cli/build_monitor.rb
 - lib/ember_cli/command.rb
 - lib/ember_cli/configuration.rb
+- lib/ember_cli/deploy/file.rb
 - lib/ember_cli/engine.rb
 - lib/ember_cli/errors.rb
 - lib/ember_cli/helpers.rb