diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2020-07-01 20:22:40 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-07-15 16:05:12 +0900 |
commit | 5783d0dbfc517c7c9e1fc7d6c10134a36e50449e (patch) | |
tree | 43ca9561df58cfd0b690c0084058da287f420bd3 /lib/bundler | |
parent | 0c8d90b5269829d9209a409163832998d5d77af4 (diff) |
Import remaining changes
The "sync with commits" scripts failed to properly import these for some
reason.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3275
Diffstat (limited to 'lib/bundler')
-rw-r--r-- | lib/bundler/rubygems_integration.rb | 4 | ||||
-rw-r--r-- | lib/bundler/shared_helpers.rb | 2 | ||||
-rw-r--r-- | lib/bundler/vendor/thor/lib/thor.rb | 7 | ||||
-rw-r--r-- | lib/bundler/vendor/thor/lib/thor/actions/create_link.rb | 3 | ||||
-rw-r--r-- | lib/bundler/vendor/thor/lib/thor/base.rb | 9 | ||||
-rw-r--r-- | lib/bundler/vendor/thor/lib/thor/version.rb | 2 |
6 files changed, 13 insertions, 14 deletions
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb index 5470eb7263..9256fa274c 100644 --- a/lib/bundler/rubygems_integration.rb +++ b/lib/bundler/rubygems_integration.rb @@ -136,14 +136,10 @@ module Bundler end def inflate(obj) - require "rubygems/util" - Gem::Util.inflate(obj) end def correct_for_windows_path(path) - require "rubygems/util" - if Gem::Util.respond_to?(:correct_for_windows_path) Gem::Util.correct_for_windows_path(path) elsif path[0].chr == "/" && path[1].chr =~ /[a-z]/i && path[2].chr == ":" diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb index 6e83bc5ff4..19fab78cc3 100644 --- a/lib/bundler/shared_helpers.rb +++ b/lib/bundler/shared_helpers.rb @@ -194,7 +194,7 @@ module Bundler return @md5_available if defined?(@md5_available) @md5_available = begin require "openssl" - OpenSSL::Digest::MD5.digest("") + OpenSSL::Digest.digest("MD5", "") true rescue LoadError true diff --git a/lib/bundler/vendor/thor/lib/thor.rb b/lib/bundler/vendor/thor/lib/thor.rb index 01c0b2f83c..f2a03388cc 100644 --- a/lib/bundler/vendor/thor/lib/thor.rb +++ b/lib/bundler/vendor/thor/lib/thor.rb @@ -344,13 +344,6 @@ class Bundler::Thor command && disable_required_check.include?(command.name.to_sym) end - def deprecation_warning(message) #:nodoc: - unless ENV['THOR_SILENCE_DEPRECATION'] - warn "Deprecation warning: #{message}\n" + - 'You can silence deprecations warning by setting the environment variable THOR_SILENCE_DEPRECATION.' - end - end - protected def stop_on_unknown_option #:nodoc: diff --git a/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb b/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb index 70504a2c1f..fb76fcdbe9 100644 --- a/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +++ b/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb @@ -33,7 +33,8 @@ class Bundler::Thor # Boolean:: true if it is identical, false otherwise. # def identical? - exists? && File.identical?(render, destination) + source = File.expand_path(render, File.dirname(destination)) + exists? && File.identical?(source, destination) end def invoke! diff --git a/lib/bundler/vendor/thor/lib/thor/base.rb b/lib/bundler/vendor/thor/lib/thor/base.rb index 9ba5243378..8487f9590a 100644 --- a/lib/bundler/vendor/thor/lib/thor/base.rb +++ b/lib/bundler/vendor/thor/lib/thor/base.rb @@ -22,6 +22,15 @@ class Bundler::Thor TEMPLATE_EXTNAME = ".tt" + class << self + def deprecation_warning(message) #:nodoc: + unless ENV['THOR_SILENCE_DEPRECATION'] + warn "Deprecation warning: #{message}\n" + + 'You can silence deprecations warning by setting the environment variable THOR_SILENCE_DEPRECATION.' + end + end + end + module Base attr_accessor :options, :parent_options, :args diff --git a/lib/bundler/vendor/thor/lib/thor/version.rb b/lib/bundler/vendor/thor/lib/thor/version.rb index 7750d27637..1b222da995 100644 --- a/lib/bundler/vendor/thor/lib/thor/version.rb +++ b/lib/bundler/vendor/thor/lib/thor/version.rb @@ -1,3 +1,3 @@ class Bundler::Thor - VERSION = "1.0.0" + VERSION = "1.0.1" end |