ember-cli-rails 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa3abcfef9d6d58b294ce9bd564f43c36254773
-  data.tar.gz: 439aa2140f65b265d8a0dfa306b5945662030b49
+  metadata.gz: 17234641f3cac538a57c2cf6bdacf0b691d24143
+  data.tar.gz: b506c5306a619e6f930c20665c70237f64a1f237
 SHA512:
-  metadata.gz: 7be48d6ed2a100ef955f9ea7c9473dfbb46d4187b4865e5cca700cb16856980919ae48306992cb9cd9f2917f64e0916c5068a14796d396c082d4401fb4f9fda0
-  data.tar.gz: f3791d09918c175737f48d5fb5fe3d8543f2801acd57e9aaeb57dac1b6812f65e4b5c65efd8ded2dfd64e85218faa3182a1f86f667298f9b8327371073e6918e
+  metadata.gz: d7067bf6bd90c4141896666325994ca3a853de4393ba96d1ceede011ae91341650141c9180c39e16c99ff8ced4991e9fdd9ad42ac0ded250f00e2e191a1ccf3d
+  data.tar.gz: 74093676f7a68a38f36853bb2c48e71ee3b6cf9f00c27016f9e7bbc411cad0b41649bbd56526b396a4aba78f2919ba1b2947f53df17a1e04a493bacaf5b7117e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.3.0
+-----
+
+* Add enable option to speficy what paths should have ember compiled [#145](https://github.com/rwz/ember-cli-rails/pull/145)
+* Add Runner class to monitor ember deamon failures in development [#145](https://github.com/rwz/ember-cli-rails/pull/145)
+
 0.2.3
 -----
 

data/README.md

@@ -51,10 +51,15 @@ end
 - path - the path, where your EmberCLI applications is located. The default
   value is the name of your app in the Rails root.
 
+- enable - a lambda that accepts each requests' path. The default value is a
+  lambda that returns `true`.
+
 ```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"
+  c.app :frontend,
+    path: "/path/to/your/ember-cli-app/on/disk",
+    enable: -> path { path.starts_with?("/app/") }
 end
 ```
 
@@ -240,7 +245,7 @@ found in both `node_modules` and `bower_components`.
 
 ember-cli-rails adds your ember apps' build process to the rails asset compilation process.
 
-Now you should be ready to deploy. 
+Now you should be ready to deploy.
 
 ## Additional Information
 

data/lib/ember-cli-rails.rb

@@ -8,6 +8,7 @@ module EmberCLI
   autoload :Helpers,       "ember-cli/helpers"
   autoload :Middleware,    "ember-cli/middleware"
   autoload :PathSet,       "ember-cli/path_set"
+  autoload :Runner,        "ember-cli/runner"
 
   def configure
     yield configuration
@@ -47,27 +48,13 @@ module EmberCLI
     each_app &:install_dependencies
   end
 
-  def run!
-    prepare!
-    each_app &:run
-  end
-
   def run_tests!
     prepare!
     each_app &:run_tests
   end
 
-  def compile!
-    prepare!
-    each_app &:compile
-  end
-
-  def stop!
-    each_app &:stop
-  end
-
-  def wait!
-    each_app &:wait
+  def process_path(path)
+    each_app{ |app| Runner.new(app, path).process }
   end
 
   def root

data/lib/ember-cli/app.rb

@@ -17,9 +17,12 @@ module EmberCLI
     end
 
     def compile
-      prepare
-      silence_build { exec command }
-      check_for_build_error!
+      @compiled ||= begin
+        prepare
+        silence_build{ exec command }
+        check_for_build_error!
+        true
+      end
     end
 
     def install_dependencies
@@ -29,9 +32,11 @@ module EmberCLI
 
     def run
       prepare
+      FileUtils.touch lockfile_path
       cmd = command(watch: true)
       @pid = exec(cmd, method: :spawn)
-      at_exit{ stop }
+      Process.detach pid
+      set_on_exit_callback
     end
 
     def run_tests
@@ -40,7 +45,7 @@ module EmberCLI
     end
 
     def stop
-      Process.kill "INT", pid if pid
+      Process.kill :INT, pid if pid
       @pid = nil
     end
 
@@ -100,6 +105,10 @@ module EmberCLI
 
     private
 
+    def set_on_exit_callback
+      @on_exit_callback ||= at_exit{ stop }
+    end
+
     def supported_path_method(original)
       path_method = original.to_s[/\A(.+)_path\z/, 1]
       path_method if path_method && paths.respond_to?(path_method)
@@ -140,7 +149,6 @@ module EmberCLI
         check_addon!
         check_ember_cli_version!
         reset_build_error!
-        FileUtils.touch lockfile_path
         symlink_to_assets_root
         add_assets_to_precompile_list
         true

data/lib/ember-cli/middleware.rb

@@ -5,28 +5,14 @@ module EmberCLI
     end
 
     def call(env)
-      enable_ember_cli
-      EmberCLI.wait!
+      path = env["PATH_INFO"].to_s
 
-      if env["PATH_INFO"] == "/testem.js"
+      if path == "/testem.js"
         [ 200, { "Content-Type" => "text/javascript" }, [""] ]
       else
+        EmberCLI.process_path path
         @app.call(env)
       end
     end
-
-    private
-
-    def enable_ember_cli
-      @enabled ||= begin
-        if EmberCLI.env.development?
-          EmberCLI.run!
-        else
-          EmberCLI.compile!
-        end
-
-        true
-      end
-    end
   end
 end

data/lib/ember-cli/runner.rb

@@ -0,0 +1,53 @@
+module EmberCLI
+  class Runner
+    TRUE_PROC = ->(*){ true }
+
+    attr_reader :app, :path
+
+    def initialize(app, path)
+      @app, @path = app, path
+    end
+
+    def process
+      return if skip?
+
+      if EmberCLI.env.development?
+        start_or_restart!
+      else
+        compile!
+      end
+
+      wait!
+    end
+
+    private
+
+    def skip?
+      invoker = app.options.fetch(:enable, TRUE_PROC)
+      !invoker.call(path)
+    end
+
+    def start_or_restart!
+      run! unless app.pid && still_running?
+    end
+
+    def still_running?
+      Process.getpgid app.pid
+      true
+    rescue Errno::ESRCH # no such process
+      false
+    end
+
+    def wait!
+      app.wait
+    end
+
+    def compile!
+      app.compile
+    end
+
+    def run!
+      app.run
+    end
+  end
+end

data/lib/ember-cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCLI
-  VERSION = "0.2.3".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -68,6 +68,7 @@ files:
 - lib/ember-cli/helpers.rb
 - lib/ember-cli/middleware.rb
 - lib/ember-cli/path_set.rb
+- lib/ember-cli/runner.rb
 - lib/ember-cli/version.rb
 - lib/generators/ember-cli/init/USAGE
 - lib/generators/ember-cli/init/init_generator.rb