rubygems-update 2.7.11 → 3.0.9

data/lib/rubygems/util/licenses.rb

@@ -19,6 +19,8 @@ class Gem::Licenses
       AFL-3.0
       AGPL-1.0
       AGPL-3.0
+      AGPL-3.0-only
+      AGPL-3.0-or-later
       AMDPLPA
       AML
       AMPAS
@@ -41,9 +43,11 @@ class Gem::Licenses
       Artistic-1.0-Perl
       Artistic-1.0-cl8
       Artistic-2.0
+      BSD-1-Clause
       BSD-2-Clause
       BSD-2-Clause-FreeBSD
       BSD-2-Clause-NetBSD
+      BSD-2-Clause-Patent
       BSD-3-Clause
       BSD-3-Clause-Attribution
       BSD-3-Clause-Clear
@@ -96,6 +100,8 @@ class Gem::Licenses
       CC0-1.0
       CDDL-1.0
       CDDL-1.1
+      CDLA-Permissive-1.0
+      CDLA-Sharing-1.0
       CECILL-1.0
       CECILL-1.1
       CECILL-2.0
@@ -124,9 +130,11 @@ class Gem::Licenses
       EFL-1.0
       EFL-2.0
       EPL-1.0
+      EPL-2.0
       EUDatagrid
       EUPL-1.0
       EUPL-1.1
+      EUPL-1.2
       Entessa
       ErlPL-1.1
       Eurosym
@@ -138,13 +146,23 @@ class Gem::Licenses
       Frameworx-1.0
       FreeImage
       GFDL-1.1
+      GFDL-1.1-only
+      GFDL-1.1-or-later
       GFDL-1.2
+      GFDL-1.2-only
+      GFDL-1.2-or-later
       GFDL-1.3
+      GFDL-1.3-only
+      GFDL-1.3-or-later
       GL2PS
       GPL-1.0
       GPL-1.0+
+      GPL-1.0-only
+      GPL-1.0-or-later
       GPL-2.0
       GPL-2.0+
+      GPL-2.0-only
+      GPL-2.0-or-later
       GPL-2.0-with-GCC-exception
       GPL-2.0-with-autoconf-exception
       GPL-2.0-with-bison-exception
@@ -152,6 +170,8 @@ class Gem::Licenses
       GPL-2.0-with-font-exception
       GPL-3.0
       GPL-3.0+
+      GPL-3.0-only
+      GPL-3.0-or-later
       GPL-3.0-with-GCC-exception
       GPL-3.0-with-autoconf-exception
       Giftware
@@ -177,10 +197,16 @@ class Gem::Licenses
       LAL-1.3
       LGPL-2.0
       LGPL-2.0+
+      LGPL-2.0-only
+      LGPL-2.0-or-later
       LGPL-2.1
       LGPL-2.1+
+      LGPL-2.1-only
+      LGPL-2.1-or-later
       LGPL-3.0
       LGPL-3.0+
+      LGPL-3.0-only
+      LGPL-3.0-or-later
       LGPLLR
       LPL-1.0
       LPL-1.02
@@ -317,7 +343,6 @@ class Gem::Licenses
       W3C-19980720
       W3C-20150513
       WTFPL
-      WXwindows
       Watcom-1.0
       Wsuipa
       X11
@@ -349,6 +374,7 @@ class Gem::Licenses
       mpich2
       psfrag
       psutils
+      wxWindows
       xinetd
       xpp
       zlib-acknowledgement

data/lib/rubygems/util/list.rb

@@ -25,7 +25,7 @@ module Gem
       List.new value, self
     end
 
-    def pretty_print q # :nodoc:
+    def pretty_print(q) # :nodoc:
       q.pp to_a
     end
 

data/lib/rubygems/util.rb

@@ -15,7 +15,7 @@ module Gem::Util
     data = StringIO.new(data, 'r')
 
     unzipped = Zlib::GzipReader.new(data).read
-    unzipped.force_encoding Encoding::BINARY if Object.const_defined? :Encoding
+    unzipped.force_encoding Encoding::BINARY
     unzipped
   end
 
@@ -26,7 +26,7 @@ module Gem::Util
     require 'zlib'
     require 'stringio'
     zipped = StringIO.new(String.new, 'w')
-    zipped.set_encoding Encoding::BINARY if Object.const_defined? :Encoding
+    zipped.set_encoding Encoding::BINARY
 
     Zlib::GzipWriter.wrap zipped do |io| io.write data end
 
@@ -46,7 +46,7 @@ module Gem::Util
   # and implements an IO.popen-like behavior where it does not accept an array
   # for a command.
 
-  def self.popen *command
+  def self.popen(*command)
     IO.popen command, &:read
   rescue TypeError # ruby 1.8 only supports string command
     r, w = IO.pipe
@@ -67,13 +67,11 @@ module Gem::Util
     end
   end
 
-  NULL_DEVICE = defined?(IO::NULL) ? IO::NULL : Gem.win_platform? ? 'NUL' : '/dev/null'
-
   ##
   # Invokes system, but silences all output.
 
-  def self.silent_system *command
-    opt = {:out => NULL_DEVICE, :err => [:child, :out]}
+  def self.silent_system(*command)
+    opt = {:out => IO::NULL, :err => [:child, :out]}
     if Hash === command.last
       opt.update(command.last)
       cmds = command[0...-1]
@@ -82,19 +80,15 @@ module Gem::Util
     end
     return system(*(cmds << opt))
   rescue TypeError
-    require 'thread'
-
     @silent_mutex ||= Mutex.new
 
-    null_device = NULL_DEVICE
-
     @silent_mutex.synchronize do
       begin
         stdout = STDOUT.dup
         stderr = STDERR.dup
 
-        STDOUT.reopen null_device, 'w'
-        STDERR.reopen null_device, 'w'
+        STDOUT.reopen IO::NULL, 'w'
+        STDERR.reopen IO::NULL, 'w'
 
         return system(*command)
       ensure
@@ -109,7 +103,7 @@ module Gem::Util
   ##
   # Enumerates the parents of +directory+.
 
-  def self.traverse_parents directory, &block
+  def self.traverse_parents(directory, &block)
     return enum_for __method__, directory unless block_given?
 
     here = File.expand_path directory
@@ -122,4 +116,28 @@ module Gem::Util
     end
   end
 
+  ##
+  # Globs for files matching +pattern+ inside of +directory+,
+  # returning absolute paths to the matching files.
+
+  def self.glob_files_in_dir(glob, base_path)
+    if RUBY_VERSION >= "2.5"
+      Dir.glob(glob, base: base_path).map! {|f| File.expand_path(f, base_path) }
+    else
+      Dir.glob(File.expand_path(glob, base_path))
+    end
+  end
+
+  ##
+  # Corrects +path+ (usually returned by `URI.parse().path` on Windows), that
+  # comes with a leading slash.
+
+  def self.correct_for_windows_path(path)
+    if path[0].chr == '/' && path[1].chr =~ /[a-z]/i && path[2].chr == ':'
+      path[1..-1]
+    else
+      path
+    end
+  end
+
 end

data/lib/rubygems/validator.rb

@@ -62,7 +62,7 @@ class Gem::Validator
   # Describes a problem with a file in a gem.
 
   ErrorData = Struct.new :path, :problem do
-    def <=> other # :nodoc:
+    def <=>(other) # :nodoc:
       return nil unless self.class === other
 
       [path, problem] <=> [other.path, other.problem]
@@ -94,13 +94,13 @@ class Gem::Validator
       spec_path     = spec.spec_file
       gem_directory = spec.full_gem_path
 
-      unless File.directory? gem_directory then
+      unless File.directory? gem_directory
         errors[gem_name][spec.full_name] =
           "Gem registered but doesn't exist at #{gem_directory}"
         next
       end
 
-      unless File.exist? spec_path then
+      unless File.exist? spec_path
         errors[gem_name][spec_path] = "Spec file missing for installed gem"
       end
 
@@ -135,7 +135,7 @@ class Gem::Validator
               source = File.join gem_directory, entry['path']
 
               File.open source, Gem.binary_mode do |f|
-                unless f.read == data then
+                unless f.read == data
                   errors[gem_name][entry['path']] = "Modified from original"
                 end
               end
@@ -163,4 +163,3 @@ class Gem::Validator
     errors
   end
 end
-

data/lib/rubygems/version.rb

@@ -154,8 +154,8 @@ class Gem::Version
 
   include Comparable
 
-  VERSION_PATTERN = '[0-9]+(?>\.[0-9a-zA-Z]+)*(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?' # :nodoc:
-  ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/ # :nodoc:
+  VERSION_PATTERN = '[0-9]+(?>\.[0-9a-zA-Z]+)*(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?'.freeze # :nodoc:
+  ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/.freeze # :nodoc:
 
   ##
   # A string representation of this Version.
@@ -169,7 +169,7 @@ class Gem::Version
   ##
   # True if the +version+ string matches RubyGems' requirements.
 
-  def self.correct? version
+  def self.correct?(version)
     unless Gem::Deprecate.skip
       warn "nil versions are discouraged and will be deprecated in Rubygems 4" if version.nil?
     end
@@ -185,10 +185,10 @@ class Gem::Version
   #   ver2 = Version.create(ver1)       # -> (ver1)
   #   ver3 = Version.create(nil)        # -> nil
 
-  def self.create input
-    if self === input then # check yourself before you wreck yourself
+  def self.create(input)
+    if self === input  # check yourself before you wreck yourself
       input
-    elsif input.nil? then
+    elsif input.nil?
       nil
     else
       new input
@@ -197,7 +197,7 @@ class Gem::Version
 
   @@all = {}
 
-  def self.new version # :nodoc:
+  def self.new(version) # :nodoc:
     return super unless Gem::Version == self
 
     @@all[version] ||= super
@@ -207,13 +207,13 @@ class Gem::Version
   # Constructs a Version from the +version+ string.  A version string is a
   # series of digits or ASCII letters separated by dots.
 
-  def initialize version
+  def initialize(version)
     unless self.class.correct?(version)
       raise ArgumentError, "Malformed version number string #{version}"
     end
 
     # If version is an empty string convert it to 0
-    version = 0 if version =~ /\A\s*\Z/
+    version = 0 if version.is_a?(String) && version =~ /\A\s*\Z/
 
     @version = version.to_s.strip.gsub("-",".pre.")
     @segments = nil
@@ -240,7 +240,7 @@ class Gem::Version
   # A Version is only eql? to another version if it's specified to the
   # same precision. Version "1.0" is not the same as version "1".
 
-  def eql? other
+  def eql?(other)
     self.class === other and @version == other._version
   end
 
@@ -248,7 +248,7 @@ class Gem::Version
     canonical_segments.hash
   end
 
-  def init_with coder # :nodoc:
+  def init_with(coder) # :nodoc:
     yaml_initialize coder.tag, coder.map
   end
 
@@ -268,7 +268,7 @@ class Gem::Version
   # Load custom marshal format. It's a string for backwards (RubyGems
   # 1.3.5 and earlier) compatibility.
 
-  def marshal_load array
+  def marshal_load(array)
     initialize array[0]
   end
 
@@ -282,7 +282,7 @@ class Gem::Version
     ["@version"]
   end
 
-  def encode_with coder # :nodoc:
+  def encode_with(coder) # :nodoc:
     coder.add 'version', @version
   end
 
@@ -296,7 +296,7 @@ class Gem::Version
     @prerelease
   end
 
-  def pretty_print q # :nodoc:
+  def pretty_print(q) # :nodoc:
     q.text "Gem::Version.new(#{version.inspect})"
   end
 
@@ -339,7 +339,7 @@ class Gem::Version
   # one. Attempts to compare to something that's not a
   # <tt>Gem::Version</tt> return +nil+.
 
-  def <=> other
+  def <=>(other)
     return unless Gem::Version === other
     return 0 if @version == other._version || canonical_segments == other.canonical_segments
 

data/lib/rubygems/version_option.rb

@@ -17,7 +17,7 @@ module Gem::VersionOption
 
   def add_platform_option(task = command, *wrap)
     OptionParser.accept Gem::Platform do |value|
-      if value == Gem::Platform::RUBY then
+      if value == Gem::Platform::RUBY
         value
       else
         Gem::Platform.new value
@@ -27,7 +27,7 @@ module Gem::VersionOption
     add_option('--platform PLATFORM', Gem::Platform,
                "Specify the platform of gem to #{task}", *wrap) do
                  |value, options|
-      unless options[:added_platform] then
+      unless options[:added_platform]
         Gem.platforms = [Gem::Platform::RUBY]
         options[:added_platform] = true
       end
@@ -74,4 +74,3 @@ module Gem::VersionOption
   end
 
 end
-