bundler 1.11.0 → 1.11.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 790cd850ccdb73e7538f01e9af256855f86b7516
4
- data.tar.gz: 18bf330e05c66d13f0323d66ee5d6827abfe3f8f
3
+ metadata.gz: 48006abb972bf695b971270ac76428fa6c31b990
4
+ data.tar.gz: 35fed745c38c8e6563350e5ec39c87db084e7937
5
5
  SHA512:
6
- metadata.gz: 8f3056563932ce58ebb072108d9562bec53ba814f8e809ae171d7be62a268dd1bf1475310189cdcd202a93a4f7689a14848f77575a07d0588fcac464b5f52f2f
7
- data.tar.gz: 2e50a46de0dd9b0b6b8abb77359288d54bcf2a7d9e3c274312ba47234300449545afcf4981c959885feec15fda28074db68e9bedb66ef8659755a6c12641a8f8
6
+ metadata.gz: 29b87ffd1025734d121a1a708b2d4bcc1b30f4dbf7ff8cfd3be776a177161579c4295ee220e0f7b6e979e70e81d7abcbd86f56bb7d268b3a50a417ab2ea1d07a
7
+ data.tar.gz: a5f12a8df5fdec5dd719c34f61641e8efcc46ae49367f745b7a09684b448ac9d3dda6528da1e1cc8b22584b48a4cd1a5777d10a023d8e367087192ff52bcf4d5
@@ -1,3 +1,12 @@
1
+ ## 1.11.1 (2015-12-15)
2
+
3
+ Bugfixes:
4
+
5
+ - lazy-load Psych, again (#4149, @indirect)
6
+ - allow gemspec gems on other platforms (#4150, @indirect)
7
+ - fix --no-coc and --no-mit flags on `gem` (#4148, @RochesterinNYC)
8
+ - stop calling `required_ruby_version` on nil @specifications (#4147, @indirect)
9
+
1
10
  ## 1.11.0 (2015-12-12)
2
11
 
3
12
  (this space intentionally left blank)
@@ -26,6 +35,14 @@ Features:
26
35
  - allow setting a `silence_root_warning` setting to silence the warning when `bundle install` is run as root (@blackxored)
27
36
  - update the `bundle gem` code of conduct template to Contributor Covenant v1.3.0 (@CoralineAda)
28
37
  - add support for specifying gems to update when running `bundle lock` via `--update gem1 gem2` (@JuanitoFatas)
38
+ - added support for MRI 2.3 (@amatsuda)
39
+ - show a helpful message when requiring a file in `bundler require` fails (#3960, @agis-)
40
+ - include git revision hash when printing a git source (#3433, @agis-)
41
+ - improve hint when a resolution conflict occurs (@seanlinsley)
42
+ - show a friendly error when a git ref is not found (#3879, @agis-)
43
+ - improve error message when sources are not absolute URIs (#3925, @agis-)
44
+ - add `pkg` to rake's clobber list (#3676, @jasonkarns)
45
+ - retry fetching specs when fetching version metadata fails (@jingweno)
29
46
 
30
47
  Bugfixes:
31
48
 
@@ -34,37 +51,29 @@ Bugfixes:
34
51
  - fix `bin/setup` from `bundle gem` assuming `bash` is in `/bin`
35
52
  - fail more gracefully when an HTTP remote is unreachable (#3765, @steverob)
36
53
  - fix a warning running `bundle exec` on jruby 9.0.0.0 (@deivid-rodriguez, @mastfish)
37
- - added support for MRI 2.3 (@amatsuda)
38
54
  - fix the `bundle gem` readme when no tests are generated (@roseweixel)
39
55
  - the dependencies on test gems in `bundle gem` are now locked to major versions (#3811, @indirect)
40
56
  - fix the paths for native extensions generated by `--standalone` (#3813, @AlexanderPavlenko)
41
57
  - fix trying to cache a gem that has no source (@EduardoBautista)
42
58
  - fix `--source` option to `bundle update` causing incorrect gem unlocking (#3759, #3761, @neoeno)
43
- - show a helpful message when requiring a file in `bundler require` fails (#3960, @agis-)
44
- - improve hint when a resolution conflict occurs (@seanlinsley)
45
59
  - fix handling an empty `BUNDLE_GEMFILE` environment variables (#3678, @agis-)
46
60
  - avoid cleaning up gem extension directory in `bundle clean` (@Sirupsen)
47
- - include git revision hash when printing a git source (#3433, @agis-)
48
61
  - fix the `ssl_verify_mode` setting not being treated as a number (@goughy000)
49
62
  - fix not retrying on zlib errors (#4047, @andremedeiros)
50
63
  - fix a warning being shown for using `URI.encode` (@EduardoBautista)
51
64
  - fix handling of fatal HTTP errors (#3830, @indirect)
52
- - improve error message when sources are not absolute URIs (#3925, @agis-)
53
65
  - ensure all `sudo` access is done in a thread-safe manner (#3910, @agis-)
54
- - show a friendly error when a git ref is not found (#3879, @agis-)
55
66
  - fix caching gems with a path with the same prefix as the bundled application (@indirect)
56
67
  - fix showing gemspec validation errors on `bundle exec` (#3895, @agis-)
57
68
  - distinguish Gemfile syntax and evaluation errors (#3783, @agis-)
58
69
  - fix nested Gemfile sources not restoring the previous source (#3974, @agis-)
59
70
  - fix the `RUBYLIB` environment variable not being cleaned (#3982, @agis-)
60
71
  - fix handling a dependency missing from `Gemfile.lock` so parallel installation does not deadlock (#4012, @lukaso)
61
- - add `pkg` to rake's clobber list (#3676, @jasonkarns)
62
72
  - also print gemspecs in `bundle env` output (@agis-)
63
73
  - fix handling when a `path` source does not have a gemspec but a lockfile says there is (#4004, @segiddins)
64
74
  - show a warning when the `RUBYGEMS_GEMDEPS` environment variable is set (#3656, @agis-)
65
75
  - fix handling invalid RubyGems configuration files (#4042, @agis-)
66
76
  - fix `bundle console` falling back to `irb` when the preferred console is unavailable (@felixbuenemann)
67
- - retry fetching specs when fetching version metadata fails (@jingweno)
68
77
  - restrict platforms when referencing a `gemspec` in the `Gemfile` to those defined in the gemspec (#4102, @smellsblue)
69
78
 
70
79
  Performance:
data/Rakefile CHANGED
@@ -59,7 +59,7 @@ namespace :spec do
59
59
  # Strip secure_path so that RVM paths transmit through sudo -E
60
60
  system "sudo sed -i '/secure_path/d' /etc/sudoers"
61
61
  # Install groff so ronn can generate man/help pages
62
- sh "sudo apt-get install groff -y"
62
+ sh "sudo apt-get install groff-base -y"
63
63
  # Install graphviz so that the viz specs can run
64
64
  sh "sudo apt-get install graphviz -y 2>&1 | tail -n 2"
65
65
  if RUBY_VERSION < "1.9"
@@ -375,7 +375,7 @@ module Bundler
375
375
  # If the YAML is invalid, Syck raises an ArgumentError, and Psych
376
376
  # raises a Psych::SyntaxError. See psyched_yaml.rb for more info.
377
377
  Gem::Specification.from_yaml(contents)
378
- rescue YamlSyntaxError, ArgumentError, Gem::EndOfYAMLException, Gem::Exception
378
+ rescue YamlLibrarySyntaxError, ArgumentError, Gem::EndOfYAMLException, Gem::Exception
379
379
  eval_gemspec(path, contents)
380
380
  end
381
381
 
@@ -148,7 +148,8 @@ module Bundler
148
148
  end
149
149
 
150
150
  def ask_and_set(key, header, message)
151
- choice = options[key] || Bundler.settings["gem.#{key}"]
151
+ choice = options[key]
152
+ choice = Bundler.settings["gem.#{key}"] if choice.nil?
152
153
 
153
154
  if choice.nil?
154
155
  Bundler.ui.confirm header
@@ -54,15 +54,6 @@ module Bundler
54
54
  :x64_mingw_23 => Gem::Platform::X64_MINGW
55
55
  }.freeze
56
56
 
57
- REVERSE_PLATFORM_MAP = {}.tap do |reverse_platform_map|
58
- PLATFORM_MAP.each do |key, value|
59
- reverse_platform_map[value] ||= []
60
- reverse_platform_map[value] << key
61
- end
62
-
63
- reverse_platform_map.each {|_, platforms| platforms.freeze }
64
- end.freeze
65
-
66
57
  def initialize(name, version, options = {}, &blk)
67
58
  type = options["type"] || :runtime
68
59
  super(name, version, type)
@@ -60,7 +60,7 @@ module Bundler
60
60
  "#{file}. Make sure you can build the gem, then try again"
61
61
  end
62
62
 
63
- gem spec.name, :path => path, :glob => glob, :platforms => Bundler::Dependency::REVERSE_PLATFORM_MAP[spec.platform]
63
+ gem spec.name, :path => path, :glob => glob
64
64
 
65
65
  group(development_group) do
66
66
  spec.development_dependencies.each do |dep|
@@ -69,7 +69,7 @@ module Bundler
69
69
  status_code(23)
70
70
  end
71
71
 
72
- class YAMLSyntaxError < BundlerError
72
+ class YamlSyntaxError < BundlerError
73
73
  attr_reader :orig_exception
74
74
 
75
75
  def initialize(orig_exception, msg)
@@ -52,7 +52,10 @@ module Bundler
52
52
 
53
53
  # Exceptions classes that should bypass retry attempts. If your password didn't work the
54
54
  # first time, it's not going to the third time.
55
- AUTH_ERRORS = [AuthenticationRequiredError, BadAuthenticationError]
55
+ AUTH_ERRORS = [AuthenticationRequiredError, BadAuthenticationError, Net::HTTPBadGateway,
56
+ Net::HTTPBadRequest, Net::HTTPForbidden, Net::HTTPMethodNotAllowed,
57
+ Net::HTTPMovedPermanently, Net::HTTPNotImplemented, Net::HTTPNotFound,
58
+ Net::HTTPRequestEntityTooLarge, Net::HTTPNoContent]
56
59
 
57
60
  class << self
58
61
  attr_accessor :disable_endpoint, :api_timeout, :redirect_limit, :max_retries
@@ -5,7 +5,7 @@ require "bundler/vendored_thor"
5
5
  module Bundler
6
6
  def self.with_friendly_errors
7
7
  yield
8
- rescue YAMLSyntaxError => e
8
+ rescue Bundler::YamlSyntaxError => e
9
9
  Bundler.ui.error e.message
10
10
  Bundler.ui.trace e.orig_exception
11
11
  exit e.status_code
@@ -54,7 +54,7 @@ module Bundler
54
54
  end
55
55
 
56
56
  def respond_to?(*args)
57
- super || @specification.respond_to?(*args)
57
+ super || @specification ? @specification.respond_to?(*args) : nil
58
58
  end
59
59
 
60
60
  def to_s
@@ -19,8 +19,8 @@ module Bundler
19
19
  # On encountering invalid YAML,
20
20
  # Psych raises Psych::SyntaxError
21
21
  if defined?(::Psych::SyntaxError)
22
- YamlSyntaxError = ::Psych::SyntaxError
22
+ YamlLibrarySyntaxError = ::Psych::SyntaxError
23
23
  else # Syck raises ArgumentError
24
- YamlSyntaxError = ::ArgumentError
24
+ YamlLibrarySyntaxError = ::ArgumentError
25
25
  end
26
26
  end
@@ -1,7 +1,6 @@
1
1
  require "monitor"
2
2
  require "rubygems"
3
3
  require "rubygems/config_file"
4
- require "bundler/psyched_yaml"
5
4
 
6
5
  module Bundler
7
6
  class RubygemsIntegration
@@ -63,13 +62,14 @@ module Bundler
63
62
  end
64
63
 
65
64
  def configuration
65
+ require "bundler/psyched_yaml"
66
66
  Gem.configuration
67
67
  rescue Gem::SystemExitException => e
68
68
  Bundler.ui.error "#{e.class}: #{e.message}"
69
69
  Bundler.ui.trace e
70
70
  raise
71
- rescue YamlSyntaxError => e
72
- raise YAMLSyntaxError.new(e, "Your RubyGems configuration, which is " \
71
+ rescue YamlLibrarySyntaxError => e
72
+ raise YamlSyntaxError.new(e, "Your RubyGems configuration, which is " \
73
73
  "usually located in ~/.gemrc, contains invalid YAML syntax.")
74
74
  end
75
75
 
@@ -115,8 +115,16 @@ module Bundler
115
115
  end unless File.exist?(cache_path)
116
116
 
117
117
  Bundler.ui.info "Updating files in #{Bundler.settings.app_cache_path}"
118
+
119
+ # Do not try to cache specification for the gem described by the .gemspec
120
+ root_gem_name = nil
121
+ if gemspec_cache_hash = Bundler.instance_variable_get(:@gemspec_cache)
122
+ gemspec = gemspec_cache_hash.values.first
123
+ root_gem_name = gemspec.name unless gemspec.nil?
124
+ end
118
125
  specs.each do |spec|
119
126
  next if spec.name == "bundler"
127
+ next if File.exist?("#{root_gem_name}.gemspec") && spec.source.class == Bundler::Source::Path && root_gem_name && spec.name == root_gem_name
120
128
  spec.source.send(:fetch_gem, spec) if Bundler.settings[:cache_all_platforms] && spec.source.respond_to?(:fetch_gem, true)
121
129
  spec.source.cache(spec, custom_path) if spec.source.respond_to?(:cache)
122
130
  end
@@ -2,5 +2,5 @@ module Bundler
2
2
  # We're doing this because we might write tests that deal
3
3
  # with other versions of bundler and we are unsure how to
4
4
  # handle this better.
5
- VERSION = "1.11.0" unless defined?(::Bundler::VERSION)
5
+ VERSION = "1.11.1" unless defined?(::Bundler::VERSION)
6
6
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bundler
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.11.0
4
+ version: 1.11.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - André Arko
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: exe
13
13
  cert_chain: []
14
- date: 2015-12-13 00:00:00.000000000 Z
14
+ date: 2015-12-15 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: automatiek
@@ -345,9 +345,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
345
345
  version: 1.3.6
346
346
  requirements: []
347
347
  rubyforge_project:
348
- rubygems_version: 2.5.1
348
+ rubygems_version: 2.4.8
349
349
  signing_key:
350
350
  specification_version: 4
351
351
  summary: The best way to manage your application's dependencies
352
352
  test_files: []
353
- has_rdoc: