bundler 0.9.25 → 0.9.26

data/CHANGELOG.md

@@ -1,9 +1,15 @@
+## 0.9.26
+
+Features:
+
+  - error nicely on incompatible 0.10 lockfiles
+
 ## 0.9.25 (May 3, 2010)
 
 Bugfixes:
 
-  - Explicitly coerce Pathname objects to Strings for Ruby 1.9
-  - Fix some newline weirdness in output from install command
+  - explicitly coerce Pathname objects to Strings for Ruby 1.9
+  - fix some newline weirdness in output from install command
 
 ## 0.9.24 (April 22, 2010)
 

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-cache",  :type => :boolean, :banner => "Don't update the existing gem cache."
     method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
     def install(path = nil)
       opts = options.dup
@@ -94,7 +95,7 @@ module Bundler
       end
 
       lock if options[:relock]
-      cache if Bundler.root.join("vendor/cache").exist?
+      cache if Bundler.root.join("vendor/cache").exist? && !options[:no_cache]
       Bundler.ui.confirm "Your bundle is complete! " +
         "Use `bundle show [gemname]` to see where a bundled gem is installed."
     rescue GemNotFound => e
@@ -130,7 +131,7 @@ module Bundler
       end
     end
 
-    desc "show GEM", "Shows all gems that are part of the bundle, or the path to a given gem"
+    desc "show [GEM]", "Shows all gems that are part of the bundle, or the path to a given gem"
     def show(gem_name = nil)
       if gem_name
         Bundler.ui.info locate_gem(gem_name)

data/lib/bundler/definition.rb

@@ -13,7 +13,12 @@ module Bundler
     end
 
     def self.from_lock(lockfile)
-      locked_definition = Locked.new(YAML.load_file(lockfile))
+      begin
+        locked_definition = Locked.new(YAML.load_file(lockfile))
+      rescue ArgumentError
+        raise GemfileError, "Your Gemfile.lock was generated by Bundler 0.10.\n" +
+          "You must delete it if you wish to use Bundler 0.9."
+      end
 
       hash = Digest::SHA1.hexdigest(File.read("#{Bundler.root}/Gemfile"))
       unless locked_definition.hash == hash

data/lib/bundler/installer.rb

@@ -32,7 +32,7 @@ module Bundler
           Bundler.ui.info "Using #{spec.name} (#{spec.version}) from #{spec.source} "
         end
         spec.source.install(spec)
-        Bundler.ui.info "" unless spec == specs.last
+        Bundler.ui.info ""
       end
 
       if locked?

data/lib/bundler/spec_set.rb

@@ -30,10 +30,6 @@ module Bundler
       sorted.dup
     end
 
-    def last
-      sorted.last
-    end
-
   private
 
     def append_subgraph(specs, current)

data/lib/bundler/version.rb

@@ -1,3 +1,3 @@
 module Bundler
-  VERSION = "0.9.25"
+  VERSION = "0.9.26"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 25
-  version: 0.9.25
+  - 26
+  version: 0.9.26
 platform: ruby
 authors: 
 - Carl Lerche
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -07:00
+date: 2010-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency