bundler 1.3.5 → 1.3.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7304a63f3f93180bfc448131ffa016885410d872
+  data.tar.gz: 24ef788f45ff1f976584b293fc207b413d82548e
+SHA512:
+  metadata.gz: c823ec338057eeda5c740b53a0981c7db020cbde644ec656c8aa55a75be5ff65a9a1c352450a3ecb4c3ea930e830021426f593860fa1c9c057d8e5f6b2f32836
+  data.tar.gz: 059bacb8d560f78ec5fa123dc806c5d458e96260b64993912b888f666bc8b4d2e03afba9cea68640146a3b6206eea571bfa664976845f8e9f4063211ee73385a

data/.travis.yml

@@ -10,8 +10,10 @@ branches:
     - 1-0-stable
 notifications:
   email:
-    - mail@arko.net
-    - hone02@gmail.com
+    # andre
+    - secure: "bCcvqJT7YrBawtkXXwHhT+jOFth7r2Qv/30PkkbhQxk6Jb3xambjCOJ3U6vJ\ngYmiL50exi5lUp3oc3SEbHN5t2CrZqOZDQ6o7P8EAmB5c0oH2RrYaFOkI5Gt\nul/jGH/96A9sj0aMwG7JfdMSfhqj1DUKAm2PnnbXPL853VfmT24="
+    # terence
+    - secure: "MQ8eA5Jb8YzEpAo58DRGfVJklAPcEbAulpBZnTxp0am6ldneDtJHbQk21w6R\nj5GsDHlzr/lMp/GHIimtUZ7rLohfND8fj/W7fs1Dkd4eN02/ERt98x3pHlqv\nvZgSnZ39uVYv+OcphraE24QaRaGWLhWZAMYQTVe/Yz50NyG8g1U="
   irc:
     on_success: change
     on_failure: always
@@ -31,12 +33,14 @@ 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=v2.0.2
+  - RGV=v2.0.6
+  - RGV=2.0
 matrix:
   allow_failures:
     # we want to know how we're doing with head, but not fail the build
     - rvm: ruby-head
     - env: RGV=master
+    - env: RGV=2.0
     # 1.9.2 is simply too slow. it sometimes exceeds the 25m hard limit.
     - rvm: 1.9.2
   include:

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 1.3.6
+
+Bugfixes:
+
+  - make gemspec path option preserve relative paths in lock file (@bwillis)
+  - use umask when creating binstubs (#1618, @v-yarotsky)
+  - warn if graphviz is not installed (#2435, @Agis-)
+  - show git errors while loading gemspecs
+  - don't mutate gem method options hash (#2447)
+  - print Thor errors (#2478, @pjvds)
+  - print Rubygems system exit errors (James Cook)
+  - more Pathnames into Strings for MacRuby (@kml)
+  - preserve original gemspec path (@bwillis)
+  - remove warning about deps with :git (#1651, @ixti)
+  - split git files on null (#2634, @jasonmp85)
+  - handle cross-host redirects without SSL (#2686, @grddev)
+  - handle Rubygems 2 security exception (@zzak)
+  - reinstall gems if they are missing with spec present
+  - set binstub permissions using umask (#1618, @v-yarotsky)
+
 ## 1.3.5 (3 April 2013)
 
 Features:
@@ -111,6 +131,7 @@ Features:
   - `binstubs` lists child gem bins if a gem has no binstubs
   - `bundle gem --edit` will open the new gemspec (@ndbroadbent)
   - `bundle gem --test rspec` now makes working tests (@tricknotes)
+  - `bundle env` prints info about bundler's environment (@peeja)
   - add `BUNDLE_IGNORE_CONFIG` environment variable support (@richo)
 
 Bugfixes:

data/ISSUES.md

@@ -6,7 +6,7 @@ So! You're having problems with Bundler. This file is here to help. If you're ru
 
 Instructions for common Bundler uses can be found on the [Bundler documentation site](http://gembundler.com/).
 
-Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](http://gembundler.com/man/bundle.1.html).
+Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](http://gembundler.com/v1.3/man/bundle.1.html).
 
 ## Troubleshooting
 
@@ -76,7 +76,7 @@ If you are using Rails 2.3, please also include:
   - Your environment.rb file
 
 
-If you have either `rubygems-bundler` or `open_gem` installed, please try removing them and then following the troublshooting steps above before opening a new ticket.
+If you have either `rubygems-bundler` or `open_gem` installed, please try removing them and then following the troubleshooting steps above before opening a new ticket.
 
 [Create a gist](https://gist.github.com) containing all of that information, then visit the [Bundler issue tracker](https://github.com/carlhuda/bundler/issues) and [create a ticket](https://github.com/carlhuda/bundler/issues/new) describing your problem and linking to your gist.
 

data/LICENSE.md

@@ -1,4 +1,4 @@
-Portions copyright (c) 2010 Andre Arko
+Portions copyright (c) 2010 Andre Arko  
 Portions copyright (c) 2009 Engine Yard
 
 MIT License

data/Rakefile

@@ -30,7 +30,7 @@ namespace :spec do
   desc "Ensure spec dependencies are installed"
   task :deps do
     {"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 || " \
+      sh "#{Gem.ruby} -S gem list -i #{name} -v '#{version}' || " \
          "#{Gem.ruby} -S gem install #{name} -v '#{version}' --no-ri --no-rdoc"
     end
   end
@@ -85,10 +85,11 @@ begin
       system "sudo rm -rf #{File.expand_path('../tmp/sudo_gem_home', __FILE__)}"
     end
 
+    # Rubygems specs by version
     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.25 v2.0.2).each do |rg|
+      # When editing this list, also edit .travis.yml!
+      %w(master 2.0 v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.25 v2.0.6).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)

data/bin/bundle

@@ -17,4 +17,9 @@ end
 
 require 'bundler/cli'
 require 'bundler/friendly_errors'
-Bundler.with_friendly_errors { Bundler::CLI.start }
+Bundler.with_friendly_errors {
+    # Set debug flag so we can rescue Thor::error's
+    # and set the correct exit code.
+    ENV["THOR_DEBUG"] = "1"
+    Bundler::CLI.start
+}

data/bundler.gemspec

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

data/lib/bundler.rb

@@ -80,8 +80,7 @@ module Bundler
     status_code(6)
   end
 
-  class InvalidSpecSet < StandardError; end
-  class MarshalError   < StandardError; end
+  class MarshalError < StandardError; end
 
   class << self
     attr_writer :ui, :bundle_path
@@ -262,7 +261,7 @@ 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('*')]
+        dirs = [path, bin_dir] | Dir[path.join('*').to_s]
         sudo_needed = dirs.find{|d| !File.writable?(d) }
       end
 
@@ -367,7 +366,6 @@ module Bundler
         configure_gem_home
       end
 
-      Bundler.rubygems.refresh
       bundle_path
     end
 

data/lib/bundler/cli.rb

@@ -492,7 +492,7 @@ module Bundler
     long_desc <<-D
       Exec runs a command, providing it access to the gems in the bundle. While using
       bundle exec you can require and call the bundled gems as if they were installed
-      into the systemwide Rubygems repository.
+      into the system wide Rubygems repository.
     D
     def exec(*args)
       Bundler.definition.validate_ruby!
@@ -651,23 +651,19 @@ module Bundler
     method_option :format, :type => :string, :default => "png", :aliases => '-F', :banner => "This is output format option. Supported format is png, jpg, svg, dot ..."
     def viz
       require 'graphviz'
-
       output_file = File.expand_path(options[:file])
       graph = Graph.new(Bundler.load, output_file, options[:version], options[:requirements], options[:format])
-
-      begin
-        graph.viz
-      rescue LoadError => e
-        Bundler.ui.error e.inspect
-        Bundler.ui.warn "Make sure you have the graphviz ruby gem. You can install it with:"
-        Bundler.ui.warn "`gem install ruby-graphviz`"
-      rescue StandardError => e
-        if e.message =~ /GraphViz not installed or dot not in PATH/
-          Bundler.ui.error e.message
-          Bundler.ui.warn "The ruby graphviz gem requires GraphViz to be installed"
-        else
-          raise
-        end
+      graph.viz
+    rescue LoadError => e
+      Bundler.ui.error e.inspect
+      Bundler.ui.warn "Make sure you have the graphviz ruby gem. You can install it with:"
+      Bundler.ui.warn "`gem install ruby-graphviz`"
+    rescue StandardError => e
+      if e.message =~ /GraphViz not installed or dot not in PATH/
+        Bundler.ui.error e.message
+        Bundler.ui.warn "Please install GraphViz. On a Mac with homebrew, you can run `brew install graphviz`."
+      else
+        raise
       end
     end
 
@@ -721,7 +717,7 @@ module Bundler
       if options[:test]
         template(File.join("newgem/.travis.yml.tt"),         File.join(target, ".travis.yml"),            opts)
       end
-      Bundler.ui.info "Initializating git repo in #{target}"
+      Bundler.ui.info "Initializing git repo in #{target}"
       Dir.chdir(target) { `git init`; `git add .` }
 
       if options[:edit]

data/lib/bundler/definition.rb

@@ -249,7 +249,7 @@ module Bundler
           select  { |s| s.source == source }.
           # This needs to be sorted by full name so that
           # gems with the same name, but different platform
-          # are ordered consistantly
+          # are ordered consistently
           sort_by { |s| s.full_name }.
           each do |spec|
             next if spec.name == 'bundler'

data/lib/bundler/deployment.rb

@@ -20,7 +20,7 @@ module Bundler
           installed to the shared/bundle path. Gems in the development and \
           test group will not be installed. The install command is executed \
           with the --deployment and --quiet flags. If the bundle cmd cannot \
-          be found then you can override the bundle_cmd variable to specifiy \
+          be found then you can override the bundle_cmd variable to specify \
           which one it should use. The base path to the app is fetched from \
           the :latest_release variable. Set it for custom deploy layouts.
 

data/lib/bundler/dsl.rb

@@ -42,8 +42,9 @@ module Bundler
       path              = opts && opts[:path] || '.'
       name              = opts && opts[:name] || '{,*}'
       development_group = opts && opts[:development_group] || :development
-      path              = File.expand_path(path, Bundler.default_gemfile.dirname)
-      gemspecs = Dir[File.join(path, "#{name}.gemspec")]
+      expanded_path     = File.expand_path(path, Bundler.default_gemfile.dirname)
+
+      gemspecs = Dir[File.join(expanded_path, "#{name}.gemspec")]
 
       case gemspecs.size
       when 1
@@ -56,9 +57,9 @@ module Bundler
           end
         end
       when 0
-        raise InvalidOption, "There are no gemspecs at #{path}."
+        raise InvalidOption, "There are no gemspecs at #{expanded_path}."
       else
-        raise InvalidOption, "There are multiple gemspecs at #{path}. Please use the :name option to specify which one."
+        raise InvalidOption, "There are multiple gemspecs at #{expanded_path}. Please use the :name option to specify which one."
       end
     end
 
@@ -67,7 +68,7 @@ module Bundler
         raise GemfileError, %{You need to specify gem names as Strings. Use 'gem "#{name.to_s}"' instead.}
       end
 
-      options = Hash === args.last ? args.pop : {}
+      options = Hash === args.last ? args.pop.dup : {}
       version = args
 
       _normalize_options(name, version, options)

data/lib/bundler/fetcher.rb

@@ -203,7 +203,12 @@ module Bundler
         else
           req = Net::HTTP::Get.new uri.request_uri
           req.basic_auth(uri.user, uri.password) if uri.user && uri.password
-          response = @connection.request(req)
+          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)
         end
       rescue OpenSSL::SSL::SSLError
         raise CertificateFailureError.new(@public_uri)

data/lib/bundler/friendly_errors.rb

@@ -5,6 +5,12 @@ module Bundler
     Bundler.ui.error e.message, :wrap => true
     Bundler.ui.trace e
     exit e.status_code
+  rescue Thor::UndefinedTaskError => e
+    Bundler.ui.error e.message
+    exit 15
+  rescue Thor::Error => e
+    Bundler.ui.error e.message
+    exit 1
   rescue LoadError => e
     raise e unless e.message =~ /cannot load such file -- openssl|openssl.so|libcrypto.so/
     Bundler.ui.error "\nCould not load OpenSSL."

data/lib/bundler/gem_helper.rb

@@ -1,5 +1,4 @@
-$:.unshift File.expand_path('../vendor', __FILE__)
-require 'thor'
+require 'bundler/vendored_thor' unless defined?(Thor)
 require 'bundler'
 
 module Bundler

data/lib/bundler/installer.rb

@@ -163,7 +163,7 @@ module Bundler
           next
         end
 
-        File.open(binstub_path, 'w', 0755) do |f|
+        File.open(binstub_path, 'w', 0777 & ~File.umask) do |f|
           f.puts ERB.new(template, nil, '-').result(binding)
         end
       end

data/lib/bundler/rubygems_ext.rb

@@ -51,7 +51,7 @@ module Gem
     end
 
     def git_version
-      if @loaded_from && File.exist?(File.join(full_gem_path, ".git"))
+      if loaded_from && File.exist?(File.join(full_gem_path, ".git"))
         sha = Dir.chdir(full_gem_path){ `git rev-parse HEAD`.strip }
         " #{sha[0..6]}"
       end

data/lib/bundler/rubygems_integration.rb

@@ -32,6 +32,10 @@ module Bundler
 
     def configuration
       Gem.configuration
+    rescue Gem::SystemExitException => e
+      Bundler.ui.error "#{e.class}: #{e.message}"
+      Bundler.ui.trace e
+      raise Gem::SystemExitException
     end
 
     def ruby_engine
@@ -87,10 +91,6 @@ module Bundler
       Gem.bin_path(gem, bin, ver)
     end
 
-    def refresh
-      Gem.refresh
-    end
-
     def preserve_paths
       # this is a no-op outside of Rubygems 1.8
       yield
@@ -153,7 +153,7 @@ module Bundler
       end
     end
 
-    def build(spec)
+    def build(spec, skip_validation = false)
       require 'rubygems/builder'
       Gem::Builder.new(spec).build
     end
@@ -170,7 +170,7 @@ module Bundler
       @security_policies ||= begin
         require 'rubygems/security'
         Gem::Security::Policies
-      rescue LoadError
+      rescue LoadError, NameError
         {}
       end
     end
@@ -398,7 +398,7 @@ module Bundler
       end
     end
 
-    # Rubygems ~> 1.8.5
+    # Rubygems 1.8.5-1.8.19
     class Modern < RubygemsIntegration
       def stub_rubygems(specs)
         Gem::Specification.all = specs
@@ -431,14 +431,24 @@ module Bundler
       end
     end
 
+    # Rubygems 1.8.20+
+    class MoreModern < Modern
+      # Rubygems 1.8.20 and adds the skip_validation parameter, so that's
+      # when we start passing it through.
+      def build(spec, skip_validation = false)
+        require 'rubygems/builder'
+        Gem::Builder.new(spec).build(skip_validation)
+      end
+    end
+
     # Rubygems 2.0
     class Future < RubygemsIntegration
       def stub_rubygems(specs)
         Gem::Specification.all = specs
 
-        Gem.post_reset {
+        Gem.post_reset do
           Gem::Specification.all = specs
-        }
+        end
       end
 
       def all_specs
@@ -481,9 +491,9 @@ module Bundler
         return p
       end
 
-      def build(spec)
+      def build(spec, skip_validation = false)
         require 'rubygems/package'
-        Gem::Package.build(spec)
+        Gem::Package.build(spec, skip_validation)
       end
 
     end
@@ -492,6 +502,8 @@ module Bundler
 
   if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.99.99')
     @rubygems = RubygemsIntegration::Future.new
+  elsif Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.20')
+    @rubygems = RubygemsIntegration::MoreModern.new
   elsif Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.5')
     @rubygems = RubygemsIntegration::Modern.new
   elsif Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')

data/lib/bundler/source/git.rb

@@ -173,8 +173,9 @@ module Bundler
 
       def load_spec_files
         super
-      rescue PathError, GitError
-        raise GitError, "#{to_s} is not checked out. Please run `bundle install`"
+      rescue PathError => e
+        Bundler.ui.trace e
+        raise GitError, "#{to_s} is not yet checked out. Run `bundle install` first."
       end
 
       # This is the path which is going to contain a cache

data/lib/bundler/source/rubygems.rb

@@ -68,7 +68,7 @@ module Bundler
       end
 
       def install(spec)
-        if installed_specs[spec].any?
+        if installed_specs[spec].any? && gem_dir_exists?(spec)
           Bundler.ui.info "Using #{spec.name} (#{spec.version}) "
           return
         end
@@ -250,6 +250,16 @@ module Bundler
           Bundler.rubygems.sources = old
         end
       end
+
+      def gem_dir_exists?(spec)
+        return true if spec.name == "bundler"
+        # Ruby 2 default gems
+        return true if spec.loaded_from.include?("specifications/default/")
+        # Ruby 1.9 default gems
+        return true if spec.summary =~ /is bundled with Ruby/
+
+        File.directory?(spec.full_gem_path)
+      end
     end
 
   end