From f76726c09d74c4de937054b75464857d8b8edb76 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 1 May 2011 23:23:31 -0700
Subject: Use sprockets beta gem

---
 actionpack/actionpack.gemspec             |  1 +
 railties/lib/rails/generators/app_base.rb | 11 ++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 0d667a76a7..a2570587ce 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rack',             '~> 1.2.1')
   s.add_dependency('rack-test',        '~> 0.5.7')
   s.add_dependency('rack-mount',       '~> 0.7.2')
+  s.add_dependency('sprockets',        '~> 2.0.0.beta.1')
   s.add_dependency('tzinfo',           '~> 0.3.23')
   s.add_dependency('erubis',           '~> 2.7.0')
 end
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 324199e71c..689ef921e1 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -132,14 +132,12 @@ module Rails
             gem 'rails',     :path => '#{Rails::Generators::RAILS_DEV_PATH}'
             gem 'arel',      :git => 'git://github.com/rails/arel.git'
             gem 'rack',      :git => 'git://github.com/rack/rack.git'
-            gem 'sprockets', :git => 'git://github.com/sstephenson/sprockets.git'
           GEMFILE
         elsif options.edge?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :git => 'git://github.com/rails/rails.git'
             gem 'arel',      :git => 'git://github.com/rails/arel.git'
             gem 'rack',      :git => 'git://github.com/rack/rack.git'
-            gem 'sprockets', :git => 'git://github.com/sstephenson/sprockets.git'
           GEMFILE
         else
           <<-GEMFILE.strip_heredoc
@@ -149,7 +147,6 @@ module Rails
             # gem 'rails',     :git => 'git://github.com/rails/rails.git'
             # gem 'arel',      :git => 'git://github.com/rails/arel.git'
             # gem 'rack',      :git => 'git://github.com/rack/rack.git'
-            # gem 'sprockets', :git => 'git://github.com/sstephenson/sprockets.git'
           GEMFILE
         end
       end
@@ -167,7 +164,7 @@ module Rails
         else options[:database]
         end
       end
-      
+
       def gem_for_ruby_debugger
         if RUBY_VERSION < "1.9.2"
           "gem 'ruby-debug'"
@@ -175,7 +172,7 @@ module Rails
           "gem 'ruby-debug19', :require => 'ruby-debug'"
         end
       end
-      
+
       def gem_for_turn
         unless RUBY_VERSION < "1.9.2"
           <<-GEMFILE.strip_heredoc
@@ -200,7 +197,7 @@ module Rails
         empty_directory(destination, config)
         git_keep(destination)
       end
-      
+
       def git_keep(destination)
         create_file("#{destination}/.gitkeep") unless options[:skip_git]
       end
@@ -216,4 +213,4 @@ module Rails
       end
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3