ember-cli-rails 0.4.3 → 0.5.0

data/lib/ember-cli/build_monitor.rb

@@ -0,0 +1,56 @@
+module EmberCli
+  class BuildMonitor
+    def initialize(name, paths)
+      @name = name
+      @paths = paths
+    end
+
+    def check!
+      if build_error?
+        raise_build_error!
+      end
+
+      true
+    end
+
+    def reset
+      if build_error?
+        error_file.delete
+      end
+    end
+
+    def wait!
+      loop do
+        check!
+        break if complete?
+        sleep 0.1
+      end
+    end
+
+    private
+
+    attr_reader :name, :paths
+
+    def complete?
+      !paths.lockfile.exist?
+    end
+
+    def build_error?
+      error_file.exist? && error_file.size?
+    end
+
+    def error_file
+      paths.build_error_file
+    end
+
+    def raise_build_error!
+      backtrace = error_file.readlines.reject(&:blank?)
+      message = "#{name.inspect} has failed to build: #{backtrace.first}"
+
+      error = BuildError.new(message)
+      error.set_backtrace(backtrace)
+
+      fail error
+    end
+  end
+end

data/lib/ember-cli/capture.rb

@@ -1,25 +1,11 @@
 module EmberCli
-  SKIP_CAPTURE = ["", ""].freeze
-
   class Capture
     def initialize(sprockets:, &block)
       @sprockets = sprockets
-      @block = block
+      @block = block || NullBlock.new
     end
 
     def capture
-      if block.present?
-        capture_content
-      else
-        SKIP_CAPTURE
-      end
-    end
-
-    private
-
-    attr_reader :block, :sprockets
-
-    def capture_content
       if block.arity > 0
         block.call(*block_arguments)
       end
@@ -27,6 +13,10 @@ module EmberCli
       [head.content, body.content]
     end
 
+    private
+
+    attr_reader :block, :sprockets
+
     def block_arguments
       [head, body].first(block.arity)
     end
@@ -73,5 +63,15 @@ module EmberCli
       end
     end
     private_constant :Block
+
+    class NullBlock
+      def arity
+        1
+      end
+
+      def call(*)
+      end
+    end
+    private_constant :NullBlock
   end
 end

data/lib/ember-cli/command.rb

@@ -0,0 +1,63 @@
+module EmberCli
+  class Command
+    def initialize(paths:, options: {})
+      @paths = paths
+      @options = options
+    end
+
+    def test
+      "#{paths.ember} test --environment test"
+    end
+
+    def build(watch: false)
+      [
+        "#{paths.ember} build",
+        "#{watch_flag(watch)}",
+        "--environment #{build_environment}",
+        "--output-path #{paths.dist}",
+        pipe_errors_to_file,
+        pipe_to_log_files,
+      ].join(" ")
+    end
+
+    private
+
+    attr_reader :options, :paths
+
+    def process_watcher
+      options.fetch(:watcher) { EmberCli.configuration.watcher }
+    end
+
+    def watch_flag(watch)
+      watch_flag = ""
+
+      if watch
+        watch_flag = "--watch"
+
+        if process_watcher
+          watch_flag += " --watcher #{process_watcher}"
+        end
+      end
+
+      watch_flag
+    end
+
+    def pipe_errors_to_file
+      "2> #{paths.build_error_file}"
+    end
+
+    def pipe_to_log_files
+      if paths.tee
+        "| #{paths.tee} -a #{paths.log}"
+      end
+    end
+
+    def build_environment
+      if EmberCli.env == "production"
+        "production"
+      else
+        "development"
+      end
+    end
+  end
+end

data/lib/ember-cli/configuration.rb

@@ -5,6 +5,14 @@ module EmberCli
     include Singleton
 
     def app(name, **options)
+      if options.has_key? :build_timeout
+        deprecate_timeout
+      end
+
+      if options.has_key? :enable
+        deprecate_enable
+      end
+
       apps.store name, App.new(name, options)
     end
 
@@ -29,11 +37,34 @@ module EmberCli
       @bundler_path ||= Helpers.which("bundler")
     end
 
-    def build_timeout
-      @build_timeout ||= 5
+    def build_timeout=(*)
+      deprecate_timeout
     end
 
-    attr_writer :build_timeout
     attr_accessor :watcher
+
+    private
+
+    def deprecate_enable
+      warn <<-WARN.strip_heredoc
+
+      The `enable` lambda configuration has been removed.
+
+      Please read https://github.com/thoughtbot/ember-cli-rails/pull/261 for
+      details.
+
+      WARN
+    end
+
+    def deprecate_timeout
+      warn <<-WARN.strip_heredoc
+
+      The `build_timeout` configuration has been removed.
+
+      Please read https://github.com/thoughtbot/ember-cli-rails/pull/259 for
+      details.
+
+      WARN
+    end
   end
 end

data/lib/ember-cli/constraint.rb

@@ -0,0 +1,9 @@
+module EmberCli
+  class Constraint
+    def matches?(request)
+      matches = request.format.to_s =~ /html/ || -1
+
+      matches > -1
+    end
+  end
+end

data/lib/ember-cli/controller_extension.rb

@@ -0,0 +1,13 @@
+module EmberCli
+  module ControllerExtension
+    def self.included(base)
+      base.before_action do
+        app = params[:ember_app]
+
+        if app.present?
+          EmberCli[app].build
+        end
+      end
+    end
+  end
+end

data/lib/ember-cli/engine.rb

@@ -1,12 +1,23 @@
 module EmberCli
   class Engine < Rails::Engine
+    initializer "ember-cli-rails.rendering" do
+      require "ember-cli/ember_controller"
+      require "ember-cli/route_helpers"
+    end
+
     initializer "ember-cli-rails.enable" do
       EmberCli.enable! unless EmberCli.skip?
     end
 
-    initializer "ember-cli-rails.helpers" do
-      config.to_prepare do
-        ActionController::Base.helper EmberRailsHelper
+    config.to_prepare do
+      ActionController::Base.helper EmberRailsHelper
+    end
+
+    config.after_initialize do
+      if defined?(ApplicationController)
+        require "ember-cli/controller_extension"
+
+        ApplicationController.include(EmberCli::ControllerExtension)
       end
     end
   end

data/lib/ember-cli/errors.rb

@@ -0,0 +1,4 @@
+module EmberCli
+  class BuildError < StandardError; end
+  class DependencyError < BuildError; end
+end

data/lib/ember-cli/helpers.rb

@@ -2,15 +2,6 @@ module EmberCli
   module Helpers
     extend self
 
-    def match_version?(version, requirements)
-      version = Gem::Version.new(version)
-
-      Array.wrap(requirements).any? do |requirement|
-        requirement = Gem::Requirement.new(requirement)
-        requirement.satisfied_by?(version)
-      end
-    end
-
     def which(cmd)
       exts = ENV.fetch("PATHEXT", ?;).split(?;, -1).uniq
 
@@ -41,8 +32,11 @@ module EmberCli
     end
 
     def rails_config_for(key)
-      config = Rails.configuration
-      config.respond_to?(key) ? config.public_send(key) : yield
+      if Rails.configuration.respond_to?(key)
+        Rails.configuration.public_send(key)
+      else
+        yield
+      end
     end
   end
 end

data/lib/ember-cli/html_page.rb

@@ -1,8 +1,7 @@
 module EmberCli
   class HtmlPage
-    def initialize(content:, asset_resolver:, head: "", body: "")
+    def initialize(content:, head: "", body: "")
       @content = content
-      @asset_resolver = asset_resolver
       @head = head
       @body = body
     end
@@ -16,11 +15,13 @@ module EmberCli
         insert_body_content
       end
 
-      html
+      content
     end
 
     private
 
+    attr_reader :content
+
     def has_head_tag?
       head_tag_index >= 0
     end
@@ -30,27 +31,19 @@ module EmberCli
     end
 
     def insert_head_content
-      html.insert(head_tag_index, @head.to_s)
+      content.insert(head_tag_index, @head.to_s)
     end
 
     def insert_body_content
-      html.insert(body_tag_index, @body.to_s)
-    end
-
-    def html
-      @html ||= resolved_html
+      content.insert(body_tag_index, @body.to_s)
     end
 
     def head_tag_index
-      html.index("</head") || -1
+      content.index("</head") || -1
     end
 
     def body_tag_index
-      html.index("</body") || -1
-    end
-
-    def resolved_html
-      @asset_resolver.resolve_urls(@content)
+      content.index("</body") || -1
     end
   end
 end

data/lib/ember-cli/path_set.rb

@@ -11,14 +11,22 @@ module EmberCli
       end
     end
 
-    def initialize(app)
+    def initialize(app:, rails_root:, ember_cli_root:, environment:, configuration:)
       @app = app
+      @configuration = configuration
+      @rails_root = rails_root
+      @environment = environment
+      @ember_cli_root = ember_cli_root
     end
 
     define_path :root do
       path = app_options.fetch(:path){ default_root }
       pathname = Pathname.new(path)
-      pathname.absolute?? pathname : Rails.root.join(path)
+      if pathname.absolute?
+        pathname
+      else
+        rails_root.join(path)
+      end
     end
 
     define_path :tmp do
@@ -26,43 +34,45 @@ module EmberCli
     end
 
     define_path :log do
-      Rails.root.join("log", "ember-#{app_name}.#{Rails.env}.log")
+      rails_root.join("log", "ember-#{app_name}.#{environment}.log")
     end
 
     define_path :dist do
-      EmberCli.root.join("apps", app_name).tap(&:mkpath)
+      ember_cli_root.join("apps", app_name).tap(&:mkpath)
     end
 
     define_path :assets do
-      EmberCli.root.join("assets").tap(&:mkpath)
+      ember_cli_root.join("assets").tap(&:mkpath)
+    end
+
+    define_path :app_assets do
+      assets.join(app_name)
     end
 
     define_path :applications do
-      Rails.root.join("public", "_apps").tap(&:mkpath)
+      rails_root.join("public", "_apps").tap(&:mkpath)
     end
 
     define_path :gemfile do
       root.join("Gemfile")
     end
 
-    define_path :tests do
-      dist.join("tests")
-    end
-
     define_path :package_json_file do
       root.join("package.json")
     end
 
-    define_path :node_modules do
-      root.join("node_modules")
-    end
-
     define_path :ember do
       root.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 #{app_name} app located at #{root}
-        MSG
+        unless path.executable?
+          fail DependencyError.new <<-MSG.strip_heredoc
+            No `ember-cli` executable found for `#{app_name}`.
+
+            Install it:
+
+                $ cd #{root}
+                $ npm install
+          MSG
+        end
       end
     end
 
@@ -75,34 +85,39 @@ module EmberCli
     end
 
     define_path :tee do
-      app_options.fetch(:tee_path){ configuration.tee_path }
+      app_options.fetch(:tee_path) { configuration.tee_path }
     end
 
     define_path :bower do
-      app_options.fetch(:bower_path) { configuration.bower_path }
+      app_options.fetch(:bower_path) { configuration.bower_path }.tap do |path|
+        unless Pathname(path).executable?
+          fail DependencyError.new <<-MSG.strip_heredoc
+          Bower is required by EmberCLI
+
+          Install it with:
+
+              $ npm install -g bower
+          MSG
+        end
+      end
     end
 
     define_path :npm do
-      app_options.fetch(:npm_path){ configuration.npm_path }
+      app_options.fetch(:npm_path) { configuration.npm_path }
     end
 
     define_path :bundler do
-      app_options.fetch(:bundler_path){ configuration.bundler_path }
-    end
-
-    define_path :addon_package_json_file do
-      root.join("node_modules", "ember-cli-rails-addon", "package.json")
+      app_options.fetch(:bundler_path) { configuration.bundler_path }
     end
 
     private
 
-    attr_reader :app
+    attr_reader :app, :configuration, :ember_cli_root, :environment, :rails_root
 
     delegate :name, :options, to: :app, prefix: true
-    delegate :configuration, to: EmberCli
 
     def default_root
-      Rails.root.join(app_name)
+      rails_root.join(app_name)
     end
   end
 end