lib/ember-cli/app.rb in ember-cli-rails-0.0.17 vs lib/ember-cli/app.rb in ember-cli-rails-0.0.18
- old
+ new
@@ -1,12 +1,11 @@
require "timeout"
module EmberCLI
class App
- ADDON_VERSION = "0.0.7"
- EMBER_CLI_VERSION = "~> 0.1.3"
- JQUERY_VERSIONS = ["~> 1.7", "~> 2.1"].freeze
+ ADDON_VERSION = "0.0.8"
+ EMBER_CLI_VERSION = "~> 0.1.5"
attr_reader :name, :options, :pid
def initialize(name, options={})
@name, @options = name.to_s, options
@@ -99,18 +98,10 @@
add_assets_to_precompile_list
true
end
end
- def suppress_jquery?
- return false unless defined?(Jquery::Rails::JQUERY_VERSION)
-
- JQUERY_VERSIONS.any? do |requirement|
- match_version?(Jquery::Rails::JQUERY_VERSION, requirement)
- end
- end
-
def check_ember_cli_version!
version = dev_dependencies.fetch("ember-cli").split("-").first
unless match_version?(version, EMBER_CLI_VERSION)
fail <<-MSG.strip_heredoc
@@ -204,13 +195,17 @@
def addon_present?
dev_dependencies["ember-cli-rails-addon"] == ADDON_VERSION &&
app_path.join("node_modules", "ember-cli-rails-addon", "package.json").exist?
end
+ def excluded_ember_deps
+ Array.wrap(options[:exclude_ember_deps]).join(",")
+ end
+
def env_hash
ENV.clone.tap do |vars|
vars.store "DISABLE_FINGERPRINTING", "true"
- vars.store "SUPPRESS_JQUERY", "true" if suppress_jquery?
+ vars.store "EXCLUDE_EMBER_ASSETS", excluded_ember_deps
end
end
def exec(cmd, options={})
method_name = options.fetch(:method, :system)