bundler 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 790cd850ccdb73e7538f01e9af256855f86b7516
-  data.tar.gz: 18bf330e05c66d13f0323d66ee5d6827abfe3f8f
+  metadata.gz: 48006abb972bf695b971270ac76428fa6c31b990
+  data.tar.gz: 35fed745c38c8e6563350e5ec39c87db084e7937
 SHA512:
-  metadata.gz: 8f3056563932ce58ebb072108d9562bec53ba814f8e809ae171d7be62a268dd1bf1475310189cdcd202a93a4f7689a14848f77575a07d0588fcac464b5f52f2f
-  data.tar.gz: 2e50a46de0dd9b0b6b8abb77359288d54bcf2a7d9e3c274312ba47234300449545afcf4981c959885feec15fda28074db68e9bedb66ef8659755a6c12641a8f8
+  metadata.gz: 29b87ffd1025734d121a1a708b2d4bcc1b30f4dbf7ff8cfd3be776a177161579c4295ee220e0f7b6e979e70e81d7abcbd86f56bb7d268b3a50a417ab2ea1d07a
+  data.tar.gz: a5f12a8df5fdec5dd719c34f61641e8efcc46ae49367f745b7a09684b448ac9d3dda6528da1e1cc8b22584b48a4cd1a5777d10a023d8e367087192ff52bcf4d5

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.11.1 (2015-12-15)
+
+Bugfixes:
+
+  - lazy-load Psych, again (#4149, @indirect)
+  - allow gemspec gems on other platforms (#4150, @indirect)
+  - fix --no-coc and --no-mit flags on `gem` (#4148, @RochesterinNYC)
+  - stop calling `required_ruby_version` on nil @specifications (#4147, @indirect)
+
 ## 1.11.0 (2015-12-12)
 
 (this space intentionally left blank)
@@ -26,6 +35,14 @@ Features:
   - allow setting a `silence_root_warning` setting to silence the warning when `bundle install` is run as root (@blackxored)
   - update the `bundle gem` code of conduct template to Contributor Covenant v1.3.0 (@CoralineAda)
   - add support for specifying gems to update when running `bundle lock` via `--update gem1 gem2` (@JuanitoFatas)
+  - added support for MRI 2.3 (@amatsuda)
+  - show a helpful message when requiring a file in `bundler require` fails (#3960, @agis-)
+  - include git revision hash when printing a git source (#3433, @agis-)
+  - improve hint when a resolution conflict occurs (@seanlinsley)
+  - show a friendly error when a git ref is not found (#3879, @agis-)
+  - improve error message when sources are not absolute URIs (#3925, @agis-)
+  - add `pkg` to rake's clobber list (#3676, @jasonkarns)
+  - retry fetching specs when fetching version metadata fails (@jingweno)
 
 Bugfixes:
 
@@ -34,37 +51,29 @@ Bugfixes:
   - fix `bin/setup` from `bundle gem` assuming `bash` is in `/bin`
   - fail more gracefully when an HTTP remote is unreachable (#3765, @steverob)
   - fix a warning running `bundle exec` on jruby 9.0.0.0 (@deivid-rodriguez, @mastfish)
-  - added support for MRI 2.3 (@amatsuda)
   - fix the `bundle gem` readme when no tests are generated (@roseweixel)
   - the dependencies on test gems in `bundle gem` are now locked to major versions (#3811, @indirect)
   - fix the paths for native extensions generated by `--standalone` (#3813, @AlexanderPavlenko)
   - fix trying to cache a gem that has no source (@EduardoBautista)
   - fix `--source` option to `bundle update` causing incorrect gem unlocking (#3759, #3761, @neoeno)
-  - show a helpful message when requiring a file in `bundler require` fails (#3960, @agis-)
-  - improve hint when a resolution conflict occurs (@seanlinsley)
   - fix handling an empty `BUNDLE_GEMFILE` environment variables (#3678, @agis-)
   - avoid cleaning up gem extension directory in `bundle clean` (@Sirupsen)
-  - include git revision hash when printing a git source (#3433, @agis-)
   - fix the `ssl_verify_mode` setting not being treated as a number (@goughy000)
   - fix not retrying on zlib errors (#4047, @andremedeiros)
   - fix a warning being shown for using `URI.encode` (@EduardoBautista)
   - fix handling of fatal HTTP errors (#3830, @indirect)
-  - improve error message when sources are not absolute URIs (#3925, @agis-)
   - ensure all `sudo` access is done in a thread-safe manner (#3910, @agis-)
-  - show a friendly error when a git ref is not found (#3879, @agis-)
   - fix caching gems with a path with the same prefix as the bundled application (@indirect)
   - fix showing gemspec validation errors on `bundle exec` (#3895, @agis-)
   - distinguish Gemfile syntax and evaluation errors (#3783, @agis-)
   - fix nested Gemfile sources not restoring the previous source (#3974, @agis-)
   - fix the `RUBYLIB` environment variable not being cleaned (#3982, @agis-)
   - fix handling a dependency missing from `Gemfile.lock` so parallel installation does not deadlock (#4012, @lukaso)
-  - add `pkg` to rake's clobber list (#3676, @jasonkarns)
   - also print gemspecs in `bundle env` output (@agis-)
   - fix handling when a `path` source does not have a gemspec but a lockfile says there is (#4004, @segiddins)
   - show a warning when the `RUBYGEMS_GEMDEPS` environment variable is set (#3656, @agis-)
   - fix handling invalid RubyGems configuration files (#4042, @agis-)
   - fix `bundle console` falling back to `irb` when the preferred console is unavailable (@felixbuenemann)
-  - retry fetching specs when fetching version metadata fails (@jingweno)
   - restrict platforms when referencing a `gemspec` in the `Gemfile` to those defined in the gemspec (#4102, @smellsblue)
 
 Performance:

data/Rakefile

@@ -59,7 +59,7 @@ namespace :spec do
       # Strip secure_path so that RVM paths transmit through sudo -E
       system "sudo sed -i '/secure_path/d' /etc/sudoers"
       # Install groff so ronn can generate man/help pages
-      sh "sudo apt-get install groff -y"
+      sh "sudo apt-get install groff-base -y"
       # Install graphviz so that the viz specs can run
       sh "sudo apt-get install graphviz -y 2>&1 | tail -n 2"
       if RUBY_VERSION < "1.9"

data/lib/bundler.rb

@@ -375,7 +375,7 @@ module Bundler
       # If the YAML is invalid, Syck raises an ArgumentError, and Psych
       # raises a Psych::SyntaxError. See psyched_yaml.rb for more info.
       Gem::Specification.from_yaml(contents)
-    rescue YamlSyntaxError, ArgumentError, Gem::EndOfYAMLException, Gem::Exception
+    rescue YamlLibrarySyntaxError, ArgumentError, Gem::EndOfYAMLException, Gem::Exception
       eval_gemspec(path, contents)
     end
 

data/lib/bundler/cli/gem.rb

@@ -148,7 +148,8 @@ module Bundler
     end
 
     def ask_and_set(key, header, message)
-      choice = options[key] || Bundler.settings["gem.#{key}"]
+      choice = options[key]
+      choice = Bundler.settings["gem.#{key}"] if choice.nil?
 
       if choice.nil?
         Bundler.ui.confirm header

data/lib/bundler/dependency.rb

@@ -54,15 +54,6 @@ module Bundler
       :x64_mingw_23 => Gem::Platform::X64_MINGW
     }.freeze
 
-    REVERSE_PLATFORM_MAP = {}.tap do |reverse_platform_map|
-      PLATFORM_MAP.each do |key, value|
-        reverse_platform_map[value] ||= []
-        reverse_platform_map[value] << key
-      end
-
-      reverse_platform_map.each {|_, platforms| platforms.freeze }
-    end.freeze
-
     def initialize(name, version, options = {}, &blk)
       type = options["type"] || :runtime
       super(name, version, type)

data/lib/bundler/dsl.rb

@@ -60,7 +60,7 @@ module Bundler
             "#{file}. Make sure you can build the gem, then try again"
         end
 
-        gem spec.name, :path => path, :glob => glob, :platforms => Bundler::Dependency::REVERSE_PLATFORM_MAP[spec.platform]
+        gem spec.name, :path => path, :glob => glob
 
         group(development_group) do
           spec.development_dependencies.each do |dep|

data/lib/bundler/errors.rb

@@ -69,7 +69,7 @@ module Bundler
     status_code(23)
   end
 
-  class YAMLSyntaxError < BundlerError
+  class YamlSyntaxError < BundlerError
     attr_reader :orig_exception
 
     def initialize(orig_exception, msg)

data/lib/bundler/fetcher.rb

@@ -52,7 +52,10 @@ module Bundler
 
     # Exceptions classes that should bypass retry attempts. If your password didn't work the
     # first time, it's not going to the third time.
-    AUTH_ERRORS = [AuthenticationRequiredError, BadAuthenticationError]
+    AUTH_ERRORS = [AuthenticationRequiredError, BadAuthenticationError, Net::HTTPBadGateway,
+                   Net::HTTPBadRequest, Net::HTTPForbidden, Net::HTTPMethodNotAllowed,
+                   Net::HTTPMovedPermanently, Net::HTTPNotImplemented, Net::HTTPNotFound,
+                   Net::HTTPRequestEntityTooLarge, Net::HTTPNoContent]
 
     class << self
       attr_accessor :disable_endpoint, :api_timeout, :redirect_limit, :max_retries

data/lib/bundler/friendly_errors.rb

@@ -5,7 +5,7 @@ require "bundler/vendored_thor"
 module Bundler
   def self.with_friendly_errors
     yield
-  rescue YAMLSyntaxError => e
+  rescue Bundler::YamlSyntaxError => e
     Bundler.ui.error e.message
     Bundler.ui.trace e.orig_exception
     exit e.status_code

data/lib/bundler/lazy_specification.rb

@@ -54,7 +54,7 @@ module Bundler
     end
 
     def respond_to?(*args)
-      super || @specification.respond_to?(*args)
+      super || @specification ? @specification.respond_to?(*args) : nil
     end
 
     def to_s

data/lib/bundler/psyched_yaml.rb

@@ -19,8 +19,8 @@ module Bundler
   # On encountering invalid YAML,
   # Psych raises Psych::SyntaxError
   if defined?(::Psych::SyntaxError)
-    YamlSyntaxError = ::Psych::SyntaxError
+    YamlLibrarySyntaxError = ::Psych::SyntaxError
   else # Syck raises ArgumentError
-    YamlSyntaxError = ::ArgumentError
+    YamlLibrarySyntaxError = ::ArgumentError
   end
 end

data/lib/bundler/rubygems_integration.rb

@@ -1,7 +1,6 @@
 require "monitor"
 require "rubygems"
 require "rubygems/config_file"
-require "bundler/psyched_yaml"
 
 module Bundler
   class RubygemsIntegration
@@ -63,13 +62,14 @@ module Bundler
     end
 
     def configuration
+      require "bundler/psyched_yaml"
       Gem.configuration
     rescue Gem::SystemExitException => e
       Bundler.ui.error "#{e.class}: #{e.message}"
       Bundler.ui.trace e
       raise
-    rescue YamlSyntaxError => e
-      raise YAMLSyntaxError.new(e, "Your RubyGems configuration, which is " \
+    rescue YamlLibrarySyntaxError => e
+      raise YamlSyntaxError.new(e, "Your RubyGems configuration, which is " \
         "usually located in ~/.gemrc, contains invalid YAML syntax.")
     end
 

data/lib/bundler/runtime.rb

@@ -115,8 +115,16 @@ module Bundler
       end unless File.exist?(cache_path)
 
       Bundler.ui.info "Updating files in #{Bundler.settings.app_cache_path}"
+
+      # Do not try to cache specification for the gem described by the .gemspec
+      root_gem_name = nil
+      if gemspec_cache_hash = Bundler.instance_variable_get(:@gemspec_cache)
+        gemspec = gemspec_cache_hash.values.first
+        root_gem_name = gemspec.name unless gemspec.nil?
+      end
       specs.each do |spec|
         next if spec.name == "bundler"
+        next if File.exist?("#{root_gem_name}.gemspec") && spec.source.class == Bundler::Source::Path && root_gem_name && spec.name == root_gem_name
         spec.source.send(:fetch_gem, spec) if Bundler.settings[:cache_all_platforms] && spec.source.respond_to?(:fetch_gem, true)
         spec.source.cache(spec, custom_path) if spec.source.respond_to?(:cache)
       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.11.0" unless defined?(::Bundler::VERSION)
+  VERSION = "1.11.1" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -345,9 +345,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []
-has_rdoc: