bundler 1.6.0.rc → 1.6.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d32bda726a60693191debeba799d0381900a0ad
-  data.tar.gz: 3030c023da47b1d7d59a812883ce432b1aea0204
+  metadata.gz: 7909274a9b9a99eda0647f03f88cc32e9cdc02c2
+  data.tar.gz: 9f3d0fe8471bab816bb6332bf36e45acc807236d
 SHA512:
-  metadata.gz: 3913a39ba40e4d72850c24ae963f28d83dfbf82de3905da16acc6f6322fab22bd72fdb0b5a0aa51b527c53a4560e3af25c5efcf6843bec3b97614e0f8add37cd
-  data.tar.gz: 16519e8be7841230cdaba12ff2dde2b04f60562d4221ae75d97c85ac39d4be471dc63a30ab05816c0c9f2b98ad2e0a1a1dd28a9d173de45f6a6dd4f5d0d871ef
+  metadata.gz: 1c670d2553f073f0cab99ee3fb038eeb94e7f0707a264fceb8b36f0c84e94a99bc9d93c7a6f702bcd7fedc0e3e4514e5ea0bac1d86eb65c49a9df7c988847d95
+  data.tar.gz: 20696ca89ad28274c8fbe26200a45432c70eb08e7c9dae5cdf43847a7ee374d12fa51808d8990a18680f0341c2ad074ed866dc1d756c49976723850bfacbf4ef

data/CHANGELOG.md

@@ -10,6 +10,10 @@ Bugfixes:
   - allow long config values (#2823, @kgrz)
   - cache successfully even locked to gems shipped with Ruby (#2869, @aughr)
   - respect NO_PROXY even if a proxy is configured (#2878, @stlay)
+  - only retry git commands that hit the network (#2899, @timmoore)
+  - fix NameError regression when OpenSSL is not available (#2898, @timmoore)
+  - handle exception installing when build_info owned by root (@Who828)
+  - skip HTTP redirects from rubygems.org, huge speed boost (@Who828)
 
 Features:
 
@@ -21,6 +25,8 @@ Features:
   - highlight installed or updated gems (#2722, #2741, @yaotti, @simi)
   - display the `post_install_message` for gems installed via :git (@phallstrom)
   - `bundle outdated --strict` now only reports allowed updates (@davidblondeau)
+  - `bundle show --verbose` Add gem summary to the output (@lardcanoe)
+  - `bundle gem GEM --ext` now generates a skeleton for a C extension (@superdealloc)
 
 ## 1.5.3 (2014-02-06)
 

data/README.md

@@ -1,6 +1,6 @@
-[![Code Climate](https://codeclimate.com/github/bundler/bundler.png)](https://codeclimate.com/github/bundler/bundler)
-[![Build Status](https://travis-ci.org/bundler/bundler.png?branch=master)](http://travis-ci.org/bundler/bundler)
-<a href="http://badge.fury.io/rb/bundler"><img src="https://badge.fury.io/rb/bundler@2x.png" alt="Gem Version" height="18"></a>
+[![Code Climate](https://img.shields.io/codeclimate/github/bundler/bundler.svg)](https://codeclimate.com/github/bundler/bundler)
+[![Build Status](https://img.shields.io/travis/bundler/bundler/master.svg)](https://travis-ci.org/bundler/bundler)
+[![Version     ](https://img.shields.io/gem/v/bundler.svg)](https://rubygems.org/gems/bundler)
 
 # Bundler: a gem to bundle gems
 Bundler keeps ruby applications running the same code on every machine.

data/Rakefile

@@ -30,7 +30,19 @@ end
 namespace :spec do
   desc "Ensure spec dependencies are installed"
   task :deps do
-    {"rdiscount" => "~> 1.6", "ronn" => "~> 0.7.3", "rspec" => "~> 3.0.beta"}.each do |name, version|
+    deps = {
+      "rdiscount" => "~> 1.6",
+      "ronn" => "~> 0.7.3",
+      "rspec" => "~> 3.0.beta"
+    }
+
+    # JRuby can't build ronn or rdiscount, so we skip that
+    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+      deps.delete("ronn")
+      deps.delete("rdiscount")
+    end
+
+    deps.each do |name, version|
       sh "#{Gem.ruby} -S gem list -i '^#{name}$' -v '#{version}' || " \
          "#{Gem.ruby} -S gem install #{name} -v '#{version}' --no-ri --no-rdoc"
     end
@@ -62,11 +74,10 @@ end
 begin
   # running the specs needs both rspec and ronn
   require 'rspec/core/rake_task'
-  require 'ronn'
 
   desc "Run specs"
   RSpec::Core::RakeTask.new do |t|
-    t.rspec_opts = %w(-fs --color)
+    t.rspec_opts = %w(--format documentation --color)
     t.ruby_opts  = %w(-w)
   end
   task :spec => "man:build"
@@ -104,7 +115,7 @@ begin
       (branches + releases).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
-          t.rspec_opts = %w(-fs --color)
+          t.rspec_opts = %w(--format documentation --color)
           t.ruby_opts  = %w(-w)
         end
 
@@ -141,7 +152,7 @@ begin
 
       desc "Run specs under a Rubygems checkout (set RG=path)"
       RSpec::Core::RakeTask.new("co") do |t|
-        t.rspec_opts = %w(-fs --color)
+        t.rspec_opts = %w(--format documentation --color)
         t.ruby_opts  = %w(-w)
       end
 
@@ -224,8 +235,8 @@ begin
 
 rescue LoadError
   namespace :man do
-    task(:build) { abort "Install the ronn gem to be able to release!" }
-    task(:clean) { abort "Install the ronn gem to be able to release!" }
+    task(:build) { warn "Install the ronn gem to be able to release!" }
+    task(:clean) { warn "Install the ronn gem to be able to release!" }
   end
 end
 

data/lib/bundler.rb

@@ -278,8 +278,8 @@ module Bundler
         bin_dir = bin_dir.parent until bin_dir.exist?
 
         # if any directory is not writable, we need sudo
-        dirs = [path, bin_dir] | Dir[path.join('*').to_s]
-        sudo_needed = dirs.find{|d| !File.writable?(d) }
+        files = [path, bin_dir] | Dir[path.join('build_info/*').to_s] | Dir[path.join('*').to_s]
+        sudo_needed = files.any?{|f| !File.writable?(f) }
       end
 
       @requires_sudo_ran = true

data/lib/bundler/cli.rb

@@ -64,7 +64,7 @@ module Bundler
       end
     end
 
-    desc "init", "Generates a Gemfile into the current working directory"
+    desc "init [OPTIONS]", "Generates a Gemfile into the current working directory"
     long_desc <<-D
       Init generates a default Gemfile in the current working directory. When adding a
       Gemfile to a gem with a gemspec, the --gemspec option will automatically add each
@@ -76,7 +76,7 @@ module Bundler
       Init.new(options.dup).run
     end
 
-    desc "check", "Checks if the dependencies listed in Gemfile are satisfied by currently installed gems"
+    desc "check [OPTIONS]", "Checks if the dependencies listed in Gemfile are satisfied by currently installed gems"
     long_desc <<-D
       Check searches the local machine for each of the gems requested in the Gemfile. If
       all gems are found, Bundler prints a success message and exits with a status of 0.
@@ -93,7 +93,7 @@ module Bundler
       Check.new(options).run
     end
 
-    desc "install", "Install the current environment to the system"
+    desc "install [OPTIONS]", "Install the current environment to the system"
     long_desc <<-D
       Install will install all of the gems in the current bundle, making them available
       for use. In a freshly checked out repository, this command will give you the same
@@ -146,7 +146,7 @@ module Bundler
       Install.new(options.dup).run
     end
 
-    desc "update", "update the current environment"
+    desc "update [OPTIONS]", "update the current environment"
     long_desc <<-D
       Update will install the newest versions of the gems listed in the Gemfile. Use
       update when you have changed the Gemfile, or if you want to get the newest
@@ -168,7 +168,7 @@ module Bundler
       Update.new(options, gems).run
     end
 
-    desc "show [GEM]", "Shows all gems that are part of the bundle, or the path to a given gem"
+    desc "show GEM [OPTIONS]", "Shows all gems that are part of the bundle, or the path to a given gem"
     long_desc <<-D
       Show lists the names and versions of all gems that are required by your Gemfile.
       Calling show with [GEM] will list the exact location of that gem on your machine.
@@ -181,7 +181,7 @@ module Bundler
     end
     map %w(list) => "show"
 
-    desc "binstubs [GEM]", "install the binstubs of the listed gem"
+    desc "binstubs GEM [OPTIONS]", "install the binstubs of the listed gem"
     long_desc <<-D
       Generate binstubs for executables in [GEM]. Binstubs are put into bin,
       or the --binstubs directory if one has been set.
@@ -195,7 +195,7 @@ module Bundler
       Binstubs.new(options, gems).run
     end
 
-    desc "outdated [GEM]", "list installed gems with newer versions available"
+    desc "outdated GEM [OPTIONS]", "list installed gems with newer versions available"
     long_desc <<-D
       Outdated lists the names and versions of gems that have a newer version available
       in the given source. Calling outdated with [GEM [GEM]] will only check for newer
@@ -213,7 +213,7 @@ module Bundler
       Outdated.new(options, gems).run
     end
 
-    desc "cache", "Cache all the gems to vendor/cache", :hide => true
+    desc "cache [OPTIONS]", "Cache all the gems to vendor/cache", :hide => true
     method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
     method_option "all",  :type => :boolean, :banner => "Include all sources (including path and git)."
     def cache
@@ -221,7 +221,7 @@ module Bundler
       Cache.new(options).run
     end
 
-    desc "package", "Locks and then caches all of the gems into vendor/cache"
+    desc "package [OPTIONS]", "Locks and then caches all of the gems into vendor/cache"
     method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
     method_option "all",  :type => :boolean, :banner => "Include all sources (including path and git)."
     method_option "quiet", :type => :boolean, :banner => "Only output warnings and errors."
@@ -240,7 +240,7 @@ module Bundler
     end
     map %w(pack) => :package
 
-    desc "exec", "Run the command in context of the bundle"
+    desc "exec [OPTIONS]", "Run the command in context of the bundle"
     method_option :keep_file_descriptors, :type => :boolean, :default => false
     long_desc <<-D
       Exec runs a command, providing it access to the gems in the bundle. While using
@@ -307,7 +307,7 @@ module Bundler
       end
     end
 
-    desc 'viz', "Generates a visual dependency graph"
+    desc 'viz [OPTIONS]', "Generates a visual dependency graph"
     long_desc <<-D
       Viz generates a PNG file of the current Gemfile as a dependency graph.
       Viz requires the ruby-graphviz gem (and its dependencies).
@@ -322,13 +322,14 @@ module Bundler
       Viz.new(options).run
     end
 
-    desc "gem GEM", "Creates a skeleton for creating a rubygem"
+    desc "gem GEM [OPTIONS]", "Creates a skeleton for creating a rubygem"
     method_option :bin, :type => :boolean, :default => false, :aliases => '-b', :banner => "Generate a binary for your library."
     method_option :test, :type => :string, :lazy_default => 'rspec', :aliases => '-t', :banner => "Generate a test directory for your library: 'rspec' is the default, but 'minitest' is also supported."
     method_option :edit, :type => :string, :aliases => "-e",
                   :lazy_default => [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? },
                   :required => false, :banner => "/path/to/your/editor",
                   :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
+    method_option :ext, :type => :boolean, :detailt => false, :banner => "Generate the boilerplate for C extension code"
 
     def gem(name)
       require 'bundler/cli/gem'
@@ -339,7 +340,7 @@ module Bundler
       File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
     end
 
-    desc "clean", "Cleans up unused gems in your bundler directory"
+    desc "clean [OPTIONS]", "Cleans up unused gems in your bundler directory"
     method_option "dry-run", :type => :boolean, :default => false, :banner =>
       "only print out changes, do not actually clean gems"
     method_option "force", :type => :boolean, :default => false, :banner =>
@@ -349,7 +350,7 @@ module Bundler
       Clean.new(options.dup).run
     end
 
-    desc "platform", "Displays platform compatibility information"
+    desc "platform [OPTIONS]", "Displays platform compatibility information"
     method_option "ruby", :type => :boolean, :default => false, :banner =>
       "only display ruby related platform information"
     def platform

data/lib/bundler/cli/gem.rb

@@ -8,7 +8,16 @@ module Bundler
     end
 
     def run
+      if options[:ext] && gem_name.index('-')
+        Bundler.ui.error "You have specified a gem name which does not conform to the \n" \
+                         "naming guidelines for C extensions. For more information, \n" \
+                         "see the 'Extension Naming' section at the following URL:\n" \
+                         "http://guides.rubygems.org/gems-with-extensions/\n"
+        exit 1
+      end
+
       name = gem_name.chomp("/") # remove trailing slash if present
+      underscored_name = name.tr('-', '_')
       namespaced_path = name.tr('-', '/')
       target = File.join(Dir.pwd, name)
       constant_name = name.split('_').map{|p| p[0..0].upcase + p[1..-1] }.join
@@ -17,13 +26,15 @@ module Bundler
       git_user_name = `git config user.name`.chomp
       git_user_email = `git config user.email`.chomp
       opts = {
-        :name            => name,
-        :namespaced_path => namespaced_path,
-        :constant_name   => constant_name,
-        :constant_array  => constant_array,
-        :author          => git_user_name.empty? ? "TODO: Write your name" : git_user_name,
-        :email           => git_user_email.empty? ? "TODO: Write your email address" : git_user_email,
-        :test            => options[:test]
+        :name             => name,
+        :underscored_name => underscored_name,
+        :namespaced_path  => namespaced_path,
+        :constant_name    => constant_name,
+        :constant_array   => constant_array,
+        :author           => git_user_name.empty? ? "TODO: Write your name" : git_user_name,
+        :email            => git_user_email.empty? ? "TODO: Write your email address" : git_user_email,
+        :test             => options[:test],
+        :ext              => options[:ext]
       }
       gemspec_dest = File.join(target, "#{name}.gemspec")
       thor.template(File.join("newgem/Gemfile.tt"),               File.join(target, "Gemfile"),                             opts)
@@ -49,6 +60,11 @@ module Bundler
       if options[:test]
         thor.template(File.join("newgem/.travis.yml.tt"),         File.join(target, ".travis.yml"),            opts)
       end
+      if options[:ext]
+        thor.template(File.join("newgem/ext/newgem/extconf.rb.tt"), File.join(target, "ext/#{name}/extconf.rb"), opts)
+        thor.template(File.join("newgem/ext/newgem/newgem.h.tt"), File.join(target, "ext/#{name}/#{underscored_name}.h"), opts)
+        thor.template(File.join("newgem/ext/newgem/newgem.c.tt"), File.join(target, "ext/#{name}/#{underscored_name}.c"), opts)
+      end
       Bundler.ui.info "Initializing git repo in #{target}"
       Dir.chdir(target) { `git init`; `git add .` }
 

data/lib/bundler/cli/show.rb

@@ -35,10 +35,14 @@ module Bundler
       else
         Bundler.ui.info "Gems included by the bundle:"
         Bundler.load.specs.sort_by { |s| s.name }.each do |s|
-          Bundler.ui.info "  * #{s.name} (#{s.version}#{s.git_version})"
+          desc = "  * #{s.name} (#{s.version}#{s.git_version})"
+          if @options[:verbose]
+            Bundler.ui.info "#{desc} - #{s.summary || 'No description available.'}"
+          else
+            Bundler.ui.info desc
+          end
         end
       end
     end
-
   end
 end

data/lib/bundler/fetcher.rb

@@ -292,7 +292,7 @@ module Bundler
     end
 
     def dependency_api_uri(gem_names = [])
-      url = "#{@remote_uri}api/v1/dependencies"
+      url = "#{redirected_uri}api/v1/dependencies"
       url << "?gems=#{URI.encode(gem_names.join(","))}" if gem_names.any?
       URI.parse(url)
     end
@@ -378,5 +378,19 @@ module Bundler
       yield
     end
 
+    private
+    def redirected_uri
+      return bundler_uri if rubygems?
+      return @remote_uri
+    end
+
+    def rubygems?
+      @remote_uri.host == "rubygems.org"
+    end
+
+    def bundler_uri
+      URI.parse("#{@remote_uri.scheme}://bundler.#{@remote_uri.host}/")
+    end
+
   end
 end

data/lib/bundler/rubygems_integration.rb

@@ -160,7 +160,7 @@ module Bundler
 
     def spec_from_gem(path, policy = nil)
       require 'rubygems/security'
-      gem_from_path(path, Gem::Security::Policies[policy]).spec
+      gem_from_path(path, security_policies[policy]).spec
     rescue Gem::Package::FormatError
       raise GemspecError, "Could not read gem at #{path}. It may be corrupted."
     rescue Exception, Gem::Exception, Gem::Security::Exception => e

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

@@ -40,6 +40,7 @@ module Bundler
           @ref      = ref
           @revision = revision
           @allow    = allow || Proc.new { true }
+          raise GitNotInstalledError.new unless Bundler.git_present?
         end
 
         def revision
@@ -64,12 +65,12 @@ module Bundler
             return if has_revision_cached?
             Bundler.ui.confirm "Updating #{uri}"
             in_path do
-              git %|fetch --force --quiet --tags #{uri_escaped} "refs/heads/*:refs/heads/*"|
+              git_retry %|fetch --force --quiet --tags #{uri_escaped} "refs/heads/*:refs/heads/*"|
             end
           else
             Bundler.ui.info "Fetching #{uri}"
             FileUtils.mkdir_p(path.dirname)
-            git %|clone #{uri_escaped} "#{path}" --bare --no-hardlinks --quiet|
+            git_retry %|clone #{uri_escaped} "#{path}" --bare --no-hardlinks --quiet|
           end
         end
 
@@ -77,16 +78,16 @@ module Bundler
           unless File.exist?(destination.join(".git"))
             FileUtils.mkdir_p(destination.dirname)
             FileUtils.rm_rf(destination)
-            git %|clone --no-checkout --quiet "#{path}" "#{destination}"|
+            git_retry %|clone --no-checkout --quiet "#{path}" "#{destination}"|
             File.chmod((0777 & ~File.umask), destination)
           end
 
           SharedHelpers.chdir(destination) do
-            git %|fetch --force --quiet --tags "#{path}"|
+            git_retry %|fetch --force --quiet --tags "#{path}"|
             git "reset --hard #{@revision}"
 
             if submodules
-              git "submodule update --init --recursive"
+              git_retry "submodule update --init --recursive"
             end
           end
         end
@@ -102,14 +103,17 @@ module Bundler
           git("#{command} 2>#{Bundler::NULL}", false)
         end
 
+        def git_retry(command)
+          Bundler::Retry.new("git #{command}", GitNotAllowedError).attempts do
+            git(command)
+          end
+        end
+
         def git(command, check_errors=true)
           raise GitNotAllowedError.new(command) unless allow?
-          raise GitNotInstalledError.new        unless Bundler.git_present?
-          Bundler::Retry.new("git #{command}").attempts do
-            out = SharedHelpers.with_clean_git_env { %x{git #{command}} }
-            raise GitCommandError.new(command, path) if check_errors && !$?.success?
-            out
-          end
+          out = SharedHelpers.with_clean_git_env { %x{git #{command}} }
+          raise GitCommandError.new(command, path) if check_errors && !$?.success?
+          out
         end
 
         def has_revision_cached?

data/lib/bundler/templates/newgem/Rakefile.tt

@@ -14,3 +14,11 @@ RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 <% end -%>
+
+<% if config[:ext] -%>
+require "rake/extensiontask"
+
+Rake::ExtensionTask.new("<%=config[:underscored_name]%>") do |ext|
+  ext.lib_dir = "lib/<%=config[:namespaced_path]%>"
+end
+<% end -%>

data/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt

@@ -0,0 +1,3 @@
+require "mkmf"
+
+create_makefile(<%=config[:underscored_name].inspect%>)

data/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt

@@ -0,0 +1,9 @@
+#include "<%=config[:underscored_name]%>.h"
+
+VALUE rb_m<%=config[:constant_array].join%>;
+
+void
+Init_<%=config[:underscored_name]%>(void)
+{
+  rb_m<%=config[:constant_array].join%> = rb_define_module(<%=config[:constant_name].inspect%>);
+}

data/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt

@@ -0,0 +1,6 @@
+#ifndef <%=config[:underscored_name].upcase%>_H
+#define <%=config[:underscored_name].upcase%>_H 1
+
+#include "ruby.h"
+
+#endif /* <%=config[:underscored_name].upcase%>_H */

data/lib/bundler/templates/newgem/gitignore.tt

@@ -15,3 +15,8 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/lib/bundler/templates/newgem/lib/newgem.rb.tt

@@ -1,4 +1,7 @@
 require "<%=config[:namespaced_path]%>/version"
+<%- if config[:ext] -%>
+require "<%=config[:namespaced_path]%>/<%=config[:underscored_name]%>"
+<%- end -%>
 
 <%- config[:constant_array].each_with_index do |c,i| -%>
 <%= '  '*i %>module <%= c %>

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -8,6 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = <%=config[:constant_name]%>::VERSION
   spec.authors       = [<%=config[:author].inspect%>]
   spec.email         = [<%=config[:email].inspect%>]
+<% if config[:ext] -%>
+  spec.extensions    = ["ext/<%=config[:underscored_name]%>/extconf.rb"]
+<% end -%>
   spec.summary       = %q{TODO: Write a short summary. Required.}
   spec.description   = %q{TODO: Write a longer description. Optional.}
   spec.homepage      = ""
@@ -20,6 +23,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> <%= Bundler::VERSION.split(".")[0..1].join(".") %>"
   spec.add_development_dependency "rake"
+<% if config[:ext] -%>
+  spec.add_development_dependency "rake-compiler"
+<% end -%>
 <% if config[:test] -%>
   spec.add_development_dependency "<%=config[:test]%>"
 <% end -%>

data/lib/bundler/vendor/net/http/persistent.rb

@@ -203,7 +203,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent you are using
 
-  VERSION = '2.9'
+  VERSION = '2.9.3'
 
   ##
   # Exceptions rescued for automatic retry on ruby 2.0.0.  This overlaps with
@@ -616,8 +616,6 @@ class Net::HTTP::Persistent
     if @proxy_uri and not proxy_bypass? uri.host, uri.port then
       connection_id << @proxy_connection_id
       net_http_args.concat @proxy_args
-    elsif proxy_bypass? uri.host, uri.port then
-      net_http_args.concat [nil, nil]
     end
 
     connection = connections[connection_id]
@@ -633,6 +631,7 @@ class Net::HTTP::Persistent
     start connection unless connection.started?
 
     connection.read_timeout = @read_timeout if @read_timeout
+    connection.keep_alive_timeout = @idle_timeout if @idle_timeout && connection.respond_to?(:keep_alive_timeout=)
 
     connection
   rescue Errno::ECONNREFUSED
@@ -668,6 +667,14 @@ class Net::HTTP::Persistent
     CGI.escape str if str
   end
 
+  ##
+  # URI::unescape wrapper
+
+  def unescape str
+    CGI.unescape str if str
+  end
+
+
   ##
   # Returns true if the connection should be reset due to an idle timeout, or
   # maximum request count, false otherwise.
@@ -860,8 +867,8 @@ class Net::HTTP::Persistent
       @proxy_args = [
         @proxy_uri.host,
         @proxy_uri.port,
-        @proxy_uri.user,
-        @proxy_uri.password,
+        unescape(@proxy_uri.user),
+        unescape(@proxy_uri.password),
       ]
 
       @proxy_connection_id = [nil, *@proxy_args].join ':'
@@ -957,9 +964,13 @@ class Net::HTTP::Persistent
 
     start connection
   rescue Errno::ECONNREFUSED
-    raise Error, "connection refused: #{connection.address}:#{connection.port}"
+    e = Error.new "connection refused: #{connection.address}:#{connection.port}"
+    e.set_backtrace $@
+    raise e
   rescue Errno::EHOSTDOWN
-    raise Error, "host down: #{connection.address}:#{connection.port}"
+    e = Error.new "host down: #{connection.address}:#{connection.port}"
+    e.set_backtrace $@
+    raise e
   end
 
   ##

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.6.0.rc" unless defined?(::Bundler::VERSION)
+  VERSION = "1.6.0.rc2" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-config.ronn

@@ -86,12 +86,6 @@ learn more about their operation in [bundle install(1)][bundle-install].
 * `bin` (`BUNDLE_BIN`):
   Install executables from gems in the bundle to the specified directory.
   Defaults to `false`.
-* `gemfile` (`BUNDLE_GEMFILE`):
-  The name of the file that bundler should use as the `Gemfile`. This location
-  of this file also sets the root of the project, which is used to resolve
-  relative paths in the `Gemfile`, among other things. By default, bundler
-  will search up from the current working directory until it finds a
-  `Gemfile`.
 * `ssl_ca_cert` (`BUNDLE_SSL_CA_CERT`):
   Path to a designated CA certificate file or folder containing multiple
   certificates for trusted CAs in PEM format.
@@ -106,6 +100,18 @@ You can set them globally either via environment variables or `bundle config`,
 whichever is preferable for your setup. If you use both, environment variables
 will take preference over global settings.
 
+An additional setting is available only as an environment variable:
+
+* `BUNDLE_GEMFILE`:
+  The name of the file that bundler should use as the `Gemfile`. This location
+  of this file also sets the root of the project, which is used to resolve
+  relative paths in the `Gemfile`, among other things. By default, bundler
+  will search up from the current working directory until it finds a
+  `Gemfile`.
+
+Bundler will ignore any `BUNDLE_GEMFILE` entries in local or global
+configuration files.
+
 ## LOCAL GIT REPOS
 
 Bundler also allows you to work against a git repository locally

data/spec/commands/newgem_spec.rb

@@ -341,6 +341,7 @@ describe "bundle gem" do
           RSpec::Core::RakeTask.new(:spec)
 
           task :default => :spec
+
         RAKEFILE
 
         expect(bundled_app("test-gem/Rakefile").read).to eq(rakefile)
@@ -381,6 +382,7 @@ describe "bundle gem" do
           end
 
           task :default => :test
+
         RAKEFILE
 
         expect(bundled_app("test-gem/Rakefile").read).to eq(rakefile)
@@ -399,5 +401,23 @@ describe "bundle gem" do
         expect(bundled_app("test-gem/test/minitest_helper.rb")).to_not exist
       end
     end
+
+    context "--ext parameter set" do
+      before do
+        reset!
+        in_app_root
+        bundle "gem test_gem --ext"
+      end
+
+      it "builds ext skeleton" do
+        expect(bundled_app("test_gem/ext/test_gem/extconf.rb")).to exist
+        expect(bundled_app("test_gem/ext/test_gem/test_gem.h")).to exist
+        expect(bundled_app("test_gem/ext/test_gem/test_gem.c")).to exist
+      end
+
+      it "includes rake-compiler" do
+        expect(bundled_app("test_gem/test_gem.gemspec").read).to include('spec.add_development_dependency "rake-compiler"')
+      end
+    end
   end
 end

data/spec/commands/show_spec.rb

@@ -59,6 +59,13 @@ describe "bundle show" do
       gem_list = out.split.map { |p| p.split('/').last }
       expect(gem_list).to eq(gem_list.sort)
     end
+
+    it "prints summary of gems" do
+      bundle "show --verbose"
+
+      expect(out).to include(' - This is just a fake gem for testing')
+      expect(out).to include(' - Ruby based make-like utility.')
+    end
   end
 
   context "with a git repo in the Gemfile" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.6.0.rc
+  version: 1.6.0.rc2
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn
@@ -112,22 +112,6 @@ files:
 - lib/bundler/installer.rb
 - lib/bundler/lazy_specification.rb
 - lib/bundler/lockfile_parser.rb
-- lib/bundler/man/bundle
-- lib/bundler/man/bundle-config
-- lib/bundler/man/bundle-config.txt
-- lib/bundler/man/bundle-exec
-- lib/bundler/man/bundle-exec.txt
-- lib/bundler/man/bundle-install
-- lib/bundler/man/bundle-install.txt
-- lib/bundler/man/bundle-package
-- lib/bundler/man/bundle-package.txt
-- lib/bundler/man/bundle-platform
-- lib/bundler/man/bundle-platform.txt
-- lib/bundler/man/bundle-update
-- lib/bundler/man/bundle-update.txt
-- lib/bundler/man/bundle.txt
-- lib/bundler/man/gemfile.5
-- lib/bundler/man/gemfile.5.txt
 - lib/bundler/match_platform.rb
 - lib/bundler/parallel_workers.rb
 - lib/bundler/parallel_workers/thread_worker.rb
@@ -168,6 +152,9 @@ files:
 - lib/bundler/templates/newgem/README.md.tt
 - lib/bundler/templates/newgem/Rakefile.tt
 - lib/bundler/templates/newgem/bin/newgem.tt
+- lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt
+- lib/bundler/templates/newgem/ext/newgem/newgem.c.tt
+- lib/bundler/templates/newgem/ext/newgem/newgem.h.tt
 - lib/bundler/templates/newgem/gitignore.tt
 - lib/bundler/templates/newgem/lib/newgem.rb.tt
 - lib/bundler/templates/newgem/lib/newgem/version.rb.tt
@@ -336,6 +323,22 @@ files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
+- lib/bundler/man/bundle
+- lib/bundler/man/bundle-config
+- lib/bundler/man/bundle-config.txt
+- lib/bundler/man/bundle-exec
+- lib/bundler/man/bundle-exec.txt
+- lib/bundler/man/bundle-install
+- lib/bundler/man/bundle-install.txt
+- lib/bundler/man/bundle-package
+- lib/bundler/man/bundle-package.txt
+- lib/bundler/man/bundle-platform
+- lib/bundler/man/bundle-platform.txt
+- lib/bundler/man/bundle-update
+- lib/bundler/man/bundle-update.txt
+- lib/bundler/man/bundle.txt
+- lib/bundler/man/gemfile.5
+- lib/bundler/man/gemfile.5.txt
 homepage: http://bundler.io
 licenses:
 - MIT
@@ -356,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies