bundler 1.4.0.pre.2 → 1.4.0.rc.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fb8547f7f4ce966d51b5a24515f29bc0ca886024
+  data.tar.gz: d6cfae7abd77d42a01e2f123ed160004626fbf23
+SHA512:
+  metadata.gz: f7946e78153206d661eef232c12605a0a58ac317a4b30cf7ed9bf1bcc8a2f0cd4dfc60db6e485b2654a938bdc535ddcdb54a5eab9dd1abc92ad968e5de557042
+  data.tar.gz: e3f93c8eb32a8ffc4ed48dac5d366bdb36fa87de32da6a195f5dc45dec5dc5cbdec3c4739194a84b307370b0869774dcda4044c25efa0b906877ba9b72b6bfc1

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 1.4.0.pre.2
+## 1.4.0.rc.1 (2013-09-29)
 
 Features:
 
@@ -6,12 +6,21 @@ Features:
   - add :patchlevel option to ruby DSL
   - add `bundler` bin (#2598, @kirs)
   - friendly ambiguous error messages (#2581, #2550, @jlsuttles, @jendiamond, @joyicecloud)
+  - add `:jruby_18` and `:jruby_19` paltform options (@mcfiredrill)
+  - add X.509 client certificates for auth without passwords (@snackbandit)
+  - add `exec --keep-file-descriptors` for Ruby 1.9-like behavior on 2.0 (@steved555)
+  - print a better error when git is not installed (@joyicecloud)
+  - exit non-zero when `outdated` is run with an unknown gem (@joyicecloud)
+  - add `:ruby_21` platform option (@brandonblack)
+  - add `--retry` to retry failed network and git commands (@schneems)
+  - include command and versions in User-Agent (@indirect, @joyicecloud)
 
 Bugfixes:
 
   - allow passwordless Basic Auth (#2606, @rykov)
   - don't suggest `gem install foo` when `foo` is a git gem that fails (@kirs)
-  - revert #2569, going back to git instead of https for :github gems
+  - revert #2569, staying compatible with git: instead of https: for :github gems
+  - handle exceptions while installing gems in parallel (@gnufied)
 
 ## 1.4.0.pre.1 (2013-08-04)
 

data/Rakefile

@@ -43,6 +43,8 @@ namespace :spec do
       system("sudo sed -i '/secure_path/d' /etc/sudoers")
       # Install groff for the ronn gem
       system("sudo apt-get install groff -y")
+      # Switch to the Bluebox DNS servers in the Travis data center
+      system("printf 'nameserver 199.91.168.70\nnameserver 199.91.168.71\n' | sudo tee /etc/resolv.conf")
       # Install the other gem deps, etc.
       Rake::Task["spec:deps"].invoke
     end

data/lib/bundler.rb

@@ -33,6 +33,7 @@ module Bundler
   autoload :MatchPlatform,         'bundler/match_platform'
   autoload :RemoteSpecification,   'bundler/remote_specification'
   autoload :Resolver,              'bundler/resolver'
+  autoload :Retry,                 'bundler/retry'
   autoload :RubyVersion,           'bundler/ruby_version'
   autoload :RubyDsl,               'bundler/ruby_dsl'
   autoload :Runtime,               'bundler/runtime'
@@ -152,6 +153,13 @@ module Bundler
       end
     end
 
+    def locked_gems
+      @locked_gems ||= begin
+        lock = Bundler.read_file(Bundler.default_lockfile)
+        LockfileParser.new(lock)
+      end
+    end
+
     def ruby_scope
       "#{Bundler.rubygems.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}"
     end
@@ -345,6 +353,14 @@ module Bundler
       @gemspec_cache = {}
     end
 
+    def git_present?
+      @git_present ||= Bundler.which("git")
+    end
+
+    def ruby_version
+      @ruby_version ||= SystemRubyVersion.new
+    end
+
   private
 
     def eval_yaml_gemspec(path, contents)

data/lib/bundler/capistrano.rb

@@ -4,7 +4,7 @@
 # Bundler will be activated after each new deployment.
 require 'bundler/deployment'
 
-if Gem::Version.new(Capistrano::Version).release >= Gem::Version.new("3.0")
+if defined?(Capistrano::Version) && Gem::Version.new(Capistrano::Version).release >= Gem::Version.new("3.0")
   raise "For Capistrano 3.x integration, please use http://github.com/capistrano/bundler"
 end
 

data/lib/bundler/cli.rb

@@ -15,6 +15,8 @@ module Bundler
 
     def initialize(*)
       super
+      ENV['BUNDLE_GEMFILE']   = File.expand_path(options[:gemfile]) if options[:gemfile]
+      Bundler::Retry.attempts = options[:retry] || Bundler.settings[:retry] || Bundler::Retry::DEFAULT_ATTEMPTS
       Bundler.rubygems.ui = UI::RGProxy.new(Bundler.ui)
     rescue UnknownArgumentError => e
       raise InvalidOption, e.message
@@ -30,6 +32,8 @@ module Bundler
     default_task :install
     class_option "no-color", :type => :boolean, :banner => "Disable colorization in output"
     class_option "verbose",  :type => :boolean, :banner => "Enable verbose output mode", :aliases => "-V"
+    class_option "retry",    :type => :numeric, :aliases => "-r", :banner =>
+      "Specify the number of times you wish to attempt network commands"
 
     def help(cli = nil)
       case cli
@@ -106,8 +110,6 @@ module Bundler
     method_option "dry-run", :type => :boolean, :default => false, :banner =>
       "Lock the Gemfile"
     def check
-      ENV['BUNDLE_GEMFILE'] = File.expand_path(options[:gemfile]) if options[:gemfile]
-
       Bundler.settings[:path] = File.expand_path(options[:path]) if options[:path]
       begin
         definition = Bundler.definition
@@ -187,8 +189,6 @@ module Bundler
         opts[:without] = opts[:without].map{|g| g.tr(' ', ':') }
       end
 
-      # Can't use Bundler.settings for this because settings needs gemfile.dirname
-      ENV['BUNDLE_GEMFILE'] = File.expand_path(opts[:gemfile]) if opts[:gemfile]
       ENV['RB_USER_INSTALL'] = '1' if Bundler::FREEBSD
 
       # Just disable color in deployment mode
@@ -234,16 +234,16 @@ module Bundler
 
       opts["no-cache"] ||= opts[:local]
 
-      # Can't use Bundler.settings for this because settings needs gemfile.dirname
       Bundler.settings[:path]     = nil if opts[:system]
       Bundler.settings[:path]     = "vendor/bundle" if opts[:deployment]
-      Bundler.settings[:path]     = opts[:path] if opts[:path]
-      Bundler.settings[:path]     ||= "bundle" if opts[:standalone]
+      Bundler.settings[:path]     = opts["path"] if opts["path"]
+      Bundler.settings[:path]     ||= "bundle" if opts["standalone"]
       Bundler.settings[:bin]      = opts["binstubs"] if opts["binstubs"]
       Bundler.settings[:bin]      = nil if opts["binstubs"] && opts["binstubs"].empty?
-      Bundler.settings[:shebang]  = opts["shebang"] if opts[:shebang]
+      Bundler.settings[:shebang]  = opts["shebang"] if opts["shebang"]
+      Bundler.settings[:jobs]     = opts["jobs"] if opts["jobs"]
       Bundler.settings[:no_prune] = true if opts["no-prune"]
-      Bundler.settings[:clean]    = opts[:clean] if opts[:clean]
+      Bundler.settings[:clean]    = opts["clean"] if opts["clean"]
       Bundler.settings.without    = opts[:without]
       Bundler.ui.level            = "warn" if opts[:quiet]
       Bundler::Fetcher.disable_endpoint = opts["full-index"]
@@ -311,8 +311,7 @@ module Bundler
         Bundler.definition(true)
       else
         # cycle through the requested gems, just to make sure they exist
-        lock = Bundler.read_file(Bundler.default_lockfile)
-        names = LockfileParser.new(lock).specs.map{ |s| s.name }
+        names = Bundler.locked_gems.specs.map{ |s| s.name }
         gems.each do |g|
           next if names.include?(g)
           raise GemNotFound, not_found_message(g, names)
@@ -419,8 +418,12 @@ module Bundler
       "Do not attempt to fetch gems remotely and use the gem cache instead"
     def outdated(*gems)
       sources = Array(options[:source])
-      Bundler.definition.validate_ruby!
 
+      gems.each do |gem_name|
+        select_spec(gem_name)
+      end
+
+      Bundler.definition.validate_ruby!
       current_specs = Bundler.ui.silence { Bundler.load.specs }
       current_dependencies = {}
       Bundler.ui.silence { Bundler.load.dependencies.each { |dep| current_dependencies[dep.name] = dep } }
@@ -514,6 +517,7 @@ module Bundler
     map %w(pack) => :package
 
     desc "exec", "Run the command in context of the bundle"
+    method_option :keep_file_descriptors, :type => :boolean, :default => false
     long_desc <<-D
       Exec runs a command, providing it access to the gems in the bundle. While using
       bundle exec you can require and call the bundled gems as if they were installed
@@ -524,6 +528,12 @@ module Bundler
       Bundler.load.setup_environment
 
       begin
+        if RUBY_VERSION >= "2.0"
+          args << { :close_others => !options.keep_file_descriptors? }
+        elsif options.keep_file_descriptors?
+          Bundler.ui.warn "Ruby version #{RUBY_VERSION} defaults to keeping non-standard file descriptors on Kernel#exec."
+        end
+
         # Run
         Kernel.exec(*args)
       rescue Errno::EACCES
@@ -880,7 +890,6 @@ module Bundler
       message
     end
 
-
     def without_groups_message
       groups = Bundler.settings.without
       group_list = [groups[0...-1].join(", "), groups[-1..-1]].

data/lib/bundler/current_ruby.rb

@@ -19,6 +19,10 @@ module Bundler
       RUBY_VERSION =~ /^2\.0/
     end
 
+    def on_21?
+      RUBY_VERSION =~ /^2\.1/
+    end
+
     def ruby?
       !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev")
     end
@@ -35,6 +39,10 @@ module Bundler
       ruby? && on_20?
     end
 
+    def ruby_21?
+      ruby? && on_21?
+    end
+
     def mri?
       !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby")
     end
@@ -47,11 +55,14 @@ module Bundler
       mri? && on_19?
     end
 
-
     def mri_20?
       mri? && on_20?
     end
 
+    def mri_21?
+      mri? && on_21?
+    end
+
     def rbx?
       ruby? && defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
     end
@@ -60,6 +71,14 @@ module Bundler
       defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
     end
 
+    def jruby_18?
+      jruby? && on_18?
+    end
+
+    def jruby_19?
+      jruby? && on_19?
+    end
+
     def maglev?
       defined?(RUBY_ENGINE) && RUBY_ENGINE == "maglev"
     end
@@ -84,6 +103,10 @@ module Bundler
       mingw? && on_20?
     end
 
+    def mingw_21?
+      mingw? && on_21?
+    end
+
     def x64_mingw?
       Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu == 'x64'
     end
@@ -92,5 +115,9 @@ module Bundler
       x64_mingw? && on_20?
     end
 
+    def x64_mingw_21?
+      x64_mingw? && on_21?
+    end
+
   end
 end

data/lib/bundler/definition.rb

@@ -369,8 +369,7 @@ module Bundler
     def validate_ruby!
       return unless ruby_version
 
-      system_ruby_version = Bundler::SystemRubyVersion.new
-      if diff = ruby_version.diff(system_ruby_version)
+      if diff = ruby_version.diff(Bundler.ruby_version)
         problem, expected, actual = diff
 
         msg = case problem
@@ -379,7 +378,7 @@ module Bundler
         when :version
           "Your Ruby version is #{actual}, but your Gemfile specified #{expected}"
         when :engine_version
-          "Your #{system_ruby_version.engine} version is #{actual}, but your Gemfile specified #{ruby_version.engine} #{expected}"
+          "Your #{Bundler.ruby_version.engine} version is #{actual}, but your Gemfile specified #{ruby_version.engine} #{expected}"
         when :patchlevel
           "Your Ruby patchlevel is #{actual}, but your Gemfile specified #{expected}"
         end

data/lib/bundler/dependency.rb

@@ -13,19 +13,25 @@ module Bundler
       :ruby_18  => Gem::Platform::RUBY,
       :ruby_19  => Gem::Platform::RUBY,
       :ruby_20  => Gem::Platform::RUBY,
+      :ruby_21  => Gem::Platform::RUBY,
       :mri      => Gem::Platform::RUBY,
       :mri_18   => Gem::Platform::RUBY,
       :mri_19   => Gem::Platform::RUBY,
       :mri_20   => Gem::Platform::RUBY,
+      :mri_21   => Gem::Platform::RUBY,
       :rbx      => Gem::Platform::RUBY,
       :jruby    => Gem::Platform::JAVA,
+      :jruby_18 => Gem::Platform::JAVA,
+      :jruby_19 => Gem::Platform::JAVA,
       :mswin    => Gem::Platform::MSWIN,
       :mingw    => Gem::Platform::MINGW,
       :mingw_18 => Gem::Platform::MINGW,
       :mingw_19 => Gem::Platform::MINGW,
       :mingw_20 => Gem::Platform::MINGW,
+      :mingw_21 => Gem::Platform::MINGW,
       :x64_mingw    => Gem::Platform::X64_MINGW,
-      :x64_mingw_20 => Gem::Platform::X64_MINGW
+      :x64_mingw_20 => Gem::Platform::X64_MINGW,
+      :x64_mingw_21 => Gem::Platform::X64_MINGW
     }.freeze
 
     def initialize(name, version, options = {}, &blk)

data/lib/bundler/endpoint_specification.rb

@@ -1,5 +1,3 @@
-require 'uri'
-
 module Bundler
   # used for Creating Specifications from the Gemcutter Endpoint
   class EndpointSpecification < Gem::Specification

data/lib/bundler/fetcher.rb

@@ -1,4 +1,5 @@
 require 'bundler/vendored_persistent'
+require 'securerandom'
 
 module Bundler
 
@@ -57,6 +58,27 @@ module Bundler
 
         gem_path
       end
+
+      def user_agent
+        @user_agent ||= begin
+          ruby = Bundler.ruby_version
+
+          agent = "bundler/#{Bundler::VERSION}"
+          agent += " rubygems/#{Gem::VERSION}"
+          agent += " ruby/#{ruby.version}"
+          agent += " (#{ruby.host})"
+          agent += " command/#{ARGV.first}"
+
+          if ruby.engine != "ruby"
+            # engine_version raises on unknown engines
+            engine_version = ruby.engine_version rescue "???"
+            agent += " #{ruby.engine}/#{engine_version}"
+          end
+          # add a random ID so we can consolidate runs server-side
+          agent << " " << SecureRandom.hex(8)
+        end
+      end
+
     end
 
     def initialize(remote_uri)
@@ -70,18 +92,36 @@ module Bundler
       @remote_uri = remote_uri
       @public_uri = remote_uri.dup
       @public_uri.user, @public_uri.password = nil, nil # don't print these
-      if defined?(Net::HTTP::Persistent)
-        @connection = Net::HTTP::Persistent.new 'bundler', :ENV
+
+      Socket.do_not_reverse_lookup = true
+    end
+
+    def connection
+      return @connection if @connection
+
+      needs_ssl = @remote_uri.scheme == "https" ||
+        Bundler.settings[:ssl_verify_mode] ||
+        Bundler.settings[:ssl_client_cert]
+      raise SSLError if needs_ssl && !defined?(OpenSSL)
+
+      @connection = Net::HTTP::Persistent.new 'bundler', :ENV
+
+      if @remote_uri.scheme == "https"
         @connection.verify_mode = (Bundler.settings[:ssl_verify_mode] ||
           OpenSSL::SSL::VERIFY_PEER)
         @connection.cert_store = bundler_cert_store
-      else
-        raise SSLError if @remote_uri.scheme == "https"
-        @connection = Net::HTTP.new(@remote_uri.host, @remote_uri.port)
       end
+
+      if Bundler.settings[:ssl_client_cert]
+        pem = File.read(Bundler.settings[:ssl_client_cert])
+        @connection.cert = OpenSSL::X509::Certificate.new(pem)
+        @connection.key  = OpenSSL::PKey::RSA.new(pem)
+      end
+
       @connection.read_timeout = @api_timeout
+      @connection.override_headers["User-Agent"] = self.class.user_agent
 
-      Socket.do_not_reverse_lookup = true
+      @connection
     end
 
     # fetch a gem specification
@@ -207,9 +247,9 @@ module Bundler
     HTTP_ERRORS = [
       Timeout::Error, EOFError, SocketError,
       Errno::EINVAL, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EAGAIN,
-      Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError
+      Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
+      Net::HTTP::Persistent::Error
     ]
-    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
@@ -218,11 +258,7 @@ module Bundler
         Bundler.ui.debug "Fetching from: #{uri}"
         req = Net::HTTP::Get.new uri.request_uri
         req.basic_auth(uri.user, uri.password) if uri.user
-        if defined?(Net::HTTP::Persistent)
-          response = @connection.request(uri, req)
-        else
-          response = @connection.request(req)
-        end
+        response = connection.request(uri, req)
       rescue OpenSSL::SSL::SSLError
         raise CertificateFailureError.new(@public_uri)
       rescue *HTTP_ERRORS

data/lib/bundler/index.rb

@@ -47,8 +47,11 @@ module Bundler
 
       @sources.each do |source|
         source.search(query, base).each do |spec|
-          results << spec unless seen.include?([spec.name, spec.version, spec.platform])
-          seen << [spec.name, spec.version, spec.platform]
+          lookup = [spec.name, spec.version, spec.platform]
+          unless seen.include?(lookup)
+            results << spec
+            seen << lookup
+          end
         end
       end
 

data/lib/bundler/installer.rb

@@ -79,18 +79,24 @@ module Bundler
       # Since we are installing, we can resolve the definition
       # using remote specs
       unless local
-        options["local"] ?
-          @definition.resolve_with_cache! :
-          @definition.resolve_remotely!
+        if options["local"]
+          @definition.resolve_with_cache!
+        else
+          Bundler::Retry.new("source fetch").attempts do
+            @definition.resolve_remotely!
+          end
+        end
       end
-
+      # Must install gems in the order that the resolver provides
+      # as dependencies might actually affect the installation of
+      # the gem.
       Installer.post_install_messages = {}
 
       # the order that the resolver provides is significant, since
       # dependencies might actually affect the installation of a gem.
       # that said, it's a rare situation (other than rake), and parallel
       # installation is just SO MUCH FASTER. so we let people opt in.
-      jobs = [options[:jobs].to_i, 1].max
+      jobs = [Bundler.settings[:jobs].to_i, 1].max
       if jobs > 1 && can_install_parallely?
         install_in_parallel jobs, options[:standalone]
       else
@@ -148,7 +154,7 @@ module Bundler
       if options[:binstubs_cmd] && spec.executables.empty?
         options = {}
         spec.runtime_dependencies.each do |dep|
-          bins = Bundler.definition.specs[dep].first.executables
+          bins = @definition.specs[dep].first.executables
           options[dep.name] = bins unless bins.empty?
         end
         if options.any?
@@ -233,9 +239,9 @@ module Bundler
       paths = []
 
       if groups.empty?
-        specs = Bundler.definition.requested_specs
+        specs = @definition.requested_specs
       else
-        specs = Bundler.definition.specs_for groups.map { |g| g.to_sym }
+        specs = @definition.specs_for groups.map { |g| g.to_sym }
       end
 
       specs.each do |spec|
@@ -244,7 +250,7 @@ module Bundler
         spec.require_paths.each do |path|
           full_path = File.join(spec.full_gem_path, path)
           gem_path = Pathname.new(full_path).relative_path_from(Bundler.root.join(bundler_path))
-          paths << gem_path.to_s.sub("#{SystemRubyVersion.new.engine}/#{RbConfig::CONFIG['ruby_version']}", '#{ruby_engine}/#{ruby_version}')
+          paths << gem_path.to_s.sub("#{Bundler.ruby_version.engine}/#{RbConfig::CONFIG['ruby_version']}", '#{ruby_engine}/#{ruby_version}')
         end
       end
 

data/lib/bundler/lazy_specification.rb

@@ -1,5 +1,6 @@
 require "uri"
 require "rubygems/spec_fetcher"
+require "bundler/match_platform"
 
 module Bundler
   class LazySpecification

data/lib/bundler/parallel_workers/thread_worker.rb

@@ -12,11 +12,14 @@ module Bundler
       def prepare_workers(size, func)
         @threads = size.times.map do |i|
           Thread.start do
-            Thread.current.abort_on_exception = true
             loop do
               obj = @request_queue.deq
               break if obj.equal? POISON
-              @response_queue.enq func.call(obj)
+              begin
+                @response_queue.enq func.call(obj, i)
+              rescue Exception => e
+                @response_queue.enq(WrappedException.new(e))
+              end
             end
           end
         end

data/lib/bundler/parallel_workers/unix_worker.rb

@@ -9,7 +9,7 @@ module Bundler
         def work(obj)
           Marshal.dump obj, io_w
           Marshal.load io_r
-        rescue IOError
+        rescue IOError, Errno::EPIPE
           nil
         end
       end
@@ -62,7 +62,6 @@ module Bundler
         @threads = size.times.map do |i|
           Thread.start do
             worker = @workers[i]
-            Thread.current.abort_on_exception = true
             loop do
               obj = @request_queue.deq
               break if obj.equal? POISON

data/lib/bundler/parallel_workers/worker.rb

@@ -39,8 +39,8 @@ module Bundler
 
       # Stop the forked workers and started threads
       def stop
-        stop_workers
         stop_threads
+        stop_workers
       end
 
       private

data/lib/bundler/retry.rb

@@ -0,0 +1,59 @@
+module Bundler
+  # General purpose class for retrying code that may fail
+  class Retry
+    DEFAULT_ATTEMPTS = 2
+    attr_accessor :name, :total_runs, :current_run
+
+    class << self
+      attr_accessor :attempts
+    end
+
+    def initialize(name, attempts = nil)
+      @name        = name
+      attempts    ||= default_attempts
+      @total_runs =  attempts.next # will run once, then upto attempts.times
+    end
+
+    def default_attempts
+      return Integer(self.class.attempts) if self.class.attempts
+      DEFAULT_ATTEMPTS
+    end
+
+    def attempt(&block)
+      @current_run = 0
+      @failed      = false
+      @error       = nil
+      while keep_trying? do
+        run(&block)
+      end
+      @result
+    end
+    alias :attempts :attempt
+
+  private
+    def run(&block)
+      @failed      = false
+      @current_run += 1
+      @result = block.call
+    rescue => e
+      fail(e)
+    end
+
+    def fail(e)
+      @failed = true
+      raise e if last_attempt?
+      return true unless name
+      Bundler.ui.warn "Retrying #{name} due to error (#{current_run.next}/#{total_runs}): #{e.message}"
+    end
+
+    def keep_trying?
+      return true  if current_run.zero?
+      return false if last_attempt?
+      return true  if @failed
+    end
+
+    def last_attempt?
+      current_run >= total_runs
+    end
+  end
+end

data/lib/bundler/ruby_version.rb

@@ -57,6 +57,14 @@ module Bundler
         nil
       end
     end
+
+    def host
+      @host ||= [
+        RbConfig::CONFIG["host_cpu"],
+        RbConfig::CONFIG["host_vendor"],
+        RbConfig::CONFIG["host_os"]
+      ].join("-")
+    end
   end
 
   # A subclass of RubyVersion that implements version,
@@ -97,7 +105,7 @@ module Bundler
       when "jruby"
         JRUBY_VERSION.dup
       else
-        raise BundlerError, "That RUBY_ENGINE is not recognized"
+        raise BundlerError, "RUBY_ENGINE value #{RUBY_ENGINE} is not recognized"
         nil
       end
     end

data/lib/bundler/source/git/git_proxy.rb

@@ -1,7 +1,31 @@
 module Bundler
   module Source
-
     class Git < Path
+      class GitNotInstalledError < GitError
+        def initialize
+          msg =  "You need to install git to be able to use gems from git repositories. "
+          msg << "For help installing git, please refer to GitHub's tutorial at https://help.github.com/articles/set-up-git"
+          super msg
+        end
+      end
+
+      class GitNotAllowedError < GitError
+        def initialize(command)
+          msg =  "Bundler is trying to run a `git #{command}` at runtime. You probably need to run `bundle install`. However, "
+          msg << "this error message could probably be more useful. Please submit a ticket at http://github.com/bundler/bundler/issues "
+          mag << "with steps to reproduce as well as the following\n\nCALLER: #{caller.join("\n")}"
+          super msg
+        end
+      end
+
+      class GitCommandError < GitError
+        def initialize(command, path = nil)
+          msg =  "Git error: command `git #{command}` in directory #{Dir.pwd} has failed."
+          msg << "\nIf this error persists you could try removing the cache directory '#{path}'" if path && path.exist?
+          super msg
+        end
+      end
+
       # The GitProxy is responsible to iteract with git repositories.
       # All actions required by the Git source is encapsualted in this
       # object.
@@ -84,19 +108,12 @@ module Bundler
         end
 
         def git(command, check_errors=true)
-          if allow?
+          raise GitNotAllowedError.new(command) unless allow?
+          raise GitNotInstalledError.new        unless Bundler.git_present?
+          Bundler::Retry.new("git #{command}").attempts do
             out = SharedHelpers.with_clean_git_env { %x{git #{command}} }
-
-            if check_errors && $?.exitstatus != 0
-              msg = "Git error: command `git #{command}` in directory #{Dir.pwd} has failed."
-              msg << "\nIf this error persists you could try removing the cache directory '#{path}'" if path.exist?
-              raise GitError, msg
-            end
+            raise GitCommandError.new(command, path) if check_errors && !$?.success?
             out
-          else
-            raise GitError, "Bundler is trying to run a `git #{command}` at runtime. You probably need to run `bundle install`. However, " \
-                            "this error message could probably be more useful. Please submit a ticket at http://github.com/bundler/bundler/issues " \
-                            "with steps to reproduce as well as the following\n\nCALLER: #{caller.join("\n")}"
           end
         end
 

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = <%=config[:constant_name]%>::VERSION
   spec.authors       = [<%=config[:author].inspect%>]
   spec.email         = [<%=config[:email].inspect%>]
-  spec.description   = %q{TODO: Write a gem description}
-  spec.summary       = %q{TODO: Write a gem summary}
+  spec.summary       = %q{TODO: Write a short summary. Required.}
+  spec.description   = %q{TODO: Write a longer description. Optional.}
   spec.homepage      = ""
   spec.license       = "MIT"
 

data/lib/bundler/vendored_persistent.rb

@@ -1,10 +1,3 @@
-begin
-  require 'openssl'
-  OpenSSL && OpenSSL::SSL # ensure OpenSSL is loaded
-
-  vendor = File.expand_path('../vendor', __FILE__)
-  $:.unshift(vendor) unless $:.include?(vendor)
-  require 'net/http/persistent'
-rescue LoadError, NameError => e
-  require 'net/http'
-end
+vendor = File.expand_path('../vendor', __FILE__)
+$:.unshift(vendor) unless $:.include?(vendor)
+require 'net/http/persistent'

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.4.0.pre.2" unless defined?(::Bundler::VERSION)
+  VERSION = "1.4.0.rc.1" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-config.ronn

@@ -92,6 +92,12 @@ learn more about their operation in [bundle install(1)][bundle-install].
   relative paths in the `Gemfile`, among other things. By default, bundler
   will search up from the current working directory until it finds a
   `Gemfile`.
+* `ssl_ca_cert` (`BUNDLE_SSL_CA_CERT`):
+  Path to a designated CA certificate file or folder containing multiple
+  certificates for trusted CAs in PEM format.
+* `ssl_client_cert` (`BUNDLE_SSL_CLIENT_CERT`):
+  Path to a designated file containing a X.509 client certificate
+  and key in PEM format.
 
 In general, you should set these settings per-application by using the applicable
 flag to the [bundle install(1)][bundle-install] command.

data/man/bundle-exec.ronn

@@ -3,7 +3,7 @@ bundle-exec(1) -- Execute a command in the context of the bundle
 
 ## SYNOPSIS
 
-`bundle exec` <command>
+`bundle exec` [--keep-file-descriptors] <command>
 
 ## DESCRIPTION
 
@@ -18,6 +18,13 @@ should run `bundle exec rspec spec/my_spec.rb`.
 Note that `bundle exec` does not require that an executable is
 available on your shell's `$PATH`.
 
+## OPTIONS
+
+* `--keep-file-descriptors`:
+  Exec in Ruby 2.0 began discarding non-standard file descriptors. When this
+  flag is passed, exec will revert to the 1.9 behaviour of passing all file
+  descriptors to the new process.
+
 ## BUNDLE INSTALL --BINSTUBS
 
 If you use the `--binstubs` flag in [bundle install(1)][bundle-install], Bundler will

data/man/gemfile.5.ronn

@@ -149,6 +149,8 @@ There are a number of `Gemfile` platforms:
     _ruby_ `AND` version 1.9
   * `ruby_20`:
     _ruby_ `AND` version 2.0
+  * `ruby_21`:
+    _ruby_ `AND` version 2.1
   * `mri`:
     Same as _ruby_, but not Rubinius
   * `mri_18`:
@@ -157,6 +159,8 @@ There are a number of `Gemfile` platforms:
     _mri_ `AND` version 1.9
   * `mri_20`:
     _mri_ `AND` version 2.0
+  * `mri_21`:
+    _mri_ `AND` version 2.1
   * `rbx`:
     Same as _ruby_, but only Rubinius (not MRI)
   * `jruby`:
@@ -171,10 +175,14 @@ There are a number of `Gemfile` platforms:
     _mingw_ `AND` version 1.9
   * `mingw_20`:
     _mingw_ `AND` version 2.0
+  * `mingw_21`:
+    _mingw_ `AND` version 2.1
   * `x64_mingw`:
     Windows 64 bit 'mingw32' platform (aka RubyInstaller x64)
   * `x64_mingw_20`:
     _x64_mingw_ `AND` version 2.0
+  * `x64_mingw_21`:
+    _x64_mingw_ `AND` version 2.1
 
 As with groups, you can specify one or more platforms:
 

data/spec/bundler/retry_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe "bundle retry" do
+  it "return successful result if no errors" do
+    attempts = 0
+    result = Bundler::Retry.new(nil, 3).attempt do
+      attempts += 1
+      :success
+    end
+    expect(result).to eq(:success)
+    expect(attempts).to eq(1)
+  end
+
+  it "returns the first valid result" do
+    jobs = [Proc.new{ raise "foo" }, Proc.new{ :bar }, Proc.new{ raise "foo" }]
+    attempts = 0
+    result = Bundler::Retry.new(nil, 3).attempt do
+      attempts += 1
+      job = jobs.shift
+      job.call
+    end
+    expect(result).to eq(:bar)
+    expect(attempts).to eq(2)
+  end
+
+  it "raises the last error" do
+    error    = Bundler::GemfileNotFound
+    attempts = 0
+    expect {
+      Bundler::Retry.new(nil, 3).attempt do
+        attempts += 1
+        raise error
+      end
+    }.to raise_error(error)
+    expect(attempts).to eq(4)
+  end
+end

data/spec/cache/platform_spec.rb

@@ -5,7 +5,7 @@ describe "bundle cache with multiple platforms" do
     gemfile <<-G
       source "file://#{gem_repo1}"
 
-      platforms :ruby, :ruby_18, :ruby_19, :ruby_20 do
+      platforms :ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21 do
         gem "rack", "1.0.0"
       end
 
@@ -13,7 +13,7 @@ describe "bundle cache with multiple platforms" do
         gem "activesupport", "2.3.5"
       end
 
-      platforms :mri, :mri_18, :mri_19, :mri_20 do
+      platforms :mri, :mri_18, :mri_19, :mri_20, :mri_21 do
         gem "activerecord", "2.3.2"
       end
     G

data/spec/commands/exec_spec.rb

@@ -57,6 +57,44 @@ describe "bundle exec" do
     expect(out).to eq("--verbose")
   end
 
+  it "handles --keep-file-descriptors" do
+    require 'tempfile'
+
+    bundle_bin = File.expand_path('../../../bin/bundle', __FILE__)
+
+    command = Tempfile.new("io-test")
+    command.sync = true
+    command.write <<-G
+      if ARGV[0]
+        IO.for_fd(ARGV[0].to_i)
+      else
+        require 'tempfile'
+        io = Tempfile.new("io-test-fd")
+        args = %W[#{Gem.ruby} -I#{lib} #{bundle_bin} exec --keep-file-descriptors #{Gem.ruby} #{command.path} \#{io.to_i}]
+        args << { io.to_i => io } if RUBY_VERSION >= "2.0"
+        exec(*args)
+      end
+    G
+
+    install_gemfile ''
+    sys_exec("#{Gem.ruby} #{command.path}")
+
+    if RUBY_VERSION >= "2.0"
+      expect(out).to eq("")
+    else
+      expect(out).to eq("Ruby version #{RUBY_VERSION} defaults to keeping non-standard file descriptors on Kernel#exec.")
+    end
+
+    expect(err).to eq("")
+  end
+
+  it "accepts --keep-file-descriptors" do
+    install_gemfile ''
+    bundle "exec --keep-file-descriptors echo foobar"
+
+    expect(err).to eq("")
+  end
+
   it "can run a command named --verbose" do
     install_gemfile 'gem "rack"'
     File.open("--verbose", 'w') do |f|

data/spec/commands/outdated_spec.rb

@@ -113,4 +113,16 @@ describe "bundle outdated" do
       end
     end
   end
+
+  describe "with invalid gem name" do
+    it "returns could not find gem name" do
+      bundle "outdated invalid_gem_name"
+      expect(out).to include("Could not find gem 'invalid_gem_name'.")
+    end
+
+    it "returns non-zero exit code" do
+      bundle "outdated invalid_gem_name", :exitstatus => true
+      expect(exitstatus).to_not be_zero
+    end
+  end
 end

data/spec/install/gems/flex_spec.rb

@@ -207,7 +207,7 @@ describe "bundle flex_install" do
         the gems in your Gemfile, which may resolve the conflict.
       E
 
-      bundle :install
+      bundle :install, :retry => 0
       expect(out).to eq(nice_error)
     end
   end

data/spec/install/git_spec.rb

@@ -897,4 +897,18 @@ describe "bundle install with git sources" do
     end
   end
 
-end
+  describe "without git installed" do
+    it "prints a better error message" do
+      build_git "foo"
+
+      install_gemfile <<-G
+        git "#{lib_path('foo-1.0')}" do
+          gem 'foo'
+        end
+      G
+
+      bundle "update", :env => {"PATH" => ""}
+      expect(out).to include("You need to install git to be able to use gems from git repositories. For help installing git, please refer to GitHub's tutorial at https://help.github.com/articles/set-up-git")
+    end
+  end
+end

data/spec/install/invalid_spec.rb

@@ -33,3 +33,18 @@ describe "bundle install to a dead symlink" do
     expect(out).to match(/invalid symlink/)
   end
 end
+
+describe "invalid or inaccessible gem source" do
+  it "can be retried" do
+    gemfile <<-G
+      source "file://#{gem_repo_missing}"
+      gem "rack"
+      gem "signed_gem"
+    G
+    bundle "install", :retry => 2
+    exp = Regexp.escape("Retrying source fetch due to error (2/3)")
+    expect(out).to match(exp)
+    exp = Regexp.escape("Retrying source fetch due to error (3/3)")
+    expect(out).to match(exp)
+  end
+end

data/spec/realworld/parallel_install_spec.rb

@@ -4,16 +4,19 @@ describe "installing dependencies parallely", :realworld => true do
   it "installs gems parallely" do
     gemfile <<-G
       source "https://rubygems.org"
-
       gem 'activesupport', '~> 3.2.13'
       gem 'faker', '~> 1.1.2'
     G
 
     bundle :install, :jobs => 4
+
     bundle "show activesupport"
     expect(out).to match(/activesupport/)
 
     bundle "show faker"
     expect(out).to match(/faker/)
+
+    bundle "config jobs"
+    expect(out).to match(/: "4"/)
   end
 end

data/spec/runtime/load_spec.rb

@@ -32,7 +32,7 @@ describe "Bundler.load" do
       expect {
         ENV['BUNDLE_GEMFILE'] = ""
         Bundler.load
-      }.not_to raise_error(Bundler::GemfileNotFound)
+      }.not_to raise_error()
     end
 
   end

data/spec/support/helpers.rb

@@ -56,7 +56,7 @@ module Spec
     end
 
     def bundle(cmd, options = {})
-      expect_err  = options.delete(:expect_err)
+      expect_err = options.delete(:expect_err)
       exitstatus = options.delete(:exitstatus)
       options["no-color"] = true unless options.key?("no-color") || %w(exec conf).include?(cmd.to_s[0..3])
 
@@ -190,6 +190,7 @@ module Spec
     def install_gemfile(*args)
       gemfile(*args)
       opts = args.last.is_a?(Hash) ? args.last : {}
+      opts[:retry] ||= 0
       bundle :install, opts
     end
 

data/spec/support/path.rb

@@ -48,6 +48,10 @@ module Spec
       tmp("gems/remote1", *args)
     end
 
+    def gem_repo_missing(*args)
+      tmp("gems/missing", *args)
+    end
+
     def gem_repo2(*args)
       tmp("gems/remote2", *args)
     end

metadata

@@ -1,69 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bundler
-version: !ruby/object:Gem::Version 
-  hash: 4156093791
-  prerelease: 6
-  segments: 
-  - 1
-  - 4
-  - 0
-  - pre
-  - 2
-  version: 1.4.0.pre.2
+version: !ruby/object:Gem::Version
+  version: 1.4.0.rc.1
 platform: ruby
-authors: 
-- "Andr\xC3\xA9 Arko"
+authors:
+- André Arko
 - Terence Lee
 - Carl Lerche
 - Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ronn
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.7.3
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 11
-        version: "2.11"
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
   type: :development
-  version_requirements: *id002
-description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+description: Bundler manages an application's dependencies through its entire life,
+  across many machines, systematically and repeatably
+email:
 - andre@arko.net
-executables: 
+executables:
 - bundle
 - bundler
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -114,6 +101,7 @@ files:
 - lib/bundler/psyched_yaml.rb
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
+- lib/bundler/retry.rb
 - lib/bundler/ruby_dsl.rb
 - lib/bundler/ruby_version.rb
 - lib/bundler/rubygems_ext.rb
@@ -208,6 +196,7 @@ files:
 - spec/bundler/friendly_errors_spec.rb
 - spec/bundler/gem_helper_spec.rb
 - spec/bundler/psyched_yaml_spec.rb
+- spec/bundler/retry_spec.rb
 - spec/bundler/safe_catch_spec.rb
 - spec/bundler/source_spec.rb
 - spec/cache/gems_spec.rb
@@ -296,60 +285,47 @@ files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
-- lib/bundler/man/bundle-exec
 - lib/bundler/man/bundle
+- lib/bundler/man/bundle-config
+- lib/bundler/man/bundle-config.txt
+- lib/bundler/man/bundle-exec
+- lib/bundler/man/bundle-exec.txt
 - lib/bundler/man/bundle-install
-- lib/bundler/man/gemfile.5
-- lib/bundler/man/bundle-platform
+- lib/bundler/man/bundle-install.txt
 - lib/bundler/man/bundle-package
+- lib/bundler/man/bundle-package.txt
+- lib/bundler/man/bundle-platform
+- lib/bundler/man/bundle-platform.txt
 - lib/bundler/man/bundle-update
-- lib/bundler/man/bundle-exec.txt
-- lib/bundler/man/gemfile.5.txt
 - lib/bundler/man/bundle-update.txt
-- lib/bundler/man/bundle-config
-- lib/bundler/man/bundle-platform.txt
-- lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle.txt
-- lib/bundler/man/bundle-package.txt
-- lib/bundler/man/bundle-install.txt
+- lib/bundler/man/gemfile.5
+- lib/bundler/man/gemfile.5.txt
 homepage: http://bundler.io
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The best way to manage your application's dependencies
-test_files: 
+test_files:
 - spec/bundler/bundler_spec.rb
 - spec/bundler/cli_rspec.rb
 - spec/bundler/definition_spec.rb
@@ -357,6 +333,7 @@ test_files:
 - spec/bundler/friendly_errors_spec.rb
 - spec/bundler/gem_helper_spec.rb
 - spec/bundler/psyched_yaml_spec.rb
+- spec/bundler/retry_spec.rb
 - spec/bundler/safe_catch_spec.rb
 - spec/bundler/source_spec.rb
 - spec/cache/gems_spec.rb