Merge master branch from rubygems/rubygems upstream.

  * Enable Style/MethodDefParentheses in Rubocop
    https://github.com/rubygems/rubygems/pull/2478
  * Enable Style/MultilineIfThen in Rubocop
    https://github.com/rubygems/rubygems/pull/2479
  * Fix required_ruby_version with prereleases and improve error message
    https://github.com/rubygems/rubygems/pull/2344
  * Fix bundler rubygems binstub not properly looking for bundler
    https://github.com/rubygems/rubygems/pull/2426

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

10 files changed, 26 insertions, 30 deletions

diff --git a/lib/rubygems/package/digest_io.rb b/lib/rubygems/package/digest_io.rb
index 4930c9aa7d..d9e6c3c021 100644
--- a/lib/rubygems/package/digest_io.rb
+++ b/lib/rubygems/package/digest_io.rb
@@ -31,7 +31,7 @@ class Gem::Package::DigestIO
   #   digests['SHA1'].hexdigest   #=> "aaf4c61d[...]"
   #   digests['SHA512'].hexdigest #=> "9b71d224[...]"
 
-  def self.wrap io, digests
+  def self.wrap(io, digests)
     digest_io = new io, digests
 
     yield digest_io
@@ -43,7 +43,7 @@ class Gem::Package::DigestIO
   # Creates a new DigestIO instance.  Using ::wrap is recommended, see the
   # ::wrap documentation for documentation of +io+ and +digests+.
 
-  def initialize io, digests
+  def initialize(io, digests)
     @io = io
     @digests = digests
   end
@@ -51,7 +51,7 @@ class Gem::Package::DigestIO
   ##
   # Writes +data+ to the underlying IO and updates the digests
 
-  def write data
+  def write(data)
     result = @io.write data
 
     @digests.each do |_, digest|
@@ -62,4 +62,3 @@ class Gem::Package::DigestIO
   end
 
 end
-
diff --git a/lib/rubygems/package/file_source.rb b/lib/rubygems/package/file_source.rb
index ecc3a68677..8a4f9da6f2 100644
--- a/lib/rubygems/package/file_source.rb
+++ b/lib/rubygems/package/file_source.rb
@@ -10,7 +10,7 @@ class Gem::Package::FileSource < Gem::Package::Source # :nodoc: all
 
   attr_reader :path
 
-  def initialize path
+  def initialize(path)
     @path = path
   end
 
@@ -22,13 +22,12 @@ class Gem::Package::FileSource < Gem::Package::Source # :nodoc: all
     File.exist? path
   end
 
-  def with_write_io &block
+  def with_write_io(&block)
     File.open path, 'wb', &block
   end
 
-  def with_read_io &block
+  def with_read_io(&block)
     File.open path, 'rb', &block
   end
 
 end
-
diff --git a/lib/rubygems/package/io_source.rb b/lib/rubygems/package/io_source.rb
index ee79a21083..669a859d0a 100644
--- a/lib/rubygems/package/io_source.rb
+++ b/lib/rubygems/package/io_source.rb
@@ -11,7 +11,7 @@ class Gem::Package::IOSource < Gem::Package::Source # :nodoc: all
 
   attr_reader :io
 
-  def initialize io
+  def initialize(io)
     @io = io
   end
 
@@ -43,4 +43,3 @@ class Gem::Package::IOSource < Gem::Package::Source # :nodoc: all
   end
 
 end
-
diff --git a/lib/rubygems/package/old.rb b/lib/rubygems/package/old.rb
index a8457948ff..d028be134b 100644
--- a/lib/rubygems/package/old.rb
+++ b/lib/rubygems/package/old.rb
@@ -19,7 +19,7 @@ class Gem::Package::Old < Gem::Package
   # Creates a new old-format package reader for +gem+.  Old-format packages
   # cannot be written.
 
-  def initialize gem, security_policy
+  def initialize(gem, security_policy)
     require 'fileutils'
     require 'zlib'
     Gem.load_yaml
@@ -49,7 +49,7 @@ class Gem::Package::Old < Gem::Package
   ##
   # Extracts the files in this package into +destination_dir+
 
-  def extract_files destination_dir
+  def extract_files(destination_dir)
     verify
 
     errstr = "Error reading files from gem"
@@ -94,7 +94,7 @@ class Gem::Package::Old < Gem::Package
   ##
   # Reads the file list section from the old-format gem +io+
 
-  def file_list io # :nodoc:
+  def file_list(io) # :nodoc:
     header = String.new
 
     read_until_dashes io do |line|
@@ -107,7 +107,7 @@ class Gem::Package::Old < Gem::Package
   ##
   # Reads lines until a "---" separator is found
 
-  def read_until_dashes io # :nodoc:
+  def read_until_dashes(io) # :nodoc:
     while (line = io.gets) && line.chomp.strip != "---" do
       yield line if block_given?
     end
@@ -116,7 +116,7 @@ class Gem::Package::Old < Gem::Package
   ##
   # Skips the Ruby self-install header in +io+.
 
-  def skip_ruby io # :nodoc:
+  def skip_ruby(io) # :nodoc:
     loop do
       line = io.gets
 
diff --git a/lib/rubygems/package/source.rb b/lib/rubygems/package/source.rb
index fe19776c38..69701e55e9 100644
--- a/lib/rubygems/package/source.rb
+++ b/lib/rubygems/package/source.rb
@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 class Gem::Package::Source # :nodoc:
 end
-
diff --git a/lib/rubygems/package/tar_header.rb b/lib/rubygems/package/tar_header.rb
index d3c242f815..c7b5f88dbd 100644
--- a/lib/rubygems/package/tar_header.rb
+++ b/lib/rubygems/package/tar_header.rb
@@ -134,7 +134,7 @@ class Gem::Package::TarHeader
   # Creates a new TarHeader using +vals+
 
   def initialize(vals)
-    unless vals[:name] && vals[:size] && vals[:prefix] && vals[:mode] then
+    unless vals[:name] && vals[:size] && vals[:prefix] && vals[:mode]
       raise ArgumentError, ":name, :size, :prefix and :mode required"
     end
 
diff --git a/lib/rubygems/package/tar_reader.rb b/lib/rubygems/package/tar_reader.rb
index d00f89e7f6..f64915eaea 100644
--- a/lib/rubygems/package/tar_reader.rb
+++ b/lib/rubygems/package/tar_reader.rb
@@ -92,7 +92,7 @@ class Gem::Package::TarReader
   # NOTE: Do not call #rewind during #each
 
   def rewind
-    if @init_pos == 0 then
+    if @init_pos == 0
       @io.rewind
     else
       @io.pos = @init_pos
@@ -104,7 +104,7 @@ class Gem::Package::TarReader
   # yields it.  Rewinds the tar file to the beginning when the block
   # terminates.
 
-  def seek name # :yields: entry
+  def seek(name) # :yields: entry
     found = find do |entry|
       entry.full_name == name
     end
diff --git a/lib/rubygems/package/tar_reader/entry.rb b/lib/rubygems/package/tar_reader/entry.rb
index 77b06af233..19054c1635 100644
--- a/lib/rubygems/package/tar_reader/entry.rb
+++ b/lib/rubygems/package/tar_reader/entry.rb
@@ -64,7 +64,7 @@ class Gem::Package::TarReader::Entry
   # Full name of the tar entry
 
   def full_name
-    if @header.prefix != "" then
+    if @header.prefix != ""
       File.join @header.prefix, @header.name
     else
       @header.name
diff --git a/lib/rubygems/package/tar_test_case.rb b/lib/rubygems/package/tar_test_case.rb
index 381a5d0f43..75978c8ed0 100644
--- a/lib/rubygems/package/tar_test_case.rb
+++ b/lib/rubygems/package/tar_test_case.rb
@@ -52,7 +52,7 @@ class Gem::Package::TarTestCase < Gem::TestCase
       name = fields.shift
       length = fields.shift.to_i
 
-      if name == "checksum" then
+      if name == "checksum"
         chksum_off = offset
         offset += length
         next
diff --git a/lib/rubygems/package/tar_writer.rb b/lib/rubygems/package/tar_writer.rb
index aa00633cdd..87ee39a944 100644
--- a/lib/rubygems/package/tar_writer.rb
+++ b/lib/rubygems/package/tar_writer.rb
@@ -139,11 +139,11 @@ class Gem::Package::TarWriter
   #
   # The created digest object is returned.
 
-  def add_file_digest name, mode, digest_algorithms # :yields: io
+  def add_file_digest(name, mode, digest_algorithms) # :yields: io
     digests = digest_algorithms.map do |digest_algorithm|
       digest = digest_algorithm.new
       digest_name =
-        if digest.respond_to? :name then
+        if digest.respond_to? :name
           digest.name
         else
           /::([^:]+)$/ =~ digest_algorithm.name
@@ -172,7 +172,7 @@ class Gem::Package::TarWriter
   #
   # Returns the digest.
 
-  def add_file_signed name, mode, signer
+  def add_file_signed(name, mode, signer)
     digest_algorithms = [
       signer.digest_algorithm,
       Digest::SHA512,
@@ -184,7 +184,7 @@ class Gem::Package::TarWriter
 
     signature_digest = digests.values.compact.find do |digest|
       digest_name =
-        if digest.respond_to? :name then
+        if digest.respond_to? :name
           digest.name
         else
           digest.class.name[/::([^:]+)\z/, 1]
@@ -195,7 +195,7 @@ class Gem::Package::TarWriter
 
     raise "no #{signer.digest_name} in #{digests.values.compact}" unless signature_digest
 
-    if signer.key then
+    if signer.key
       signature = signer.sign signature_digest.digest
 
       add_file_simple "#{name}.sig", 0444, signature.length do |io|
@@ -309,12 +309,12 @@ class Gem::Package::TarWriter
   # Splits +name+ into a name and prefix that can fit in the TarHeader
 
   def split_name(name) # :nodoc:
-    if name.bytesize > 256 then
+    if name.bytesize > 256
       raise Gem::Package::TooLongFileName.new("File \"#{name}\" has a too long path (should be 256 or less)")
     end
 
     prefix = ''
-    if name.bytesize > 100 then
+    if name.bytesize > 100
       parts = name.split('/', -1) # parts are never empty here
       name = parts.pop            # initially empty for names with a trailing slash ("foo/.../bar/")
       prefix = parts.join('/')    # if empty, then it's impossible to split (parts is empty too)
@@ -323,11 +323,11 @@ class Gem::Package::TarWriter
         prefix = parts.join('/')
       end
 
-      if name.bytesize > 100 or prefix.empty? then
+      if name.bytesize > 100 or prefix.empty?
         raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long name (should be 100 or less)")
       end
 
-      if prefix.bytesize > 155 then
+      if prefix.bytesize > 155
         raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long base path (should be 155 or less)")
       end
     end