Merge tag 'v1.2.2'

Version 1.2.2

Conflicts:
	.travis.yml
	lib/bundler.rb
	lib/bundler/psyched_yaml.rb
	lib/bundler/version.rb
	spec/bundler/psyched_yaml_spec.rb
	spec/other/clean_spec.rb

1 files changed, 40 insertions, 0 deletions

diff --git a/spec/other/clean_spec.rb b/spec/other/clean_spec.rb
index 8b93f9a7..208bd0eb 100644
--- a/spec/other/clean_spec.rb
+++ b/spec/other/clean_spec.rb
@@ -100,6 +100,29 @@ describe "bundle clean" do
     expect(vendored_gems("bin/rackup")).to exist
   end
 
+  it "remove gems in bundle without groups" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "foo"
+
+      group :test_group do
+        gem "rack", "1.0.0"
+      end
+    G
+
+    bundle "install --path vendor/bundle"
+    bundle "install --without test_group"
+    bundle :clean
+
+    out.should eq("Removing rack (1.0.0)")
+
+    should_have_gems 'foo-1.0'
+    should_not_have_gems 'rack-1.0.0'
+
+    vendored_gems("bin/rackup").should_not exist
+  end
+
   it "does not remove cached git dir if it's being used" do
     build_git "foo"
     revision = revision_for(lib_path("foo-1.0"))
@@ -234,6 +257,23 @@ describe "bundle clean" do
     expect(vendored_gems("cache/bundler/git/foo-#{digest}")).to exist
   end
 
+  it "does not blow up when using without groups" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack"
+
+      group :development do
+        gem "foo"
+      end
+    G
+
+    bundle "install --path vendor/bundle --without development"
+
+    bundle :clean, :exitstatus => true
+    exitstatus.should == 0
+  end
+
   it "displays an error when used without --path" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"