ember-cli-rails 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef5615c19dbd1784b545f48b1de07d2cdb4b5dc5
-  data.tar.gz: 90979d9055f4f219a8fca07f8235b5407706e64b
+  metadata.gz: 84093485928f16ef6e3dad167909250468a8483e
+  data.tar.gz: eea7dab850ffb0a93d91293e29e24a7100260d8e
 SHA512:
-  metadata.gz: 5df93ef9a78f054f52f2920da162f94d2998d88743464cb9d411b6fff42e6176521aa8cfd92627d4bf8fb93fd73ef9affed8acb46f8717e9fadce8ee78e7a4eb
-  data.tar.gz: 36c52947b24d6312b4073acc3ba7116c48c4c69f3bc7883bda89c94bca1411f3e02903cc4be2145437cf186a92211549c04bfc649232f20f3a477a0c8b15ab4f
+  metadata.gz: 8ae3f692eddf8f1e6a0d50eb58c3ed0ac5d432b177bed534364ac1d9edd2c053326ba05a0657f969785b4ca8ea0d27e2e79b0c8e5271a8432c9959dbfd1d1d9a
+  data.tar.gz: 4f8c0afbb6d6176c6075e1622dc325da800226381cf88eca5f80ac9fe3e8c71e9b13ef56c408232048d73fa2f8d606e416abdf0c2fd8b1c08fdc0d0eece9133b

data/CHANGELOG.md

@@ -1,50 +1,74 @@
+0.0.16
+------
+
+* Use local executable for ember-cli instead of global one.
+  [Commit](https://github.com/rwz/ember-cli-rails/commit/4aeee53f048f0445645fbc478770417fdb66cace).
+* Use `Dir.chdir` instead of passing `chdir` to `system`/`spawn`. Seems like
+  JRuby doesn't yet support `chdir` option for these methods.
+  Commits: [1](https://github.com/rwz/ember-cli-rails/commit/3bb149941f206153003726f1c18264dc62197f51),
+           [2](https://github.com/rwz/ember-cli-rails/commit/82a39f6e523ad35ecdd595fb6e49a04cb54f9c6f).
+
 0.0.15
 ------
 
-* Fix NameError when addon version doesn't match. [#47](https://github.com/rwz/ember-cli-rails/pull/47)
-* Fix race condition in symlink creation when run multiple workers (again). [#22](https://github.com/rwz/ember-cli-rails/pull/22)
+* Fix NameError when addon version doesn't match.
+  [#47](https://github.com/rwz/ember-cli-rails/pull/47)
+* Fix race condition in symlink creation when run multiple workers (again).
+  [#22](https://github.com/rwz/ember-cli-rails/pull/22)
 
 0.0.14
 ------
 
-* Do not include jQuery into vendor.js when jquery-rails is available. [#32](https://github.com/rwz/ember-cli-rails/issues/32)
+* Do not include jQuery into vendor.js when jquery-rails is available.
+  [#32](https://github.com/rwz/ember-cli-rails/issues/32)
 
 0.0.13
 ------
 
-* Fix assets:precompile in production environment. [#38](https://github.com/rwz/ember-cli-rails/issues/38)
+* Fix assets:precompile in production environment.
+  [#38](https://github.com/rwz/ember-cli-rails/issues/38)
 
 0.0.12
 ------
 
-* Make sure ember-cli-dependency-checker is present. [#35](https://github.com/rwz/ember-cli-rails/issues/35)
+* Make sure ember-cli-dependency-checker is present.
+  [#35](https://github.com/rwz/ember-cli-rails/issues/35)
 
 0.0.11
 ------
 
-* Fix locking feature by bumping addon version to 0.0.5. [#31](https://github.com/rwz/ember-cli-rails/issues/31)
+* Fix locking feature by bumping addon version to 0.0.5.
+  [#31](https://github.com/rwz/ember-cli-rails/issues/31)
 
 0.0.10
 ------
 
-* Add locking feature to prevent stale code. [#25](https://github.com/rwz/ember-cli-rails/pull/25)
+* Add locking feature to prevent stale code.
+  [#25](https://github.com/rwz/ember-cli-rails/pull/25)
 
 0.0.9
 -----
 
-* Fix a bug when path provided as a string, not pathname. [#24](https://github.com/rwz/ember-cli-rails/issues/24)
+* Fix a bug when path provided as a string, not pathname.
+  [#24](https://github.com/rwz/ember-cli-rails/issues/24)
 
 0.0.8
 -----
 
-* Add support for including Ember stylesheet link tags. [#21](https://github.com/rwz/ember-cli-rails/pull/21)
-* Fix an error when the symlink already exists. [#22](https://github.com/rwz/ember-cli-rails/pull/22)
+* Add support for including Ember stylesheet link tags.
+  [#21](https://github.com/rwz/ember-cli-rails/pull/21)
+
+* Fix an error when the symlink already exists.
+  [#22](https://github.com/rwz/ember-cli-rails/pull/22)
 
 0.0.7
 -----
 
-* Add sprockets-rails to dependency list. [commit](https://github.com/rwz/ember-cli-rails/commit/99a893030d6b754fe71363a396fd4515b93812b6)
-* Add a flag to skip ember-cli integration. [#17](https://github.com/rwz/ember-cli-rails/issues/17)
+* Add sprockets-rails to dependency list.
+  [Commit](https://github.com/rwz/ember-cli-rails/commit/99a893030d6b754fe71363a396fd4515b93812b6)
+
+* Add a flag to skip ember-cli integration.
+  [#17](https://github.com/rwz/ember-cli-rails/issues/17)
 
 0.0.6
 -----
@@ -56,7 +80,7 @@
 0.0.5
 -----
 
-* Fix generator. [commit](https://github.com/rwz/ember-cli-rails/commit/c1bb10c6a2ec5b24d55fe69b6919fdd415fd1cdc)
+* Fix generator. [Commit](https://github.com/rwz/ember-cli-rails/commit/c1bb10c6a2ec5b24d55fe69b6919fdd415fd1cdc).
 
 0.0.4
 -----

data/README.md

@@ -113,6 +113,24 @@ could render your app at the `/` route with the following view:
 
 Your Ember application will now be served at the `/` route.
 
+## Enabling LiveReload
+In order to get LiveReload correctly up and running for EmberCLI Rails, you can
+install the [guard](https://github.com/guard/guard) and
+[guard-livereload](https://github.com/guard/guard-livereload) gems and then run
+`guard init`and adding the following line to your `Guardfile`
+
+```ruby
+guard "livereload" do
+  # ...
+  watch %r{app/<your-appname>/\w+/.+\.(js|hbs|html|css|<other-extensions>)}
+  # ...
+end
+```
+
+This tells Guard to watch your EmberCLI app for any changes to the JavaScript,
+Handlebars, HTML, or CSS files. Take note that other extensions can be added to
+the line (such as `coffee` for CoffeeScript) to watch them for changes as well.
+
 ## Additional Information
 
 When running in the development environment, EmberCLI Rails runs `ember build` 
@@ -125,6 +143,7 @@ polluting your git history. Note that for this to work, you must have
 `config/environments/development.rb`, otherwise the middleware responsible for
 building Ember CLI will not be enabled.
 
+
 ## Contributing
 
 1. Fork it (https://github.com/rwz/ember-cli-rails/fork)

data/lib/ember-cli/app.rb

@@ -14,14 +14,13 @@ module EmberCLI
 
     def compile
       prepare
-      silence_stream STDOUT do
-        system(env_hash, command, chdir: app_path, err: :out)
-      end
+      silence_stream(STDOUT){ exec command }
     end
 
     def run
       prepare
-      @pid = spawn(env_hash, command(watch: true), chdir: app_path, err: :out)
+      cmd = command(watch: true)
+      @pid = exec(cmd, method: :spawn)
       at_exit{ stop }
     end
 
@@ -68,9 +67,17 @@ module EmberCLI
       MSG
     end
 
+    def ember_path
+      @ember_path ||= app_path.join("node_modules", ".bin", "ember").tap do |path|
+        fail <<-MSG.strip_heredoc unless path.executable?
+          No local ember executable found. You should run `npm install`
+          inside the #{name} app located at #{app_path}
+        MSG
+      end
+    end
+
     private
 
-    delegate :ember_path, to: :configuration
     delegate :match_version?, :non_production?, to: Helpers
     delegate :tee_path, to: :configuration
     delegate :configuration, to: :EmberCLI
@@ -196,7 +203,7 @@ module EmberCLI
 
     def addon_present?
       dev_dependencies["ember-cli-rails-addon"] == ADDON_VERSION &&
-        app_path.join('node_modules', 'ember-cli-rails-addon', 'package.json').exist?
+        app_path.join("node_modules", "ember-cli-rails-addon", "package.json").exist?
     end
 
     def env_hash
@@ -205,5 +212,13 @@ module EmberCLI
         vars.store "SUPPRESS_JQUERY", "true" if suppress_jquery?
       end
     end
+
+    def exec(cmd, options={})
+      method_name = options.fetch(:method, :system)
+
+      Dir.chdir app_path do
+        Kernel.public_send(method_name, env_hash, cmd, err: :out)
+      end
+    end
   end
 end

data/lib/ember-cli/configuration.rb

@@ -17,16 +17,10 @@ module EmberCLI
       @tee_path = Helpers.which("tee")
     end
 
-    def ember_path
-      @ember_path ||= Helpers.which("ember").tap do |path|
-        fail "ember-cli executable could not be found" unless path
-      end
-    end
-
     def build_timeout
       @build_timeout ||= 5
     end
 
-    attr_writer :ember_path, :build_timeout
+    attr_writer :build_timeout
   end
 end

data/lib/ember-cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCLI
-  VERSION = "0.0.15".freeze
+  VERSION = "0.0.16".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -81,9 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Integration between Ember CLI and Rails
 test_files: []
-has_rdoc: