bundler 1.2.0.rc → 1.2.0.rc.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.2.0.rc.2 (Aug 8, 2012)
+
+Bugfixes:
+
+  - `clean` doesn't remove gems that are included in the lockfile
+
 ## 1.2.0.rc (Jul 17, 2012)
 
 Features:
@@ -6,7 +12,7 @@ Features:
   - loosen ruby directive for engines
   - prune git/path directories inside vendor/cache (@josevalim, #1988)
   - update vendored thor to 0.15.2 (@sferik)
-  - add .txt to LICENSCE (@postmodern, #2001)
+  - add .txt to LICENSE (@postmodern, #2001)
   - add `config disable_local_branch_check` (@josevalim, #1985)
   - fall back on the full index when experiencing syck errors (#1419)
   - handle syntax errors in Ruby gemspecs (#1974)

data/lib/bundler/definition.rb

@@ -108,9 +108,9 @@ module Bundler
       specs
     end
 
-    def specs
+    def specs(deps = requested_dependencies)
       @specs ||= begin
-        specs = resolve.materialize(requested_dependencies)
+        specs = resolve.materialize(deps)
 
         unless specs["bundler"].any?
           local = Bundler.settings[:frozen] ? rubygems_index : index
@@ -130,6 +130,10 @@ module Bundler
       @locked_specs - specs
     end
 
+    def all_specs
+      specs(dependencies)
+    end
+
     def new_platform?
       @new_platform
     end

data/lib/bundler/endpoint_specification.rb

@@ -16,7 +16,7 @@ module Bundler
     end
 
     def fetch_platform
-      @plaftorm
+      @platform
     end
 
     # needed for standalone, load required_paths from local gemspec

data/lib/bundler/runtime.rb

@@ -120,12 +120,13 @@ module Bundler
       gem_files            = Dir["#{Gem.dir}/cache/*.gem"]
       gemspec_files        = Dir["#{Gem.dir}/specifications/*.gemspec"]
       spec_gem_paths       = []
+      # need to keep git sources around
       spec_git_paths       = []
       spec_git_cache_dirs  = []
       spec_gem_executables = []
       spec_cache_paths     = []
       spec_gemspec_paths   = []
-      specs.each do |spec|
+      @definition.all_specs.each do |spec|
         spec_gem_paths << spec.full_gem_path
         # need to check here in case gems are nested like for the rails git repo
         md = %r{(.+bundler/gems/.+-[a-f0-9]{7,12})}.match(spec.full_gem_path)

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.2.0.rc" unless defined?(::Bundler::VERSION)
+  VERSION = "1.2.0.rc.2" unless defined?(::Bundler::VERSION)
 end

data/spec/other/clean_spec.rb

@@ -100,29 +100,6 @@ describe "bundle clean" do
     vendored_gems("bin/rackup").should 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"))
@@ -232,6 +209,31 @@ describe "bundle clean" do
     vendored_gems("bundler/gems/rails-#{revision[0..11]}").should exist
   end
 
+  it "does not remove git sources that are in without groups" do
+    build_git "foo", :path => lib_path("foo")
+    git_path = lib_path('foo')
+    revision = revision_for(git_path)
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+      group :test do
+        git "#{git_path}", :ref => "#{revision}" do
+          gem "foo"
+        end
+      end
+    G
+    bundle "install --path vendor/bundle --without test"
+
+    bundle :clean
+
+    out.should eq("")
+    vendored_gems("bundler/gems/foo-#{revision[0..11]}").should exist
+    digest = Digest::SHA1.hexdigest(git_path.to_s)
+    vendored_gems("cache/bundler/git/foo-#{digest}").should exist
+  end
+
   it "displays an error when used without --path" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 1143790945
+  hash: -430324494
   prerelease: 6
   segments: 
   - 1
   - 2
   - 0
   - rc
-  version: 1.2.0.rc
+  - 2
+  version: 1.2.0.rc.2
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -19,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-18 00:00:00 Z
+date: 2012-08-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn
@@ -287,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bundler
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies