ember-cli-rails 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd138b5cec9d03c0f000ee67ff10f619149621f2
-  data.tar.gz: 4ea97ed5ab28d9bfc8ef9cd7ccca5da187cbb67e
+  metadata.gz: 1ef9ebf40bb8a292bd4bbb5616564418e3dbec67
+  data.tar.gz: 588fe62b8b81b49dad39b9669a7985c1d63220da
 SHA512:
-  metadata.gz: ec01c1f6f77d4be06792d0a7e0e64cb0b635bf61e0dfb17439b506e69319fa808aed7816be0d2281a901b5dea28d5453a3563ad8aeb4b172a869b2d2f2d80367
-  data.tar.gz: 1255243bed0ad2743300013fe5908efecfd0d2cf42d3c2eb64aa492a79deb0c3c9c2224dffa809c84adeb41b55119040ff18daeb1d918308cb334deb8d320044
+  metadata.gz: 0ae1d31dc429f5bbde157e193aca190b6ed03b96243c205f3f273c3dbb3231ad31ce7b71c4d8fc6da6d03c151268b99388b53b7df70de6318c500ab18fa9611f
+  data.tar.gz: d5810b513cc52ad2f7621a6905a93d022ca3f8dfc0a81e2d34a0fad9902f602ead9c051c4e781072b2a2547f7983ae5ea7cb8e2f19bcc356ae9ae1d4618fa403

data/lib/ember-cli-rails.rb

@@ -3,7 +3,7 @@ require "ember-cli/railtie" if defined?(Rails)
 module EmberCLI
   extend self
 
-  autoload :BuildServer,   "ember-cli/build_server"
+  autoload :App,           "ember-cli/app"
   autoload :Configuration, "ember-cli/configuration"
   autoload :RackServer,    "ember-cli/rack_server"
   autoload :ViewHelpers,   "ember-cli/view_helpers"
@@ -18,17 +18,33 @@ module EmberCLI
   end
 
   def prepare!
-    Rack::Server.send :prepend, RackServer
-    Rails.configuration.assets.paths << root.join("assets").to_s
-    at_exit{ cleanup }
+    @prepared ||= begin
+      Rails.configuration.assets.paths << root.join("assets").to_s
+      at_exit{ cleanup }
+      true
+    end
   end
 
-  def start!
-    configuration.apps.values.each(&:start)
+  def enable!
+    if Rails.env.development?
+      prepare!
+      Rack::Server.send :prepend, RackServer
+    else
+      compile!
+    end
+  end
+
+  def run!
+    each_app &:run
+  end
+
+  def compile!
+    prepare!
+    each_app &:compile
   end
 
   def stop!
-    configuration.apps.values.each(&:stop)
+    each_app &:stop
   end
 
   def root
@@ -44,4 +60,8 @@ module EmberCLI
   def cleanup
     root.rmtree if root.exist?
   end
+
+  def each_app
+    configuration.apps.values.each{ |a| yield a }
+  end
 end

data/lib/ember-cli/{build_server.rb → app.rb}

@@ -1,15 +1,22 @@
 module EmberCLI
-  class BuildServer
+  class App
     attr_reader :name, :options, :pid
 
     def initialize(name, **options)
       @name, @options = name.to_s, options
     end
 
-    def start
+    def compile
       symlink_to_assets_root
       add_assets_to_precompile_list
-      @pid = spawn(command, chdir: app_path, err: :out)
+      silence_stream STDOUT do
+        system command, chdir: app_path, err: :out
+      end
+    end
+
+    def run
+      compile
+      @pid = spawn(command(watch: true), chdir: app_path, err: :out)
       at_exit{ stop }
     end
 
@@ -36,8 +43,9 @@ module EmberCLI
       Rails.configuration.assets.precompile << /(?:\/|\A)#{name}\//
     end
 
-    def command
-      "#{ember_path} build --watch --output-path #{dist_path} #{log_pipe}"
+    def command(watch: nil)
+      watch = "--watch" if watch
+      "#{ember_path} build #{watch} --environment #{environment} --output-path #{dist_path} #{log_pipe}"
     end
 
     def log_pipe
@@ -65,5 +73,9 @@ module EmberCLI
     def assets_path
       @assets_path ||= EmberCLI.root.join("assets").tap(&:mkpath)
     end
+
+    def environment
+      Rails.env.in?(%w[development test]) ? Rails.env : "production"
+    end
   end
 end

data/lib/ember-cli/configuration.rb

@@ -5,7 +5,7 @@ module EmberCLI
     include Singleton
 
     def app(name, **options)
-      apps.store name, BuildServer.new(name, **options)
+      apps.store name, App.new(name, **options)
     end
 
     def apps

data/lib/ember-cli/helpers.rb

@@ -14,5 +14,15 @@ module EmberCLI
 
       nil
     end
+
+    def override_assets_precompile_task!
+      Rake.application.instance_eval do
+        @tasks["assets:precompile:original"] = @tasks.delete("assets:precompile")
+        Rake::Task.define_task "assets:precompile", %i[assets precompile] => :environment do
+          EmberCLI.compile!
+          Rake::Task["assets:precompile:original"].execute
+        end
+      end
+    end
   end
 end

data/lib/ember-cli/rack_server.rb

@@ -1,7 +1,7 @@
 module EmberCLI
   module RackServer
     def start
-      EmberCLI.start! if defined?(Rails.application) && app == Rails.application
+      EmberCLI.run! if defined?(Rails.application) && app == Rails.application
       super
     ensure
       EmberCLI.stop!

data/lib/ember-cli/railtie.rb

@@ -1,9 +1,5 @@
 module EmberCLI
   class Railtie < Rails::Railtie
-    initializer "ember-cli-rails.rack-server" do
-      EmberCLI.prepare! if development_mode?
-    end
-
     initializer "ember-cli-rails.view_helpers" do
       ActionView::Base.send :include, ViewHelpers
     end
@@ -14,7 +10,15 @@ module EmberCLI
       end
     end
 
-    def development_mode?
+    initializer "ember-cli-rails.rack-server" do
+      EmberCLI.enable! if non_production?
+    end
+
+    rake_tasks do
+      require "ember-cli/rake_task"
+    end
+
+    def non_production?
       !Rails.env.production? && Rails.configuration.consider_all_requests_local
     end
   end

data/lib/ember-cli/rake_task.rb

@@ -0,0 +1,3 @@
+require "sprockets/rails/task"
+
+EmberCLI::Helpers.override_assets_precompile_task!

data/lib/ember-cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCLI
-  VERSION = "0.0.3".freeze
+  VERSION = "0.0.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -36,11 +36,12 @@ files:
 - LICENSE.txt
 - README.md
 - lib/ember-cli-rails.rb
-- lib/ember-cli/build_server.rb
+- lib/ember-cli/app.rb
 - lib/ember-cli/configuration.rb
 - lib/ember-cli/helpers.rb
 - lib/ember-cli/rack_server.rb
 - lib/ember-cli/railtie.rb
+- lib/ember-cli/rake_task.rb
 - lib/ember-cli/version.rb
 - lib/ember-cli/view_helpers.rb
 - lib/generators/ember-cli/init/USAGE