bundler 1.9.10 → 1.10.0.pre

data/lib/bundler/lazy_specification.rb

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

data/lib/bundler/lockfile_parser.rb

@@ -12,8 +12,9 @@ require "strscan"
 
 module Bundler
   class LockfileParser
-    attr_reader :sources, :dependencies, :specs, :platforms
+    attr_reader :sources, :dependencies, :specs, :platforms, :bundler_version
 
+    BUNDLED      = "BUNDLED WITH"
     DEPENDENCIES = "DEPENDENCIES"
     PLATFORMS    = "PLATFORMS"
     GIT          = "GIT"
@@ -21,13 +22,12 @@ module Bundler
     PATH         = "PATH"
     SPECS        = "  specs:"
     OPTIONS      = /^  ([a-z]+): (.*)$/i
-    SOURCE       = [GIT, GEM, PATH]
 
     def initialize(lockfile)
       @platforms    = []
       @sources      = []
       @dependencies = []
-      @state        = nil
+      @state        = :source
       @specs        = {}
 
       @rubygems_aggregate = Source::Rubygems.new
@@ -38,27 +38,36 @@ module Bundler
       end
 
       lockfile.split(/(?:\r?\n)+/).each do |line|
-        if SOURCE.include?(line)
-          @state = :source
-          parse_source(line)
-        elsif line == DEPENDENCIES
+        if line == DEPENDENCIES
           @state = :dependency
         elsif line == PLATFORMS
           @state = :platform
-        elsif line =~ /^[^\s]/
-          @state = nil
-        elsif @state
+        elsif line == BUNDLED
+          @state = :bundled_with
+        else
           send("parse_#{@state}", line)
         end
       end
       @sources << @rubygems_aggregate
       @specs = @specs.values
+      warn_for_outdated_bundler_version
     rescue ArgumentError => e
       Bundler.ui.debug(e)
       raise LockfileError, "Your lockfile is unreadable. Run `rm Gemfile.lock` " \
         "and then `bundle install` to generate a new lockfile."
     end
 
+    def warn_for_outdated_bundler_version
+      return unless bundler_version
+      prerelease_text = bundler_version.prerelease? ? " --pre" : ""
+      if Gem::Version.new(Bundler::VERSION) < Gem::Version.new(bundler_version)
+        Bundler.ui.warn "Warning: the running version of Bundler is older " \
+             "than the version that created the lockfile. We suggest you " \
+             "upgrade to the latest version of Bundler by running `gem " \
+             "install bundler#{prerelease_text}`.\n"
+      end
+    end
+
   private
 
     TYPES = {
@@ -163,5 +172,12 @@ module Bundler
       end
     end
 
+    def parse_bundled_with(line)
+      line = line.strip
+      if Gem::Version.correct?(line)
+        @bundler_version = Gem::Version.create(line)
+      end
+    end
+
   end
 end

data/lib/bundler/remote_specification.rb

@@ -10,7 +10,7 @@ module Bundler
     include MatchPlatform
 
     attr_reader :name, :version, :platform
-    attr_accessor :source, :source_uri
+    attr_accessor :source, :remote
 
     def initialize(name, version, platform, spec_fetcher)
       @name         = name
@@ -54,4 +54,24 @@ module Bundler
       end
     end
   end
+
+  class StubSpecification < RemoteSpecification
+    def self.from_stub(stub)
+      spec = new(stub.name, stub.version, stub.platform, nil)
+      spec.stub = stub
+      spec
+    end
+
+    attr_accessor :stub
+
+    def to_yaml
+      _remote_specification.to_yaml
+    end
+
+    private
+
+    def _remote_specification
+      stub.to_spec
+    end
+  end
 end

data/lib/bundler/resolver.rb

@@ -323,7 +323,8 @@ module Bundler
               message << "Source does not contain any versions of '#{requirement}'"
             end
           else
-            message = "Could not find gem '#{requirement}' in any of the gem sources listed in your Gemfile or installed on this machine."
+            message = "Could not find gem '#{requirement}' in any of the gem sources " \
+              "listed in your Gemfile or available on this machine."
           end
           raise GemNotFound, message
         end

data/lib/bundler/retry.rb

@@ -1,23 +1,24 @@
 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
+      def default_attempts
+        default_retries + 1
+      end
+      alias_method :attempts, :default_attempts
+
+      def default_retries
+        Bundler.settings[:retry]
+      end
     end
 
-    def initialize(name, exceptions = nil, attempts = nil)
+    def initialize(name, exceptions = nil, retries = self.class.default_retries)
       @name        = name
-      attempts    ||= default_attempts
+      @retries   = retries
       @exceptions = Array(exceptions) || []
-      @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
+      @total_runs =  @retries + 1 # will run once, then upto attempts.times
     end
 
     def attempt(&block)

data/lib/bundler/rubygems_ext.rb

@@ -13,7 +13,7 @@ module Gem
   @loaded_stacks = Hash.new { |h,k| h[k] = [] }
 
   class Specification
-    attr_accessor :source_uri, :location, :relative_loaded_from
+    attr_accessor :remote, :location, :relative_loaded_from
 
     remove_method :source if instance_methods(false).include?(:source)
     attr_accessor :source

data/lib/bundler/rubygems_integration.rb

@@ -131,6 +131,19 @@ module Bundler
       yield
     end
 
+    def loaded_gem_paths
+      # RubyGems 2.2+ can put binary extension into dedicated folders,
+      # therefore use RubyGems facilities to obtain their load paths.
+      if Gem::Specification.method_defined? :full_require_paths
+        loaded_gem_paths = Gem.loaded_specs.map {|n, s| s.full_require_paths}
+        loaded_gem_paths.flatten
+      else
+        $LOAD_PATH.select do |p|
+          Bundler.rubygems.gem_path.any?{|gp| p =~ /^#{Regexp.escape(gp)}/ }
+        end
+      end
+    end
+
     def ui=(obj)
       Gem::DefaultUserInteraction.ui = obj
     end
@@ -204,7 +217,7 @@ module Bundler
     end
 
     def download_gem(spec, uri, path)
-      uri = Bundler::Source.mirror_for(uri)
+      uri = Bundler.settings.mirror_for(uri)
       fetcher = Gem::RemoteFetcher.new(configuration[:http_proxy])
       fetcher.download(spec, uri, path)
     end
@@ -538,7 +551,7 @@ module Bundler
 
       def download_gem(spec, uri, path)
         require 'resolv'
-        uri = Bundler::Source.mirror_for(uri)
+        uri = Bundler.settings.mirror_for(uri)
         proxy, dns = configuration[:http_proxy], Resolv::DNS.new
         fetcher = Gem::RemoteFetcher.new(proxy, dns)
         fetcher.download(spec, uri, path)
@@ -561,12 +574,20 @@ module Bundler
       end
     end
 
+    # RubyGems 2.1.0
     class MoreFuture < Future
       def initialize
         super
         backport_ext_builder_monitor
       end
 
+      def all_specs
+        require 'bundler/remote_specification'
+        Gem::Specification.stubs.map do |stub|
+          StubSpecification.from_stub(stub)
+        end
+      end
+
       def backport_ext_builder_monitor
         require 'rubygems/ext'
 
@@ -586,10 +607,16 @@ module Bundler
         Gem::Ext::Builder::CHDIR_MONITOR
       end
 
-      def find_name(name)
-        Gem::Specification.stubs.find_all do |spec|
-          spec.name == name
-        end.map(&:to_spec)
+      if Gem::Specification.respond_to?(:stubs_for)
+        def find_name(name)
+          Gem::Specification.stubs_for(name).map(&:to_spec)
+        end
+      else
+        def find_name(name)
+          Gem::Specification.stubs.find_all do |spec|
+            spec.name == name
+          end.map(&:to_spec)
+        end
       end
     end
 

data/lib/bundler/settings.rb

@@ -2,7 +2,9 @@ require 'uri'
 
 module Bundler
   class Settings
-    BOOL_KEYS = %w(frozen cache_all no_prune disable_local_branch_check gem.mit gem.coc).freeze
+    BOOL_KEYS = %w(frozen cache_all no_prune disable_local_branch_check ignore_messages gem.mit gem.coc).freeze
+    NUMBER_KEYS = %w(retry timeout redirect).freeze
+    DEFAULT_CONFIG = {:retry => 3, :timeout => 10, :redirect => 5}
 
     def initialize(root = nil)
       @root          = root
@@ -12,10 +14,13 @@ module Bundler
 
     def [](name)
       key = key_for(name)
-      value = (@local_config[key] || ENV[key] || @global_config[key])
+      value = (@local_config[key] || ENV[key] || @global_config[key] || DEFAULT_CONFIG[name])
 
-      if !value.nil? && is_bool(name)
+      case
+      when !value.nil? && is_bool(name)
         to_bool(value)
+      when !value.nil? && is_num(name)
+        value.to_i
       else
         value
       end
@@ -56,6 +61,18 @@ module Bundler
       repos
     end
 
+    def mirror_for(uri)
+      uri = URI(uri.to_s) unless uri.is_a?(URI)
+
+      # Settings keys are all downcased
+      normalized_key = normalize_uri(uri.to_s.downcase)
+      gem_mirrors[normalized_key] || uri
+    end
+
+    def credentials_for(uri)
+      self[uri.to_s] || self[uri.host]
+    end
+
     def gem_mirrors
       all.inject({}) do |h, k|
         if k =~ /^mirror\./
@@ -72,6 +89,7 @@ module Bundler
       locations[:local]  = @local_config[key] if @local_config.key?(key)
       locations[:env]    = ENV[key] if ENV[key]
       locations[:global] = @global_config[key] if @global_config.key?(key)
+      locations[:default] = DEFAULT_CONFIG[key] if DEFAULT_CONFIG.key?(key)
       locations
     end
 
@@ -96,11 +114,19 @@ module Bundler
     end
 
     def without=(array)
-      self[:without] = (array.empty? ? nil : array.join(":")) if array
+      set_array(:without, array)
+    end
+
+    def with=(array)
+      set_array(:with, array)
     end
 
     def without
-      self[:without] ? self[:without].split(":").map { |w| w.to_sym } : []
+      get_array(:without)
+    end
+
+    def with
+      get_array(:with)
     end
 
     # @local_config["BUNDLE_PATH"] should be prioritized over ENV["BUNDLE_PATH"]
@@ -141,14 +167,38 @@ module Bundler
       "BUNDLE_#{key}"
     end
 
-    def is_bool(key)
-      BOOL_KEYS.include?(key.to_s)
+    def parent_setting_for(name)
+      split_specfic_setting_for(name)[0]
+    end
+
+    def specfic_gem_for(name)
+      split_specfic_setting_for(name)[1]
+    end
+
+    def split_specfic_setting_for(name)
+      name.split(".")
+    end
+
+    def is_bool(name)
+      BOOL_KEYS.include?(name.to_s) || BOOL_KEYS.include?(parent_setting_for(name.to_s))
     end
 
     def to_bool(value)
       !(value.nil? || value == '' || value =~ /^(false|f|no|n|0)$/i || value == false)
     end
 
+    def is_num(value)
+      NUMBER_KEYS.include?(value.to_s)
+    end
+
+    def get_array(key)
+      self[key] ? self[key].split(":").map { |w| w.to_sym } : []
+    end
+
+    def set_array(key, array)
+     self[key] = (array.empty? ? nil : array.join(":")) if array
+    end
+
     def set_key(key, value, hash, file)
       key = key_for(key)
 
@@ -178,7 +228,7 @@ module Bundler
         config_regex = /^(BUNDLE_.+): (['"]?)(.*(?:\n(?!BUNDLE).+)?)\2$/
         config_pairs = config_file.read.scan(config_regex).map do |m|
           key, _, value = m
-          [convert_to_backward_compatible_key(key), value.gsub(/\s+/, " ").tr('"', "'")]
+          [key, value.gsub(/\s+/, " ").tr('"', "'")]
         end
         Hash[config_pairs]
       else
@@ -186,12 +236,6 @@ module Bundler
       end
     end
 
-    def convert_to_backward_compatible_key(key)
-      key = "#{key}/" if key =~ /https?:/i && key !~ %r[/\Z]
-      key = key.gsub(".", "__") if key.include?(".")
-      key
-    end
-
     # TODO: duplicates Rubygems#normalize_uri
     # TODO: is this the correct place to validate mirror URIs?
     def normalize_uri(uri)

data/lib/bundler/shared_helpers.rb

@@ -135,10 +135,13 @@ module Bundler
       # handle 1.9 where system gems are always on the load path
       if defined?(::Gem)
         me = File.expand_path("../../", __FILE__)
+        me = /^#{Regexp.escape(me)}/
+
+        loaded_gem_paths = Bundler.rubygems.loaded_gem_paths
+
         $LOAD_PATH.reject! do |p|
-          next if File.expand_path(p) =~ /^#{Regexp.escape(me)}/
-          p != File.dirname(__FILE__) &&
-            Bundler.rubygems.gem_path.any?{|gp| p =~ /^#{Regexp.escape(gp)}/ }
+          next if File.expand_path(p) =~ me
+          loaded_gem_paths.delete(p)
         end
         $LOAD_PATH.uniq!
       end

data/lib/bundler/source.rb

@@ -4,16 +4,6 @@ module Bundler
     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
-
     attr_accessor :dependency_names
 
     def unmet_deps

data/lib/bundler/source/git.rb

@@ -159,9 +159,9 @@ module Bundler
         local_specs
       end
 
-      def install(spec)
+      def install(spec, force = false)
         debug = nil
-        if requires_checkout? && !@copied
+        if requires_checkout? && !@copied && !force
           debug = "  * Checking out revision: #{ref}"
           git_proxy.copy_to(install_path, submodules)
           serialize_gemspecs_in(install_path)

data/lib/bundler/source/path.rb

@@ -69,7 +69,7 @@ module Bundler
         File.basename(expanded_path.to_s)
       end
 
-      def install(spec)
+      def install(spec, force = false)
         generate_bin(spec, :disable_extensions)
         ["Using #{version_message(spec)} from #{to_s}", nil]
       end