bundler 1.3.0 → 1.3.1

data/.travis.yml

@@ -4,6 +4,7 @@ before_script: rake spec:travis:deps
 branches:
   only:
     - master
+    - 1-3-stable
     - 1-2-stable
     - 1-1-stable
     - 1-0-stable
@@ -22,39 +23,41 @@ notifications:
     rooms:
       - secure: "geau3P+A9ZJHkA/OHN5v9Mcb8hAti1PllXw5DsHNJfLAWBAw5ReGGMA8Xfpf\nLdT7ktIUlQwzw94cKQ6sRZk8szXTiHncf3bxXTACJf2RpiKmbkoQU51TmCDq\nYSMuY1FIryk/3t9aZCrarufbIDI3DBscDEe4Bj9bERl+TJ8ArBY="
 rvm:
+  - 2.0.0
   - 1.9.3
-  - 1.9.2
-  - 1.8.7
 # Rubygems versions MUST be available as rake tasks
 # see Rakefile:66 for the list of possible RGV values
 env:
   # we need to know if changes to rubygems will break bundler on release
   - RGV=master
   # test the latest rubygems release with all of our supported rubies
-  - RGV=v1.8.24
+  - RGV=v2.0.0
 matrix:
   allow_failures:
     # we want to know how we're doing with head, but not fail the build
     - rvm: ruby-head
-    # until the 2.0 rc, it's okay for failures to crop up
-    - rvm: 2.0.0
+    - env: RGV=master
     # 1.9.2 is simply too slow. it sometimes exceeds the 25m hard limit.
     - rvm: 1.9.2
   include:
     # riding the edge
     - rvm: ruby-head
       env: RGV=master
-    # 2.0 release track
-    - rvm: 2.0.0
-      env: RGV=v2.0.0.rc.1
-    # Bundler 1.x supports Rubygems down to 1.5.3 on Ruby 1.9.3
+    # Rubygems goes down to 1.5.3 on Ruby 1.9.3
+    - rvm: 1.9.3
+      env: RGV=v1.8.25
     - rvm: 1.9.3
       env: RGV=v1.7.2
     - rvm: 1.9.3
       env: RGV=v1.6.2
     - rvm: 1.9.3
       env: RGV=v1.5.3
-    # Bundler 1.x supports Rubygems down to 1.3.6 on Ruby 1.8.7
+    # We only want an overview of how 1.9.2 is doing
+    - rvm: 1.9.2
+      env: RGV=v1.8.25
+    # Rubygems goes down to 1.3.6 on Ruby 1.8.7
+    - rvm: 1.8.7
+      env: RGV=v1.8.25
     - rvm: 1.8.7
       env: RGV=v1.7.2
     - rvm: 1.8.7

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.3.1 (3 March 2013)
+
+Bugfixes:
+
+  - include manpages in gem, restoring many help pages
+  - handle more SSL certificate verification failures
+  - check for the full version of SSL, which we need (@alup)
+  - gem rake task 'install' now depends on task 'build' (@sunaku)
+
 ## 1.3.0 (24 February 2013)
 
 Features:

data/Rakefile

@@ -5,9 +5,6 @@ require 'rubygems'
 require 'shellwords'
 require 'benchmark'
 
-task :build => ["man:clean", "man:build"]
-task :release => ["man:clean", "man:build"]
-
 def safe_task(&block)
   yield
   true
@@ -32,7 +29,7 @@ end
 namespace :spec do
   desc "Ensure spec dependencies are installed"
   task :deps do
-    {"rdiscount" => "~> 1.6", "ronn" => "~> 0.7.3", "rspec" => "~> 2.12"}.each do |name, version|
+    {"rdiscount" => "~> 1.6", "ronn" => "~> 0.7.3", "rspec" => "~> 2.13"}.each do |name, version|
       sh "#{Gem.ruby} -S gem list #{name} -v '#{version}' | grep '#{name}' -q || " \
          "#{Gem.ruby} -S gem install #{name} -v '#{version}' --no-ri --no-rdoc"
     end
@@ -91,7 +88,7 @@ begin
     namespace :rubygems do
       # Rubygems specs by version
       rubyopt = ENV["RUBYOPT"]
-      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.24 v2.0.0.rc.1).each do |rg|
+      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.25 v2.0.0).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)
@@ -176,6 +173,15 @@ begin
     end
   end
 
+rescue LoadError
+  task :spec do
+    abort "Run `rake spec:deps` to be able to run the specs"
+  end
+end
+
+begin
+  require 'ronn'
+
   namespace :man do
     directory "lib/bundler/man"
 
@@ -204,11 +210,15 @@ begin
   end
 
 rescue LoadError
-  task :spec do
-    abort "Run `rake spec:deps` to be able to run the specs"
+  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!" }
   end
 end
 
+task :build => ["man:clean", "man:build"]
+task :release => ["man:clean", "man:build"]
+
 namespace :vendor do
   desc "Build the vendor dir"
   task :build => :clean do

data/bundler.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 2.11'
 
   spec.files       = `git ls-files`.split($/)
-  spec.files      += Dir.glob('man/**/*') # man/ is ignored by git
+  spec.files      += Dir.glob('lib/bundler/man/**/*') # man/ is ignored by git
   spec.test_files  = spec.files.grep(%r{^spec/})
 
   spec.executables   = %w(bundle)

data/lib/bundler/cli.rb

@@ -1,7 +1,6 @@
+require 'bundler'
 require 'bundler/similarity_detector'
 require 'bundler/vendored_thor'
-require 'rubygems/user_interaction'
-require 'rubygems/security'
 
 module Bundler
   class CLI < Thor
@@ -14,7 +13,7 @@ module Bundler
       raise InvalidOption, e.message
     ensure
       Bundler.ui = UI::Shell.new(options)
-      Bundler.ui.debug! if options["verbose"]
+      Bundler.ui.level = "debug" if options["verbose"]
     end
 
     check_unknown_options!(:except => [:config, :exec])
@@ -170,8 +169,10 @@ module Bundler
       "Use the rubygems modern index instead of the API endpoint"
     method_option "clean", :type => :boolean, :banner =>
       "Run bundle clean automatically after install"
-    method_option "trust-policy", :alias => "P", :type => :string, :banner =>
-      "Gem trust policy (like gem install -P). Must be one of " + Gem::Security::Policies.keys.join('|')
+    unless Bundler.rubygems.security_policies.empty?
+      method_option "trust-policy", :alias => "P", :type => :string, :banner =>
+        "Gem trust policy (like gem install -P). Must be one of " + Bundler.rubygems.security_policies.keys.join('|')
+    end
 
     def install
       opts = options.dup
@@ -193,9 +194,9 @@ module Bundler
       end
 
       if (opts["trust-policy"])
-        unless (Gem::Security::Policies.keys.include?(opts["trust-policy"]))
+        unless (Bundler.rubygems.security_policies.keys.include?(opts["trust-policy"]))
           Bundler.ui.error "Rubygems doesn't know about trust policy '#{opts["trust-policy"]}'. " \
-            "The known policies are: #{Gem::Security::Policies.keys.join(', ')}."
+            "The known policies are: #{Bundler.rubygems.security_policies.keys.join(', ')}."
           exit 1
         end
         Bundler.settings["trust-policy"] = opts["trust-policy"]
@@ -225,20 +226,20 @@ module Bundler
       end
 
       # Can't use Bundler.settings for this because settings needs gemfile.dirname
-      Bundler.settings[:path]   = nil if opts[:system]
-      Bundler.settings[:path]   = "vendor/bundle" if opts[:deployment]
-      Bundler.settings[:path]   = opts[:path] if opts[:path]
-      Bundler.settings[:path] ||= "bundle" if opts[:standalone]
-      Bundler.settings[:bin] = opts["binstubs"] if opts["binstubs"]
-      Bundler.settings[:bin] = nil if opts["binstubs"] && opts["binstubs"].empty?
-      Bundler.settings[:shebang] = opts["shebang"] if opts[:shebang]
+      Bundler.settings[:path]     = nil if opts[:system]
+      Bundler.settings[:path]     = "vendor/bundle" if opts[:deployment]
+      Bundler.settings[:path]     = opts[:path] if opts[:path]
+      Bundler.settings[:path]     ||= "bundle" if opts[:standalone]
+      Bundler.settings[:bin]      = opts["binstubs"] if opts["binstubs"]
+      Bundler.settings[:bin]      = nil if opts["binstubs"] && opts["binstubs"].empty?
+      Bundler.settings[:shebang]  = opts["shebang"] if opts[:shebang]
       Bundler.settings[:no_prune] = true if opts["no-prune"]
+      Bundler.settings[:clean]    = opts[:clean] if opts[:clean]
+      Bundler.settings.without    = opts[:without]
+      Bundler.ui.level            = "warn" if opts[:quiet]
+      Bundler::Fetcher.disable_endpoint = opts["full-index"]
       Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? '1' : nil
-      Bundler.settings.without = opts[:without]
-      Bundler.ui.quiet = opts[:quiet]
-      Bundler.settings[:clean] = opts[:clean] if opts[:clean]
 
-      Bundler::Fetcher.disable_endpoint = opts["full-index"]
       # rubygems plugins sometimes hook into the gem install process
       Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
 
@@ -289,7 +290,7 @@ module Bundler
         "Use the rubygems modern index instead of the API endpoint"
     def update(*gems)
       sources = Array(options[:source])
-      Bundler.ui.quiet = options[:quiet]
+      Bundler.ui.level = "warn" if options[:quiet]
 
       if gems.empty? && sources.empty?
         # We're doing a full update
@@ -742,9 +743,11 @@ module Bundler
     method_option "ruby", :type => :boolean, :default => false, :banner =>
       "only display ruby related platform information"
     def platform
-      platforms    = Bundler.definition.platforms.map {|p| "* #{p}" }
-      ruby_version = Bundler.definition.ruby_version
-      output       = []
+      platforms, ruby_version = Bundler.ui.silence do
+        [ Bundler.definition.platforms.map {|p| "* #{p}" },
+          Bundler.definition.ruby_version ]
+      end
+      output = []
 
       if options[:ruby]
         if ruby_version

data/lib/bundler/fetcher.rb

@@ -123,9 +123,9 @@ module Bundler
       end
 
       index
-    rescue OpenSSL::SSL::SSLError
+    rescue CertificateFailureError => e
       Bundler.ui.info "" if gem_names && use_api # newline after dots
-      raise CertificateFailureError.new(@public_uri)
+      raise e
     end
 
     # fetch index
@@ -197,6 +197,8 @@ module Bundler
           req = Net::HTTP::Get.new uri.request_uri
           response = @connection.request(req)
         end
+      rescue OpenSSL::SSL::SSLError
+        raise CertificateFailureError.new(@public_uri)
       rescue *HTTP_ERRORS
         raise HTTPError, "Network error while fetching #{uri}"
       end
@@ -250,10 +252,11 @@ module Bundler
     def fetch_all_remote_specs
       Bundler.rubygems.sources = ["#{@remote_uri}"]
       Bundler.rubygems.fetch_all_remote_specs
-    rescue Gem::RemoteFetcher::FetchError => e
+    rescue Gem::RemoteFetcher::FetchError, OpenSSL::SSL::SSLError => e
       if e.message.match("certificate verify failed")
         raise CertificateFailureError.new(@public_uri)
       else
+        Bundler.ui.trace e
         raise HTTPError, "Could not fetch specs from #{@public_uri}"
       end
     end

data/lib/bundler/friendly_errors.rb

@@ -1,24 +1,30 @@
 module Bundler
   def self.with_friendly_errors
-    begin
-      yield
-    rescue Bundler::BundlerError => e
-      Bundler.ui.error e.message, :wrap => true
-      Bundler.ui.trace e
-      exit e.status_code
-    rescue Interrupt => e
-      Bundler.ui.error "\nQuitting..."
-      Bundler.ui.trace e
-      exit 1
-    rescue SystemExit => e
-      exit e.status
-    rescue Exception => e
-      Bundler.ui.error <<-ERR, :wrap => true
-        Unfortunately, a fatal error has occurred. Please see the Bundler
-        troubleshooting documentation at http://bit.ly/bundler-issues. Thanks!
+    yield
+  rescue Bundler::BundlerError => e
+    Bundler.ui.error e.message, :wrap => true
+    Bundler.ui.trace e
+    exit e.status_code
+  rescue LoadError => e
+    raise e unless e.message =~ /cannot load such file -- openssl|openssl.so|libcrypto.so/
+    Bundler.ui.error "\nCould not load OpenSSL."
+    Bundler.ui.warn "You must recompile Ruby with OpenSSL support or change the sources in your" \
+      "\nGemfile from 'https' to 'http'. Instructions for compiling with OpenSSL" \
+      "\nusing RVM are available at rvm.io/packages/openssl."
+    Bundler.ui.trace e
+    exit 1
+  rescue Interrupt => e
+    Bundler.ui.error "\nQuitting..."
+    Bundler.ui.trace e
+    exit 1
+  rescue SystemExit => e
+    exit e.status
+  rescue Exception => e
+    Bundler.ui.error <<-ERR, :wrap => true
+      Unfortunately, a fatal error has occurred. Please see the Bundler
+      troubleshooting documentation at http://bit.ly/bundler-issues. Thanks!
 
-      ERR
-      raise e
-    end
+    ERR
+    raise e
   end
 end

data/lib/bundler/gem_helper.rb

@@ -33,19 +33,21 @@ module Bundler
     end
 
     def install
+      built_gem_path = nil
+
       desc "Build #{name}-#{version}.gem into the pkg directory."
       task 'build' do
-        build_gem
+        built_gem_path = build_gem
       end
 
       desc "Build and install #{name}-#{version}.gem into system gems."
-      task 'install' do
-        install_gem
+      task 'install' => 'build' do
+        install_gem(built_gem_path)
       end
 
       desc "Create tag #{version_tag} and build and push #{name}-#{version}.gem to Rubygems"
-      task 'release' do
-        release_gem
+      task 'release' => 'build' do
+        release_gem(built_gem_path)
       end
 
       GemHelper.instance = self
@@ -62,16 +64,16 @@ module Bundler
       File.join(base, 'pkg', file_name)
     end
 
-    def install_gem
-      built_gem_path = build_gem
+    def install_gem(built_gem_path=nil)
+      built_gem_path ||= build_gem
       out, _ = sh_with_code("gem install '#{built_gem_path}' --local")
       raise "Couldn't install gem, run `gem install #{built_gem_path}' for more detailed output" unless out[/Successfully installed/]
       Bundler.ui.confirm "#{name} (#{version}) installed."
     end
 
-    def release_gem
+    def release_gem(built_gem_path=nil)
       guard_clean
-      built_gem_path = build_gem
+      built_gem_path ||= build_gem
       tag_version { git_push } unless already_tagged?
       rubygem_push(built_gem_path) if gem_push?
     end

data/lib/bundler/installer.rb

@@ -66,13 +66,13 @@ module Bundler
       end
 
       if Bundler.default_lockfile.exist? && !options["update"]
-        real_ui, Bundler.ui = Bundler.ui, Bundler::UI.new
-        begin
-          tmpdef = Definition.build(Bundler.default_gemfile, Bundler.default_lockfile, nil)
-          local = true unless tmpdef.new_platform? || tmpdef.missing_specs.any?
-        rescue BundlerError
+        local = Bundler.ui.silence do
+          begin
+            tmpdef = Definition.build(Bundler.default_gemfile, Bundler.default_lockfile, nil)
+            true unless tmpdef.new_platform? || tmpdef.missing_specs.any?
+          rescue BundlerError
+          end
         end
-        Bundler.ui = real_ui
       end
 
       # Since we are installing, we can resolve the definition

data/lib/bundler/rubygems_integration.rb

@@ -166,6 +166,15 @@ module Bundler
       Gem::RemoteFetcher.fetcher.download(spec, uri, path)
     end
 
+    def security_policies
+      @security_policies ||= begin
+        require 'rubygems/security'
+        Gem::Security::Policies
+      rescue LoadError
+        {}
+      end
+    end
+
     def reverse_rubygems_kernel_mixin
       # Disable rubygems' gem activation system
       ::Kernel.class_eval do
@@ -424,8 +433,6 @@ module Bundler
 
     # Rubygems 2.0
     class Future < RubygemsIntegration
-      require 'rubygems/package'
-
       def stub_rubygems(specs)
         Gem::Specification.all = specs
 
@@ -460,12 +467,14 @@ module Bundler
       end
 
       def gem_from_path(path, policy = nil)
+        require 'rubygems/package'
         p = Gem::Package.new(path)
         p.security_policy = policy if policy
         return p
       end
 
       def build(spec)
+        require 'rubygems/package'
         Gem::Package.build(spec)
       end
 

data/lib/bundler/ui.rb

@@ -28,7 +28,8 @@ module Bundler
     end
 
     class Shell < UI
-      attr_reader :quiet
+      LEVELS = %w(silent error warn confirm info debug)
+
       attr_writer :shell
 
       def initialize(options = {})
@@ -36,52 +37,51 @@ module Bundler
           Thor::Base.shell = Thor::Shell::Basic
         end
         @shell = Thor::Base.shell.new
-        @quiet = false
-        @debug = ENV['DEBUG']
-        @trace = ENV['TRACE']
+        @level = ENV['DEBUG'] ? "debug" : "info"
       end
 
       def info(msg, newline = nil)
-        tell_me(msg, nil, newline) if !@quiet
+        tell_me(msg, nil, newline) if level("info")
       end
 
       def confirm(msg, newline = nil)
-        tell_me(msg, :green, newline) if !@quiet
+        tell_me(msg, :green, newline) if level("confirm")
       end
 
       def warn(msg, newline = nil)
-        tell_me(msg, :yellow, newline)
+        tell_me(msg, :yellow, newline) if level("warn")
       end
 
       def error(msg, newline = nil)
-        tell_me(msg, :red, newline)
-      end
-
-      def quiet=(value)
-        @quiet = value
+        tell_me(msg, :red, newline) if level("error")
       end
 
-      def quiet?
-        @quiet
+      def debug(msg, newline = nil)
+        tell_me(msg, nil, newline) if level("debug")
       end
 
       def debug?
         # needs to be false instead of nil to be newline param to other methods
-        !!@debug && !@quiet
-      end
-
-      def debug!
-        @debug = true
+        level("debug")
       end
 
-      def debug(msg, newline = nil)
-        tell_me(msg, nil, newline) if debug?
+      def quiet?
+        LEVELS.index(@level) <= LEVELS.index("warn")
       end
 
       def ask(msg)
         @shell.ask(msg)
       end
 
+      def level=(level)
+        raise ArgumentError unless LEVELS.include?(level.to_s)
+        @level = level
+      end
+
+      def level(name = nil)
+        name ? LEVELS.index(name) <= LEVELS.index(@level) : @level
+      end
+
       def trace(e, newline = nil)
         msg = ["#{e.class}: #{e.message}", *e.backtrace].join("\n")
         if debug?
@@ -91,6 +91,13 @@ module Bundler
         end
       end
 
+      def silence
+        old_level, @level = @level, "silent"
+        yield
+      ensure
+        @level = old_level
+      end
+
     private
 
       # valimism

data/lib/bundler/vendored_persistent.rb

@@ -1,6 +1,6 @@
 begin
   require 'openssl'
-  OpenSSL # ensure OpenSSL is loaded
+  OpenSSL && OpenSSL::SSL # ensure OpenSSL is loaded
 
   vendor = File.expand_path('../vendor', __FILE__)
   $:.unshift(vendor) unless $:.include?(vendor)

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.3.0" unless defined?(::Bundler::VERSION)
+  VERSION = "1.3.1" unless defined?(::Bundler::VERSION)
 end

data/spec/install/gems/dependency_api_spec.rb

@@ -433,13 +433,13 @@ describe "gemcutter's dependency API" do
   end
 
   context "when SSL certificate verification fails" do
-    it "explains what is going on" do
+    it "explains what happened" do
       # Install a monkeypatch that reproduces the effects of openssl raising
-      # a certificate validation error at the appropriate moment.
+      # a certificate validation error when Rubygems tries to connect.
       gemfile <<-G
-        class Bundler::Fetcher
-          def fetch_all_remote_specs
-            raise OpenSSL::SSL::SSLError, "Certificate invalid"
+        class Net::HTTP
+          def start
+            raise OpenSSL::SSL::SSLError, "certificate verify failed"
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn
@@ -269,6 +269,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://gembundler.com
 licenses:
 - MIT