lib/ember-cli/path_set.rb in ember-cli-rails-0.4.3 vs lib/ember-cli/path_set.rb in ember-cli-rails-0.5.0

@@ -9,62 +9,72 @@
           instance_exec(&definition).tap{ |value| instance_variable_set ivar, value }
         end
       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
       root.join("tmp").tap(&:mkpath)
     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
 
     define_path :lockfile do
       tmp.join("build.lock")
@@ -73,36 +83,41 @@
     define_path :build_error_file do
       tmp.join("error.txt")
     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 }
+      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")
-    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