bundler 1.16.0.pre.1 → 1.16.0.pre.2

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of bundler might be problematic. Click here for more details.

Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +8 -0
  3. data/lib/bundler/build_metadata.rb +2 -2
  4. data/lib/bundler/gem_helper.rb +5 -1
  5. data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +1 -1
  6. data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +6 -2
  7. data/lib/bundler/vendored_persistent.rb +1 -0
  8. data/lib/bundler/version.rb +1 -1
  9. data/man/bundle-package.1 +1 -1
  10. data/man/bundle-package.1.txt +1 -1
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 461ac41667e722cb445f3b68673de5b3a4c944496662d08d4f1b7c009533adbf
4
- data.tar.gz: 9b0d4a479e0a0672c568995a08a58c15b6461cbc24f5faff4fa6d78c63c2b5ca
3
+ metadata.gz: bd9b80e0e02fb0287ef6b7914878f5f879dbf240f0b8883bad8a6e742c3309b1
4
+ data.tar.gz: 94fb33b3fdd901a67aacad6ca81d787b0cf91c97f98615bd63179736850d05f4
5
5
  SHA512:
6
- metadata.gz: 9f807456d92092ba14ccfe3b233d367936b6eebf8eadf7eec9484f1d369cd4cae38769015bafcd6d362d70b3a4cab7e405c019bc5814f9b9817acb9a69a1f3bb
7
- data.tar.gz: fc4cd931a53cfa305391ec6180dde28d372a8568b1d30a228f21e6c96d850f4c146669d0cbf7f568ef65913fd83e39ba660c2a5390fcfbfa39ab0aa03b7276a3
6
+ metadata.gz: 253c2e9963cf446cbfdf5dcb9d5384ba188b0b402cbf69e707e28a5d29d7d72d3a6ef31c7598a46e900e144cd894a4e871ead7fecd76f478cf206a9a54e11874
7
+ data.tar.gz: e6c0b141ae252949947ae8e2a270abd5a7c15852e3d405ad5d82e5c9d4bc1382fa9609e10d7ad09243e43c36ae416d65657adea963e5f07b58f45fe4b26e3514
data/CHANGELOG.md CHANGED
@@ -1,3 +1,11 @@
1
+ ## 1.16.0.pre.2 (2017-09-06)
2
+
3
+ Bugfixes:
4
+
5
+ - handle when a connection is missing a socket when warning about OpenSSL version (@greysteil)
6
+ - the description for the `rake release` task now reflects `$RUBYGEMS_HOST` (@wadetandy)
7
+ - fix a bug where `bundle update` would regress transitive dependencies (@greysteil)
8
+
1
9
  ## 1.16.0.pre.1 (2017-09-04)
2
10
 
3
11
  Features:
data/lib/bundler/build_metadata.rb CHANGED
@@ -4,8 +4,8 @@ module Bundler
4
4
  # Represents metadata from when the Bundler gem was built.
5
5
  module BuildMetadata
6
6
  # begin ivars
7
- @built_at = "2017-09-05".freeze
8
- @git_commit_sha = "5ffc8b010".freeze
7
+ @built_at = "2017-09-07".freeze
8
+ @git_commit_sha = "c1db119a5".freeze
9
9
  @release = true
10
10
  # end ivars
11
11
 
data/lib/bundler/gem_helper.rb CHANGED
@@ -118,7 +118,11 @@ module Bundler
118
118
  end
119
119
 
120
120
  def gem_push_host
121
- allowed_push_host || "rubygems.org"
121
+ env_rubygems_host = ENV["RUBYGEMS_HOST"]
122
+ env_rubygems_host = nil if
123
+ env_rubygems_host && env_rubygems_host.empty?
124
+
125
+ allowed_push_host || env_rubygems_host || "rubygems.org"
122
126
  end
123
127
 
124
128
  def perform_git_push(options = "")
data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb CHANGED
@@ -2,5 +2,5 @@
2
2
 
3
3
  module Bundler::Molinillo
4
4
  # The version of Bundler::Molinillo.
5
- VERSION = '0.6.2'.freeze
5
+ VERSION = '0.6.3'.freeze
6
6
  end
data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb CHANGED
@@ -461,11 +461,15 @@ module Bundler::Molinillo
461
461
  # @param [UnwindDetails] details of the conflict just unwound from
462
462
  # @return [void]
463
463
  def filter_possibilities_for_primary_unwind(unwind_details)
464
- all_requirements = unwind_details.conflicting_requirements
464
+ unwinds_to_state = unused_unwind_options.select { |uw| uw.state_index == unwind_details.state_index }
465
+ unwinds_to_state << unwind_details
466
+ unwind_requirement_sets = unwinds_to_state.map(&:conflicting_requirements)
465
467
 
466
468
  state.possibilities.reject! do |possibility_set|
467
469
  possibility_set.possibilities.none? do |poss|
468
- possibility_satisfies_requirements?(poss, all_requirements)
470
+ unwind_requirement_sets.any? do |requirements|
471
+ possibility_satisfies_requirements?(poss, requirements)
472
+ end
469
473
  end
470
474
  end
471
475
  end
data/lib/bundler/vendored_persistent.rb CHANGED
@@ -30,6 +30,7 @@ module Bundler
30
30
  return unless (uri.host || "").end_with?("rubygems.org")
31
31
 
32
32
  socket = connection.instance_variable_get(:@socket)
33
+ return unless socket
33
34
  socket_io = socket.io
34
35
  return unless socket_io.respond_to?(:ssl_version)
35
36
  ssl_version = socket_io.ssl_version
data/lib/bundler/version.rb CHANGED
@@ -7,7 +7,7 @@ module Bundler
7
7
  # We're doing this because we might write tests that deal
8
8
  # with other versions of bundler and we are unsure how to
9
9
  # handle this better.
10
- VERSION = "1.16.0.pre.1" unless defined?(::Bundler::VERSION)
10
+ VERSION = "1.16.0.pre.2" unless defined?(::Bundler::VERSION)
11
11
 
12
12
  def self.overwrite_loaded_gem_version
13
13
  begin
data/man/bundle-package.1 CHANGED
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "BUNDLE\-PACKAGE" "1" "August 2017" "" ""
4
+ .TH "BUNDLE\-PACKAGE" "1" "September 2017" "" ""
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBbundle\-package\fR \- Package your needed \fB\.gem\fR files into your application
data/man/bundle-package.1.txt CHANGED
@@ -76,4 +76,4 @@ BUNDLE-PACKAGE(1) BUNDLE-PACKAGE(1)
76
76
 
77
77
 
78
78
 
79
- August 2017 BUNDLE-PACKAGE(1)
79
+ September 2017 BUNDLE-PACKAGE(1)
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.16.0.pre.1
4
+ version: 1.16.0.pre.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - André Arko
@@ -17,7 +17,7 @@ authors:
17
17
  autorequire:
18
18
  bindir: exe
19
19
  cert_chain: []
20
- date: 2017-09-05 00:00:00.000000000 Z
20
+ date: 2017-09-07 00:00:00.000000000 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  name: automatiek