From 8e9dd12070b93105e426b7134cc1254ca42b5881 Mon Sep 17 00:00:00 2001
From: Sean Doyle <sean.p.doyle24@gmail.com>
Date: Fri, 18 Dec 2015 23:51:06 -0500
Subject: [PATCH] depend on gem

---
 Gemfile                 | 1 -
 ember-cli-rails.gemspec | 1 +
 gemfiles/3.2.gemfile    | 1 -
 gemfiles/4.1.gemfile    | 1 -
 gemfiles/4.2.gemfile    | 1 -
 lib/ember-cli-rails.rb  | 3 ++-
 lib/ember_cli/engine.rb | 1 -
 7 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index bc752d09..6e587d71 100644
--- 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
index 17164abd..68c95f7c 100644
--- 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
index 4ffeb407..5ecbda6f 100644
--- 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
index d9a7ce3d..e03a704e 100644
--- 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
index 60b20f44..bf8203eb 100644
--- 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
index f9d1e02f..53c8e55c 100644
--- 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
index ffb38fd8..77f73e53 100644
--- 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