diff options
| author | Joshua Hull <joshbuddy@gmail.com> | 2010-04-20 14:42:20 -0400 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2010-04-20 14:29:16 -0700 |
| commit | 0ce100171e9863b0ba82dc004c772ae2dcd74757 (patch) | |
| tree | a29a5a8d671d120bfbc672d02542846faaf22ee3 | |
| parent | 1d5b0696cf0f0b2d53e96143ff6d2e8c1a128313 (diff) | |
| download | bundler-0ce100171e9863b0ba82dc004c772ae2dcd74757.tar.gz | |
Fix up bundle init --gemspec
| -rw-r--r-- | lib/bundler/rubygems_ext.rb | 14 | ||||
| -rw-r--r-- | spec/other/init_spec.rb | 5 |
2 files changed, 14 insertions, 5 deletions
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb index 647bfe12bb..52b352ce91 100644 --- a/lib/bundler/rubygems_ext.rb +++ b/lib/bundler/rubygems_ext.rb @@ -27,8 +27,16 @@ module Gem def to_gemfile(path = nil) gemfile = "source :gemcutter\n" - gemfile << dependencies_to_gemfile(dependencies) - gemfile << dependencies_to_gemfile(development_dependencies, :development) + gemfile << dependencies_to_gemfile(nondevelopment_dependencies) + unless development_dependencies.empty? + gemfile << "\n" + gemfile << dependencies_to_gemfile(development_dependencies, :development) + end + gemfile + end + + def nondevelopment_dependencies + dependencies - development_dependencies end def add_bundler_dependencies(*groups) @@ -47,7 +55,7 @@ module Gem def dependencies_to_gemfile(dependencies, group = nil) gemfile = '' if dependencies.any? - gemfile << "group #{group} do\n" if group + gemfile << "group :#{group} do\n" if group dependencies.each do |dependency| gemfile << ' ' if group gemfile << %|gem "#{dependency.name}"| diff --git a/spec/other/init_spec.rb b/spec/other/init_spec.rb index 912a90c684..51fe800485 100644 --- a/spec/other/init_spec.rb +++ b/spec/other/init_spec.rb @@ -32,8 +32,9 @@ describe "bundle init" do gemfile = bundled_app("Gemfile").read gemfile.should =~ /source :gemcutter/ - gemfile.should =~ /gem "rack", "= 1.0.1"/ - gemfile.should =~ /gem "rspec", "= 1.2"/ + gemfile.scan(/gem "rack", "= 1.0.1"/).size.should == 1 + gemfile.scan(/gem "rspec", "= 1.2"/).size.should == 1 + gemfile.scan(/group :development/).size.should == 1 end end
\ No newline at end of file |