bundler 1.4.0.pre.1 → 1.4.0.pre.2

data/lib/bundler/gem_helpers.rb

@@ -3,18 +3,19 @@ module Bundler
 
     GENERIC_CACHE = {}
     GENERICS = [
-      Gem::Platform.new('java'),
-      Gem::Platform.new('mswin32'),
-      Gem::Platform.new('x86-mingw32'),
-      Gem::Platform::RUBY
+      [Gem::Platform.new('java'), Gem::Platform.new('java')],
+      [Gem::Platform.new('mswin32'), Gem::Platform.new('mswin32')],
+      [Gem::Platform.new('x64-mingw32'), Gem::Platform.new('x64-mingw32')],
+      [Gem::Platform.new('x86_64-mingw32'), Gem::Platform.new('x64-mingw32')],
+      [Gem::Platform.new('mingw32'), Gem::Platform.new('x86-mingw32')]
     ]
 
     def generic(p)
       return p if p == Gem::Platform::RUBY
 
       GENERIC_CACHE[p] ||= begin
-        found = GENERICS.find do |p2|
-          p2.is_a?(Gem::Platform) && p.os == p2.os
+        _, found = GENERICS.find do |match, _generic|
+          p.os == match.os && (!match.cpu || p.cpu == match.cpu)
         end
         found || Gem::Platform::RUBY
       end

data/lib/bundler/installer.rb

@@ -84,16 +84,15 @@ module Bundler
           @definition.resolve_remotely!
       end
 
-      # Must install gems in the order that the resolver provides
-      # as dependencies might actually affect the installation of
-      # the gem.
       Installer.post_install_messages = {}
 
-      size = options[:jobs] || 1
-      size = [size, 1].max
-
-      if size > 1 && can_install_parallely?
-        install_in_parallel size, options[:standalone]
+      # the order that the resolver provides is significant, since
+      # dependencies might actually affect the installation of a gem.
+      # that said, it's a rare situation (other than rake), and parallel
+      # installation is just SO MUCH FASTER. so we let people opt in.
+      jobs = [options[:jobs].to_i, 1].max
+      if jobs > 1 && can_install_parallely?
+        install_in_parallel jobs, options[:standalone]
       else
         install_sequentially options[:standalone]
       end
@@ -102,17 +101,21 @@ module Bundler
       generate_standalone(options[:standalone]) if options[:standalone]
     end
 
-    def install_gem_from_spec(spec, standalone = false)
+    def install_gem_from_spec(spec, standalone = false, worker = 0)
       # Download the gem to get the spec, because some specs that are returned
       # by rubygems.org are broken and wrong.
       Bundler::Fetcher.fetch(spec) if spec.source.is_a?(Bundler::Source::Rubygems)
 
       # Fetch the build settings, if there are any
-      settings = Bundler.settings["build.#{spec.name}"]
-      message = nil
+      settings             = Bundler.settings["build.#{spec.name}"]
+      install_message      = nil
+      post_install_message = nil
+      debug_message        = nil
       Bundler.rubygems.with_build_args [settings] do
-        message = spec.source.install(spec)
-        Bundler.ui.debug "  #{spec.name} (#{spec.version}) from #{spec.loaded_from}"
+        install_message, post_install_message, debug_message = spec.source.install(spec)
+        Bundler.ui.info install_message
+        Bundler.ui.debug debug_message if debug_message
+        Bundler.ui.debug "#{worker}:  #{spec.name} (#{spec.version}) from #{spec.loaded_from}"
       end
 
       if Bundler.settings[:bin] && standalone
@@ -122,17 +125,21 @@ module Bundler
       end
 
       FileUtils.rm_rf(Bundler.tmp)
-      message
+      post_install_message
     rescue Exception => e
-      # install hook failed
+      # if install hook failed or gem signature is bad, just die
       raise e if e.is_a?(Bundler::InstallHookError) || e.is_a?(Bundler::SecurityError)
 
       # other failure, likely a native extension build failure
       Bundler.ui.info ""
       Bundler.ui.warn "#{e.class}: #{e.message}"
       msg = "An error occurred while installing #{spec.name} (#{spec.version}),"
-      msg << " and Bundler cannot continue.\nMake sure that `gem install"
-      msg << " #{spec.name} -v '#{spec.version}'` succeeds before bundling."
+      msg << " and Bundler cannot continue."
+
+      unless spec.source.options["git"]
+        msg << "\nMake sure that `gem install"
+        msg << " #{spec.name} -v '#{spec.version}'` succeeds before bundling."
+      end
       Bundler.ui.debug e.backtrace.join("\n")
       raise Bundler::InstallError, msg
     end
@@ -256,7 +263,7 @@ module Bundler
 
     def install_sequentially(standalone)
       specs.each do |spec|
-        message = install_gem_from_spec spec, standalone
+        message = install_gem_from_spec spec, standalone, 0
         if message
           Installer.post_install_messages[spec.name] = message
         end
@@ -272,9 +279,9 @@ module Bundler
         remains[spec.name] = true
       end
 
-      worker_pool = ParallelWorkers.worker_pool size, lambda { |name|
+      worker_pool = ParallelWorkers.worker_pool size, lambda { |name, worker|
         spec = name2spec[name]
-        message = install_gem_from_spec spec, standalone
+        message = install_gem_from_spec spec, standalone, worker
         { :name => spec.name, :post_install => message }
       }
       specs.each do |spec|

data/lib/bundler/parallel_workers/unix_worker.rb

@@ -22,7 +22,7 @@ module Bundler
       # @param size [Integer] Size of worker pool
       # @param func [Proc] Job that should be executed in the worker
       def prepare_workers(size, func)
-        @workers = size.times.map do
+        @workers = size.times.map do |num|
           child_read, parent_write = IO.pipe
           parent_read, child_write = IO.pipe
 
@@ -33,7 +33,7 @@ module Bundler
 
               while !child_read.eof?
                 obj = Marshal.load child_read
-                Marshal.dump func.call(obj), child_write
+                Marshal.dump func.call(obj, num), child_write
               end
             rescue Exception => e
               begin

data/lib/bundler/ruby_dsl.rb

@@ -5,7 +5,7 @@ module Bundler
       raise GemfileError, "Please define :engine" if options[:engine_version] && options[:engine].nil?
 
       raise GemfileError, "ruby_version must match the :engine_version for MRI" if options[:engine] == "ruby" && options[:engine_version] && ruby_version != options[:engine_version]
-      @ruby_version = RubyVersion.new(ruby_version, options[:engine], options[:engine_version])
+      @ruby_version = RubyVersion.new(ruby_version, options[:patchlevel], options[:engine], options[:engine_version])
     end
   end
 end

data/lib/bundler/ruby_version.rb

@@ -1,8 +1,8 @@
 module Bundler
   class RubyVersion
-    attr_reader :version, :engine, :engine_version
+    attr_reader :version, :patchlevel, :engine, :engine_version
 
-    def initialize(version, engine, engine_version)
+    def initialize(version, patchlevel, engine, engine_version)
       # The parameters to this method must satisfy the
       # following constraints, which are verified in
       # the DSL:
@@ -20,10 +20,12 @@ module Bundler
       # keep track of the engine specified by the user
       @input_engine   = engine
       @engine_version = engine_version || version
+      @patchlevel     = patchlevel
     end
 
     def to_s
       output = "ruby #{version}"
+      output << "p#{patchlevel}" if patchlevel
       output << " (#{engine} #{engine_version})" unless engine == "ruby"
 
       output
@@ -32,7 +34,8 @@ module Bundler
     def ==(other)
       version          == other.version &&
         engine         == other.engine &&
-        engine_version == other.engine_version
+        engine_version == other.engine_version &&
+        patchlevel     == other.patchlevel
     end
 
     # Returns a tuple of thsee things:
@@ -48,6 +51,8 @@ module Bundler
         [ :version, version, other.version ]
       elsif engine_version != other.engine_version && @input_engine
         [ :engine_version, engine_version, other.engine_version ]
+      elsif patchlevel != other.patchlevel && @patchlevel
+        [ :patchlevel, patchlevel, other.patchlevel ]
       else
         nil
       end
@@ -96,5 +101,9 @@ module Bundler
         nil
       end
     end
+
+    def patchlevel
+      RUBY_PATCHLEVEL
+    end
   end
 end

data/lib/bundler/rubygems_ext.rb

@@ -136,6 +136,7 @@ module Gem
     JAVA  = Gem::Platform.new('java') unless defined?(JAVA)
     MSWIN = Gem::Platform.new('mswin32') unless defined?(MSWIN)
     MINGW = Gem::Platform.new('x86-mingw32') unless defined?(MINGW)
+    X64_MINGW = Gem::Platform.new('x64-mingw32') unless defined?(X64_MINGW)
 
     undef_method :hash if method_defined? :hash
     def hash

data/lib/bundler/rubygems_integration.rb

@@ -194,7 +194,7 @@ module Bundler
       @security_policies ||= begin
         require 'rubygems/security'
         Gem::Security::Policies
-      rescue LoadError
+      rescue LoadError, NameError
         {}
       end
     end

data/lib/bundler/runtime.rb

@@ -23,7 +23,8 @@ module Bundler
 
         if activated_spec = Bundler.rubygems.loaded_specs(spec.name) and activated_spec.version != spec.version
           e = Gem::LoadError.new "You have already activated #{activated_spec.name} #{activated_spec.version}, " \
-                                 "but your Gemfile requires #{spec.name} #{spec.version}. Using bundle exec may solve this."
+                                 "but your Gemfile requires #{spec.name} #{spec.version}. Prepending " \
+                                 "`bundle exec` to your command may solve this."
           e.name = spec.name
           if e.respond_to?(:requirement=)
             e.requirement = Gem::Requirement.new(spec.version.to_s)

data/lib/bundler/shared_helpers.rb

@@ -57,6 +57,19 @@ module Bundler
       end
     end
 
+    def with_clean_git_env(&block)
+      keys    = %w[GIT_DIR GIT_WORK_TREE]
+      old_env = keys.inject({}) do |h, k|
+        h.update(k => ENV[k])
+      end
+
+      keys.each {|key| ENV.delete(key) }
+
+      block.call
+    ensure
+      keys.each {|key| ENV[key] = old_env[key] }
+    end
+
   private
 
     def find_gemfile

data/lib/bundler/source/git.rb

@@ -151,15 +151,15 @@ module Bundler
       end
 
       def install(spec)
-        Bundler.ui.info "Using #{spec.name} (#{spec.version}) from #{to_s}"
+        debug = nil
         if requires_checkout? && !@copied
-          Bundler.ui.debug "  * Checking out revision: #{ref}"
+          debug = "  * Checking out revision: #{ref}"
           git_proxy.copy_to(install_path, submodules)
           serialize_gemspecs_in(install_path)
           @copied = true
         end
         generate_bin(spec)
-        nil
+        ["Using #{spec.name} (#{spec.version}) from #{to_s}", nil, debug]
       end
 
       def cache(spec)

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

@@ -85,7 +85,7 @@ module Bundler
 
         def git(command, check_errors=true)
           if allow?
-            out = %x{git #{command}}
+            out = SharedHelpers.with_clean_git_env { %x{git #{command}} }
 
             if check_errors && $?.exitstatus != 0
               msg = "Git error: command `git #{command}` in directory #{Dir.pwd} has failed."

data/lib/bundler/source/path.rb

@@ -70,9 +70,8 @@ module Bundler
       end
 
       def install(spec)
-        Bundler.ui.info "Using #{spec.name} (#{spec.version}) from #{to_s}"
         generate_bin(spec, :disable_extensions)
-        nil
+        ["Using #{spec.name} (#{spec.version}) from #{to_s}", nil]
       end
 
       def cache(spec)

data/lib/bundler/source/rubygems.rb

@@ -69,11 +69,10 @@ module Bundler
 
       def install(spec)
         if installed_specs[spec].any?
-          Bundler.ui.info "Using #{spec.name} (#{spec.version})"
-          return
+          return ["Using #{spec.name} (#{spec.version})", nil]
         end
 
-        Bundler.ui.info "Installing #{spec.name} (#{spec.version})"
+        install_message = "Installing #{spec.name} (#{spec.version})"
         path = cached_gem(spec)
         if Bundler.requires_sudo?
           install_path = Bundler.tmp
@@ -105,10 +104,9 @@ module Bundler
             Bundler.sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Bundler.system_bindir}"
           end
         end
-        Bundler.ui.info "Installed #{spec.name} (#{spec.version})"
         installed_spec.loaded_from = "#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec"
         spec.loaded_from = "#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec"
-        spec.post_install_message
+        [install_message, spec.post_install_message]
       end
 
       def cache(spec)

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.pre.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.4.0.pre.2" unless defined?(::Bundler::VERSION)
 end

data/man/bundle.ronn

@@ -10,7 +10,7 @@ bundle(1) -- Ruby Dependency Management
 Bundler manages an `application's dependencies` through its entire life
 across many machines systematically and repeatably.
 
-See [the bundler website](http://gembundler.com) for information on getting
+See [the bundler website](http://bundler.io) for information on getting
 started, and Gemfile(5) for more information on the `Gemfile` format.
 
 ## OPTIONS

data/man/gemfile.5.ronn

@@ -130,7 +130,7 @@ are obviously not available).
 Note that on `bundle install`, bundler downloads and evaluates all gems, in order to
 create a single canonical list of all of the required gems and their dependencies.
 This means that you cannot list different versions of the same gems in different
-groups. For more details, see [Understanding Bundler](http://gembundler.com/rationale.html).
+groups. For more details, see [Understanding Bundler](http://bundler.io/rationale.html).
 
 ### PLATFORMS (:platforms)
 
@@ -164,13 +164,17 @@ There are a number of `Gemfile` platforms:
   * `mswin`:
     Windows
   * `mingw`:
-    Windows 'mingw32' platform (aka RubyInstaller)
+    Windows 32 bit 'mingw32' platform (aka RubyInstaller)
   * `mingw_18`:
     _mingw_ `AND` version 1.8
   * `mingw_19`:
     _mingw_ `AND` version 1.9
   * `mingw_20`:
     _mingw_ `AND` version 2.0
+  * `x64_mingw`:
+    Windows 64 bit 'mingw32' platform (aka RubyInstaller x64)
+  * `x64_mingw_20`:
+    _x64_mingw_ `AND` version 2.0
 
 As with groups, you can specify one or more platforms:
 

data/spec/bundler/dsl_spec.rb

@@ -9,7 +9,7 @@ describe Bundler::Dsl do
   describe "#_normalize_options" do
     it "converts :github to :git" do
       subject.gem("sparks", :github => "indirect/sparks")
-      github_uri = "https://github.com/indirect/sparks.git"
+      github_uri = "git://github.com/indirect/sparks.git"
       expect(subject.dependencies.first.source.uri).to eq(github_uri)
     end
 
@@ -27,7 +27,7 @@ describe Bundler::Dsl do
 
     it "converts 'rails' to 'rails/rails'" do
       subject.gem("rails", :github => "rails")
-      github_uri = "https://github.com/rails/rails.git"
+      github_uri = "git://github.com/rails/rails.git"
       expect(subject.dependencies.first.source.uri).to eq(github_uri)
     end
   end

data/spec/bundler/friendly_errors_spec.rb

@@ -0,0 +1,13 @@
+require "spec_helper"
+require "bundler"
+require "bundler/friendly_errors"
+
+describe Bundler, "friendly errors" do
+  it "rescues Thor::AmbiguousTaskError and raises SystemExit" do
+    expect {
+      Bundler.with_friendly_errors do
+        raise Thor::AmbiguousTaskError.new("")
+      end
+    }.to raise_error(SystemExit)
+  end
+end

data/spec/install/gems/dependency_api_spec.rb

@@ -419,6 +419,20 @@ describe "gemcutter's dependency API" do
       bundle :install, :artifice => "endpoint_creds_diff_host"
       should_be_installed "rack 1.0.0"
     end
+
+    describe "with no password" do
+      let(:password) { nil }
+
+      it "passes basic authentication details" do
+        gemfile <<-G
+          source "#{basic_auth_source_uri}"
+          gem "rack"
+        G
+
+        bundle :install, :artifice => "endpoint_basic_authentication"
+        should_be_installed "rack 1.0.0"
+      end
+    end
   end
 
   context "when ruby is compiled without openssl" do