Skip to content
Browse files

Use sprockets beta gem

  • Loading branch information...
1 parent 31155ee commit f76726c09d74c4de937054b75464857d8b8edb76 @josh josh committed May 1, 2011
Showing with 5 additions and 7 deletions.
  1. +1 −0 actionpack/actionpack.gemspec
  2. +4 −7 railties/lib/rails/generators/app_base.rb
View
1 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
View
11 railties/lib/rails/generators/app_base.rb
@@ -132,14 +132,12 @@ def rails_gemfile_entry
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 @@ def rails_gemfile_entry
# 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,15 +164,15 @@ def gem_for_database
else options[:database]
end
end
-
+
def gem_for_ruby_debugger
if RUBY_VERSION < "1.9.2"
"gem 'ruby-debug'"
else
"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 @@ def empty_directory_with_gitkeep(destination, config = {})
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 @@ def key_value(key, value)
end
end
end
-end
+end

0 comments on commit f76726c

Please sign in to comment.
Something went wrong with that request. Please try again.