depend on gem

thoughtbot · Dec 19, 2015 · 8e9dd12 · 8e9dd12
1 parent 2adf53b
commit 8e9dd12
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,6 @@ source "https://rubygems.org"
 gemspec
 
 gem "appraisal"
-gem "ember-cli-rails-assets", github: "seanpdoyle/ember-cli-rails-assets"
 gem "rails", "4.2.4"
 gem "pry"
 

diff --git a/ember-cli-rails.gemspec b/ember-cli-rails.gemspec
@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.1.0"
 
+  spec.add_dependency "ember-cli-rails-assets", ">= 0.6.1"
   spec.add_dependency "railties", ">= 3.2", "< 5"
   spec.add_dependency "cocaine", "~> 0.5.8"
   spec.add_dependency "html_page", "~> 0.1.0"

diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "ember-cli-rails-assets", github: "seanpdoyle/ember-cli-rails-assets"
 gem "test-unit", "~> 3.0"
 gem "rails", :git => "https://github.com/rails/rails.git", :branch => "3-2-stable"
 gem "pry"

diff --git a/gemfiles/4.1.gemfile b/gemfiles/4.1.gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "ember-cli-rails-assets", github: "seanpdoyle/ember-cli-rails-assets"
 gem "rails", "~> 4.1.1"
 gem "pry"
 

diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "ember-cli-rails-assets", github: "seanpdoyle/ember-cli-rails-assets"
 gem "rails", "~> 4.2.1"
 gem "pry"
 

diff --git a/lib/ember-cli-rails.rb b/lib/ember-cli-rails.rb
@@ -1,5 +1,6 @@
 require "fileutils"
-require "ember_cli/engine" if defined?(Rails)
+require "ember_cli/engine"
+require "ember-cli-rails-assets"
 require "ember_cli/errors"
 
 module EmberCli

diff --git a/lib/ember_cli/engine.rb b/lib/ember_cli/engine.rb
@@ -6,7 +6,6 @@ class Engine < Rails::Engine
     end
 
     config.to_prepare do
-      require "ember-cli-rails-assets"
       ActionController::Base.helper EmberRailsHelper
     end
   end