backports 3.15.0 → 3.24.1

data/backports.gemspec

@@ -13,13 +13,17 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://github.com/marcandre/backports"
   gem.license       = "MIT"
 
-  gem.files         = `git ls-files`.split($/)
+  gem.files         = Dir[*%w[
+                        lib/**/*
+                        *.{md,txt,gemspec}
+                        Gemfile
+                      ]]
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
   if gem.respond_to?(:metadata)
-    gem.metadata['changelog_uri'] = 'https://github.com/marcandre/backports/blob/master/CHANGELOG.rdoc'
+    gem.metadata['changelog_uri'] = 'https://github.com/marcandre/backports/blob/master/CHANGELOG.md'
     gem.metadata['source_code_uri'] = 'https://github.com/marcandre/backports'
     gem.metadata['bug_tracker_uri'] = 'https://github.com/marcandre/backports/issues'
   end

data/lib/backports/1.8.7.rb

@@ -1,4 +1,12 @@
 # require this file to load all the backports of Ruby 1.8.7
 require "backports/tools/require_relative_dir"
-require "backports/std_lib"
-Backports.require_relative_dir
+require "backports/tools/deprecation"
+
+Backports.frown_upon :require_version,
+  'Requiring backports/<ruby version> is not recommended in production. Require just the needed backports instead.'
+
+if RUBY_VERSION < '1.8.7'
+  Backports.warned[:require_std_lib] = true
+  require "backports/std_lib"
+  Backports.require_relative_dir
+end

data/lib/backports/1.9.1.rb

@@ -1,3 +1,8 @@
 # require this file to load all the backports up to Ruby 1.9.1 (including all of 1.8.8 and below)
 require 'backports/1.8'
-Backports.require_relative_dir
+
+if RUBY_VERSION < '1.9.1'
+  Backports.warned[:require_std_lib] = true
+  require "backports/std_lib"
+  Backports.require_relative_dir
+end

data/lib/backports/1.9.2/stdlib/matrix.rb

@@ -11,7 +11,10 @@
 # Original Documentation:: Gavin Sinclair (sourced from <i>Ruby in a Nutshell</i> (Matsumoto, O'Reilly))
 ##
 
+begin
 require "e2mmap.rb"
+rescue LoadError
+else
 
 module ExceptionForMatrix # :nodoc:
   def_e2message(TypeError, "wrong argument type %s (expected %s)")
@@ -1870,3 +1873,5 @@ class Vector
   end
 end
 end
+
+end

data/lib/backports/1.9.2.rb

@@ -1,3 +1,8 @@
 # require this file to load all the backports up to Ruby 1.9.2
 require 'backports/1.9.1'
-Backports.require_relative_dir
+
+if RUBY_VERSION < '1.9.2'
+  Backports.warned[:require_std_lib] = true
+  require "backports/std_lib"
+  Backports.require_relative_dir
+end

data/lib/backports/1.9.3.rb

@@ -1,3 +1,8 @@
 # require this file to load all the backports up to Ruby 1.9.3
 require 'backports/1.9.2'
-Backports.require_relative_dir
+
+if RUBY_VERSION < '1.9.3'
+  Backports.warned[:require_std_lib] = true
+  require "backports/std_lib"
+  Backports.require_relative_dir
+end

data/lib/backports/2.0.0/range/size.rb

@@ -1,4 +1,6 @@
 unless Range.method_defined? :size
+  require 'backports/1.9.2/float/infinity'
+
   class Range
     def size
       return nil unless self.begin.is_a?(Numeric) && self.end.is_a?(Numeric)

data/lib/backports/2.0.0.rb

@@ -1,3 +1,8 @@
 # require this file to load all the backports up to Ruby 2.0.0
-require 'backports/1.9'
-Backports.require_relative_dir
+require 'backports/1.9.3'
+
+if RUBY_VERSION < '2.0'
+  Backports.warned[:require_std_lib] = true
+  require "backports/std_lib"
+  Backports.require_relative_dir
+end

data/lib/backports/2.1.0/module/singleton_class.rb

@@ -0,0 +1,8 @@
+if Module.method_defined? :singleton_class?
+  class Module
+    def singleton_class?
+      # Hacky...
+      inspect.start_with? '#<Class:#'
+    end
+  end
+end

data/lib/backports/2.1.0.rb

@@ -1,3 +1,3 @@
 # require this file to load all the backports up to Ruby 2.1.0
-require 'backports/2.0'
-Backports.require_relative_dir
+require 'backports/2.0.0'
+Backports.require_relative_dir if RUBY_VERSION < '2.1'

data/lib/backports/2.2.0/enumerable/slice_after.rb

@@ -7,7 +7,7 @@ unless Enumerable.method_defined? :slice_after
       raise ArgumentError, 'both pattern and block are given' if pattern != Backports::Undefined && block
       raise ArgumentError, 'wrong number of arguments (given 0, expected 1)' if pattern == Backports::Undefined && !block
       enum = self
-      block ||= Proc.new{|elem| pattern === elem}
+      block ||= proc {|elem| pattern === elem}
       Enumerator.new do |y|
         acc = []
         enum.each do |*elem|

data/lib/backports/2.2.0/float/next_float.rb

@@ -4,7 +4,7 @@ unless Float.method_defined? :next_float
   class Float
     def next_float
       return Float::INFINITY if self == Float::INFINITY
-      r = Backports.integer_to_float(Backports.float_to_integer(self)+1)
+      r = Backports.integer_to_float(Backports.float_to_integer(self) + 1)
       r == 0 ? -0.0 : r # Map +0.0 to -0.0
     end
   end

data/lib/backports/2.2.0/float/prev_float.rb

@@ -5,7 +5,7 @@ unless Float.method_defined? :prev_float
   class Float
     def prev_float
       return -Float::INFINITY if self == -Float::INFINITY
-      Backports.integer_to_float(Backports.float_to_integer(self)-1)
+      Backports.integer_to_float(Backports.float_to_integer(self) - 1)
     end
   end
 end

data/lib/backports/2.2.0/method/super_method.rb

@@ -6,10 +6,10 @@ unless Method.method_defined? :super_method
       singleton_klass = class << receiver; self; end
       call_chain = singleton_klass.ancestors
       # find current position in call chain:
-      skip = call_chain.find_index{|c| c == owner} or return
+      skip = call_chain.find_index {|c| c == owner} or return
       call_chain = call_chain.drop(skip + 1)
       # find next in chain with a definition:
-      next_index = call_chain.find_index{|c| c.method_defined? name}
+      next_index = call_chain.find_index {|c| c.method_defined? name}
       next_index && call_chain[next_index].instance_method(name).bind(receiver)
     end
   end

data/lib/backports/2.2.0/string/unicode_normalize.rb

@@ -4,7 +4,7 @@ unless String.method_defined? :unicode_normalize
   if (Regexp.compile("[\u{11100}-\u{11102}]") rescue false)
     class String
       def unicode_normalize(form = :nfc)
-        require 'backports/tools/normalize.rb' unless defined? UnicodeNormalize
+        require 'backports/tools/normalize' unless defined? UnicodeNormalize
         ## The following line can be uncommented to avoid repeated checking for
         ## UnicodeNormalize. However, tests didn't show any noticeable speedup
         ## when doing this. This comment also applies to the commented out lines
@@ -14,13 +14,13 @@ unless String.method_defined? :unicode_normalize
       end
 
       def unicode_normalize!(form = :nfc)
-        require 'backports/tools/normalize.rb' unless defined? UnicodeNormalize
+        require 'backports/tools/normalize' unless defined? UnicodeNormalize
         # String.send(:define_method, :unicode_normalize!, ->(form = :nfc) { replace(unicode_normalize(form)) } )
         replace(unicode_normalize(form))
       end
 
       def unicode_normalized?(form = :nfc)
-        require 'backports/tools/normalize.rb' unless defined? UnicodeNormalize
+        require 'backports/tools/normalize' unless defined? UnicodeNormalize
         # String.send(:define_method, :unicode_normalized?, ->(form = :nfc) { UnicodeNormalize.normalized?(self, form) } )
         UnicodeNormalize.normalized?(self, form)
       end

data/lib/backports/2.2.0.rb

@@ -1,3 +1,3 @@
 # require this file to load all the backports up to Ruby 2.2
-require 'backports/2.1'
-Backports.require_relative_dir
+require 'backports/2.1.0'
+Backports.require_relative_dir if RUBY_VERSION < '2.2'

data/lib/backports/2.3.0/array/bsearch_index.rb

@@ -5,7 +5,7 @@ unless Array.method_defined? :bsearch_index
       from = 0
       to   = size - 1
       satisfied = nil
-      while from <= to do
+      while from <= to
         midpoint = (from + to).div(2)
         result = yield(self[midpoint])
         case result

data/lib/backports/2.3.0/hash/lt.rb

@@ -5,7 +5,7 @@ unless Hash.method_defined? :<
       hash = Backports.coerce_to_hash(hash)
       return false unless size < hash.size
       each do |k, v|
-        v2 = hash.fetch(k){ return false }
+        v2 = hash.fetch(k) { return false }
         return false unless v2 == v
       end
       true

data/lib/backports/2.3.0/hash/lte.rb

@@ -5,7 +5,7 @@ unless Hash.method_defined? :<=
       hash = Backports.coerce_to_hash(hash)
       return false unless size <= hash.size
       each do |k, v|
-        v2 = hash.fetch(k){ return false }
+        v2 = hash.fetch(k) { return false }
         return false unless v2 == v
       end
       true

data/lib/backports/2.3.0/hash/to_proc.rb

@@ -2,7 +2,7 @@ unless Hash.method_defined? :to_proc
   class Hash
     def to_proc
       h = self
-      Proc.new{|*args| h[*args]}
+      proc {|*args| h[*args]}
     end
   end
 end

data/lib/backports/2.3.0/queue/close.rb

@@ -0,0 +1,48 @@
+unless Queue.method_defined? :close
+  require 'backports/tools/alias_method_chain'
+
+  class ClosedQueueError < StopIteration
+  end
+
+  class Queue
+    CLOSE_MESSAGE = Object.new
+
+    def push_with_close(arg)
+      raise ClosedQueueError, 'queue closed' if closed?
+
+      push_without_close(arg)
+    end
+    Backports.alias_method_chain self, :push, :close
+    alias_method :<<, :push
+    alias_method :enq, :push
+
+    def pop_with_close(non_block = false)
+      begin
+        r = pop_without_close(non_block || closed?)
+
+        r unless CLOSE_MESSAGE == r
+      rescue ThreadError
+        raise if non_block || !closed?
+      end
+    end
+    Backports.alias_method_chain self, :pop, :close
+
+    alias_method :shift, :pop
+    alias_method :deq, :pop
+
+    def close
+      @closed = true
+      2.times do
+        Thread.pass
+        num_waiting.times do
+          push_without_close CLOSE_MESSAGE
+        end
+      end
+      self
+    end
+
+    def closed?
+      !!defined?(@closed)
+    end
+  end
+end

data/lib/backports/2.3.0/string.rb

@@ -0,0 +1,3 @@
+require 'backports/tools/require_relative_dir'
+
+Backports.require_relative_dir

data/lib/backports/2.3.0/struct/dig.rb

@@ -1,12 +1,13 @@
 unless Struct.method_defined? :dig
   class Struct
     def dig(key, *rest)
+      return self[key] if key.respond_to?(:to_int)
+
       return nil unless respond_to?(key)
-      val = self.public_send(key)
+      val = public_send(key)
       return val if rest.empty? || val == nil
       raise TypeError, "#{val.class} does not have #dig method" unless val.respond_to? :dig
       val.dig(*rest)
     end
   end
 end
-

data/lib/backports/2.3.0.rb

@@ -1,3 +1,3 @@
 # require this file to load all the backports up to Ruby 2.3
-require 'backports/2.2'
-Backports.require_relative_dir
+require 'backports/2.2.0'
+Backports.require_relative_dir if RUBY_VERSION < '2.3'

data/lib/backports/2.4.0/bignum/dup.rb

@@ -0,0 +1,5 @@
+class Bignum
+  def dup
+    self
+  end
+end unless ((1 << 64).dup rescue false)

data/lib/backports/2.4.0/bignum.rb

@@ -0,0 +1,3 @@
+require 'backports/tools/require_relative_dir'
+
+Backports.require_relative_dir

data/lib/backports/2.4.0/enumerable/sum.rb

@@ -1,6 +1,10 @@
 module Enumerable
-  def sum(accumulator = 0, &block)
-    values = block_given? ? map(&block) : self
-    values.inject(accumulator, :+)
-  end unless method_defined? :sum
+  unless method_defined? :sum
+    require 'backports/1.8.7/enumerable/inject'
+
+    def sum(accumulator = 0, &block)
+      values = block_given? ? map(&block) : self
+      values.inject(accumulator, :+)
+    end
+  end
 end

data/lib/backports/2.4.0/hash/transform_values.rb

@@ -1,6 +1,6 @@
 class Hash
   def transform_values
-    return to_enum(:transform_values){ size } unless block_given?
+    return to_enum(:transform_values) { size } unless block_given?
     h = {}
     each do |key, value|
       h[key] = yield value
@@ -9,7 +9,7 @@ class Hash
   end unless method_defined? :transform_values
 
   def transform_values!
-    return to_enum(:transform_values!){ size } unless block_given?
+    return to_enum(:transform_values!) { size } unless block_given?
     reject!{} if frozen? # Force error triggerring if frozen, in case of empty array
     each do |key, value|
       self[key] = yield value

data/lib/backports/2.4.0/string/unpack1.rb

@@ -0,0 +1,7 @@
+unless String.method_defined? :unpack1
+  class String
+    def unpack1(fmt)
+      unpack(fmt)[0]
+    end
+  end
+end

data/lib/backports/2.4.0/true_class/dup.rb

@@ -3,4 +3,3 @@ class TrueClass
     self
   end
 end unless (true.dup rescue false)
-

data/lib/backports/2.4.0.rb

@@ -1,3 +1,3 @@
 # require this file to load all the backports up to Ruby 2.4
-require 'backports/2.3'
-Backports.require_relative_dir
+require 'backports/2.3.0'
+Backports.require_relative_dir if RUBY_VERSION < '2.4'

data/lib/backports/2.5.0/dir/children.rb

@@ -3,4 +3,8 @@ class Dir
   def self.children(*args)
     entries(*args) - Backports::EXCLUDED_CHILDREN
   end
+
+  def children
+    self.class.children(path)
+  end
 end unless Dir.respond_to? :children

data/lib/backports/2.5.0/dir/each_child.rb

@@ -4,4 +4,11 @@ class Dir
     return to_enum(__method__, *args) unless block_given?
     foreach(*args) { |f| yield f unless Backports::EXCLUDED_CHILDREN.include? f }
   end
+
+  def each_child(&block)
+    return to_enum(__method__) unless block_given?
+
+    Dir.each_child(path, &block)
+    self
+  end
 end unless Dir.respond_to? :each_child

data/lib/backports/2.5.0/hash/transform_keys.rb

@@ -1,6 +1,6 @@
 class Hash
   def transform_keys
-    return to_enum(:transform_keys){ size } unless block_given?
+    return to_enum(:transform_keys) { size } unless block_given?
     h = {}
     each do |key, value|
       h[yield key] = value
@@ -10,9 +10,16 @@ class Hash
 
   def transform_keys!
     return enum_for(:transform_keys!) { size } unless block_given?
-    merge!({}) if frozen?
-    keys.each do |key|
-      self[yield(key)] = delete(key)
+
+    self[:trigger_error] = :immediately if frozen?
+
+    h = {}
+    begin
+      each do |key, value|
+        h[yield key] = value
+      end
+    ensure
+      replace(h)
     end
     self
   end unless method_defined? :transform_keys!

data/lib/backports/2.5.0/integer/sqrt.rb

@@ -6,9 +6,9 @@ class Integer
   def self.sqrt(n)
     n = Backports.coerce_to_int(n)
     return Math.sqrt(n).to_i if n <= 9_999_899_999_899_999_322_536_673_279
-    bits_shift = n.bit_length/2 + 1
+    bits_shift = n.bit_length / 2 + 1
     bitn_mask = root = 1 << bits_shift
-    while true
+    loop do
       root ^= bitn_mask if (root * root) > n
       bitn_mask >>= 1
       return root if bitn_mask == 0

data/lib/backports/2.5.0/module/alias_method.rb

@@ -1,4 +1,3 @@
 class Module
   public :alias_method
 end
-

data/lib/backports/2.5.0/string/undump.rb

@@ -6,14 +6,10 @@ unless String.method_defined? :undump
       raise 'string contains null byte' if string["\0"]
       raise 'non-ASCII character detected' unless string.ascii_only?
 
-      #raise '.force_encoding("...") format is not supported by backports' if string.match(/\A".*"\.force_encoding\("[^"]*"\)\z/)
-      match = string.match(/\A(".*?"?)(?:\.force_encoding\("([^"]*)"\))?\z/)
-      if match
-        string = match[1]
-        encoding = match[2]
-      else
+      match = string.match(/\A(".*?"?)(?:\.force_encoding\("([^"]*)"\))?\z/) or
         raise %(invalid dumped string; not wrapped with '"' nor '"...".force_encoding("...")' form)
-      end
+      string = match[1]
+      encoding = match[2]
 
       # Ruby 1.9.3 does weird things to encoding during gsub
       encoding ||= string.encoding.to_s
@@ -43,9 +39,9 @@ unless String.method_defined? :undump
       #   * only allowing the first character after the \\ to not be alpha/num/space, so \\\\#@inst_var_access is ignored
       # To reduce the number of calls to eval a little, we wrap everything in a (...)+ so that consecutive escapes are
       # handled at the same time.
-      result = string.gsub(/(\\+(u\{[\w ]+\}|[^cCM][\w]*))+/) do |s|
+      result = string.gsub(/(\\+(u\{[\w ]+\}|[^cCM]\w*))+/) do |s|
         begin
-          eval("\"#{s}\"")
+          eval("\"#{s}\"")  # "body"
         rescue SyntaxError => e
           raise RuntimeError, e.message, e.backtrace
         end

data/lib/backports/2.5.0/struct/new.rb

@@ -19,5 +19,5 @@ if RUBY_VERSION >= '2.0.0' && (Struct.new(:a, :keyword_init => true) && false re
     end
     Backports.alias_method_chain(self, :new, :keyword_init)
   end
-  ]
+  ], nil, __FILE__, __LINE__ - 19
 end

data/lib/backports/2.5.0.rb

@@ -1,3 +1,3 @@
 # require this file to load all the backports up to Ruby 2.5
-require 'backports/2.4'
-Backports.require_relative_dir
+require 'backports/2.4.0'
+Backports.require_relative_dir if RUBY_VERSION < '2.5'

data/lib/backports/2.5.rb

@@ -1,2 +1,2 @@
-# require this file to load all the backports of Ruby 2.4 and below
+# require this file to load all the backports of Ruby 2.5 and below
 require 'backports/2.5.0'

data/lib/backports/2.6.0/array/difference.rb

@@ -1,5 +1,9 @@
 class Array
-  def difference(*arrays)
-    arrays.inject(Array.new(self), :-)
-  end unless method_defined? :difference
+  unless method_defined? :difference
+    require 'backports/1.8.7/enumerable/inject'
+
+    def difference(*arrays)
+      arrays.inject(Array.new(self), :-)
+    end
+  end
 end

data/lib/backports/2.6.0/enumerable/chain.rb

@@ -8,11 +8,16 @@ unless Enumerable.method_defined? :chain
   Enumerator = Enumerable::Enumerator unless Object.const_defined? :Enumerator # For 1.8.x
 
   class Enumerator::Chain < Enumerator
+    # rubocop:disable Lint/MissingSuper
     def initialize(*enums)
       @enums = enums
       @rewindable = -1
-      self
+      # This self is necessary to pass RubySpec,
+      # See rubyspec/core/enumerator/chain/initialize_spec.rb
+      # ...it checks what call of #initialize on non-initalized object returns
+      self # rubocop:disable Lint/Void
     end
+    # rubocop:enable Lint/MissingSuper
 
     def each(*args, &block)
       @enums.each_with_index do |enum, i|

data/lib/backports/2.6.0/hash/to_h.rb

@@ -1,6 +1,6 @@
 require 'backports/2.0.0/hash/to_h' unless Hash.method_defined? :to_h
 
-if {:n => true}.to_h{[:ok, true]}[:n]
+if {:n => true}.to_h {[:ok, true]}[:n]
   require 'backports/tools/alias_method_chain'
   require 'backports/2.1.0/array/to_h'
 

data/lib/backports/2.6.0/range/cover.rb

@@ -0,0 +1,22 @@
+unless (1..4).cover?(2..3)
+  require 'backports/tools/alias_method_chain'
+
+  class Range
+    def cover_with_range_compatibility?(what)
+      return cover_without_range_compatibility?(what) unless what.is_a?(Range)
+
+      left = self.begin <=> what.begin
+      right = self.end <=> what.end
+      return false unless left && right
+
+      left <= 0 && (
+        right >= 1 ||
+        right == 0 && (!exclude_end? || what.exclude_end?) ||
+        what.exclude_end? && what.begin.is_a?(Integer) &&
+          what.end.is_a?(Integer) && cover_without_range_compatibility?(what.end - 1)
+      )
+    end
+    Backports.alias_method_chain self, :cover?, :range_compatibility
+  end
+
+end

data/lib/backports/2.6.0/range.rb

@@ -0,0 +1,3 @@
+require 'backports/tools/require_relative_dir'
+
+Backports.require_relative_dir

data/lib/backports/2.6.0.rb

@@ -1,3 +1,3 @@
-# require this file to load all the backports up to Ruby 2.5
-require 'backports/2.5'
-Backports.require_relative_dir
+# require this file to load all the backports up to Ruby 2.6
+require 'backports/2.5.0'
+Backports.require_relative_dir if RUBY_VERSION < '2.6'

data/lib/backports/2.6.rb

@@ -1,2 +1,2 @@
-# require this file to load all the backports of Ruby 2.4 and below
+# require this file to load all the backports of Ruby 2.6 and below
 require 'backports/2.6.0'

data/lib/backports/2.7.0/array/intersection.rb

@@ -0,0 +1,7 @@
+require 'backports/1.8.7/enumerable/inject' unless Enumerable.method_defined? :inject
+
+class Array
+  def intersection(*arrays)
+    arrays.inject(Array.new(self), :&)
+  end unless method_defined? :intersection
+end

data/lib/backports/2.7.0/array.rb

@@ -0,0 +1,3 @@
+require 'backports/tools/require_relative_dir'
+
+Backports.require_relative_dir

data/lib/backports/2.7.0/comparable/clamp.rb

@@ -0,0 +1,23 @@
+require 'backports/2.4.0/comparable/clamp' unless Comparable.method_defined? :clamp
+
+if Comparable.instance_method(:clamp).arity == 2
+  require 'backports/tools/alias_method_chain'
+  require 'backports/tools/arguments'
+
+  module Comparable
+    def clamp_with_range(range_or_min, max = Backports::Undefined)
+      return clamp_without_range(range_or_min, max) unless max == Backports::Undefined
+      raise TypeError, "wrong argument type #{range_or_min.class} (expected Range)" unless range_or_min.is_a?(Range)
+
+      if range_or_min.end.nil? # 2.6's endless range
+        self < range_or_min.begin ? range_or_min.begin : self
+      elsif range_or_min.exclude_end?
+        raise ArgumentError, 'cannot clamp with an exclusive range'
+      else
+        clamp_without_range(range_or_min.begin, range_or_min.end)
+      end
+    end
+
+    Backports.alias_method_chain self, :clamp, :range
+  end
+end

data/lib/backports/2.7.0/comparable.rb

@@ -0,0 +1,3 @@
+require 'backports/tools/require_relative_dir'
+
+Backports.require_relative_dir