update gemfile_generator to current rails preamble and bundler syntax
This commit is contained in:
parent
51fac11ae2
commit
f44e5c7edf
@ -47,7 +47,7 @@ module Rails
|
||||
data = {}
|
||||
|
||||
# Add new keys from old keys
|
||||
data[:require_as] = options[:lib] if options[:lib]
|
||||
data[:require] = options[:lib] if options[:lib]
|
||||
data[:source] = options[:source] if options[:source]
|
||||
|
||||
version = options[:version]
|
||||
@ -60,10 +60,9 @@ module Rails
|
||||
preamble = <<STR
|
||||
# Edit this Gemfile to bundle your application's dependencies.
|
||||
# This preamble is the current preamble for Rails 3 apps; edit as needed.
|
||||
path "/path/to/rails", :glob => "{*/,}*.gemspec"
|
||||
git "git://github.com/rails/rack.git"
|
||||
source 'http://rubygems.org'
|
||||
|
||||
gem "rails", "3.0.pre"
|
||||
gem 'rails', '3.0.0.beta3'
|
||||
|
||||
STR
|
||||
preamble + generate_upgraded_code
|
||||
@ -93,4 +92,4 @@ STR
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -22,10 +22,9 @@ class GemfileGeneratorTest < ActiveSupport::TestCase
|
||||
PREAMBLE = <<STR
|
||||
# Edit this Gemfile to bundle your application's dependencies.
|
||||
# This preamble is the current preamble for Rails 3 apps; edit as needed.
|
||||
path "/path/to/rails", :glob => "{*/,}*.gemspec"
|
||||
git "git://github.com/rails/rack.git"
|
||||
source 'http://rubygems.org'
|
||||
|
||||
gem "rails", "3.0.pre"
|
||||
gem 'rails', '3.0.0.beta3'
|
||||
|
||||
STR
|
||||
|
||||
@ -61,13 +60,13 @@ STR
|
||||
generator = Rails::Upgrading::GemfileGenerator.new
|
||||
generator.environment_code = "config.gem 'camping', :lib => 'kamping'"
|
||||
|
||||
assert_equal PREAMBLE + "gem 'camping', :require_as => 'kamping'", generator.generate_gemfile
|
||||
assert_equal PREAMBLE + "gem 'camping', :require => 'kamping'", generator.generate_gemfile
|
||||
end
|
||||
|
||||
def test_generates_with_all_options
|
||||
generator = Rails::Upgrading::GemfileGenerator.new
|
||||
generator.environment_code = "config.gem 'camping', :lib => 'kamping', :source => 'http://code.whytheluckystiff.net', :version => '2.1.1'"
|
||||
|
||||
assert_equal PREAMBLE + "source 'http://code.whytheluckystiff.net'\ngem 'camping', '2.1.1', :require_as => 'kamping'", generator.generate_gemfile
|
||||
assert_equal PREAMBLE + "source 'http://code.whytheluckystiff.net'\ngem 'camping', '2.1.1', :require => 'kamping'", generator.generate_gemfile
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user