bundler 1.3.6 → 1.4.0.pre.1

data/lib/bundler/constants.rb

@@ -0,0 +1,5 @@
+module Bundler
+  WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
+  FREEBSD = RbConfig::CONFIG["host_os"] =~ /bsd/
+  NULL    = WINDOWS ? "NUL" : "/dev/null"
+end

data/lib/bundler/current_ruby.rb

@@ -0,0 +1,88 @@
+module Bundler
+  # Returns current version of Ruby
+  #
+  # @return [CurrentRuby] Current version of Ruby
+  def self.current_ruby
+    @current_ruby ||= CurrentRuby.new
+  end
+
+  class CurrentRuby
+    def on_18?
+      RUBY_VERSION =~ /^1\.8/
+    end
+
+    def on_19?
+      RUBY_VERSION =~ /^1\.9/
+    end
+
+    def on_20?
+      RUBY_VERSION =~ /^2\.0/
+    end
+
+    def ruby?
+      !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev")
+    end
+
+    def ruby_18?
+      ruby? && on_18?
+    end
+
+    def ruby_19?
+      ruby? && on_19?
+    end
+
+    def ruby_20?
+      ruby? && on_20?
+    end
+
+    def mri?
+      !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby")
+    end
+
+    def mri_18?
+      mri? && on_18?
+    end
+
+    def mri_19?
+      mri? && on_19?
+    end
+
+
+    def mri_20?
+      mri? && on_20?
+    end
+
+    def rbx?
+      ruby? && defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+    end
+
+    def jruby?
+      defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+    end
+
+    def maglev?
+      defined?(RUBY_ENGINE) && RUBY_ENGINE == "maglev"
+    end
+
+    def mswin?
+      Bundler::WINDOWS
+    end
+
+    def mingw?
+      Bundler::WINDOWS && Gem::Platform.local.os == "mingw32"
+    end
+
+    def mingw_18?
+      mingw? && on_18?
+    end
+
+    def mingw_19?
+      mingw? && on_19?
+    end
+
+    def mingw_20?
+      mingw? && on_20?
+    end
+
+  end
+end

data/lib/bundler/definition.rb

@@ -8,6 +8,13 @@ module Bundler
     attr_reader :dependencies, :platforms, :sources, :ruby_version,
       :locked_deps
 
+    # Given a gemfile and lockfile creates a Bundler definition
+    #
+    # @param gemfile [Pathname] Path to Gemfile
+    # @param lockfile [Pathname,nil] Path to Gemfile.lock
+    # @param unlock [Hash, Boolean, nil] Gems that have been requested
+    #   to be updated or true if all gems should be updated
+    # @return [Bundler::Definition]
     def self.build(gemfile, lockfile, unlock)
       unlock ||= {}
       gemfile = Pathname.new(gemfile).expand_path
@@ -19,18 +26,24 @@ module Bundler
       Dsl.evaluate(gemfile, lockfile, unlock)
     end
 
-=begin
-    How does the new system work?
-    ===
-    * Load information from Gemfile and Lockfile
-    * Invalidate stale locked specs
-      * All specs from stale source are stale
-      * All specs that are reachable only through a stale
-        dependency are stale.
-    * If all fresh dependencies are satisfied by the locked
-      specs, then we can try to resolve locally.
-=end
 
+    #
+    # How does the new system work?
+    #
+    # * Load information from Gemfile and Lockfile
+    # * Invalidate stale locked specs
+    #  * All specs from stale source are stale
+    #  * All specs that are reachable only through a stale
+    #    dependency are stale.
+    # * If all fresh dependencies are satisfied by the locked
+    #  specs, then we can try to resolve locally.
+    #
+    # @param lockfile [Pathname] Path to Gemfile.lock
+    # @param dependencies [Array(Bundler::Dependency)] array of dependencies from Gemfile
+    # @param sources [Array(Bundler::Source::Rubygems)]
+    # @param unlock [Hash, Boolean, nil] Gems that have been requested
+    #   to be updated or true if all gems should be updated
+    # @param ruby_version [Bundler::RubyVersion, nil] Requested Ruby Version
     def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil)
       @unlocking = unlock == true || !unlock.empty?
 
@@ -109,6 +122,12 @@ module Bundler
       specs
     end
 
+    # For given dependency list returns a SpecSet with Gemspec of all the required
+    # dependencies.
+    #  1. The method first resolves the dependencies specified in Gemfile
+    #  2. After that it tries and fetches gemspec of resolved dependencies
+    #
+    # @return [Bundler::SpecSet]
     def specs
       @specs ||= begin
         specs = resolve.materialize(requested_dependencies)
@@ -159,6 +178,11 @@ module Bundler
       specs.for(expand_dependencies(deps))
     end
 
+    # Resolve all the dependencies specified in Gemfile. It ensures that
+    # dependencies that have been already resolved via locked file and are fresh
+    # are reused when resolving dependencies
+    #
+    # @return [SpecSet] resolved dependencies
     def resolve
       @resolve ||= begin
         if Bundler.settings[:frozen] || (!@unlocking && nothing_changed?)

data/lib/bundler/dependency.rb

@@ -70,7 +70,9 @@ module Bundler
 
     def current_platform?
       return true if @platforms.empty?
-      @platforms.any? { |p| send("#{p}?") }
+      @platforms.any? { |p|
+        Bundler.current_ruby.send("#{p}?")
+      }
     end
 
     def to_lock
@@ -79,84 +81,11 @@ module Bundler
       out << "\n"
     end
 
-  private
 
-    def on_18?
-      RUBY_VERSION =~ /^1\.8/
+    def specific?
+      super
+    rescue NoMethodError
+      requirement != ">= 0"
     end
-
-    def on_19?
-      RUBY_VERSION =~ /^1\.9/
-    end
-
-    def on_20?
-      RUBY_VERSION =~ /^2\.0/
-    end
-
-    def ruby?
-      !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev")
-    end
-
-    def ruby_18?
-      ruby? && on_18?
-    end
-
-    def ruby_19?
-      ruby? && on_19?
-    end
-
-    def ruby_20?
-      ruby? && on_20?
-    end
-
-    def mri?
-      !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby")
-    end
-
-    def mri_18?
-      mri? && on_18?
-    end
-
-    def mri_19?
-      mri? && on_19?
-    end
-
-
-    def mri_20?
-      mri? && on_20?
-    end
-
-    def rbx?
-      ruby? && defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
-    end
-
-    def jruby?
-      defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
-    end
-
-    def maglev?
-      defined?(RUBY_ENGINE) && RUBY_ENGINE == "maglev"
-    end
-
-    def mswin?
-      Bundler::WINDOWS
-    end
-
-    def mingw?
-      Bundler::WINDOWS && Gem::Platform.local.os == "mingw32"
-    end
-
-    def mingw_18?
-      mingw? && on_18?
-    end
-
-    def mingw_19?
-      mingw? && on_19?
-    end
-
-    def mingw_20?
-      mingw? && on_20?
-    end
-
   end
 end

data/lib/bundler/dsl.rb

@@ -230,7 +230,7 @@ module Bundler
 
       if github = opts.delete("github")
         github = "#{github}/#{github}" unless github.include?("/")
-        opts["git"] = "git://github.com/#{github}.git"
+        opts["git"] = "https://github.com/#{github}.git"
       end
 
       if gist = opts.delete("gist")

data/lib/bundler/fetcher.rb

@@ -4,11 +4,6 @@ module Bundler
 
   # Handles all the fetching with the rubygems server
   class Fetcher
-    # How many redirects to allew in one request
-    REDIRECT_LIMIT = 5
-    # how long to wait for each gemcutter API call
-    API_TIMEOUT = 10
-
     # This error is raised if the API returns a 413 (only printed in verbose)
     class FallbackError < HTTPError; end
     # This is the error raised if OpenSSL fails the cert verification
@@ -33,7 +28,7 @@ module Bundler
     end
 
     class << self
-      attr_accessor :disable_endpoint
+      attr_accessor :disable_endpoint, :api_timeout, :redirect_limit, :max_retries
 
       @@spec_fetch_map ||= {}
 
@@ -65,6 +60,13 @@ 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
+      @api_timeout = 10
+      # How many retries for the gemcutter API call
+      @max_retries = 3
+
       @remote_uri = remote_uri
       @public_uri = remote_uri.dup
       @public_uri.user, @public_uri.password = nil, nil # don't print these
@@ -77,7 +79,7 @@ module Bundler
         raise SSLError if @remote_uri.scheme == "https"
         @connection = Net::HTTP.new(@remote_uri.host, @remote_uri.port)
       end
-      @connection.read_timeout = API_TIMEOUT
+      @connection.read_timeout = @api_timeout
 
       Socket.do_not_reverse_lookup = true
     end
@@ -85,17 +87,28 @@ module Bundler
     # fetch a gem specification
     def fetch_spec(spec)
       spec = spec - [nil, 'ruby', '']
-      spec_file_name = "#{spec.join '-'}.gemspec.rz"
-
-      uri = URI.parse("#{@remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}")
+      spec_file_name = "#{spec.join '-'}.gemspec"
 
-      spec_rz = (uri.scheme == "file") ? Gem.read_binary(uri.path) : fetch(uri)
-      Bundler.load_marshal Gem.inflate(spec_rz)
+      uri = URI.parse("#{@remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
+      if uri.scheme == 'file'
+        Bundler.load_marshal Gem.inflate(Gem.read_binary(uri.path))
+      elsif cached_spec_path = gemspec_cached_path(spec_file_name)
+        Bundler.load_gemspec(cached_spec_path)
+      else
+        Bundler.load_marshal Gem.inflate(fetch(uri))
+      end
     rescue MarshalError => e
       raise HTTPError, "Gemspec #{spec} contained invalid data.\n" \
         "Your network or your gem server is probably having issues right now."
     end
 
+    # cached gem specification path, if one exists
+    def gemspec_cached_path spec_file_name
+      paths = Bundler.rubygems.spec_cache_dirs.map { |dir| File.join(dir, spec_file_name) }
+      paths = paths.select {|path| File.file? path }
+      paths.first
+    end
+
     # return the specs in the bundler format as an index
     def specs(gem_names, source)
       index = Index.new
@@ -157,14 +170,19 @@ module Bundler
     # 2. Marshal blob doesn't load properly
     # 3. One of the YAML gemspecs has the Syck::DefaultKey problem
     rescue HTTPError, MarshalError, GemspecError => e
-      @use_api = false
-
       # 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
+
+      @use_api = false
       return nil
     end
 
@@ -194,21 +212,16 @@ module Bundler
     HTTP_ERRORS << Net::HTTP::Persistent::Error if defined?(Net::HTTP::Persistent)
 
     def fetch(uri, counter = 0)
-      raise HTTPError, "Too many redirects" if counter >= REDIRECT_LIMIT
+      raise HTTPError, "Too many redirects" if counter >= @redirect_limit
 
       begin
         Bundler.ui.debug "Fetching from: #{uri}"
+        req = Net::HTTP::Get.new uri.request_uri
+        req.basic_auth(uri.user, uri.password) if uri.user && uri.password
         if defined?(Net::HTTP::Persistent)
-          response = @connection.request(uri)
+          response = @connection.request(uri, req)
         else
-          req = Net::HTTP::Get.new uri.request_uri
-          req.basic_auth(uri.user, uri.password) if uri.user && uri.password
-          if uri.host == @connection.address && uri.port == @connection.port
-            connection = @connection
-          else
-            connection = Net::HTTP.new(uri.host, uri.port)
-          end
-          response = connection.request(req)
+          response = @connection.request(req)
         end
       rescue OpenSSL::SSL::SSLError
         raise CertificateFailureError.new(@public_uri)

data/lib/bundler/gem_helper.rb

@@ -24,7 +24,7 @@ module Bundler
 
     def initialize(base = nil, name = nil)
       Bundler.ui = UI::Shell.new
-      @base = (base ||= Dir.pwd)
+      @base = (base ||= SharedHelpers.pwd)
       gemspecs = name ? [File.join(base, "#{name}.gemspec")] : Dir[File.join(base, "{,*}.gemspec")]
       raise "Unable to determine name from existing gemspec. Use :name => 'gemname' in #install_tasks to manually set it." unless gemspecs.size == 1
       @spec_path = gemspecs.first
@@ -153,7 +153,7 @@ module Bundler
       cmd << " 2>&1"
       outbuf = ''
       Bundler.ui.debug(cmd)
-      Dir.chdir(base) {
+      SharedHelpers.chdir(base) {
         outbuf = `#{cmd}`
         if $? == 0
           block.call(outbuf) if block

data/lib/bundler/gem_installer.rb

@@ -5,5 +5,14 @@ module Bundler
     def check_executable_overwrite(filename)
       # Bundler needs to install gems regardless of binstub overwriting
     end
+
+    if Bundler.current_ruby.mswin? || Bundler.current_ruby.jruby?
+      def build_extensions
+        # Gain the lock because rubygems use Dir.chdir
+        SharedHelpers.chdir('.') do
+          super
+        end
+      end
+    end
   end
 end

data/lib/bundler/installer.rb

@@ -1,5 +1,6 @@
 require 'erb'
 require 'rubygems/dependency_installer'
+require 'bundler/parallel_workers'
 
 module Bundler
   class Installer < Environment
@@ -87,8 +88,14 @@ module Bundler
       # as dependencies might actually affect the installation of
       # the gem.
       Installer.post_install_messages = {}
-      specs.each do |spec|
-        install_gem_from_spec(spec, options[:standalone])
+
+      size = options[:jobs] || 1
+      size = [size, 1].max
+
+      if size > 1 && can_install_parallely?
+        install_in_parallel size, options[:standalone]
+      else
+        install_sequentially options[:standalone]
       end
 
       lock
@@ -102,13 +109,12 @@ module Bundler
 
       # Fetch the build settings, if there are any
       settings = Bundler.settings["build.#{spec.name}"]
+      message = nil
       Bundler.rubygems.with_build_args [settings] do
-        spec.source.install(spec)
-        Bundler.ui.debug "from #{spec.loaded_from} "
+        message = spec.source.install(spec)
+        Bundler.ui.debug "  #{spec.name} (#{spec.version}) from #{spec.loaded_from}"
       end
 
-      # newline comes after installing, some gems say "with native extensions"
-      Bundler.ui.info ""
       if Bundler.settings[:bin] && standalone
         generate_standalone_bundler_executable_stubs(spec)
       elsif Bundler.settings[:bin]
@@ -116,6 +122,7 @@ module Bundler
       end
 
       FileUtils.rm_rf(Bundler.tmp)
+      message
     rescue Exception => e
       # install hook failed
       raise e if e.is_a?(Bundler::InstallHookError) || e.is_a?(Bundler::SecurityError)
@@ -163,7 +170,7 @@ module Bundler
           next
         end
 
-        File.open(binstub_path, 'w', 0777 & ~File.umask) do |f|
+        File.open(binstub_path, 'w', 0755) do |f|
           f.puts ERB.new(template, nil, '-').result(binding)
         end
       end
@@ -184,6 +191,16 @@ module Bundler
     end
 
   private
+    def can_install_parallely?
+      if Bundler.current_ruby.mri? || Bundler.rubygems.provides?(">= 2.1.0.rc")
+        true
+      else
+        Bundler.ui.warn "Rubygems #{Gem::VERSION} is not threadsafe, so your "\
+          "gems must be installed one at a time. Upgrade to Rubygems 2.1 or "\
+          "higher to enable parallel gem installation."
+        false
+      end
+    end
 
     def generate_standalone_bundler_executable_stubs(spec)
       # double-assignment to avoid warnings about variables that will be used by ERB
@@ -236,5 +253,57 @@ module Bundler
         end
       end
     end
+
+    def install_sequentially(standalone)
+      specs.each do |spec|
+        message = install_gem_from_spec spec, standalone
+        if message
+          Installer.post_install_messages[spec.name] = message
+        end
+      end
+    end
+
+    def install_in_parallel(size, standalone)
+      name2spec = {}
+      remains = {}
+      enqueued = {}
+      specs.each do |spec|
+        name2spec[spec.name] = spec
+        remains[spec.name] = true
+      end
+
+      worker_pool = ParallelWorkers.worker_pool size, lambda { |name|
+        spec = name2spec[name]
+        message = install_gem_from_spec spec, standalone
+        { :name => spec.name, :post_install => message }
+      }
+      specs.each do |spec|
+        deps = spec.dependencies.select { |dep| dep.type != :development }
+        if deps.empty?
+          worker_pool.enq spec.name
+          enqueued[spec.name] = true
+        end
+      end
+
+      until remains.empty?
+        message = worker_pool.deq
+        remains.delete message[:name]
+        if message[:post_install]
+          Installer.post_install_messages[message[:name]] = message[:post_install]
+        end
+        remains.keys.each do |name|
+          next if enqueued[name]
+          spec = name2spec[name]
+          deps = spec.dependencies.select { |dep| remains[dep.name] and dep.type != :development }
+          if deps.empty?
+            worker_pool.enq name
+            enqueued[name] = true
+          end
+        end
+      end
+      message
+    ensure
+      worker_pool && worker_pool.stop
+    end
   end
 end