bundler 1.11.2 → 1.12.0.pre.1

data/lib/bundler/installer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "erb"
 require "rubygems/dependency_installer"
 require "bundler/worker"
@@ -129,12 +130,12 @@ module Bundler
     def generate_standalone_bundler_executable_stubs(spec)
       # double-assignment to avoid warnings about variables that will be used by ERB
       bin_path = Bundler.bin_path
+      standalone_path = standalone_path = Bundler.root.join(Bundler.settings[:path]).relative_path_from(bin_path)
       template = File.read(File.expand_path("../templates/Executable.standalone", __FILE__))
       ruby_command = ruby_command = Thor::Util.ruby_command
 
       spec.executables.each do |executable|
         next if executable == "bundle"
-        standalone_path = standalone_path = Pathname(Bundler.settings[:path]).expand_path.relative_path_from(bin_path)
         executable_path = executable_path = Pathname(spec.full_gem_path).join(spec.bindir, executable).relative_path_from(bin_path)
         File.open "#{bin_path}/#{executable}", "w", 0755 do |f|
           f.puts ERB.new(template, nil, "-").result(binding)
@@ -190,9 +191,8 @@ module Bundler
         end
       end
 
-      unless local
-        options["local"] ? @definition.resolve_with_cache! : @definition.resolve_remotely!
-      end
+      return if local
+      options["local"] ? @definition.resolve_with_cache! : @definition.resolve_remotely!
     end
   end
 end

data/lib/bundler/installer/gem_installer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class GemInstaller
     attr_reader :spec, :standalone, :worker, :force, :installer

data/lib/bundler/installer/parallel_installer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/worker"
 require "bundler/installer/gem_installer"
 
@@ -45,7 +46,7 @@ class ParallelInstaller
       @dependencies ||= begin
         deps = all_dependencies.reject {|dep| ignorable_dependency? dep }
         missing = deps.reject {|dep| all_spec_names.include? dep.name }
-        if missing.size > 0
+        unless missing.empty?
           raise Bundler::LockfileError, "Your Gemfile.lock is corrupt. The following #{missing.size > 1 ? "gems are" : "gem is"} missing " \
                               "from the DEPENDENCIES section: '#{missing.map(&:name).join('\' \'')}'"
         end
@@ -84,7 +85,7 @@ class ParallelInstaller
   end
 
   def worker_pool
-    @worker_pool ||= Bundler::Worker.new @size, lambda { |spec_install, worker_num|
+    @worker_pool ||= Bundler::Worker.new @size, "Parallel Installer", lambda { |spec_install, worker_num|
       message = Bundler::GemInstaller.new(
         spec_install.spec, @installer, @standalone, worker_num, @force
       ).install_from_spec

data/lib/bundler/installer/standalone.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class Standalone
     def initialize(groups, definition)
@@ -33,7 +34,7 @@ module Bundler
     end
 
     def version_dir
-      "#{Bundler.ruby_version.engine}/#{RbConfig::CONFIG["ruby_version"]}"
+      "#{Bundler::RubyVersion.system.engine}/#{RbConfig::CONFIG["ruby_version"]}"
     end
 
     def bundler_path
@@ -43,6 +44,9 @@ module Bundler
     def gem_path(path, spec)
       full_path = Pathname.new(path).absolute? ? path : File.join(spec.full_gem_path, path)
       Pathname.new(full_path).relative_path_from(Bundler.root.join(bundler_path)).to_s
+    rescue TypeError
+      error_message = "#{spec.name} #{spec.version} has an invalid gemspec"
+      raise Gem::InvalidSpecificationException.new(error_message)
     end
   end
 end

data/lib/bundler/lazy_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "uri"
 require "rubygems/spec_fetcher"
 require "bundler/match_platform"
@@ -35,10 +36,12 @@ module Bundler
     end
 
     def to_lock
+      out = String.new
+
       if platform == Gem::Platform::RUBY || platform.nil?
-        out = "    #{name} (#{version})\n"
+        out << "    #{name} (#{version})\n"
       else
-        out = "    #{name} (#{version}-#{platform})\n"
+        out << "    #{name} (#{version}-#{platform})\n"
       end
 
       dependencies.sort_by(&:to_s).uniq.each do |dep|

data/lib/bundler/lockfile_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "strscan"
 
 # Some versions of the Bundler 1.1 RC series introduced corrupted
@@ -12,17 +13,18 @@ require "strscan"
 
 module Bundler
   class LockfileParser
-    attr_reader :sources, :dependencies, :specs, :platforms, :bundler_version
-
-    BUNDLED      = "BUNDLED WITH"
-    DEPENDENCIES = "DEPENDENCIES"
-    PLATFORMS    = "PLATFORMS"
-    GIT          = "GIT"
-    GEM          = "GEM"
-    PATH         = "PATH"
-    SPECS        = "  specs:"
+    attr_reader :sources, :dependencies, :specs, :platforms, :bundler_version, :ruby_version
+
+    BUNDLED      = "BUNDLED WITH".freeze
+    DEPENDENCIES = "DEPENDENCIES".freeze
+    PLATFORMS    = "PLATFORMS".freeze
+    RUBY         = "RUBY VERSION".freeze
+    GIT          = "GIT".freeze
+    GEM          = "GEM".freeze
+    PATH         = "PATH".freeze
+    SPECS        = "  specs:".freeze
     OPTIONS      = /^  ([a-z]+): (.*)$/i
-    SOURCE       = [GIT, GEM, PATH]
+    SOURCE       = [GIT, GEM, PATH].freeze
 
     def initialize(lockfile)
       @platforms    = []
@@ -46,6 +48,8 @@ module Bundler
           @state = :dependency
         elsif line == PLATFORMS
           @state = :platform
+        elsif line == RUBY
+          @state = :ruby
         elsif line == BUNDLED
           @state = :bundled_with
         elsif line =~ /^[^\s]/
@@ -86,7 +90,7 @@ module Bundler
       GIT  => Bundler::Source::Git,
       GEM  => Bundler::Source::Rubygems,
       PATH => Bundler::Source::Path,
-    }
+    }.freeze
 
     def parse_source(line)
       case line
@@ -131,7 +135,7 @@ module Bundler
       end
     end
 
-    NAME_VERSION = '(?! )(.*?)(?: \(([^-]*)(?:-(.*))?\))?'
+    NAME_VERSION = '(?! )(.*?)(?: \(([^-]*)(?:-(.*))?\))?'.freeze
     NAME_VERSION_2 = /^ {2}#{NAME_VERSION}(!)?$/
     NAME_VERSION_4 = /^ {4}#{NAME_VERSION}$/
     NAME_VERSION_6 = /^ {6}#{NAME_VERSION}$/
@@ -189,9 +193,12 @@ module Bundler
 
     def parse_bundled_with(line)
       line = line.strip
-      if Gem::Version.correct?(line)
-        @bundler_version = Gem::Version.create(line)
-      end
+      return unless Gem::Version.correct?(line)
+      @bundler_version = Gem::Version.create(line)
+    end
+
+    def parse_ruby(line)
+      @ruby_version = line.strip
     end
   end
 end

data/lib/bundler/match_platform.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/gem_helpers"
 
 module Bundler

data/lib/bundler/mirror.rb

@@ -0,0 +1,218 @@
+# frozen_string_literal: true
+module Bundler
+  class Settings
+    # Class used to build the mirror set and then find a mirror for a given URI
+    #
+    # @param prober [Prober object, nil] by default a TCPSocketProbe, this object
+    #   will be used to probe the mirror address to validate that the mirror replies.
+    class Mirrors
+      def initialize(prober = nil)
+        @all = Mirror.new
+        @prober = prober || TCPSocketProbe.new
+        @mirrors = {}
+      end
+
+      # Returns a mirror for the given uri.
+      #
+      # Depending on the uri having a valid mirror or not, it may be a
+      #   mirror that points to the provided uri
+      def for(uri)
+        if @all.validate!(@prober).valid?
+          @all
+        else
+          fetch_valid_mirror_for(Settings.normalize_uri(uri))
+        end
+      end
+
+      def each
+        @mirrors.each do |k, v|
+          yield k, v.uri.to_s
+        end
+      end
+
+      def parse(key, value)
+        config = MirrorConfig.new(key, value)
+        if config.all?
+          mirror = @all
+        else
+          mirror = (@mirrors[config.uri] = @mirrors[config.uri] || Mirror.new)
+        end
+        config.update_mirror(mirror)
+      end
+
+    private
+
+      def fetch_valid_mirror_for(uri)
+        mirror = (@mirrors[URI(uri.to_s.downcase)] || Mirror.new(uri)).validate!(@prober)
+        mirror = Mirror.new(uri) unless mirror.valid?
+        mirror
+      end
+    end
+
+    # A mirror
+    #
+    # Contains both the uri that should be used as a mirror and the
+    #   fallback timeout which will be used for probing if the mirror
+    #   replies on time or not.
+    class Mirror
+      DEFAULT_FALLBACK_TIMEOUT = 0.1
+
+      attr_reader :uri, :fallback_timeout
+
+      def initialize(uri = nil, fallback_timeout = 0)
+        self.uri = uri
+        self.fallback_timeout = fallback_timeout
+        @valid = nil
+      end
+
+      def uri=(uri)
+        @uri = if uri.nil?
+          nil
+        else
+          URI(uri.to_s)
+        end
+        @valid = nil
+      end
+
+      def fallback_timeout=(timeout)
+        case timeout
+        when true, "true"
+          @fallback_timeout = DEFAULT_FALLBACK_TIMEOUT
+        when false, "false"
+          @fallback_timeout = 0
+        else
+          @fallback_timeout = timeout.to_i
+        end
+        @valid = nil
+      end
+
+      def ==(other)
+        !other.nil? && uri == other.uri && fallback_timeout == other.fallback_timeout
+      end
+
+      def valid?
+        return false if @uri.nil?
+        return @valid unless @valid.nil?
+        false
+      end
+
+      def validate!(probe = nil)
+        @valid = false if uri.nil?
+        if @valid.nil?
+          @valid = fallback_timeout == 0 || (probe || TCPSocketProbe.new).replies?(self)
+        end
+        self
+      end
+    end
+
+    # Class used to parse one configuration line
+    #
+    # Gets the configuration line and the value.
+    #   This object provides a `update_mirror` method
+    #   used to setup the given mirror value.
+    class MirrorConfig
+      attr_accessor :uri, :value
+
+      def initialize(config_line, value)
+        uri, fallback =
+          config_line.match(%r{^mirror\.(all|.+?)(\.fallback_timeout)?\/?$}).captures
+        @fallback = !fallback.nil?
+        @all = false
+        if uri == "all"
+          @all = true
+        else
+          @uri = Settings.normalize_uri(uri)
+        end
+        @value = value
+      end
+
+      def all?
+        @all
+      end
+
+      def update_mirror(mirror)
+        if @fallback
+          mirror.fallback_timeout = @value
+        else
+          mirror.uri = Settings.normalize_uri(@value)
+        end
+      end
+    end
+
+    # Class used for probing TCP availability for a given mirror.
+    class TCPSocketProbe
+      def replies?(mirror)
+        MirrorSockets.new(mirror).any? do |socket, address, timeout|
+          begin
+            socket.connect_nonblock(address)
+          rescue Errno::EINPROGRESS
+            wait_for_writtable_socket(socket, address, timeout)
+          rescue # Connection failed somehow, again
+            false
+          end
+        end
+      end
+
+    private
+
+      def wait_for_writtable_socket(socket, address, timeout)
+        if IO.select(nil, [socket], nil, timeout)
+          probe_writtable_socket(socket, address)
+        else # TCP Handshake timed out, or there is something dropping packets
+          false
+        end
+      end
+
+      def probe_writtable_socket(socket, address)
+        socket.connect_nonblock(address)
+      rescue Errno::EISCONN
+        true
+      rescue # Connection failed
+        false
+      end
+    end
+  end
+
+  # Class used to build the list of sockets that correspond to
+  #   a given mirror.
+  #
+  # One mirror may correspond to many different addresses, both
+  #   because of it having many dns entries or just because
+  #   the network interface is both ipv4 and ipv5
+  class MirrorSockets
+    def initialize(mirror)
+      @timeout = mirror.fallback_timeout
+      @addresses = Socket.getaddrinfo(mirror.uri.host, mirror.uri.port).map do |address|
+        SocketAddress.new(address[0], address[3], address[1])
+      end
+    end
+
+    def any?
+      @addresses.any? do |address|
+        socket = Socket.new(Socket.const_get(address.type), Socket::SOCK_STREAM, 0)
+        socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+        value = yield socket, address.to_socket_address, @timeout
+        socket.close unless socket.closed?
+        value
+      end
+    end
+  end
+
+  # Socket address builder.
+  #
+  # Given a socket type, a host and a port,
+  #   provides a method to build sockaddr string
+  class SocketAddress
+    attr_reader :type, :host, :port
+
+    def initialize(type, host, port)
+      @type = type
+      @host = host
+      @port = port
+    end
+
+    def to_socket_address
+      Socket.pack_sockaddr_in(@port, @host)
+    end
+  end
+end

data/lib/bundler/path_preserver.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Bundler
+  module PathPreserver
+    def self.preserve_path_in_environment(env_var, env)
+      original_env_var      = "_ORIGINAL_#{env_var}"
+      original_path         = env[original_env_var]
+      path                  = env[env_var]
+      env[original_env_var] = path if original_path.nil? || original_path.empty?
+      env[env_var]          = original_path if path.nil? || path.empty?
+    end
+  end
+end

data/lib/bundler/psyched_yaml.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Psych could be a gem, so try to ask for it
 begin
   gem "psych"

data/lib/bundler/remote_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "uri"
 require "rubygems/spec_fetcher"
 
@@ -15,7 +16,7 @@ module Bundler
 
     def initialize(name, version, platform, spec_fetcher)
       @name         = name
-      @version      = version
+      @version      = Gem::Version.create version
       @platform     = platform
       @spec_fetcher = spec_fetcher
     end
@@ -69,6 +70,8 @@ module Bundler
 
     def _remote_specification
       @_remote_specification ||= @spec_fetcher.fetch_spec([@name, @version, @platform])
+      @_remote_specification || raise(GemspecError, "Gemspec data for #{full_name} was" \
+        " missing from the server! Try installing with `--full-index` as a workaround.")
     end
 
     def method_missing(method, *args, &blk)