bundler 1.4.0.rc.1 → 1.5.0.rc.1

data/.travis.yml

@@ -14,16 +14,11 @@ notifications:
     - secure: "bCcvqJT7YrBawtkXXwHhT+jOFth7r2Qv/30PkkbhQxk6Jb3xambjCOJ3U6vJ\ngYmiL50exi5lUp3oc3SEbHN5t2CrZqOZDQ6o7P8EAmB5c0oH2RrYaFOkI5Gt\nul/jGH/96A9sj0aMwG7JfdMSfhqj1DUKAm2PnnbXPL853VfmT24="
     # terence
     - secure: "MQ8eA5Jb8YzEpAo58DRGfVJklAPcEbAulpBZnTxp0am6ldneDtJHbQk21w6R\nj5GsDHlzr/lMp/GHIimtUZ7rLohfND8fj/W7fs1Dkd4eN02/ERt98x3pHlqv\nvZgSnZ39uVYv+OcphraE24QaRaGWLhWZAMYQTVe/Yz50NyG8g1U="
-  irc:
-    on_success: change
-    on_failure: always
-    channels:
-      - "irc.freenode.org#bundler"
   campfire:
     on_success: change
     on_failure: always
     rooms:
-      - secure: "geau3P+A9ZJHkA/OHN5v9Mcb8hAti1PllXw5DsHNJfLAWBAw5ReGGMA8Xfpf\nLdT7ktIUlQwzw94cKQ6sRZk8szXTiHncf3bxXTACJf2RpiKmbkoQU51TmCDq\nYSMuY1FIryk/3t9aZCrarufbIDI3DBscDEe4Bj9bERl+TJ8ArBY="
+      secure: MNTSGIySYwHia5gIgRiZxXtPMPDIP9KmzQk7Kq2ZoVvP3mIk8W1TMkvcyFkEf6uCasyVZZixzUBfY+E0BlHAz1ycQpTh1jvSpuIpEVYW48ShJldJ+8W8xfzafyOHii3z7VrDaomEffmMDdmHRsbQAfekMjdR4bTpXtT9V+wOXlg=
 rvm:
   - 2.0.0
   - 1.9.3
@@ -33,16 +28,15 @@ env:
   # We need to know if changes to rubygems will break bundler on release
   - RGV=master
   # Test the latest rubygems release with all of our supported rubies
-  - RGV=v2.0.6
+  - RGV=v2.1.9
   # Test the latest stable branch so we know the next minor will work
-  - RGV=2.0
+  - RGV=2.1
 matrix:
   allow_failures:
     # We want to know how we're doing with head, but not fail the build
     - rvm: ruby-head
     - env: RGV=master
-    - env: RGV=2.0
-    # 1.9.2 is simply too slow. it sometimes exceeds the 25m hard limit.
+    # 1.9.2 is simply too slow. it sometimes exceeds the Travis hard limit.
     - rvm: 1.9.2
     # Alternate implementations are good data points but not maintained
     - rvm: jruby
@@ -53,12 +47,21 @@ matrix:
       env: RGV=master
     # Alternate implementations
     - rvm: jruby
-      env: RGV=v2.0.6
+      env: RGV=v2.1.9
     - rvm: rbx
-      env: RGV=v2.0.6
+      env: RGV=v2.1.9
+    # Rubygems goes down to 2.0 on Ruby 2.0.0
+    - rvm: 2.0.0
+      env: RGV=v2.1.9
+    - rvm: 2.0.0
+      env: RGV=v2.0.12
     # Rubygems goes down to 1.5.3 on Ruby 1.9.3
     - rvm: 1.9.3
-      env: RGV=v1.8.25
+      env: RGV=v2.1.9
+    - rvm: 1.9.3
+      env: RGV=v2.0.12
+    - rvm: 1.9.3
+      env: RGV=v1.8.28
     - rvm: 1.9.3
       env: RGV=v1.7.2
     - rvm: 1.9.3
@@ -67,10 +70,10 @@ matrix:
       env: RGV=v1.5.3
     # We only want an overview of how 1.9.2 is doing
     - rvm: 1.9.2
-      env: RGV=v2.0.6
+      env: RGV=v2.1.9
     # Rubygems goes down to 1.3.6 on Ruby 1.8.7
     - rvm: 1.8.7
-      env: RGV=v1.8.25
+      env: RGV=v1.8.28
     - rvm: 1.8.7
       env: RGV=v1.7.2
     - rvm: 1.8.7

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 1.5.0.rc.1 (2013-11-09)
+
+Features:
+
+  - bundle update also accepts --jobs (#2692, @mrkn)
+  - add fork URL to README for new `bundle gem` (#2665, @zzak)
+  - add `bundle outdated --strict` (#2685, @rhysd)
+  - warn if same gem/version is added twice (#2679, @jendiamond)
+  - don't redownload installed specs for `bundle install` (#2680, @cainlevy)
+  - override gem sources with mirrors (#2650, @danielsdeleo, @mkristian)
+
+Bugfixes:
+
+  - fix sharing same SSL socket when forking workers for parallel install (#2632)
+  - fix msg typo in GitNotAllowedError (#2654, @joyicecloud)
+  - fix Bundler.which for directories (#2697, @rhysd)
+  - properly require `Capistrano::Version` (#2690, @steveklabnik)
+  - search for git.exe and git
+  - fix the bug that downloads every spec when API fetcher encouters an error
+  - only retry network requests
+
 ## 1.4.0.rc.1 (2013-09-29)
 
 Features:
@@ -6,7 +27,7 @@ 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 `:jruby_18` and `:jruby_19` platform 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)
@@ -68,7 +89,7 @@ Bugfixes:
   - use basic auth even when SSL is not available (@jayniz)
   - installing git gems without dependencies in deployment now works
 
-## 1.3.4 (15 March 2103)
+## 1.3.4 (15 March 2013)
 
 Bugfixes:
 

data/Rakefile

@@ -91,7 +91,9 @@ begin
     namespace :rubygems do
       rubyopt = ENV["RUBYOPT"]
       # When editing this list, also edit .travis.yml!
-      %w(master 2.0 v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.25 v2.0.6).each do |rg|
+      branches = %w(master 2.1)
+      releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.28 v2.0.12 v2.1.9)
+      (branches + releases).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)

data/bundler.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = '>= 1.3.6'
 
   spec.add_development_dependency 'ronn', '~> 0.7.3'
-  spec.add_development_dependency 'rspec', '~> 2.11'
+  spec.add_development_dependency 'rspec', '~> 2.99.0.beta1'
 
   spec.files       = `git ls-files`.split($/)
   spec.files      += Dir.glob('lib/bundler/man/**/*') # man/ is ignored by git

data/lib/bundler.rb

@@ -290,7 +290,7 @@ module Bundler
     end
 
     def which(executable)
-      if File.executable?(executable)
+      if File.file?(executable) && File.executable?(executable)
         executable
       elsif ENV['PATH']
         path = ENV['PATH'].split(File::PATH_SEPARATOR).find do |p|
@@ -354,7 +354,8 @@ module Bundler
     end
 
     def git_present?
-      @git_present ||= Bundler.which("git")
+      return @git_present if defined?(@git_present)
+      @git_present = Bundler.which("git") || Bundler.which("git.exe")
     end
 
     def ruby_version

data/lib/bundler/capistrano.rb

@@ -3,6 +3,7 @@
 # Just add "require 'bundler/capistrano'" in your Capistrano deploy.rb, and
 # Bundler will be activated after each new deployment.
 require 'bundler/deployment'
+require 'capistrano/version'
 
 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"

data/lib/bundler/cli.rb

@@ -302,6 +302,8 @@ module Bundler
       "Only output warnings and errors."
     method_option "full-index", :type => :boolean, :banner =>
         "Use the rubygems modern index instead of the API endpoint"
+    method_option "jobs", :aliases => "-j", :type => :numeric, :banner =>
+      "Specify the number of jobs to run in parallel"
     def update(*gems)
       sources = Array(options[:source])
       Bundler.ui.level = "warn" if options[:quiet]
@@ -321,7 +323,12 @@ module Bundler
 
       Bundler::Fetcher.disable_endpoint = options["full-index"]
 
-      opts = {"update" => true, "local" => options[:local]}
+      opts = options.dup
+      opts["update"] = true
+      opts["local"] = options[:local]
+
+      Bundler.settings[:jobs]     = opts["jobs"] if opts["jobs"]
+
       # rubygems plugins sometimes hook into the gem install process
       Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
 
@@ -416,6 +423,8 @@ module Bundler
     method_option "source", :type => :array, :banner => "Check against a specific source"
     method_option "local", :type => :boolean, :banner =>
       "Do not attempt to fetch gems remotely and use the gem cache instead"
+    method_option "strict", :type => :boolean, :banner =>
+      "Only list newer versions allowed by your Gemfile requirements"
     def outdated(*gems)
       sources = Array(options[:source])
 
@@ -444,13 +453,19 @@ module Bundler
       [gemfile_specs.sort_by(&:name), dependency_specs.sort_by(&:name)].flatten.each do |current_spec|
         next if !gems.empty? && !gems.include?(current_spec.name)
 
-        active_spec = definition.index[current_spec.name].sort_by { |b| b.version }
+        dependency = current_dependencies[current_spec.name]
 
+        active_spec = definition.index[current_spec.name].sort_by { |b| b.version }
         if !current_spec.version.prerelease? && !options[:pre] && active_spec.size > 1
           active_spec = active_spec.delete_if { |b| b.respond_to?(:version) && b.version.prerelease? }
         end
-
-        active_spec = active_spec.last
+        if options["strict"]
+          active_spec =  active_spec.reverse.detect do |b|
+            dependency && b.respond_to?(:version) && dependency.requirement.satisfied_by?(b.version)
+          end || active_spec.last
+        else
+          active_spec = active_spec.last
+        end
         next if active_spec.nil?
 
         gem_outdated = Gem::Version.new(active_spec.version) > Gem::Version.new(current_spec.version)
@@ -466,7 +481,6 @@ module Bundler
 
           spec_version    = "#{active_spec.version}#{active_spec.git_version}"
           current_version = "#{current_spec.version}#{current_spec.git_version}"
-          dependency = current_dependencies[current_spec.name]
           dependency_version = %|Gemfile specifies "#{dependency.requirement}"| if dependency && dependency.specific?
           Bundler.ui.info "  * #{active_spec.name} (#{spec_version} > #{current_version}) #{dependency_version}".rstrip
           out_count += 1

data/lib/bundler/definition.rb

@@ -53,7 +53,7 @@ module Bundler
       @lockfile_contents = ""
       @ruby_version      = ruby_version
 
-      if lockfile && File.exists?(lockfile)
+      if lockfile && File.exist?(lockfile)
         @lockfile_contents = Bundler.read_file(lockfile)
         locked = LockfileParser.new(@lockfile_contents)
         @platforms      = locked.platforms
@@ -380,7 +380,11 @@ module Bundler
         when :engine_version
           "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}"
+          if !expected.is_a?(String)
+            "The Ruby patchlevel in your Gemfile must be a string"
+          else
+            "Your Ruby patchlevel is #{actual}, but your Gemfile specified #{expected}"
+          end
         end
 
         raise RubyVersionMismatch, msg

data/lib/bundler/dsl.rb

@@ -83,10 +83,14 @@ module Bundler
           elsif dep.type == :development
             return
           else
-            raise GemfileError, "You cannot specify the same gem twice with different version requirements. \n" \
-                            "You specified: #{current.name} (#{current.requirement}) and " \
-                            "#{dep.name} (#{dep.requirement})\n"
+            raise GemfileError, "You cannot specify the same gem twice with different version requirements.\n" \
+                            "You specified: #{current.name} (#{current.requirement}) and #{dep.name} (#{dep.requirement})"
           end
+
+        else
+          Bundler.ui.warn "Your Gemfile lists the gem #{current.name} (#{current.requirement}) more than once.\n" \
+                          "You should probably keep only one of them.\n" \
+                          "While it's not a problem now, it could cause errors if you change the version of just one of them later."
         end
 
         if current.source != dep.source

data/lib/bundler/endpoint_specification.rb

@@ -4,7 +4,7 @@ module Bundler
     include MatchPlatform
 
     attr_reader :name, :version, :platform, :dependencies
-    attr_accessor :source
+    attr_accessor :source, :source_uri
 
     def initialize(name, version, platform, dependencies)
       @name         = name

data/lib/bundler/fetcher.rb

@@ -31,17 +31,6 @@ module Bundler
     class << self
       attr_accessor :disable_endpoint, :api_timeout, :redirect_limit, :max_retries
 
-      @@spec_fetch_map ||= {}
-
-      def fetch(spec)
-        spec, uri = @@spec_fetch_map[spec.full_name]
-        if spec
-          path = download_gem_from_uri(spec, uri)
-          s = Bundler.rubygems.spec_from_gem(path, Bundler.settings["trust-policy"])
-          spec.__swap__(s)
-        end
-      end
-
       def download_gem_from_uri(spec, uri)
         spec.fetch_platform
 
@@ -82,6 +71,7 @@ module Bundler
     end
 
     def initialize(remote_uri)
+
       # How many redirects to allew in one request
       @redirect_limit = 5
       # How long to wait for each gemcutter API call
@@ -89,8 +79,8 @@ module Bundler
       # How many retries for the gemcutter API call
       @max_retries = 3
 
-      @remote_uri = remote_uri
-      @public_uri = remote_uri.dup
+      @remote_uri = Bundler::Source.mirror_for(remote_uri)
+      @public_uri = @remote_uri.dup
       @public_uri.user, @public_uri.password = nil, nil # don't print these
 
       Socket.do_not_reverse_lookup = true
@@ -124,6 +114,10 @@ module Bundler
       @connection
     end
 
+    def uri
+      @public_uri
+    end
+
     # fetch a gem specification
     def fetch_spec(spec)
       spec = spec - [nil, 'ruby', '']
@@ -155,18 +149,16 @@ module Bundler
       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?
         specs = fetch_remote_specs(gem_names)
-        # new line now that the dots are over
-        Bundler.ui.info "" if specs && !Bundler.ui.debug?
       end
 
       if specs.nil?
         # API errors mean we should treat this as a non-API source
         @use_api = false
 
-        Bundler.ui.info "Fetching source index from #{@public_uri}"
-        specs = fetch_all_remote_specs
+        specs = Bundler::Retry.new("source fetch").attempts do
+          fetch_all_remote_specs
+        end
       end
 
       specs[@remote_uri].each do |name, version, platform, dependencies|
@@ -178,7 +170,7 @@ module Bundler
           spec = RemoteSpecification.new(name, version, platform, self)
         end
         spec.source = source
-        @@spec_fetch_map[spec.full_name] = [spec, @remote_uri]
+        spec.source_uri = @remote_uri
         index << spec
       end
 
@@ -201,27 +193,16 @@ module Bundler
 
       return {@remote_uri => last_spec_list} if query_list.empty?
 
-      spec_list, deps_list = fetch_dependency_remote_specs(query_list)
-      returned_gems = spec_list.map {|spec| spec.first }.uniq
+      remote_specs = Bundler::Retry.new("dependency api").attempts do
+        fetch_dependency_remote_specs(query_list)
+      end
 
+      spec_list, deps_list = remote_specs
+      returned_gems = spec_list.map {|spec| spec.first }.uniq
       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. Marshal blob doesn't load properly
-    # 3. One of the YAML gemspecs has the Syck::DefaultKey problem
     rescue HTTPError, MarshalError, GemspecError => e
-      # new line now that the dots are over
-      Bundler.ui.info "" unless Bundler.ui.debug?
-
-      Bundler.ui.debug "Error during API request. #{e.class}: #{e.message}"
-      Bundler.ui.debug e.backtrace.join("  ")
-
-      @current_retries ||= 0
-      if @current_retries < @max_retries
-        @current_retries += 1
-        retry
-      end
-
+      Bundler.ui.info "" unless Bundler.ui.debug? # new line now that the dots are over
+      Bundler.ui.debug "could not fetch from the dependency API, trying the full index"
       @use_api = false
       return nil
     end
@@ -239,7 +220,7 @@ module Bundler
     end
 
     def inspect
-      "#<#{self.class}:0x#{object_id} uri=#{@public_uri.to_s}>"
+      "#<#{self.class}:0x#{object_id} uri=#{uri}>"
     end
 
   private
@@ -260,7 +241,7 @@ module Bundler
         req.basic_auth(uri.user, uri.password) if uri.user
         response = connection.request(uri, req)
       rescue OpenSSL::SSL::SSLError
-        raise CertificateFailureError.new(@public_uri)
+        raise CertificateFailureError.new(uri)
       rescue *HTTP_ERRORS
         raise HTTPError, "Network error while fetching #{uri}"
       end
@@ -316,10 +297,10 @@ module Bundler
       Bundler.rubygems.fetch_all_remote_specs
     rescue Gem::RemoteFetcher::FetchError, OpenSSL::SSL::SSLError => e
       if e.message.match("certificate verify failed")
-        raise CertificateFailureError.new(@public_uri)
+        raise CertificateFailureError.new(uri)
       else
         Bundler.ui.trace e
-        raise HTTPError, "Could not fetch specs from #{@public_uri}"
+        raise HTTPError, "Could not fetch specs from #{uri}"
       end
     end
 

data/lib/bundler/installer.rb

@@ -79,13 +79,7 @@ module Bundler
       # Since we are installing, we can resolve the definition
       # using remote specs
       unless local
-        if options["local"]
-          @definition.resolve_with_cache!
-        else
-          Bundler::Retry.new("source fetch").attempts do
-            @definition.resolve_remotely!
-          end
-        end
+        options["local"] ? @definition.resolve_with_cache! : @definition.resolve_remotely!
       end
       # Must install gems in the order that the resolver provides
       # as dependencies might actually affect the installation of
@@ -108,10 +102,6 @@ module Bundler
     end
 
     def install_gem_from_spec(spec, standalone = false, worker = 0)
-      # Download the gem to get the spec, because some specs that are returned
-      # by rubygems.org are broken and wrong.
-      Bundler::Fetcher.fetch(spec) if spec.source.is_a?(Bundler::Source::Rubygems)
-
       # Fetch the build settings, if there are any
       settings             = Bundler.settings["build.#{spec.name}"]
       install_message      = nil

data/lib/bundler/lazy_specification.rb

@@ -7,7 +7,7 @@ module Bundler
     include MatchPlatform
 
     attr_reader :name, :version, :dependencies, :platform
-    attr_accessor :source
+    attr_accessor :source, :source_uri
 
     def initialize(name, version, platform, source = nil)
       @name          = name