lib/ember-cli/app.rb in ember-cli-rails-0.0.11 vs lib/ember-cli/app.rb in ember-cli-rails-0.0.12

- old
+ new

@@ -1,10 +1,10 @@ require "timeout" module EmberCLI class App - ADDON_VERSION = "0.0.5" + ADDON_VERSION = "0.0.6" EMBER_CLI_VERSION = "~> 0.1.3" attr_reader :name, :options, :pid def initialize(name, options={}) @@ -108,17 +108,17 @@ MSG end end def check_addon! - unless dev_dependencies["ember-cli-rails-addon"] == ADDON_VERSION + unless addon_present? fail <<-MSG.strip_heredoc EmberCLI Rails requires your Ember app to have an addon. Please run: - $ npm install --save-dev ember-cli-rails-addon@#{ADDON_VERSION}` + $ npm install --save-dev ember-cli-rails-addon@#{ADDON_VERSION} in you Ember application root: #{app_path} MSG end end @@ -180,8 +180,13 @@ @package_json ||= JSON.parse(app_path.join("package.json").read).with_indifferent_access end def dev_dependencies package_json.fetch("devDependencies", {}) + end + + def addon_present? + dev_dependencies["ember-cli-rails-addon"] == ADDON_VERSION && + app_path.join('node_modules', 'ember-cli-rails-addon', 'package.json').exist? end end end