bundler 1.10.6 → 1.11.0.pre.1

data/lib/bundler/source/path/installer.rb

@@ -1,8 +1,7 @@
 module Bundler
   class Source
     class Path
-
-      class Installer < Bundler::GemInstaller
+      class Installer < Bundler::RubyGemsGemInstaller
         attr_reader :spec
 
         def initialize(spec, options = {})
@@ -28,7 +27,9 @@ module Bundler
           super
 
           if Bundler.requires_sudo?
-            Bundler.mkdir_p @gem_bin_dir
+            SharedHelpers.filesystem_access(@gem_bin_dir) do |p|
+              Bundler.mkdir_p(p)
+            end
             spec.executables.each do |exe|
               Bundler.sudo "cp -R #{@bin_dir}/#{exe} #{@gem_bin_dir}"
             end
@@ -37,7 +38,6 @@ module Bundler
           Bundler.rm_rf(@tmp_dir) if Bundler.requires_sudo?
         end
       end
-
     end
   end
 end

data/lib/bundler/source/rubygems.rb

@@ -1,6 +1,6 @@
-require 'uri'
-require 'rubygems/user_interaction'
-require 'rubygems/spec_fetcher'
+require "uri"
+require "rubygems/user_interaction"
+require "rubygems/spec_fetcher"
 
 module Bundler
   class Source
@@ -22,7 +22,7 @@ module Bundler
         @allow_cached = false
         @caches = [Bundler.app_cache, *Bundler.rubygems.gem_cache]
 
-        Array(options["remotes"] || []).reverse_each{|r| add_remote(r) }
+        Array(options["remotes"] || []).reverse_each {|r| add_remote(r) }
       end
 
       def remote!
@@ -37,11 +37,11 @@ module Bundler
         @remotes.hash
       end
 
-      def eql?(o)
-        o.is_a?(Rubygems) && o.credless_remotes == credless_remotes
+      def eql?(other)
+        other.is_a?(Rubygems) && other.credless_remotes == credless_remotes
       end
 
-      alias == eql?
+      alias_method :==, :eql?
 
       def include?(o)
         o.is_a?(Rubygems) && (o.credless_remotes - credless_remotes).empty?
@@ -52,7 +52,7 @@ module Bundler
       end
 
       def options
-        { "remotes" => @remotes.map { |r| r.to_s } }
+        { "remotes" => @remotes.map(&:to_s) }
       end
 
       def self.from_lock(options)
@@ -68,7 +68,7 @@ module Bundler
       end
 
       def to_s
-        remote_names = self.remotes.map { |r| r.to_s }.join(', ')
+        remote_names = remotes.map(&:to_s).join(", ")
         "rubygems repository #{remote_names}"
       end
       alias_method :name, :to_s
@@ -108,7 +108,7 @@ module Bundler
         if spec.remote
           # Check for this spec from other sources
           uris = [spec.remote.anonymized_uri]
-          uris += remotes_for_spec(spec).map { |remote| remote.anonymized_uri }
+          uris += remotes_for_spec(spec).map(&:anonymized_uri)
           uris.uniq!
           Installer.ambiguous_gems << [spec.name, *uris] if uris.length > 1
 
@@ -132,7 +132,8 @@ module Bundler
 
           installed_spec = nil
           Bundler.rubygems.preserve_paths do
-            installed_spec = Bundler::GemInstaller.new(path,
+            installed_spec = Bundler::RubyGemsGemInstaller.new(
+              path,
               :install_dir         => install_path.to_s,
               :bin_dir             => bin_path.to_s,
               :ignore_dependencies => true,
@@ -149,15 +150,19 @@ module Bundler
               if name == "extensions" && Dir.glob(src).any?
                 src = File.join(src, "*/*")
                 ext_src = Dir.glob(src).first
-                ext_src.gsub!(src[0..-6], '')
+                ext_src.gsub!(src[0..-6], "")
                 dst = File.dirname(File.join(dst, ext_src))
               end
-              Bundler.mkdir_p dst
+              SharedHelpers.filesystem_access(dst) do |p|
+                Bundler.mkdir_p(p)
+              end
               Bundler.sudo "cp -R #{src} #{dst}" if Dir[src].any?
             end
 
             spec.executables.each do |exe|
-              Bundler.mkdir_p Bundler.system_bindir
+              SharedHelpers.filesystem_access(Bundler.system_bindir) do |p|
+                Bundler.mkdir_p(p)
+              end
               Bundler.sudo "cp -R #{install_path}/bin/#{exe} #{Bundler.system_bindir}/"
             end
           end
@@ -189,7 +194,11 @@ module Bundler
         cached_path = cached_path(spec)
         if cached_path.nil?
           remote_spec = remote_specs.search(spec).first
-          cached_path = fetch_gem(remote_spec)
+          if remote_spec
+            cached_path = fetch_gem(remote_spec)
+          else
+            Bundler.ui.warn "#{spec.full_name} is built in to Ruby, and can't be cached because your Gemfile doesn't have any sources that contain it."
+          end
         end
         cached_path
       end
@@ -249,20 +258,21 @@ module Bundler
       end
 
       def cached_path(spec)
-        possibilities = @caches.map { |p| "#{p}/#{spec.file_name}" }
-        possibilities.find { |p| File.exist?(p) }
+        possibilities = @caches.map {|p| "#{p}/#{spec.file_name}" }
+        possibilities.find {|p| File.exist?(p) }
       end
 
       def normalize_uri(uri)
         uri = uri.to_s
-        uri = "#{uri}/" unless uri =~ %r'/$'
+        uri = "#{uri}/" unless uri =~ %r{/$}
         uri = URI(uri)
-        raise ArgumentError, "The source must be an absolute URI" unless uri.absolute?
+        raise ArgumentError, "The source must be an absolute URI. For example:\n" \
+          "source 'https://rubygems.org'" if !uri.absolute? || (uri.is_a?(URI::HTTP) && uri.host.nil?)
         uri
       end
 
       def suppress_configured_credentials(remote)
-        remote_nouser = remote.dup.tap { |uri| uri.user = uri.password = nil }.to_s
+        remote_nouser = remote.dup.tap {|uri| uri.user = uri.password = nil }.to_s
         if remote.userinfo && remote.userinfo == Bundler.settings[remote_nouser]
           remote_nouser
         else
@@ -274,27 +284,27 @@ module Bundler
         @installed_specs ||= begin
           idx = Index.new
           have_bundler = false
-          Bundler.rubygems.all_specs.reverse.each do |spec|
-            next if spec.name == 'bundler' && spec.version.to_s != VERSION
-            have_bundler = true if spec.name == 'bundler'
+          Bundler.rubygems.all_specs.reverse_each do |spec|
+            next if spec.name == "bundler" && spec.version.to_s != VERSION
+            have_bundler = true if spec.name == "bundler"
             spec.source = self
             idx << spec
           end
 
           # Always have bundler locally
           unless have_bundler
-           # We're running bundler directly from the source
-           # so, let's create a fake gemspec for it (it's a path)
-           # gemspec
-           bundler = Gem::Specification.new do |s|
-             s.name     = 'bundler'
-             s.version  = VERSION
-             s.platform = Gem::Platform::RUBY
-             s.source   = self
-             s.authors  = ["bundler team"]
-             s.loaded_from = File.expand_path("..", __FILE__)
-           end
-           idx << bundler
+            # We're running bundler directly from the source
+            # so, let's create a fake gemspec for it (it's a path)
+            # gemspec
+            bundler = Gem::Specification.new do |s|
+              s.name     = "bundler"
+              s.version  = VERSION
+              s.platform = Gem::Platform::RUBY
+              s.source   = self
+              s.authors  = ["bundler team"]
+              s.loaded_from = File.expand_path("..", __FILE__)
+            end
+            idx << bundler
           end
           idx
         end
@@ -327,7 +337,7 @@ module Bundler
           # gather lists from non-api sites
           index_fetchers.each do |f|
             Bundler.ui.info "Fetching source index from #{f.uri}"
-            idx.use f.specs(nil, self)
+            idx.use f.specs_with_retry(nil, self)
           end
 
           # because ensuring we have all the gems we need involves downloading
@@ -340,8 +350,8 @@ module Bundler
           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
+              idx.use f.specs_with_retry(dependency_names, self)
+              Bundler.ui.info "" unless Bundler.ui.debug? # new line now that the dots are over
             end
 
             # Suppose the gem Foo depends on the gem Bar.  Foo exists in Source A.  Bar has some versions that exist in both
@@ -349,14 +359,15 @@ module Bundler
             # but will not have found any versions of Bar from source B, which is a problem if the requested version
             # of Foo specifically depends on a version of Bar that is only found in source B. This ensures that for
             # each spec we found, we add all possible versions from all sources to the index.
-            begin
+            loop do
               idxcount = idx.size
               api_fetchers.each do |f|
                 Bundler.ui.info "Fetching version metadata from #{f.uri}", Bundler.ui.debug?
-                idx.use f.specs(idx.dependency_names, self), true
-                Bundler.ui.info "" if !Bundler.ui.debug? # new line now that the dots are over
+                idx.use f.specs_with_retry(idx.dependency_names, self), true
+                Bundler.ui.info "" unless Bundler.ui.debug? # new line now that the dots are over
               end
-            end until idxcount == idx.size
+              break if idxcount == idx.size
+            end
 
             if api_fetchers.any?
               # it's possible that gems from one source depend on gems from some
@@ -367,8 +378,8 @@ module Bundler
               # if there are any cross-site gems we missed, get them now
               api_fetchers.each do |f|
                 Bundler.ui.info "Fetching dependency 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
+                idx.use f.specs_with_retry(unmet, self)
+                Bundler.ui.info "" unless Bundler.ui.debug? # new line now that the dots are over
               end if unmet.any?
             else
               allow_api = false
@@ -378,7 +389,7 @@ module Bundler
           unless allow_api
             api_fetchers.each do |f|
               Bundler.ui.info "Fetching source index from #{f.uri}"
-              idx.use f.specs(nil, self)
+              idx.use f.specs_with_retry(nil, self)
             end
           end
         end
@@ -392,11 +403,15 @@ module Bundler
         download_path = Bundler.requires_sudo? ? Bundler.tmp(spec.full_name) : Bundler.rubygems.gem_dir
         gem_path = "#{Bundler.rubygems.gem_dir}/cache/#{spec.full_name}.gem"
 
-        FileUtils.mkdir_p("#{download_path}/cache")
+        SharedHelpers.filesystem_access("#{download_path}/cache") do |p|
+          FileUtils.mkdir_p(p)
+        end
         Bundler.rubygems.download_gem(spec, uri, download_path)
 
         if Bundler.requires_sudo?
-          Bundler.mkdir_p "#{Bundler.rubygems.gem_dir}/cache"
+          SharedHelpers.filesystem_access("#{Bundler.rubygems.gem_dir}/cache") do |p|
+            Bundler.mkdir_p(p)
+          end
           Bundler.sudo "mv #{download_path}/cache/#{spec.full_name}.gem #{gem_path}"
         end
 
@@ -416,7 +431,6 @@ module Bundler
       def installed?(spec)
         installed_specs[spec].any?
       end
-
     end
   end
 end

data/lib/bundler/source/rubygems/remote.rb

@@ -2,11 +2,12 @@ module Bundler
   class Source
     class Rubygems
       class Remote
-        attr_reader :uri,
-                    :anonymized_uri
+        attr_reader :uri, :anonymized_uri, :original_uri
 
         def initialize(uri)
+          orig_uri = uri
           uri = Bundler.settings.mirror_for(uri)
+          @original_uri = orig_uri if orig_uri != uri
           fallback_auth = Bundler.settings.credentials_for(uri)
 
           @uri = apply_auth(uri, fallback_auth).freeze
@@ -32,7 +33,6 @@ module Bundler
 
           uri
         end
-
       end
     end
   end

data/lib/bundler/source_list.rb

@@ -1,7 +1,7 @@
 module Bundler
   class SourceList
     attr_reader :path_sources,
-                :git_sources
+      :git_sources
 
     def initialize
       @path_sources       = []
@@ -40,7 +40,7 @@ module Bundler
     end
 
     def get(source)
-      source_list_for(source).find { |s| source == s }
+      source_list_for(source).find {|s| source == s }
     end
 
     def lock_sources
@@ -53,12 +53,12 @@ module Bundler
 
       [path_sources, git_sources].each do |source_list|
         source_list.map! do |source|
-          replacement_sources.find { |s| s == source } || source
+          replacement_sources.find {|s| s == source } || source
         end
       end
 
       replacement_rubygems =
-        replacement_sources.detect { |s| s.is_a?(Source::Rubygems) }
+        replacement_sources.detect {|s| s.is_a?(Source::Rubygems) }
       @rubygems_aggregate = replacement_rubygems if replacement_rubygems
 
       # Return true if there were changes

data/lib/bundler/spec_set.rb

@@ -1,5 +1,5 @@
-require 'tsort'
-require 'forwardable'
+require "tsort"
+require "forwardable"
 
 module Bundler
   class SpecSet
@@ -10,12 +10,14 @@ module Bundler
     def_delegators :sorted, :each
 
     def initialize(specs)
-      @specs = specs.sort_by { |s| s.name }
+      @specs = specs.sort_by(&:name)
     end
 
     def for(dependencies, skip = [], check = false, match_current_platform = false)
-      handled, deps, specs = {}, dependencies.dup, []
-      skip << 'bundler'
+      handled = {}
+      deps = dependencies.dup
+      specs = []
+      skip << "bundler"
 
       until deps.empty?
         dep = deps.shift
@@ -44,7 +46,7 @@ module Bundler
         end
       end
 
-      if spec = lookup['bundler'].first
+      if spec = lookup["bundler"].first
         specs << spec
       end
 
@@ -81,7 +83,7 @@ module Bundler
 
     def materialize(deps, missing_specs = nil)
       materialized = self.for(deps, [], false, true).to_a
-      deps = materialized.map {|s| s.name }.uniq
+      deps = materialized.map(&:name).uniq
       materialized.map! do |s|
         next s unless s.is_a?(LazySpecification)
         s.source.dependency_names = deps if s.source.respond_to?(:dependency_names=)
@@ -99,7 +101,7 @@ module Bundler
     def merge(set)
       arr = sorted.dup
       set.each do |s|
-        next if arr.any? { |s2| s2.name == s.name && s2.version == s.version && s2.platform == s.platform }
+        next if arr.any? {|s2| s2.name == s.name && s2.version == s.version && s2.platform == s.platform }
         arr << s
       end
       SpecSet.new(arr)
@@ -108,12 +110,12 @@ module Bundler
   private
 
     def sorted
-      rake = @specs.find { |s| s.name == 'rake' }
+      rake = @specs.find {|s| s.name == "rake" }
       begin
         @sorted ||= ([rake] + tsort).compact.uniq
       rescue TSort::Cyclic => error
         cgems = extract_circular_gems(error)
-        raise CyclicDependencyError, "Your Gemfile requires gems that depend" \
+        raise CyclicDependencyError, "Your bundle requires gems that depend" \
           " depend on each other, creating an infinite loop. Please remove" \
           " either gem '#{cgems[1]}' or gem '#{cgems[0]}' and try again."
       end
@@ -129,9 +131,9 @@ module Bundler
 
     def lookup
       @lookup ||= begin
-        lookup = Hash.new { |h,k| h[k] = [] }
+        lookup = Hash.new {|h, k| h[k] = [] }
         specs = @specs.sort_by do |s|
-          s.platform.to_s == 'ruby' ? "\0" : s.platform.to_s
+          s.platform.to_s == "ruby" ? "\0" : s.platform.to_s
         end
         specs.reverse_each do |s|
           lookup[s.name] << s
@@ -141,13 +143,13 @@ module Bundler
     end
 
     def tsort_each_node
-      @specs.each { |s| yield s }
+      @specs.each {|s| yield s }
     end
 
     def tsort_each_child(s)
-      s.dependencies.sort_by { |d| d.name }.each do |d|
+      s.dependencies.sort_by(&:name).each do |d|
         next if d.type == :development
-        lookup[d.name].each { |s2| yield s2 }
+        lookup[d.name].each {|s2| yield s2 }
       end
     end
   end

data/lib/bundler/ssl_certs/certificate_manager.rb

@@ -1,6 +1,6 @@
-require 'fileutils'
-require 'net/https'
-require 'openssl'
+require "fileutils"
+require "net/https"
+require "openssl"
 
 module Bundler
   module SSLCerts
@@ -13,7 +13,7 @@ module Bundler
 
       def initialize(rubygems_path = nil)
         if rubygems_path
-          rubygems_cert_path = File.join(rubygems_path, 'lib/rubygems/ssl_certs')
+          rubygems_cert_path = File.join(rubygems_path, "lib/rubygems/ssl_certs")
           @rubygems_certs = certificates_in(rubygems_cert_path)
         end
 
@@ -41,7 +41,7 @@ module Bundler
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
         http.cert_store = store
-        http.head('/')
+        http.head("/")
       end
 
     private
@@ -59,7 +59,6 @@ module Bundler
           store
         end
       end
-
     end
   end
 end