bundler 0.9.15 → 0.9.16

data/CHANGELOG.md

@@ -1,18 +1,37 @@
+## 0.9.16 (April 3, 2010)
+
+Features:
+
+  - exit gracefully on INT signal
+  - resolver output now indicates whether remote sources were checked
+  - print error instead of backtrace when exec cannot find a binary (#241)
+
+Bugfixes:
+
+  - show, check, and open commands work again while locked (oops)
+  - show command for git gems
+    - outputs branch names other than master
+    - gets the correct sha from the checkout
+    - doesn't print sha twice if :ref is set
+  - report errors from bundler/setup.rb without backtraces (#243)
+  - fix Gem::Spec#git_version to not error on unloaded specs
+  - improve deprecation, Gemfile, and command error messages (#242)
+
 ## 0.9.15 (April 1, 2010)
 
 Features:
 
-  - Use the env_file if possible instead of doing a runtime resolve
-     - Huge speedup when calling Bundler.setup while locked
-     - Ensures bundle exec is fast while locked
-     - Regenerates env_file if it was generated by an older version
-  - Update cached/packed gems when you update gems via bundle install
+  - use the env_file if possible instead of doing a runtime resolve
+     - huge speedup when calling Bundler.setup while locked
+     - ensures bundle exec is fast while locked
+     - regenerates env_file if it was generated by an older version
+  - update cached/packed gems when you update gems via bundle install
 
 Bugfixes:
 
-  - Prep for Rubygems 1.3.7 changes
-  - Install command now pulls git branches correctly (#211)
-  - Raise errors on invalid options in the Gemfile
+  - prep for Rubygems 1.3.7 changes
+  - install command now pulls git branches correctly (#211)
+  - raise errors on invalid options in the Gemfile
 
 ## 0.9.14 (March 30, 2010)
 

data/bin/bundle

@@ -14,4 +14,7 @@ begin
 rescue Bundler::BundlerError => e
   Bundler.ui.error e.message
   exit e.status_code
+rescue Interrupt
+  Bundler.ui.error "\nQuitting..."
+  exit 1
 end

data/lib/bundler/cli.rb

@@ -44,7 +44,7 @@ module Bundler
 
     desc "check", "Checks if the dependencies listed in Gemfile are satisfied by currently installed gems"
     def check
-      env = Bundler.load
+      env = Bundler.runtime
       # Check top level dependencies
       missing = env.dependencies.select { |d| env.index.search(d).empty? }
       if missing.any?
@@ -52,14 +52,14 @@ module Bundler
         missing.each do |d|
           Bundler.ui.error "  * #{d}"
         end
-        Bundler.ui.error "Try running `bundle install`"
+        Bundler.ui.warn "Install missing gems with `bundle install`"
         exit 1
       else
         not_installed = env.requested_specs.select { |spec| !spec.loaded_from }
 
         if not_installed.any?
           not_installed.each { |s| Bundler.ui.error "#{s.name} (#{s.version}) is cached, but not installed" }
-          Bundler.ui.error "Try running `bundle install`"
+          Bundler.ui.warn "Install missing gems with `bundle install`"
           exit 1
         else
           Bundler.ui.info "The Gemfile's dependencies are satisfied"
@@ -103,15 +103,14 @@ module Bundler
         remove_lockfiles
       end
 
-      environment = Bundler.load
-      environment.lock
+      Bundler.runtime.lock
     rescue GemNotFound, VersionConflict => e
       Bundler.ui.error(e.message)
-      Bundler.ui.info "Run `bundle install` to install missing gems"
+      Bundler.ui.warn "Run `bundle install` to install missing gems."
       exit 128
     end
 
-    desc "unlock", "Unlock the bundle. This allows gem versions to be changed"
+    desc "unlock", "Unlock the bundle. This allows gem versions to be changed."
     def unlock
       if locked?
         remove_lockfiles
@@ -126,9 +125,8 @@ module Bundler
       if gem_name
         Bundler.ui.info locate_gem(gem_name)
       else
-        environment = Bundler.load
         Bundler.ui.info "Gems included by the bundle:"
-        environment.specs.sort_by { |s| s.name }.each do |s|
+        Bundler.runtime.specs.sort_by { |s| s.name }.each do |s|
           Bundler.ui.info "  * #{s.name} (#{s.version}#{s.git_version})"
         end
       end
@@ -140,7 +138,7 @@ module Bundler
       Bundler.runtime.cache
     rescue GemNotFound => e
       Bundler.ui.error(e.message)
-      Bundler.ui.info "Run `bundle install` to install missing gems."
+      Bundler.ui.warn "Run `bundle install` to install missing gems."
       exit 128
     end
 
@@ -169,8 +167,13 @@ module Bundler
       rubyopt.unshift "-I#{File.expand_path('../..', __FILE__)}"
       ENV["RUBYOPT"] = rubyopt.join(' ')
 
-      # Run
-      Kernel.exec *ARGV
+      begin
+        # Run
+        Kernel.exec *ARGV
+      rescue Errno::ENOENT
+        Bundler.ui.error "bundler: command not found: #{ARGV.first}"
+        Bundler.ui.warn  "Install missing gem binaries with `bundle install`"
+      end
     end
 
     desc "open GEM", "Opens the source directory of the given bundled gem"
@@ -203,7 +206,7 @@ module Bundler
     end
 
     def locate_gem(name)
-      spec = Bundler.load.specs.find{|s| s.name == name }
+      spec = Bundler.runtime.specs.find{|s| s.name == name }
       raise GemNotFound, "Could not find gem '#{name}' in the current bundle." unless spec
       spec.full_gem_path
     end

data/lib/bundler/dsl.rb

@@ -64,13 +64,20 @@ module Bundler
 
     # Deprecated methods
 
-    def self.deprecate(name)
+    def self.deprecate(name, replacement = nil)
       define_method(name) do |*|
-        raise DeprecatedMethod, "#{name} is removed. See the README for more information"
+        message = "'#{name}' has been removed from the Gemfile DSL, "
+        if replacement
+          message << "and has been replaced with '#{replacement}'."
+        else
+          message << "and is no longer supported."
+        end
+        message << "\nSee the README for more information on upgrading from Bundler 0.8."
+        raise DeprecatedMethod, message
       end
     end
 
-    deprecate :only
+    deprecate :only, :group
     deprecate :except
     deprecate :disable_system_gems
     deprecate :disable_rubygems
@@ -101,9 +108,13 @@ module Bundler
       invalid_keys = opts.keys - %w(group git path name branch ref tag require)
       if invalid_keys.any?
         plural = invalid_keys.size > 1
-        raise InvalidOption, "You passed #{invalid_keys.join(", ")} " \
-          "#{plural ? 'as options, but they are' : 'as an option, but it is'}" \
-          " invalid"
+        message = "You passed #{invalid_keys.map{|k| ':'+k }.join(", ")} "
+        if plural
+          message << "as options for gem '#{name}', but they are invalid."
+        else
+          message << "as an option for gem '#{name}', but it is invalid."
+        end
+        raise InvalidOption, message
       end
 
       group = opts.delete("group") || @group

data/lib/bundler/index.rb

@@ -68,6 +68,12 @@ module Bundler
       end
     end
 
+    def sources
+      @specs.values.map do |specs|
+        specs.map{|s| s.source.class }
+      end.flatten.uniq
+    end
+
     alias [] search
 
     def <<(spec)

data/lib/bundler/resolver.rb

@@ -148,18 +148,19 @@ module Bundler
               versions = @source_requirements[name][name].map { |s| s.version }
               message  = "Could not find gem '#{current}' in #{current.source}.\n"
               if versions.any?
-                message << "Source contains '#{current.name}' at: #{versions.join(', ')}"
+                message << "Source contains '#{name}' at: #{versions.join(', ')}"
               else
                 message << "Source does not contain any versions of '#{current}'"
               end
-
-              raise GemNotFound, message
             else
-              raise GemNotFound, "Could not find gem '#{current}' in any of the sources."
+              message = "Could not find gem '#{current}' "
+              if @index.sources.include?(Bundler::Source::Rubygems)
+                message << "in any of the gem sources."
+              else
+                message << "in the gems available on this machine."
+              end
             end
-            location = current.source ? current.source.to_s : "any of the sources"
-            raise GemNotFound, "Could not find gem '#{current}' in #{location}.\n" \
-              "Source contains fo"
+            raise GemNotFound, message
           else
             @errors[current.name] = [nil, current]
           end

data/lib/bundler/rubygems_ext.rb

@@ -18,11 +18,11 @@ module Gem
     end
 
     def git_version
-      Dir.chdir(full_gem_path) do
-        rev = `git rev-parse HEAD`.strip[0...6]
-        branch = `git show-branch --no-color 2>/dev/null`.strip[/\[(.*?)\]/, 1]
-        branch.empty? ? " #{rev}" : " #{branch}-#{rev}"
-      end if File.exist?(File.join(full_gem_path, ".git"))
+      if @loaded_from && File.exist?(File.join(full_gem_path, ".git"))
+        sha = Dir.chdir(full_gem_path){ `git rev-parse HEAD`.strip }
+        branch = full_gem_path.split("-")[3]
+        (branch && branch != sha) ? " #{branch}-#{sha[0...6]}" : " #{sha[0...6]}"
+      end
     end
 
     def to_gemfile(path = nil)

data/lib/bundler/runtime.rb

@@ -64,7 +64,7 @@ module Bundler
       FileUtils.mkdir_p("#{root}/.bundle")
       write_yml_lock
       write_rb_lock
-      Bundler.ui.info("The bundle is now locked. Use `bundle show` to list the gems in the environment.")
+      Bundler.ui.confirm("The bundle is now locked. Use `bundle show` to list the gems in the environment.")
     end
 
     def dependencies_for(*groups)

data/lib/bundler/setup.rb

@@ -9,6 +9,11 @@ if Bundler::SharedHelpers.in_bundle?
   else
     require 'rubygems'
     require 'bundler'
-    Bundler.setup
+    begin
+      Bundler.setup
+    rescue Bundler::BundlerError => e
+      puts "\e[31m#{e.message}\e[0m"
+      exit e.status_code
+    end
   end
 end

data/lib/bundler/shared_helpers.rb

@@ -16,7 +16,7 @@ module Bundler
 
     def default_gemfile
       gemfile = find_gemfile
-      gemfile or raise GemfileNotFound, "The default Gemfile was not found"
+      gemfile or raise GemfileNotFound, "Could not locate Gemfile"
       Pathname.new(gemfile)
     end
 

data/lib/bundler/specification.rb

@@ -16,7 +16,7 @@ module Bundler
     end
 
     def full_gem_path
-      Pathname.new(loaded_from).dirname.expand_path
+      Pathname.new(loaded_from).dirname.expand_path.to_s
     end
 
   end

data/lib/bundler/version.rb

@@ -1,3 +1,3 @@
 module Bundler
-  VERSION = "0.9.15"
+  VERSION = "0.9.16"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 15
-  version: 0.9.15
+  - 16
+  version: 0.9.16
 platform: ruby
 authors: 
 - Carl Lerche
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 -07:00
+date: 2010-04-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency