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

data/lib/bundler/parallel_workers/unix_worker.rb

@@ -14,6 +14,12 @@ module Bundler
         end
       end
 
+      def initialize(size, job)
+        # Close the persistent connections for the main thread before forking
+        Net::HTTP::Persistent.new('bundler', :ENV).shutdown
+        super
+      end
+
       private
 
       # Start forked workers for downloading gems. This version of worker

data/lib/bundler/remote_specification.rb

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

data/lib/bundler/retry.rb

@@ -8,9 +8,10 @@ module Bundler
       attr_accessor :attempts
     end
 
-    def initialize(name, attempts = nil)
+    def initialize(name, exceptions = nil, attempts = nil)
       @name        = name
       attempts    ||= default_attempts
+      @exceptions = Array(exceptions) || []
       @total_runs =  attempts.next # will run once, then upto attempts.times
     end
 
@@ -41,9 +42,9 @@ module Bundler
 
     def fail(e)
       @failed = true
-      raise e if last_attempt?
+      raise e if last_attempt? || @exceptions.any?{|k| k === e }
       return true unless name
-      Bundler.ui.warn "Retrying #{name} due to error (#{current_run.next}/#{total_runs}): #{e.message}"
+      Bundler.ui.warn "Retrying#{" #{name}" if name} due to error (#{current_run.next}/#{total_runs}): #{e.class} #{e.message}"
     end
 
     def keep_trying?

data/lib/bundler/ruby_version.rb

@@ -111,7 +111,7 @@ module Bundler
     end
 
     def patchlevel
-      RUBY_PATCHLEVEL
+      RUBY_PATCHLEVEL.to_s
     end
   end
 end

data/lib/bundler/rubygems_ext.rb

@@ -13,7 +13,10 @@ module Gem
   @loaded_stacks = Hash.new { |h,k| h[k] = [] }
 
   class Specification
-    attr_accessor :source, :location, :relative_loaded_from
+    attr_accessor :source_uri, :location, :relative_loaded_from
+
+    remove_method :source if instance_methods(false).include?(:source)
+    attr_accessor :source
 
     alias_method :rg_full_gem_path, :full_gem_path
     alias_method :rg_loaded_from,   :loaded_from
@@ -31,6 +34,8 @@ module Gem
     end
 
     def load_paths
+      return full_require_paths if respond_to?(:full_require_paths)
+
       require_paths.map do |require_path|
         if require_path.include?(full_gem_path)
           require_path
@@ -41,7 +46,7 @@ module Gem
     end
 
     # RubyGems 1.8+ used only.
-    remove_method :gem_dir if method_defined? :gem_dir
+    remove_method :gem_dir if instance_methods(false).include?(:gem_dir)
     def gem_dir
       full_gem_path
     end

data/lib/bundler/rubygems_integration.rb

@@ -187,6 +187,7 @@ module Bundler
     end
 
     def download_gem(spec, uri, path)
+      uri = Bundler::Source.mirror_for(uri)
       Gem::RemoteFetcher.fetcher.download(spec, uri, path)
     end
 
@@ -212,6 +213,8 @@ module Bundler
     end
 
     def replace_gem(specs)
+      reverse_rubygems_kernel_mixin
+
       executables = specs.map { |s| s.executables }.flatten
 
       ::Kernel.send(:define_method, :gem) do |dep, *reqs|
@@ -252,21 +255,9 @@ module Bundler
       end
     end
 
-    def stub_source_index137(specs)
-      # Rubygems versions lower than 1.7 use SourceIndex#from_gems_in
-      source_index_class = (class << Gem::SourceIndex ; self ; end)
-      source_index_class.send(:remove_method, :from_gems_in)
-      source_index_class.send(:define_method, :from_gems_in) do |*args|
-        source_index = Gem::SourceIndex.new
-        source_index.spec_dirs = *args
-        source_index.add_specs(*specs)
-        source_index
-      end
-    end
-
-    def stub_source_index170(specs)
+    def stub_source_index(specs)
       Gem::SourceIndex.send(:alias_method, :old_initialize, :initialize)
-      Gem::SourceIndex.send(:define_method, :initialize) do |*args|
+      redefine_method(Gem::SourceIndex, :initialize) do |*args|
         @gems = {}
         # You're looking at this thinking: Oh! This is how I make those
         # rubygems deprecations go away!
@@ -289,8 +280,7 @@ module Bundler
     # +specs+
     def replace_bin_path(specs)
       gem_class = (class << Gem ; self ; end)
-      gem_class.send(:remove_method, :bin_path)
-      gem_class.send(:define_method, :bin_path) do |name, *args|
+      redefine_method(gem_class, :bin_path) do |name, *args|
         exec_name = args.first
 
         if exec_name == 'bundle'
@@ -317,15 +307,12 @@ module Bundler
     # we don't #refresh, so stub it out.
     def replace_refresh
       gem_class = (class << Gem ; self ; end)
-      gem_class.send(:remove_method, :refresh)
-      gem_class.send(:define_method, :refresh) { }
+      redefine_method(gem_class, :refresh) { }
     end
 
     # Replace or hook into Rubygems to provide a bundlerized view
     # of the world.
     def replace_entrypoints(specs)
-      reverse_rubygems_kernel_mixin
-
       replace_gem(specs)
 
       stub_rubygems(specs)
@@ -339,7 +326,7 @@ module Bundler
     # This backports the correct segment generation code from Rubygems 1.4+
     # by monkeypatching it into the method in Rubygems 1.3.6 and 1.3.7.
     def backport_segment_generation
-      Gem::Version.send(:define_method, :segments) do
+      redefine_method(Gem::Version, :segments) do
         @segments ||= @version.scan(/[0-9]+|[a-z]+/i).map do |s|
           /^\d+$/ =~ s ? s.to_i : s
         end
@@ -348,7 +335,7 @@ module Bundler
 
     # This backport fixes the marshaling of @segments.
     def backport_yaml_initialize
-      Gem::Version.send(:define_method, :yaml_initialize) do |tag, map|
+      redefine_method(Gem::Version, :yaml_initialize) do |tag, map|
         @version = map['version']
         @segments = nil
         @hash = nil
@@ -358,32 +345,39 @@ module Bundler
     # This backports base_dir which replaces installation path
     # Rubygems 1.8+
     def backport_base_dir
-      Gem::Specification.send(:define_method, :base_dir) do
+      redefine_method(Gem::Specification, :base_dir) do
         return Gem.dir unless loaded_from
         File.dirname File.dirname loaded_from
       end
     end
 
     def backport_cache_file
-      Gem::Specification.send(:define_method, :cache_dir) do
+      redefine_method(Gem::Specification, :cache_dir) do
         @cache_dir ||= File.join base_dir, "cache"
       end
 
-      Gem::Specification.send(:define_method, :cache_file) do
+      redefine_method(Gem::Specification, :cache_file) do
         @cache_file ||= File.join cache_dir, "#{full_name}.gem"
       end
     end
 
     def backport_spec_file
-      Gem::Specification.send(:define_method, :spec_dir) do
+      redefine_method(Gem::Specification, :spec_dir) do
         @spec_dir ||= File.join base_dir, "specifications"
       end
 
-      Gem::Specification.send(:define_method, :spec_file) do
+      redefine_method(Gem::Specification, :spec_file) do
         @spec_file ||= File.join spec_dir, "#{full_name}.gemspec"
       end
     end
 
+    def redefine_method(klass, method, &block)
+      if klass.instance_methods(false).include?(method)
+        klass.send(:remove_method, method)
+      end
+      klass.send(:define_method, method, &block)
+    end
+
     # Rubygems 1.4 through 1.6
     class Legacy < RubygemsIntegration
       def initialize
@@ -395,7 +389,14 @@ module Bundler
       end
 
       def stub_rubygems(specs)
-        stub_source_index137(specs)
+        # Rubygems versions lower than 1.7 use SourceIndex#from_gems_in
+        source_index_class = (class << Gem::SourceIndex ; self ; end)
+        source_index_class.send(:define_method, :from_gems_in) do |*args|
+          source_index = Gem::SourceIndex.new
+          source_index.spec_dirs = *args
+          source_index.add_specs(*specs)
+          source_index
+        end
       end
 
       def all_specs
@@ -418,7 +419,7 @@ module Bundler
     # Rubygems 1.7
     class Transitional < Legacy
       def stub_rubygems(specs)
-        stub_source_index170(specs)
+        stub_source_index(specs)
       end
     end
 
@@ -431,7 +432,7 @@ module Bundler
           Gem::Specification.all = specs
         }
 
-        stub_source_index170(specs)
+        stub_source_index(specs)
       end
 
       def all_specs

data/lib/bundler/settings.rb

@@ -29,6 +29,7 @@ module Bundler
 
     def all
       env_keys = ENV.keys.select { |k| k =~ /BUNDLE_.*/ }
+
       keys = @global_config.keys | @local_config.keys | env_keys
 
       keys.map do |key|
@@ -46,6 +47,16 @@ module Bundler
       repos
     end
 
+    def gem_mirrors
+      all.inject({}) do |h, k|
+        if k =~ /^mirror\./
+          uri = normalize_uri($')
+          h[uri] = normalize_uri(self[k])
+        end
+        h
+      end
+    end
+
     def locations(key)
       key = key_for(key)
       locations = {}
@@ -149,5 +160,15 @@ module Bundler
       end
     end
 
+    # TODO: duplicates Rubygems#normalize_uri
+    # TODO: is this the correct place to validate mirror URIs?
+    def normalize_uri(uri)
+      uri = uri.to_s
+      uri = "#{uri}/" unless uri =~ %r[/\Z]
+      uri = URI(uri)
+      raise ArgumentError, "Gem mirror sources must be absolute URIs (configured: #{mirror_source})" unless uri.absolute?
+      uri
+    end
+
   end
 end

data/lib/bundler/source.rb

@@ -1,7 +1,18 @@
 module Bundler
   module Source
     autoload :Rubygems, 'bundler/source/rubygems'
-    autoload :Path, 'bundler/source/path'
-    autoload :Git, 'bundler/source/git'
+    autoload :Path,     'bundler/source/path'
+    autoload :Git,      'bundler/source/git'
+
+    def self.mirror_for(uri)
+      uri = URI(uri.to_s) unless uri.is_a?(URI)
+
+      # Settings keys are all downcased
+      mirrors = Bundler.settings.gem_mirrors
+      normalized_key = URI(uri.to_s.downcase)
+
+      mirrors[normalized_key] || uri
+    end
+
   end
 end

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

@@ -13,7 +13,7 @@ module Bundler
         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")}"
+          msg << "with steps to reproduce as well as the following\n\nCALLER: #{caller.join("\n")}"
           super msg
         end
       end

data/lib/bundler/source/rubygems.rb

@@ -72,6 +72,14 @@ module Bundler
           return ["Using #{spec.name} (#{spec.version})", nil]
         end
 
+        # Download the gem to get the spec, because some specs that are returned
+        # by rubygems.org are broken and wrong.
+        if spec.source_uri
+          path = Fetcher.download_gem_from_uri(spec, spec.source_uri)
+          s = Bundler.rubygems.spec_from_gem(path, Bundler.settings["trust-policy"])
+          spec.__swap__(s)
+        end
+
         install_message = "Installing #{spec.name} (#{spec.version})"
         path = cached_gem(spec)
         if Bundler.requires_sudo?
@@ -221,24 +229,46 @@ module Bundler
           index_fetchers = fetchers - api_fetchers
 
           # gather lists from non-api sites
-          index_fetchers.each { |f| idx.use f.specs(nil, self) }
+          index_fetchers.each do |f|
+            Bundler.ui.info "Fetching source index from #{f.uri}"
+            idx.use f.specs(nil, self)
+          end
           return idx if api_fetchers.empty?
 
           # because ensuring we have all the gems we need involves downloading
           # the gemspecs of those gems, if the non-api sites contain more than
           # about 100 gems, we just treat all sites as non-api for speed.
-          if idx.size < API_REQUEST_LIMIT && dependency_names.size < API_REQUEST_LIMIT
-            api_fetchers.each { |f| idx.use f.specs(dependency_names, self) }
-
-            # it's possible that gems from one source depend on gems from some
-            # other source, so now we download gemspecs and iterate over those
-            # dependencies, looking for gems we don't have info on yet.
-            unmet = idx.unmet_dependency_names
-
-            # if there are any cross-site gems we missed, get them now
-            api_fetchers.each { |f| idx.use f.specs(unmet, self) } if unmet.any?
-          else
-            api_fetchers.each { |f| idx.use f.specs(nil, self) }
+          allow_api = idx.size < API_REQUEST_LIMIT && dependency_names.size < API_REQUEST_LIMIT
+
+          if allow_api
+            api_fetchers.each do |f|
+              Bundler.ui.info "Fetching gem metadata from #{f.uri}", Bundler.ui.debug?
+              idx.use f.specs(dependency_names, self)
+              Bundler.ui.info "" if !Bundler.ui.debug? # new line now that the dots are over
+            end
+
+            if api_fetchers.all?{|f| f.use_api }
+              # it's possible that gems from one source depend on gems from some
+              # other source, so now we download gemspecs and iterate over those
+              # dependencies, looking for gems we don't have info on yet.
+              unmet = idx.unmet_dependency_names
+
+              # if there are any cross-site gems we missed, get them now
+              api_fetchers.each do |f|
+                Bundler.ui.info "Fetching additional metadata from #{f.uri}", Bundler.ui.debug?
+                idx.use f.specs(unmet, self)
+                Bundler.ui.info "" if !Bundler.ui.debug? # new line now that the dots are over
+              end if unmet.any?
+            else
+              allow_api = false
+            end
+          end
+
+          if !allow_api
+            api_fetchers.each do |f|
+              Bundler.ui.info "Fetching source index from #{f.uri}"
+              idx.use f.specs(nil, self)
+            end
           end
 
           return idx

data/lib/bundler/templates/newgem/README.md.tt

@@ -22,7 +22,7 @@ TODO: Write usage instructions here
 
 ## Contributing
 
-1. Fork it
+1. Fork it ( http://github.com/<my-github-username>/<%=config[:name]%>/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe <%= config[:constant_name] %> do
   it 'should have a version number' do
-    <%= config[:constant_name] %>::VERSION.should_not be_nil
+    expect(<%= config[:constant_name] %>::VERSION).not_to be nil
   end
 
   it 'should do something useful' do
-    false.should be_true
+    expect(false).to be true
   end
 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.4.0.rc.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.5.0.rc.1" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-config.ronn

@@ -138,3 +138,12 @@ accidental locking to a different branch.
 Finally, Bundler also ensures that the current revision in the
 `Gemfile.lock` exists in the local git repository. By doing this, Bundler
 forces you to fetch the latest changes in the remotes.
+
+## MIRRORS OF GEM REPOSITORIES
+
+Bundler supports overriding gem sources with mirrors. This allows you to
+configure rubygems.org as the gem source in your Gemfile while still using your
+mirror to fetch gems.
+
+    bundle config mirror.http://rubygems.org http://rubygems-mirror.org
+

data/man/bundle-install.ronn

@@ -11,6 +11,7 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile
                  [--standalone[=GROUP1[ GROUP2...]]]
                  [--trust-policy=POLICY]
                  [--jobs=SIZE]
+                 [--retry=TRIES]
                  [--no-cache]
                  [--quiet]
 
@@ -41,11 +42,11 @@ update process below under [CONSERVATIVE UPDATING][].
   to it.
 
 * `--path=<path>`:
-  The location to install the gems in the bundle to. This defaults
-  to the gem home, which is the location that `gem install` installs
-  gems to. This means that, by default, gems installed without a
-  `--path` setting will show up in `gem list`. This setting is a
-  [remembered option][REMEMBERED OPTIONS].
+  The location to install the gems in the bundle to. This defaults to
+  Rubygems' gem home, which is also the default location where `gem
+  install` installs gems. This means that, by default, gems installed
+  without a `--path` setting will show up in `gem list`. This setting is
+  a [remembered option][REMEMBERED OPTIONS].
 
 * `--system`:
   Installs the gems in the bundle to the system location. This
@@ -92,6 +93,9 @@ update process below under [CONSERVATIVE UPDATING][].
 * `--jobs=[<size>]`:
   Install gems parallely by starting <size> number of parallel workers.
 
+* `--retry[<tries]`:
+  Retries failed network or git requests <tries> times.
+
 * `--no-cache`:
   Do not update the cache in `vendor/cache` with the newly bundled gems. This
   does not remove any existing cached gems, only stops the newly bundled gems