diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/csv.rb | 2 | ||||
| -rw-r--r-- | lib/fileutils.rb | 4 | ||||
| -rw-r--r-- | lib/open-uri.rb | 6 | ||||
| -rw-r--r-- | lib/pstore.rb | 6 | ||||
| -rwxr-xr-x | lib/rubygems/core_ext/kernel_warn.rb | 9 | ||||
| -rw-r--r-- | lib/rubygems/package.rb | 6 | ||||
| -rw-r--r-- | lib/tempfile.rb | 6 |
7 files changed, 20 insertions, 19 deletions
diff --git a/lib/csv.rb b/lib/csv.rb index 61702137d0..60dbbcc230 100644 --- a/lib/csv.rb +++ b/lib/csv.rb @@ -637,7 +637,7 @@ class CSV file_opts = {universal_newline: false}.merge(options) begin - f = File.open(filename, mode, file_opts) + f = File.open(filename, mode, **file_opts) rescue ArgumentError => e raise unless /needs binmode/.match?(e.message) and mode == "r" mode = "rb" diff --git a/lib/fileutils.rb b/lib/fileutils.rb index cfc6ef1ec8..11321763a5 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1276,9 +1276,9 @@ module FileUtils opts[:encoding] = ::Encoding::UTF_8 if fu_windows? files = if Dir.respond_to?(:children) - Dir.children(path, opts) + Dir.children(path, **opts) else - Dir.entries(path(), opts) + Dir.entries(path(), **opts) .reject {|n| n == '.' or n == '..' } end diff --git a/lib/open-uri.rb b/lib/open-uri.rb index d9517e4b9e..f4cb536006 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -10,15 +10,15 @@ module Kernel alias open_uri_original_open open # :nodoc: end - def open(name, *rest, &block) # :nodoc: + def open(name, *rest, **kw, &block) # :nodoc: if (name.respond_to?(:open) && !name.respond_to?(:to_path)) || (name.respond_to?(:to_str) && %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ name && (uri = URI.parse(name)).respond_to?(:open)) warn('calling URI.open via Kernel#open is deprecated, call URI.open directly', uplevel: 1) - URI.open(name, *rest, &block) + URI.open(name, *rest, **kw, &block) else - open_uri_original_open(name, *rest, &block) + open_uri_original_open(name, *rest, **kw, &block) end end module_function :open diff --git a/lib/pstore.rb b/lib/pstore.rb index 4daa2e003f..1180fd50a0 100644 --- a/lib/pstore.rb +++ b/lib/pstore.rb @@ -374,7 +374,7 @@ class PStore def open_and_lock_file(filename, read_only) if read_only begin - file = File.new(filename, RD_ACCESS) + file = File.new(filename, **RD_ACCESS) begin file.flock(File::LOCK_SH) return file @@ -386,7 +386,7 @@ class PStore return nil end else - file = File.new(filename, RDWR_ACCESS) + file = File.new(filename, **RDWR_ACCESS) file.flock(File::LOCK_EX) return file end @@ -449,7 +449,7 @@ class PStore def save_data_with_atomic_file_rename_strategy(data, file) temp_filename = "#{@filename}.tmp.#{Process.pid}.#{rand 1000000}" - temp_file = File.new(temp_filename, WR_ACCESS) + temp_file = File.new(temp_filename, **WR_ACCESS) begin temp_file.flock(File::LOCK_EX) temp_file.write(data) diff --git a/lib/rubygems/core_ext/kernel_warn.rb b/lib/rubygems/core_ext/kernel_warn.rb index 3e531441ed..6c5b387e88 100755 --- a/lib/rubygems/core_ext/kernel_warn.rb +++ b/lib/rubygems/core_ext/kernel_warn.rb @@ -12,9 +12,9 @@ if RUBY_VERSION >= "2.5" original_warn = method(:warn) - module_function define_method(:warn) {|*messages, uplevel: nil| - unless uplevel - return original_warn.call(*messages) + module_function define_method(:warn) {|*messages, **kw| + unless uplevel = kw[:uplevel] + return original_warn.call(*messages, **kw) end # Ensure `uplevel` fits a `long` @@ -39,7 +39,8 @@ if RUBY_VERSION >= "2.5" end uplevel = start end - original_warn.call(*messages, uplevel: uplevel) + kw[:uplevel] = uplevel + original_warn.call(*messages, **kw) } end end diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb index b5f83205b3..49cdf98b31 100644 --- a/lib/rubygems/package.rb +++ b/lib/rubygems/package.rb @@ -529,11 +529,11 @@ EOM when 'metadata' then @spec = Gem::Specification.from_yaml entry.read when 'metadata.gz' then - args = [entry] - args << { :external_encoding => Encoding::UTF_8 } if + opts = {} + opts[:external_encoding] = Encoding::UTF_8 if Zlib::GzipReader.method(:wrap).arity != 1 - Zlib::GzipReader.wrap(*args) do |gzio| + Zlib::GzipReader.wrap(entry, **opts) do |gzio| @spec = Gem::Specification.from_yaml gzio.read end end diff --git a/lib/tempfile.rb b/lib/tempfile.rb index 2bd124abea..f7caf65f0c 100644 --- a/lib/tempfile.rb +++ b/lib/tempfile.rb @@ -130,7 +130,7 @@ class Tempfile < DelegateClass(File) @mode = mode|File::RDWR|File::CREAT|File::EXCL ::Dir::Tmpname.create(basename, tmpdir, **options) do |tmpname, n, opts| opts[:perm] = 0600 - @tmpfile = File.open(tmpname, @mode, opts) + @tmpfile = File.open(tmpname, @mode, **opts) @opts = opts.freeze end ObjectSpace.define_finalizer(self, Remover.new(@tmpfile)) @@ -142,7 +142,7 @@ class Tempfile < DelegateClass(File) def open _close mode = @mode & ~(File::CREAT|File::EXCL) - @tmpfile = File.open(@tmpfile.path, mode, @opts) + @tmpfile = File.open(@tmpfile.path, mode, **@opts) __setobj__(@tmpfile) end @@ -329,7 +329,7 @@ def Tempfile.create(basename="", tmpdir=nil, mode: 0, **options) Dir::Tmpname.create(basename, tmpdir, **options) do |tmpname, n, opts| mode |= File::RDWR|File::CREAT|File::EXCL opts[:perm] = 0600 - tmpfile = File.open(tmpname, mode, opts) + tmpfile = File.open(tmpname, mode, **opts) end if block_given? begin |