ember-cli-rails 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66a6b948a0cc20a4a451f0765f34143b6c25c878
-  data.tar.gz: bc90703a1cf03404bad413c8114c2976f9e4d956
+  metadata.gz: 0e8e3eae43c6174217f04aa96d57a7396f6b1ba8
+  data.tar.gz: c8d43e9a2efd2b5a9367d6fa974fa3ccedd4bb69
 SHA512:
-  metadata.gz: 7b4334c4774fde5f7640736250b69e60fc9875e18eb9c573d16f770b16ae7032cff847c9e0e3c90141c116e9e3bd5d07f8cbbfaca8708ae654190f5bfa9c3e41
-  data.tar.gz: 949d2dc2b36e751a22ecc56252361d2758b9febbd3821fa62f570e311a45d8c5e78c9fdbd50435f1c2a55b179cfac73b4ecbe2f4a466e8c3622021c5a9d069ee
+  metadata.gz: c1f9f0227c30692510edba35b843344b25e839c003437c92df089312c20803246653f9c7e88fddd3ff08d7f684a5ee57c073af3709b64a98e3014ba886442d79
+  data.tar.gz: a0789e42c15df281a2cd76ce4e61b30688eb1d60e0a28cd7ab81b9b819b0927b525dbeb1b2b4e0c384e795390ef2f08c327bb6934277b0ccd38707502a70e2ea

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 master
 ------
 
+0.10.0
+------
+
+* Remove `bin/heroku_install` to simplify Heroku setup.
+  To upgrade, remove your project's generated `bin/heroku_install`.
+  Next, execute `rake ember:heroku`. [#544]
+* Generate an empty `yarn.lock` so that Heroku understands that the
+  application's deployment target requires `yarn`. Closes [#538]. [#540]
+* No longer support `rails < 4.2`. [#543]
+* Generate an empty `yarn.lock` so that Heroku understands that the
+  application's deployment target requires `yarn`. Closes [#538]. [#540]
+
+[#543]: https://github.com/thoughtbot/ember-cli-rails/pull/543
+[#544]: https://github.com/thoughtbot/ember-cli-rails/pull/544
+[#538]: https://github.com/thoughtbot/ember-cli-rails/issues/538
+[#540]: https://github.com/thoughtbot/ember-cli-rails/pull/540
+
 0.9.0
 -----
 

data/README.md

@@ -476,13 +476,13 @@ EmberCli.configure do |c|
 end
 ```
 
-Next, mount the applications alongside the rest of Rails' routes:
+Next, mount the applications alongside the rest of Rails' routes. Note that `admin_panel` route is added before the `frontend` route because it's more specific:
 
 ```rb
 # /config/routes.rb
 Rails.application.routes.draw do
-  mount_ember_app :frontend, to: "/"
   mount_ember_app :admin_panel, to: "/admin_panel"
+  mount_ember_app :frontend, to: "/"
 end
 ```
 
@@ -661,7 +661,7 @@ This project supports:
 This project supports:
 
 * Ruby versions `>= 2.2.0`
-* Rails versions `>=4.1.x`.
+* Rails versions `>=4.2.x`.
 
 To learn more about supported versions and upgrades, read the [upgrading guide].
 

data/lib/ember-cli-rails.rb

@@ -1,69 +1,3 @@
-require "fileutils"
-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
-
-  def configure
-    yield configuration
-  end
-
-  def configuration
-    Configuration.instance
-  end
-
-  def app(name)
-    apps.fetch(name) do
-      fail KeyError, "#{name.inspect} app is not defined"
-    end
-  end
-
-  def build(name)
-    app(name).build
-  end
-
-  alias_method :[], :app
-
-  def skip?
-    ENV["SKIP_EMBER"].present?
-  end
-
-  def install_dependencies!
-    each_app(&:install_dependencies)
-  end
-
-  def test!
-    each_app(&:test)
-  end
-
-  def compile!
-    cleanup!
-    each_app(&:compile)
-  end
-
-  def root
-    @root ||= Rails.root.join("tmp", "ember-cli").tap(&:mkpath)
-  end
-
-  def env
-    @env ||= Helpers.current_environment
-  end
-
-  delegate :apps, to: :configuration
-
-  private
-
-  def cleanup!
-    root.children.each { |tmp_file| FileUtils.rm_rf(tmp_file) }
-  end
-
-  def each_app
-    apps.each { |_, app| yield app }
-  end
-end
+require "ember_cli"
 
 EmberCLI = EmberCli

data/lib/ember_cli.rb

@@ -0,0 +1,72 @@
+require "fileutils"
+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
+
+  def configure
+    yield configuration
+  end
+
+  def configuration
+    Configuration.instance
+  end
+
+  def app(name)
+    apps.fetch(name) do
+      fail KeyError, "#{name.inspect} app is not defined"
+    end
+  end
+  alias_method :[], :app
+
+  def apps
+    configuration.apps
+  end
+
+  def build(name)
+    app(name).build
+  end
+
+  def any?(*arguments, &block)
+    apps.values.any?(*arguments, &block)
+  end
+
+  def skip?
+    ENV["SKIP_EMBER"].present?
+  end
+
+  def install_dependencies!
+    each_app(&:install_dependencies)
+  end
+
+  def test!
+    each_app(&:test)
+  end
+
+  def compile!
+    cleanup!
+    each_app(&:compile)
+  end
+
+  def root
+    @root ||= Rails.root.join("tmp", "ember-cli").tap(&:mkpath)
+  end
+
+  def env
+    @env ||= Helpers.current_environment
+  end
+
+  private
+
+  def cleanup!
+    root.children.each { |tmp_file| FileUtils.rm_rf(tmp_file) }
+  end
+
+  def each_app
+    apps.each { |_, app| yield app }
+  end
+end

data/lib/ember_cli/app.rb

@@ -33,6 +33,10 @@ module EmberCli
       paths.dist
     end
 
+    def cached_directories
+      paths.cached_directories
+    end
+
     def compile
       @compiled ||= begin
         prepare
@@ -83,6 +87,14 @@ module EmberCli
       deploy.mountable?
     end
 
+    def yarn_enabled?
+      options.fetch(:yarn, false)
+    end
+
+    def bower?
+      paths.bower_json.exist?
+    end
+
     def to_rack
       deploy.to_rack
     end

data/lib/ember_cli/path_set.rb

@@ -36,7 +36,7 @@ module EmberCli
     end
 
     def bower_json
-      ember_cli_root.join("bower.json")
+      root.join("bower.json")
     end
 
     def ember
@@ -108,6 +108,13 @@ module EmberCli
       @bundler ||= path_for_executable("bundler")
     end
 
+    def cached_directories
+      [
+        node_modules,
+        (bower_components if bower_json.exist?),
+      ].compact
+    end
+
     private
 
     attr_reader :app, :ember_cli_root, :environment, :rails_root

data/lib/ember_cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCli
-  VERSION = "0.9.0".freeze
+  VERSION = "0.10.0".freeze
 end

data/lib/generators/ember/heroku/USAGE

@@ -4,9 +4,8 @@ Description:
     Once the generator is complete, execute the following:
 
         $ 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 config:set NPM_CONFIG_PRODUCTION=false
+        $ heroku buildpacks:add --index 1 heroku/nodejs
+        $ heroku buildpacks:add --index 2 heroku/ruby
         $ heroku config:unset SKIP_EMBER
 
 Example:
@@ -16,5 +15,4 @@ Example:
         rails_12factor
 
     This will create:
-        bin/heroku_install
         package.json

data/lib/generators/ember/heroku/heroku_generator.rb

@@ -8,19 +8,44 @@ module EmberCli
       template "package.json.erb", "package.json"
     end
 
-    def copy_setup_heroku_file
-      template "bin_heroku_install.erb", "bin/heroku_install"
-      run "chmod a+x bin/heroku_install"
+    def identify_as_yarn_project
+      if EmberCli.any?(&:yarn_enabled?)
+        template "yarn.lock.erb", "yarn.lock"
+      end
     end
 
     def inject_12factor_gem
       gem "rails_12factor", group: [:staging, :production]
     end
 
+    private
+
+    def cache_directories
+      all_cached_directories.map do |cached_directory|
+        cached_directory.relative_path_from(Rails.root).to_s
+      end
+    end
+
+    def all_cached_directories
+      app_specific_cached_directories + project_root_cached_directories
+    end
+
+    def app_specific_cached_directories
+      apps.flat_map(&:cached_directories)
+    end
+
+    def project_root_cached_directories
+      [Rails.root.join("node_modules")]
+    end
+
     def app_paths
       EmberCli.apps.values.map do |app|
         app.root_path.relative_path_from(Rails.root)
       end
     end
+
+    def apps
+      EmberCli.apps.values
+    end
   end
 end

data/lib/generators/ember/heroku/templates/package.json.erb

@@ -1,15 +1,8 @@
 {
-  "scripts": {
-    "postinstall": "sh bin/heroku_install"
-  },
+  <% if EmberCli.any?(&:bower?) %>
   "dependencies": {
     "bower": "*"
   },
-  "cacheDirectories": [
-    <%- app_paths.each do |app_path| -%>
-    "<%= app_path %>/node_modules",
-    "<%= app_path %>/bower_components",
-    <%- end -%>
-    "node_modules"
-  ]
+  <% end %>
+  "cacheDirectories": <%= cache_directories.to_json %>
 }

data/lib/generators/ember/heroku/templates/yarn.lock.erb

@@ -0,0 +1 @@
+

data/lib/tasks/ember-cli.rake

@@ -16,10 +16,5 @@ namespace :ember do
 end
 
 unless EmberCli.skip?
-  # Hook into assets:precompile:all for Rails 3.1+
-  if Rails::VERSION::MAJOR < 4
-    task "assets:precompile:all" => "ember:compile"
-  else
-    task "assets:precompile" => "ember:compile"
-  end
+  task "assets:precompile" => "ember:compile"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ember-cli-rails-assets
@@ -68,6 +68,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: generator_spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 description: 
 email:
 - pavel@pravosud.com
@@ -84,6 +98,7 @@ files:
 - app/helpers/ember_rails_helper.rb
 - app/views/ember_cli/ember/index.html.erb
 - lib/ember-cli-rails.rb
+- lib/ember_cli.rb
 - lib/ember_cli/app.rb
 - lib/ember_cli/build_monitor.rb
 - lib/ember_cli/command.rb
@@ -100,8 +115,8 @@ files:
 - lib/ember_cli/version.rb
 - lib/generators/ember/heroku/USAGE
 - lib/generators/ember/heroku/heroku_generator.rb
-- lib/generators/ember/heroku/templates/bin_heroku_install.erb
 - lib/generators/ember/heroku/templates/package.json.erb
+- lib/generators/ember/heroku/templates/yarn.lock.erb
 - lib/generators/ember/init/USAGE
 - lib/generators/ember/init/init_generator.rb
 - lib/generators/ember/init/templates/initializer.rb

data/lib/generators/ember/heroku/templates/bin_heroku_install.erb

@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-
-bower="$(pwd)/node_modules/.bin/bower"
-
-for app in <%= app_paths.map { |app_path| %{"#{app_path}"} }.join(" ") -%>; do
-  cd $app &&
-    npm install &&
-    $bower install &&
-    cd -
-done