ember-cli-rails 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf2e33d142612da5f350fd3e2c5485b91655b13e
-  data.tar.gz: 2129b69228ea81c517036b91c321a27acdb283aa
+  metadata.gz: edce710d889ed900929e5b4f2d38d586258e8a48
+  data.tar.gz: 5806b65215cae0a61d60627a18399aecb6019acf
 SHA512:
-  metadata.gz: 68ca6fb42d0228394855838337b9e9a75749cedf9bf82898cc5c574a572597b7941542824782a1c973317654bf5551be1f508ea8dfc4666d84c2c1bbc49b1417
-  data.tar.gz: 93897168ded00864768d3cb1db00c45e230b713f05de4106b806005c6f4b4ddfa7205dac0a850c7f54efb65f7d78a3110b1f3e65f08c310bc60d791d6ea9b1c8
+  metadata.gz: 3028691cbb5ced53772813f9e302588bdb2f005b1d3831d14a5316e2489e7673ea20e458de9d4ff8aad4a8d63780c626d4eacf7d370ab9587367edd27022c3a2
+  data.tar.gz: b389dce752aca330ba2bde20591022a23002e1c61d9b0450f11d72a408f98ba6de8c718878a431a437c249c640afcd91875a6772fa86353acd89e05c006611e0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+0.1.6
+-----
+
+* Support Gemfile in EmberCLI app [#84](https://github.com/rwz/ember-cli-rails/commit/652cf12c0a196b4719f6517f2fea308d8d556a5f) [@sevos](https://github.com/sevos)
+* Allow relative path to be set via initializer [#72](https://github.com/rwz/ember-cli-rails/issues/74)
+* Conditionally silence build output [#82](https://github.com/rwz/ember-cli-rails/issues/82)
+* [DEPRECATION] Default EmberCLI application in Rails' app path [#66](https://github.com/rwz/ember-cli-rails/issues/66) [@jesenko](https://github.com/jesenko)
+
 0.1.5
 -----
 

data/README.md

@@ -46,14 +46,14 @@ end
 
 ##### options
 
-- app - this represents the name of the ember cli application.  The presumed
-  path of which would be `Rails.root.join('app', <your-appname>)`
+- app - this represents the name of the EmberCLI application.
 
-- path - used if you need to override the default path (mentioned above).
-  Example usage:
+- path - the path, where your EmberCLI applications is located. The default
+  value is the name of your app in the Rails root.
 
 ```ruby
 EmberCLI.configure do |c|
+  c.app :adminpanel # path is "<your-rails-root>/adminpanel"
   c.app :frontend, path: "/path/to/your/ember-cli-app/on/disk"
 end
 ```

data/lib/ember-cli/app.rb

@@ -15,11 +15,12 @@ module EmberCLI
 
     def compile
       prepare
-      silence_stream(STDOUT){ exec command }
+      silence_build { exec command }
       check_for_build_error!
     end
 
     def install_dependencies
+      exec "#{bundler_path} install" if gemfile_path.exist?
       exec "#{npm_path} install"
     end
 
@@ -92,7 +93,34 @@ module EmberCLI
 
     delegate :match_version?, :non_production?, to: Helpers
     delegate :configuration, to: EmberCLI
-    delegate :tee_path, :npm_path, to: :configuration
+    delegate :tee_path, :npm_path, :bundler_path, to: :configuration
+
+    def default_app_path
+      path = Rails.root.join("app", name)
+
+      return name unless path.directory?
+
+      ActiveSupport::Deprecation.warn <<-MSG.strip_heredoc
+        We have found that placing your EmberCLI
+        application inside Rails' app has negative performance implications.
+
+        Please see, https://github.com/rwz/ember-cli-rails/issues/66 for more
+        detailed information.
+
+        It is now reccomended to place your EmberCLI application into the Rails
+        root path.
+      MSG
+
+      path
+    end
+
+    def silence_build(&block)
+      if ENV.fetch("EMBER_CLI_RAILS_VERBOSE"){ !Helpers.non_production? }
+        yield
+      else
+        silence_stream(STDOUT, &block)
+      end
+    end
 
     def build_timeout
       options.fetch(:build_timeout){ configuration.build_timeout }
@@ -191,8 +219,9 @@ module EmberCLI
 
     def app_path
       @app_path ||= begin
-        path = options.fetch(:path){ Rails.root.join("app", name) }
-        Pathname.new(path)
+        path = options.fetch(:path){ default_app_path }
+        pathname = Pathname.new(path)
+        app_path = pathname.absolute?? pathname : Rails.root.join(path)
       end
     end
 
@@ -241,9 +270,14 @@ module EmberCLI
       ENV.clone.tap do |vars|
         vars.store "DISABLE_FINGERPRINTING", "true"
         vars.store "EXCLUDE_EMBER_ASSETS", excluded_ember_deps
+        vars.store "BUNDLE_GEMFILE", gemfile_path.to_s
       end
     end
 
+    def gemfile_path
+      app_path.join("Gemfile")
+    end
+
     def exec(cmd, options={})
       method_name = options.fetch(:method, :system)
 

data/lib/ember-cli/configuration.rb

@@ -21,6 +21,10 @@ module EmberCLI
       @npm_path ||= Helpers.which("npm")
     end
 
+    def bundler_path
+      @bundler_path ||= Helpers.which("bundler")
+    end
+
     def build_timeout
       @build_timeout ||= 5
     end

data/lib/ember-cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCLI
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties