bundler 0.9.22 → 0.9.23

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.9.23 (April 20, 2010)
+
+Bugfixes:
+
+  - cache command no longer prunes gems created by an older rubygems version
+  - cache command no longer prunes gems that are for other platforms
+
 ## 0.9.22 (April 20, 2010)
 
 Features:

data/lib/bundler/cli.rb

@@ -72,6 +72,7 @@ module Bundler
     method_option "relock",  :type => :boolean, :banner => "Unlock, install the gems, and relock."
     method_option "disable-shared-gems", :type => :boolean, :banner => "Do not use any shared gems, such as the system gem repository."
     method_option "gemfile", :type => :string, :banner => "Use the specified gemfile instead of Gemfile"
+    method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
     def install(path = nil)
       opts = options.dup
       opts[:without] ||= []
@@ -91,11 +92,11 @@ module Bundler
         raise GemfileChanged, "You changed your Gemfile after locking. " +
           "Please run `bundle install --relock`."
       end
-      Bundler.ui.confirm "Your bundle is complete! " +
-        "Use `bundle show [gemname]` to see where a bundled gem is installed."
 
       lock if options[:relock]
       cache if Bundler.root.join("vendor/cache").exist?
+      Bundler.ui.confirm "Your bundle is complete! " +
+        "Use `bundle show [gemname]` to see where a bundled gem is installed."
     rescue GemNotFound => e
       if Bundler.definition.sources.empty?
         Bundler.ui.warn "Your Gemfile doesn't have any sources. You can add one with a line like 'source :gemcutter'"

data/lib/bundler/runtime.rb

@@ -97,9 +97,13 @@ module Bundler
       FileUtils.mkdir_p(cache_path)
 
       Bundler.ui.info "Removing outdated .gem files from vendor/cache"
-      cache_path.children.each do |gemfile|
-        spec = Gem::Format.from_file_by_path(gemfile).spec
-        gemfile.rmtree unless specs.include?(spec)
+      cache_path.children.each do |gem_path|
+        cached_spec = Gem::Format.from_file_by_path(gem_path).spec
+        next unless cached_spec.platform =~ Gem::Platform.local
+        unless specs.any?{|s| s.full_name == cached_spec.full_name }
+          Bundler.ui.info "  * #{File.basename(gem_path)}"
+          gem_path.rmtree
+        end
       end
     end
 

data/lib/bundler/version.rb

@@ -1,3 +1,3 @@
 module Bundler
-  VERSION = "0.9.22"
+  VERSION = "0.9.23"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 22
-  version: 0.9.22
+  - 23
+  version: 0.9.23
 platform: ruby
 authors: 
 - Carl Lerche