diff --git a/lib/gemfile_generator.rb b/lib/gemfile_generator.rb index 72dc8f6..bc8a3ef 100644 --- a/lib/gemfile_generator.rb +++ b/lib/gemfile_generator.rb @@ -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 = < "{*/,}*.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 \ No newline at end of file +end diff --git a/test/gemfile_generator_test.rb b/test/gemfile_generator_test.rb index fb35358..d0f1bd6 100644 --- a/test/gemfile_generator_test.rb +++ b/test/gemfile_generator_test.rb @@ -22,10 +22,9 @@ class GemfileGeneratorTest < ActiveSupport::TestCase PREAMBLE = < "{*/,}*.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 \ No newline at end of file +end