bundler 1.3.0.pre.8 → 1.3.0

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 1.3.0 (24 February 2013)
+
+Features:
+
+  - raise a useful error when the lockfile contains a merge conflict (@zofrex)
+  - ensure `rake release` checks for uncommitted as well as unstaged (@benmoss)
+  - allow environment variables to be negated with 'false' and '0' (@brettporter)
+  - set $MANPATH inside `exec` for gems with man pages (@sunaku)
+  - partial gem names for `open` and `update` now return a list (@takkanm)
+
+Bugfixes:
+
+  - `update` now (again) finds gems that aren't listed in the Gemfile
+  - `install` now (again) updates cached gems that aren't in the Gemfile
+  - install Gemfiles with HTTP sources even without OpenSSL present
+  - display CerficateFailureError message in full
+
 ## 1.3.0.pre.8 (12 February 2013)
 
 Security:
@@ -138,6 +155,13 @@ Bugfixes:
   - `gem` generates gemspecs that block double-requires
   - `gem` generates gemspecs that admit they depend on rake
 
+## 1.2.5 (Feb 24, 2013)
+
+Bugfixes:
+
+  - install Gemfiles with HTTP sources even without OpenSSL present
+  - display CerficateFailureError message in full
+
 ## 1.2.4 (Feb 12, 2013)
 
 Features:

data/lib/bundler.rb

@@ -48,20 +48,21 @@ module Bundler
     end
   end
 
-  class GemfileNotFound      < BundlerError; status_code(10) ; end
-  class GemNotFound          < BundlerError; status_code(7)  ; end
-  class GemfileError         < BundlerError; status_code(4)  ; end
-  class InstallError         < BundlerError; status_code(5)  ; end
-  class InstallHookError     < BundlerError; status_code(6)  ; end
-  class PathError            < BundlerError; status_code(13) ; end
-  class GitError             < BundlerError; status_code(11) ; end
-  class DeprecatedError      < BundlerError; status_code(12) ; end
-  class GemspecError         < BundlerError; status_code(14) ; end
-  class InvalidOption        < BundlerError; status_code(15) ; end
-  class ProductionError      < BundlerError; status_code(16) ; end
-  class HTTPError            < BundlerError; status_code(17) ; end
-  class RubyVersionMismatch  < BundlerError; status_code(18) ; end
-  class SecurityError        < BundlerError; status_code(19) ; end
+  class GemfileNotFound     < BundlerError; status_code(10) ; end
+  class GemNotFound         < BundlerError; status_code(7)  ; end
+  class GemfileError        < BundlerError; status_code(4)  ; end
+  class InstallError        < BundlerError; status_code(5)  ; end
+  class InstallHookError    < BundlerError; status_code(6)  ; end
+  class PathError           < BundlerError; status_code(13) ; end
+  class GitError            < BundlerError; status_code(11) ; end
+  class DeprecatedError     < BundlerError; status_code(12) ; end
+  class GemspecError        < BundlerError; status_code(14) ; end
+  class InvalidOption       < BundlerError; status_code(15) ; end
+  class ProductionError     < BundlerError; status_code(16) ; end
+  class HTTPError           < BundlerError; status_code(17) ; end
+  class RubyVersionMismatch < BundlerError; status_code(18) ; end
+  class SecurityError       < BundlerError; status_code(19) ; end
+  class LockfileError       < BundlerError; status_code(20) ; end
 
   WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
   FREEBSD = RbConfig::CONFIG["host_os"] =~ /bsd/
@@ -80,6 +81,7 @@ module Bundler
   end
 
   class InvalidSpecSet < StandardError; end
+  class MarshalError   < StandardError; end
 
   class << self
     attr_writer :ui, :bundle_path
@@ -207,6 +209,7 @@ module Bundler
 
     def with_clean_env
       with_original_env do
+        ENV['MANPATH'] = ENV['BUNDLE_ORIG_MANPATH']
         ENV.delete_if { |k,_| k[0,7] == 'BUNDLE_' }
         if ENV.has_key? 'RUBYOPT'
           ENV['RUBYOPT'] = ENV['RUBYOPT'].sub '-rbundler/setup', ''
@@ -282,6 +285,12 @@ module Bundler
       File.open(file, "rb") { |f| f.read }
     end
 
+    def load_marshal(data)
+      Marshal.load(data)
+    rescue => e
+      raise MarshalError, "#{e.class}: #{e.message}"
+    end
+
     def load_gemspec(file)
       @gemspec_cache ||= {}
       key = File.expand_path(file)

data/lib/bundler/cli.rb

@@ -44,7 +44,7 @@ module Bundler
       if manpages.include?(command)
         root = File.expand_path("../man", __FILE__)
 
-        if have_groff? && root !~ %r{^file:/.+!/META-INF/jruby.home/.+}
+        if Bundler.which("groff") && root !~ %r{^file:/.+!/META-INF/jruby.home/.+}
           groff = "groff -Wall -mtty-char -mandoc -Tascii"
           pager = pager_system
 
@@ -296,7 +296,12 @@ module Bundler
         Bundler.definition(true)
       else
         # cycle through the requested gems, just to make sure they exist
-        gems.each{ |n| gem_dependency_with_name(n) }
+        lock = Bundler.read_file(Bundler.default_lockfile)
+        names = LockfileParser.new(lock).specs.map{ |s| s.name }
+        gems.each do |g|
+          next if names.include?(g)
+          raise GemNotFound, not_found_message(g, names)
+        end
         Bundler.definition(:gems => gems, :sources => sources)
       end
 
@@ -326,14 +331,22 @@ module Bundler
       Bundler.load.lock
 
       if gem_name
-        path_to_gem = locate_gem(gem_name)
-        unless File.directory?(path_to_gem)
-          Bundler.ui.warn "Warning: The following path to #{gem_name} no longer exists."
+        if gem_name == "bundler"
+          path = File.expand_path("../../..", __FILE__)
+        else
+          spec = select_spec(gem_name, :regex_match)
+          return unless spec
+          path = spec.full_gem_path
+          if !File.directory?(path)
+            Bundler.ui.warn "The gem #{gem_name} has been deleted. It was installed at:"
+          end
         end
-        Bundler.ui.info path_to_gem
-      elsif options[:paths]
-        Bundler.load.specs.sort_by { |s| s.name }.each do |s|
-          Bundler.ui.info locate_gem(s.name)
+        return Bundler.ui.info(path)
+      end
+
+      if options[:paths]
+        Bundler.load.specs.sort_by { |s| s.name }.map do |s|
+          Bundler.ui.info s.full_gem_path
         end
       else
         Bundler.ui.info "Gems included by the bundle:"
@@ -359,7 +372,7 @@ module Bundler
       Bundler.settings[:bin] = nil if options["path"] && options["path"].empty?
       installer = Installer.new(Bundler.root, Bundler.definition)
       spec      = installer.specs.find{|s| s.name == gem_name }
-      raise GemNotFound, not_found_message(gem_name, Bundler.load.specs) unless spec
+      raise GemNotFound, not_found_message(gem_name, Bundler.definition.specs) unless spec
 
       if spec.name == "bundler"
         Bundler.ui.warn "Sorry, Bundler can only be run via Rubygems."
@@ -579,15 +592,13 @@ module Bundler
     desc "open GEM", "Opens the source directory of the given bundled gem"
     def open(name)
       editor = [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? }
-      if editor
-        gem_path = locate_gem(name)
-        Dir.chdir(gem_path) do
-          command = "#{editor} #{gem_path}"
-          success = system(command)
-          Bundler.ui.info "Could not run '#{command}'" unless success
-        end
-      else
-        Bundler.ui.info("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR")
+      return Bundler.ui.info("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR") unless editor
+      spec = select_spec(name, :regex_match)
+      return unless spec
+      Dir.chdir(spec.full_gem_path) do
+        command = "#{editor} #{spec.full_gem_path}"
+        success = system(command)
+        Bundler.ui.info "Could not run '#{command}'" unless success
       end
     end
 
@@ -801,23 +812,29 @@ module Bundler
       end
     end
 
-    def have_groff?
-      !(`which groff` rescue '').empty?
-    end
+    def select_spec(name, regex_match = nil)
+      specs = []
+      regexp = Regexp.new(name) if regex_match
 
-    def locate_gem(name)
-      spec = Bundler.load.specs.find{|s| s.name == name }
-      raise GemNotFound, not_found_message(name, Bundler.load.specs) unless spec
-      if spec.name == 'bundler'
-        return File.expand_path('../../../', __FILE__)
+      Bundler.definition.specs.each do |spec|
+        return spec if spec.name == name
+        specs << spec if regexp && spec.name =~ regexp
       end
-      spec.full_gem_path
-    end
 
-    def gem_dependency_with_name(name)
-      dep = Bundler.load.dependencies.find{|d| d.name == name }
-      raise GemNotFound, not_found_message(name, Bundler.load.dependencies) unless dep
-      dep
+      case specs.count
+      when 0
+        raise GemNotFound, not_found_message(name, Bundler.definition.dependencies)
+      when 1
+        specs.first
+      else
+        specs.each_with_index do |spec, index|
+          Bundler.ui.info "#{index.succ} : #{spec.name}", true
+        end
+        Bundler.ui.info '0 : - exit -', true
+
+        input = Bundler.ui.ask('> ')
+        (num = input.to_i) > 0 ? specs[num - 1] : nil
+      end
     end
 
     def not_found_message(missing_gem_name, alternatives)
@@ -825,7 +842,7 @@ module Bundler
 
       # This is called as the result of a GemNotFound, let's see if
       # there's any similarly named ones we can propose instead
-      alternate_names = alternatives.map{|a| a.name}
+      alternate_names = alternatives.map { |a| a.respond_to?(:name) ? a.name : a }
       suggestions = SimilarityDetector.new(alternate_names).similar_word_list(missing_gem_name)
       message += "\nDid you mean #{suggestions}?" if suggestions
       message
@@ -833,8 +850,8 @@ module Bundler
 
     def pager_system
       pager = ENV['PAGER'] || ENV['MANPAGER']
-      pager ||= 'less -R' if !(`which less` rescue '').empty?
-      pager ||= 'more' if !(`which more` rescue '').empty?
+      pager ||= 'less -R' if Bundler.which("less")
+      pager ||= 'more' if Bundler.which("more")
       pager ||= 'cat'
     end
 

data/lib/bundler/dsl.rb

@@ -68,7 +68,7 @@ module Bundler
       end
 
       options = Hash === args.last ? args.pop : {}
-      version = args || [">= 0"]
+      version = args
 
       _normalize_options(name, version, options)
 
@@ -110,7 +110,7 @@ module Bundler
         Bundler.ui.warn "The source :#{source} is deprecated because HTTP " \
           "requests are insecure.\nPlease change your source to 'https://" \
           "rubygems.org' if possible, or 'http://rubygems.org' if not."
-        @rubygems_source.add_remote "https://rubygems.org"
+        @rubygems_source.add_remote "http://rubygems.org"
         return
       when String
         @rubygems_source.add_remote source

data/lib/bundler/fetcher.rb

@@ -1,24 +1,27 @@
 require 'bundler/vendored_persistent'
 
 module Bundler
-  # This is the error raised if OpenSSL fails the cert verification
-  class CertificateFailureError < HTTPError
-    def initialize(message = nil)
-      @message = message
-      @message ||= "\nCould not verify the SSL certificate for " \
-        "#{@remote_uri}. Either you don't have the CA certificates needed to " \
-        "verify it, or you are experiencing a man-in-the-middle attack. To " \
-        "connect without using SSL, edit your Gemfile sources to and change " \
-        "'https' to 'http'."
-    end
-  end
 
   # Handles all the fetching with the rubygems server
   class Fetcher
+    # How many redirects to allew in one request
     REDIRECT_LIMIT = 5
     # how long to wait for each gemcutter API call
-    API_TIMEOUT    = 10
-    class FallbackError < Bundler::HTTPError; end
+    API_TIMEOUT = 10
+
+    # This error is raised if the API returns a 413 (only printed in verbose)
+    class FallbackError < HTTPError; end
+    # This is the error raised if OpenSSL fails the cert verification
+    class CertificateFailureError < HTTPError
+      def initialize(remote_uri)
+        super "Could not verify the SSL certificate for #{remote_uri}.\nThere" \
+          " is a chance you are experiencing a man-in-the-middle attack, but" \
+          " most likely your system doesn't have the CA certificates needed" \
+          " for verification. For information about OpenSSL certificates, see" \
+          " bit.ly/ssl-certs. To connect without using SSL, edit your Gemfile" \
+          " sources and change 'https' to 'http'."
+      end
+    end
 
     class << self
       attr_accessor :disable_endpoint
@@ -56,7 +59,17 @@ module Bundler
       @remote_uri = remote_uri
       @public_uri = remote_uri.dup
       @public_uri.user, @public_uri.password = nil, nil # don't print these
-      @connection ||= Net::HTTP::Persistent.new 'bundler', :ENV
+      if USE_PERSISTENT
+        @connection ||= Net::HTTP::Persistent.new 'bundler', :ENV
+      else
+        if @remote_uri.scheme == "https"
+          raise Bundler::HTTPError, "Could not load OpenSSL.\n" \
+            "You must recompile Ruby with OpenSSL support or change the sources in your " \
+            "Gemfile from 'https' to 'http'. Instructions for compiling with OpenSSL " \
+            "using RVM are available at rvm.io/packages/openssl."
+        end
+        @connection ||= Net::HTTP.new(@remote_uri.host, @remote_uri.port)
+      end
       @connection.read_timeout = API_TIMEOUT
 
       Socket.do_not_reverse_lookup = true
@@ -70,12 +83,16 @@ module Bundler
       uri = URI.parse("#{@remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}")
 
       spec_rz = (uri.scheme == "file") ? Gem.read_binary(uri.path) : fetch(uri)
-      Marshal.load Gem.inflate(spec_rz)
+      Bundler.load_marshal Gem.inflate(spec_rz)
+    rescue MarshalError => e
+      raise HTTPError, "Gemspec #{spec} contained invalid data.\n" \
+        "Your network or your gem server is probably having issues right now."
     end
 
     # return the specs in the bundler format as an index
     def specs(gem_names, source)
       index = Index.new
+      use_full_source_index = !gem_names || @remote_uri.scheme == "file" || Bundler::Fetcher.disable_endpoint
 
       if gem_names && use_api
         Bundler.ui.info "Fetching gem metadata from #{@public_uri}", Bundler.ui.debug?
@@ -107,7 +124,8 @@ module Bundler
 
       index
     rescue OpenSSL::SSL::SSLError
-      raise CertificateFailureError.new
+      Bundler.ui.info "" if gem_names && use_api # newline after dots
+      raise CertificateFailureError.new(@public_uri)
     end
 
     # fetch index
@@ -129,9 +147,9 @@ module Bundler
       fetch_remote_specs(deps_list, full_dependency_list + returned_gems, spec_list + last_spec_list)
     # fall back to the legacy index in the following cases
     # 1. Gemcutter Endpoint doesn't return a 200
-    # 2,3. Marshal blob doesn't load properly
-    # 4. One of the YAML gemspecs has the Syck::DefaultKey problem
-    rescue HTTPError, ArgumentError, TypeError, GemspecError => e
+    # 2. Marshal blob doesn't load properly
+    # 3. One of the YAML gemspecs has the Syck::DefaultKey problem
+    rescue HTTPError, MarshalError, GemspecError => e
       @use_api = false
 
       # new line now that the dots are over
@@ -161,15 +179,25 @@ module Bundler
 
   private
 
+    HTTP_ERRORS = [
+      Timeout::Error, EOFError, SocketError,
+      Errno::EINVAL, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EAGAIN,
+      Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError
+    ]
+    HTTP_ERRORS << Net::HTTP::Persistent::Error if defined?(Net::HTTP::Persistent)
+
     def fetch(uri, counter = 0)
       raise HTTPError, "Too many redirects" if counter >= REDIRECT_LIMIT
 
       begin
         Bundler.ui.debug "Fetching from: #{uri}"
-        response = @connection.request(uri)
-      rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ETIMEDOUT,
-             EOFError, SocketError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
-             Errno::EAGAIN, Net::HTTP::Persistent::Error, Net::ProtocolError
+        if USE_PERSISTENT
+          response = @connection.request(uri)
+        else
+          req = Net::HTTP::Get.new uri.request_uri
+          response = @connection.request(req)
+        end
+      rescue *HTTP_ERRORS
         raise HTTPError, "Network error while fetching #{uri}"
       end
 
@@ -202,28 +230,13 @@ module Bundler
     def fetch_dependency_remote_specs(gem_names)
       Bundler.ui.debug "Query Gemcutter Dependency Endpoint API: #{gem_names.join(',')}"
       marshalled_deps = fetch dependency_api_uri(gem_names)
-      gem_list = Marshal.load(marshalled_deps)
+      gem_list = Bundler.load_marshal(marshalled_deps)
       deps_list = []
 
       spec_list = gem_list.map do |s|
-        dependencies = s[:dependencies].map do |d|
-          begin
-            name, requirement = d
-            dep = Gem::Dependency.new(name, requirement.split(", "))
-          rescue ArgumentError => e
-            if e.message.include?('Ill-formed requirement ["#<YAML::Syck::DefaultKey')
-              puts # we shouldn't print the error message on the "fetching info" status line
-              raise GemspecError,
-                "Unfortunately, the gem #{s[:name]} (#{s[:number]}) has an invalid gemspec. \n" \
-                "Please ask the gem author to yank the bad version to fix this issue. For \n" \
-                "more information, see http://bit.ly/syck-defaultkey."
-            else
-              raise e
-            end
-          end
-
+        dependencies = s[:dependencies].map do |name, requirement|
+          dep = well_formed_dependency(name, requirement.split(", "))
           deps_list << dep.name
-
           dep
         end
 
@@ -239,11 +252,24 @@ module Bundler
       Bundler.rubygems.fetch_all_remote_specs
     rescue Gem::RemoteFetcher::FetchError => e
       if e.message.match("certificate verify failed")
-        raise CertificateFailureError.new
+        raise CertificateFailureError.new(@public_uri)
       else
         raise HTTPError, "Could not fetch specs from #{@public_uri}"
       end
     end
 
+    def well_formed_dependency(name, *requirements)
+      Gem::Dependency.new(name, *requirements)
+    rescue ArgumentError => e
+      illformed = 'Ill-formed requirement ["#<YAML::Syck::DefaultKey'
+      raise e unless e.message.include?(illformed)
+      puts # we shouldn't print the error message on the "fetching info" status line
+      raise GemspecError,
+        "Unfortunately, the gem #{s[:name]} (#{s[:number]}) has an invalid " \
+        "gemspec. \nPlease ask the gem author to yank the bad version to fix " \
+        "this issue. For more information, see http://bit.ly/syck-defaultkey."
+    end
+
+
   end
 end

data/lib/bundler/friendly_errors.rb

@@ -3,7 +3,7 @@ module Bundler
     begin
       yield
     rescue Bundler::BundlerError => e
-      Bundler.ui.error e.message
+      Bundler.ui.error e.message, :wrap => true
       Bundler.ui.trace e
       exit e.status_code
     rescue Interrupt => e
@@ -13,9 +13,11 @@ module Bundler
     rescue SystemExit => e
       exit e.status
     rescue Exception => e
-      Bundler.ui.error(
-        "Unfortunately, a fatal error has occurred. Please see the Bundler \n" \
-        "troubleshooting documentation at http://bit.ly/bundler-issues. Thanks!\n")
+      Bundler.ui.error <<-ERR, :wrap => true
+        Unfortunately, a fatal error has occurred. Please see the Bundler
+        troubleshooting documentation at http://bit.ly/bundler-issues. Thanks!
+
+      ERR
       raise e
     end
   end

data/lib/bundler/gem_helper.rb

@@ -110,13 +110,17 @@ module Bundler
     end
 
     def guard_clean
-      clean? or raise("There are files that need to be committed first.")
+      clean? && committed? or raise("There are files that need to be committed first.")
     end
 
     def clean?
       sh_with_code("git diff --exit-code")[1] == 0
     end
 
+    def committed?
+      sh_with_code("git diff-index --quiet --cached HEAD")[1] == 0
+    end
+
     def tag_version
       sh "git tag -a -m \"Version #{version}\" #{version_tag}"
       Bundler.ui.confirm "Tagged #{version_tag}."

data/lib/bundler/lockfile_parser.rb

@@ -29,6 +29,11 @@ module Bundler
       @state        = :source
       @specs        = {}
 
+      if lockfile.match(/<<<<<<<|=======|>>>>>>>|\|\|\|\|\|\|\|/)
+        raise LockfileError, "Your Gemfile.lock contains merge conflicts.\n" \
+          "Run `git checkout HEAD -- Gemfile.lock` first to get a clean lock."
+      end
+
       lockfile.split(/(?:\r?\n)+/).each do |line|
         if line == DEPENDENCIES
           @state = :dependency
@@ -38,7 +43,7 @@ module Bundler
           send("parse_#{@state}", line)
         end
       end
-      @specs        = @specs.values
+      @specs = @specs.values
     end
 
   private

data/lib/bundler/resolver.rb

@@ -134,6 +134,7 @@ module Bundler
     end
 
     def initialize(index, source_requirements, base)
+      @iteration_counter    = 0
       @errors               = {}
       @stack                = []
       @base                 = base
@@ -167,6 +168,11 @@ module Bundler
       # gem dependencies have been resolved.
       throw :success, successify(activated) if reqs.empty?
 
+      @iteration_counter += 1
+      if((@iteration_counter % 10000) == 0)
+        Bundler.ui.info ".", false
+      end
+
       debug { print "\e[2J\e[f" ; "==== Iterating ====\n\n" }
 
       # Sort dependencies so that the ones that are easiest to resolve are first.
@@ -302,12 +308,12 @@ module Bundler
         # on this conflict.  Note that if the tree has multiple conflicts, we don't
         # care which one we throw, as long as we get out safe
         if !current.required_by.empty? && !conflicts.empty?
-          @errors.reverse_each do |name, pair|
-            if conflicts.include?(name)
+          @errors.reverse_each do |req_name, pair|
+            if conflicts.include?(req_name)
               # Choose the closest pivot in the stack that will affect the conflict
-              errorpivot = (@stack & [name, current.required_by.last.name]).last
+              errorpivot = (@stack & [req_name, current.required_by.last.name]).last
               debug { "    -> Jumping to: #{errorpivot}" }
-              throw errorpivot, name
+              throw errorpivot, req_name
             end
           end
         end

data/lib/bundler/ruby_version.rb

@@ -67,12 +67,16 @@ module Bundler
     end
 
     def version
-      RUBY_VERSION
+      RUBY_VERSION.dup
+    end
+
+    def gem_version
+      @gem_version ||= Gem::Version.new(version)
     end
 
     def engine
       if defined?(RUBY_ENGINE)
-        RUBY_ENGINE
+        RUBY_ENGINE.dup
       else
         # not defined in ruby 1.8.7
         "ruby"
@@ -82,11 +86,11 @@ module Bundler
     def engine_version
       case engine
       when "ruby"
-        RUBY_VERSION
+        RUBY_VERSION.dup
       when "rbx"
-        Rubinius::VERSION
+        Rubinius::VERSION.dup
       when "jruby"
-        JRUBY_VERSION
+        JRUBY_VERSION.dup
       else
         raise BundlerError, "That RUBY_ENGINE is not recognized"
         nil

data/lib/bundler/runtime.rb

@@ -38,6 +38,8 @@ module Bundler
         $LOAD_PATH.unshift(*load_paths)
       end
 
+      setup_manpath
+
       lock
 
       self
@@ -142,7 +144,8 @@ module Bundler
         md = %r{(.+bundler/gems/.+-[a-f0-9]{7,12})}.match(spec.full_gem_path)
         spec_git_paths << md[1] if md
         spec_gem_executables << spec.executables.collect do |executable|
-          "#{Bundler.rubygems.gem_bindir}/#{executable}"
+          e = "#{Bundler.rubygems.gem_bindir}/#{executable}"
+          [e, "#{e}.bat"]
         end
         spec_cache_paths << spec.cache_file
         spec_gemspec_paths << spec.spec_file
@@ -276,6 +279,23 @@ module Bundler
       end
     end
 
+    def setup_manpath
+      # Store original MANPATH for restoration later in with_clean_env()
+      ENV['BUNDLE_ORIG_MANPATH'] = ENV['MANPATH']
+
+      # Add man/ subdirectories from activated bundles to MANPATH for man(1)
+      manuals = $LOAD_PATH.map do |path|
+        man_subdir = path.sub(/lib$/, 'man')
+        man_subdir unless Dir[man_subdir + '/man?/'].empty?
+      end.compact
+
+      unless manuals.empty?
+        ENV['MANPATH'] = manuals.concat(
+          ENV['MANPATH'].to_s.split(File::PATH_SEPARATOR)
+        ).uniq.join(File::PATH_SEPARATOR)
+      end
+    end
+
     def cache_path
       root.join("vendor/cache")
     end

data/lib/bundler/settings.rb

@@ -7,8 +7,9 @@ module Bundler
     end
 
     def [](key)
-      key = key_for(key)
-      @local_config[key] || ENV[key] || @global_config[key]
+      the_key = key_for(key)
+      value = (@local_config[the_key] || ENV[the_key] || @global_config[the_key])
+      is_bool(key) ? to_bool(value) : value
     end
 
     def []=(key, value)
@@ -109,6 +110,14 @@ module Bundler
       "BUNDLE_#{key}"
     end
 
+    def is_bool(key)
+      %w(frozen cache_all no_prune disable_local_branch_check).include? key.to_s
+    end
+
+    def to_bool(value)
+      !(value.nil? || value == '' || value =~ /^(false|f|no|n|0)$/i)
+    end
+
     def set_key(key, value, hash, file)
       key = key_for(key)
 

data/lib/bundler/spec_set.rb

@@ -22,9 +22,11 @@ module Bundler
         next if handled[dep] || skip.include?(dep.name)
 
         spec = lookup[dep.name].find do |s|
-          match_current_platform ?
-            Gem::Platform.match(s.platform) :
+          if match_current_platform
+            Gem::Platform.match(s.platform)
+          else
             s.match_platform(dep.__platform)
+          end
         end
 
         handled[dep] = true

data/lib/bundler/ui.rb

@@ -24,6 +24,9 @@ module Bundler
       false
     end
 
+    def ask(message)
+    end
+
     class Shell < UI
       attr_reader :quiet
       attr_writer :shell
@@ -75,6 +78,10 @@ module Bundler
         tell_me(msg, nil, newline) if debug?
       end
 
+      def ask(msg)
+        @shell.ask(msg)
+      end
+
       def trace(e, newline = nil)
         msg = ["#{e.class}: #{e.message}", *e.backtrace].join("\n")
         if debug?
@@ -84,10 +91,22 @@ module Bundler
         end
       end
 
-      private
+    private
+
       # valimism
       def tell_me(msg, color = nil, newline = nil)
-        newline.nil? ? @shell.say(msg, color) : @shell.say(msg, color, newline)
+        msg = word_wrap(msg) if newline.is_a?(Hash) && newline[:wrap]
+        if newline.nil?
+          @shell.say(msg, color)
+        else
+          @shell.say(msg, color, newline)
+        end
+      end
+
+      def word_wrap(text, line_width = @shell.terminal_width)
+        text.split("\n").collect do |line|
+          line.length > line_width ? line.gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip : line
+        end * "\n"
       end
     end
 

data/lib/bundler/vendored_persistent.rb

@@ -1,14 +1,15 @@
 begin
   require 'openssl'
-  # ensure OpenSSL is loaded
-  OpenSSL
+  OpenSSL # ensure OpenSSL is loaded
+
+  vendor = File.expand_path('../vendor', __FILE__)
+  $:.unshift(vendor) unless $:.include?(vendor)
+  require 'net/http/persistent'
+
+  USE_PERSISTENT = true
+
 rescue LoadError, NameError => e
-  raise Bundler::HTTPError, "\nCould not load OpenSSL." \
-    "\nYou must recompile Ruby with OpenSSL support or change the sources in your" \
-    "\nGemfile from 'https' to 'http'. Instructions for compiling with OpenSSL" \
-    "\nusing RVM are available at rvm.io/packages/openssl."
-end
+  require 'net/http'
+  USE_PERSISTENT = false
 
-vendor = File.expand_path('../vendor', __FILE__)
-$:.unshift(vendor) unless $:.include?(vendor)
-require 'net/http/persistent'
+end

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.3.0.pre.8" unless defined?(::Bundler::VERSION)
+  VERSION = "1.3.0" unless defined?(::Bundler::VERSION)
 end

data/spec/bundler/gem_helper_spec.rb

@@ -128,7 +128,12 @@ describe "Bundler::GemHelper tasks" do
     end
 
     describe 'release' do
+      it "shouldn't push if there are unstaged files" do
+        expect { @helper.release_gem }.to raise_error(/files that need to be committed/)
+      end
+
       it "shouldn't push if there are uncommitted files" do
+        %x{cd test; git add .}
         expect { @helper.release_gem }.to raise_error(/files that need to be committed/)
       end
 

data/spec/install/deploy_spec.rb

@@ -113,6 +113,20 @@ describe "install with --deployment or --frozen" do
       expect(out).not_to include("You have changed in the Gemfile")
     end
 
+    it "can have --frozen set to false via an environment variable" do
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack"
+        gem "rack-obama"
+      G
+
+      ENV['BUNDLE_FROZEN'] = "false"
+      bundle "install"
+      expect(out).not_to include("deployment mode")
+      expect(out).not_to include("You have added to the Gemfile")
+      expect(out).not_to include("* rack-obama")
+    end
+
     it "explodes with the --frozen flag if you make a change and don't check in the lockfile" do
       gemfile <<-G
         source "file://#{gem_repo1}"

data/spec/install/gems/dependency_api_spec.rb

@@ -396,6 +396,16 @@ describe "gemcutter's dependency API" do
       bundle :install, :artifice => "endpoint_500"
       expect(out).not_to include("#{user}:#{password}")
     end
+
+    it "does not pass the user / password to different hosts on redirect" do
+      gemfile <<-G
+        source "#{basic_auth_source_uri}"
+        gem "rack"
+      G
+
+      bundle :install, :artifice => "endpoint_creds_diff_host"
+      should_be_installed "rack 1.0.0"
+    end
   end
 
   context "when ruby is compiled without openssl" do
@@ -422,6 +432,26 @@ describe "gemcutter's dependency API" do
     end
   end
 
+  context "when SSL certificate verification fails" do
+    it "explains what is going on" do
+      # Install a monkeypatch that reproduces the effects of openssl raising
+      # a certificate validation error at the appropriate moment.
+      gemfile <<-G
+        class Bundler::Fetcher
+          def fetch_all_remote_specs
+            raise OpenSSL::SSL::SSLError, "Certificate invalid"
+          end
+        end
+
+        source "#{source_uri.gsub(/http/, 'https')}"
+        gem "rack"
+      G
+
+      bundle :install
+      expect(out).to match(/could not verify the SSL certificate/i)
+    end
+  end
+
   context ".gemrc with sources is present" do
     before do
       File.open(home('.gemrc'), 'w') do |file|
@@ -444,4 +474,5 @@ describe "gemcutter's dependency API" do
       expect(exitstatus).to eq(0)
     end
   end
+
 end

data/spec/install/gems/resolving_spec.rb

@@ -68,5 +68,24 @@ describe "bundle install with gem sources" do
         should_be_installed "net_a 1.0", "net_b 1.0", "net_c 1.0", "net_d 1.0", "net_e 1.0"
       end
     end
+
+    describe "when some gems require a different version of ruby" do
+      it "does not try to install those gems" do
+        pending "waiting for a rubygems index that includes ruby version"
+
+        update_repo gem_repo1 do
+          build_gem "require_ruby" do |s|
+            s.required_ruby_version = "> 9000"
+          end
+        end
+
+        install_gemfile <<-G
+          source "file://#{gem_repo1}"
+          gem 'require_ruby'
+        G
+
+        expect(out).to_not include("Gem::InstallError: require_ruby requires Ruby version > 9000")
+      end
+    end
   end
 end

data/spec/lock/lockfile_spec.rb

@@ -806,4 +806,31 @@ describe "the lockfile format" do
       end
     end
   end
+
+  it "refuses to install if Gemfile.lock contains conflict markers" do
+    lockfile <<-L
+      GEM
+        remote: file://#{gem_repo1}/
+        specs:
+      <<<<<<<
+          rack (1.0.0)
+      =======
+          rack (1.0.1)
+      >>>>>>>
+
+      PLATFORMS
+        ruby
+
+      DEPENDENCIES
+        rack
+    L
+
+    error = install_gemfile(<<-G, :expect_err => true)
+      source "file://#{gem_repo1}"
+      gem "rack"
+    G
+
+    expect(error).to match(/your Gemfile.lock contains merge conflicts/i)
+    expect(error).to match(/git checkout HEAD -- Gemfile.lock/i)
+  end
 end

data/spec/other/config_spec.rb

@@ -147,4 +147,35 @@ describe ".bundle/config" do
       expect(out).to eq(File.expand_path(Dir.pwd + "/.."))
     end
   end
+
+  describe "env" do
+    before(:each) { bundle :install }
+
+    it "can set boolean properties via the environment" do
+      ENV["BUNDLE_FROZEN"] = "true"
+
+      run "if Bundler.settings[:frozen]; puts 'true' else puts 'false' end"
+      expect(out).to eq("true")
+    end
+
+    it "can set negative boolean properties via the environment" do
+      run "if Bundler.settings[:frozen]; puts 'true' else puts 'false' end"
+      expect(out).to eq("false")
+
+      ENV["BUNDLE_FROZEN"] = "false"
+
+      run "if Bundler.settings[:frozen]; puts 'true' else puts 'false' end"
+      expect(out).to eq("false")
+
+      ENV["BUNDLE_FROZEN"] = "0"
+
+      run "if Bundler.settings[:frozen]; puts 'true' else puts 'false' end"
+      expect(out).to eq("false")
+
+      ENV["BUNDLE_FROZEN"] = ""
+
+      run "if Bundler.settings[:frozen]; puts 'true' else puts 'false' end"
+      expect(out).to eq("false")
+    end
+  end
 end

data/spec/other/open_spec.rb

@@ -37,4 +37,19 @@ describe "bundle open" do
     bundle "open Rails", :env => {"EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => ""}
     expect(out).to match(/did you mean rails\?/i)
   end
+
+  it "opens the gem with short words" do
+    bundle "open rec" , :env => {"EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor"}
+
+    expect(out).to eq("bundler_editor #{default_bundle_path('gems', 'activerecord-2.3.2')}")
+  end
+
+  it "select the gem from many match gems" do
+    env = {"EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor"}
+    bundle "open active" , :env => env do |input|
+      input.puts '2'
+    end
+
+    expect(out).to match(/bundler_editor #{default_bundle_path('gems', 'activerecord-2.3.2')}\z/)
+  end
 end

data/spec/other/show_spec.rb

@@ -34,8 +34,8 @@ describe "bundle show" do
 
     bundle "show rails"
 
-    expect(out).to match('Warning: The following path to rails no longer exists')
-    expect(out).to match(default_bundle_path('gems', 'rails-2.3.2').to_s)
+    expect(out).to match(/has been deleted/i)
+    expect(out).to include(default_bundle_path('gems', 'rails-2.3.2').to_s)
   end
 
   it "prints the path to the running bundler" do

data/spec/spec_helper.rb

@@ -31,6 +31,9 @@ FileUtils.rm_rf(Spec::Path.gem_repo1)
 ENV['RUBYOPT'] = "#{ENV['RUBYOPT']} -r#{Spec::Path.root}/spec/support/rubygems_hax/platform.rb"
 ENV['BUNDLE_SPEC_RUN'] = "true"
 
+# Don't wrap output in tests
+ENV['THOR_COLUMNS'] = '10000'
+
 RSpec.configure do |config|
   config.include Spec::Builders
   config.include Spec::Helpers

data/spec/support/artifice/endpoint_creds_diff_host.rb

@@ -0,0 +1,38 @@
+require File.expand_path("../endpoint", __FILE__)
+
+Artifice.deactivate
+
+class EndpointCredsDiffHost < Endpoint
+  helpers do
+    def auth
+      @auth ||= Rack::Auth::Basic::Request.new(request.env)
+    end
+
+    def authorized?
+      auth.provided? && auth.basic? && auth.credentials && auth.credentials == ['user', 'pass']
+    end
+
+    def protected!
+      unless authorized?
+        response['WWW-Authenticate'] = %(Basic realm="Testing HTTP Auth")
+        throw(:halt, [401, "Not authorized\n"])
+      end
+    end
+  end
+
+  before do
+    protected! unless request.path_info.include?("/no/creds/")
+  end
+
+  get "/gems/:id" do
+    redirect "http://diffhost.com/no/creds/#{params[:id]}"
+  end
+
+  get "/no/creds/:id" do
+    if request.host.include?("diffhost") && !auth.provided?
+      File.read("#{gem_repo1}/gems/#{params[:id]}")
+    end
+  end
+end
+
+Artifice.activate_with(EndpointCredsDiffHost)

data/spec/support/artifice/endpoint_fallback.rb

@@ -6,11 +6,10 @@ class EndpointFallback < Endpoint
   DEPENDENCY_LIMIT = 60
 
   get "/api/v1/dependencies" do
-    if params[:gems].size <= DEPENDENCY_LIMIT
+    if params[:gems] && params[:gems].size <= DEPENDENCY_LIMIT
       Marshal.dump(dependencies_for(params[:gems]))
     else
-      status 413
-      "Too many gems to resolve, please request less than #{DEPENDENCY_LIMIT} gems"
+      halt 413, "Too many gems to resolve, please request less than #{DEPENDENCY_LIMIT} gems"
     end
   end
 end

data/spec/support/sudo.rb

@@ -1,8 +1,7 @@
 module Spec
   module Sudo
     def self.present?
-      @which_sudo ||= (`which sudo`.chomp rescue '')
-      !@which_sudo.empty?
+      @which_sudo ||= Bundler.which("sudo")
     end
 
     def self.test_sudo?

data/spec/update/gems_spec.rb

@@ -67,6 +67,14 @@ describe "bundle update" do
     end
   end
 
+  describe "with a child dependency" do
+    it "should update the child dependency" do
+      update_repo2
+      bundle "update rack"
+      should_be_installed "rack 1.2"
+    end
+  end
+
   describe "with --local option" do
     it "doesn't hit repo2" do
       FileUtils.rm_rf(gem_repo2)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre.8
-  prerelease: 6
+  version: 1.3.0
+  prerelease: 
 platform: ruby
 authors:
 - André Arko
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn
@@ -247,6 +247,7 @@ files:
 - spec/support/artifice/endpoint_500.rb
 - spec/support/artifice/endpoint_api_missing.rb
 - spec/support/artifice/endpoint_basic_authentication.rb
+- spec/support/artifice/endpoint_creds_diff_host.rb
 - spec/support/artifice/endpoint_extra.rb
 - spec/support/artifice/endpoint_extra_missing.rb
 - spec/support/artifice/endpoint_fallback.rb
@@ -289,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
@@ -361,6 +362,7 @@ test_files:
 - spec/support/artifice/endpoint_500.rb
 - spec/support/artifice/endpoint_api_missing.rb
 - spec/support/artifice/endpoint_basic_authentication.rb
+- spec/support/artifice/endpoint_creds_diff_host.rb
 - spec/support/artifice/endpoint_extra.rb
 - spec/support/artifice/endpoint_extra_missing.rb
 - spec/support/artifice/endpoint_fallback.rb
@@ -382,4 +384,3 @@ test_files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
-has_rdoc: