backports 3.6.0 → 3.6.1

data/lib/backports/tools/alias_method.rb

@@ -0,0 +1,8 @@
+module Backports
+  # Safe alias_method that will only alias if the source exists and destination doesn't
+  def self.alias_method(mod, new_name, old_name)
+    mod.instance_eval do
+      alias_method new_name, old_name
+    end if mod.method_defined?(old_name) && !mod.method_defined?(new_name)
+  end
+end

data/lib/backports/tools/alias_method_chain.rb

@@ -0,0 +1,26 @@
+module Backports
+  # Modified to avoid polluting Module if so desired
+  # (from Rails)
+  def self.alias_method_chain(mod, target, feature)
+    mod.class_eval do
+      # Strip out punctuation on predicates or bang methods since
+      # e.g. target?_without_feature is not a valid method name.
+      aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
+      yield(aliased_target, punctuation) if block_given?
+
+      with_method, without_method = "#{aliased_target}_with_#{feature}#{punctuation}", "#{aliased_target}_without_#{feature}#{punctuation}"
+
+      alias_method without_method, target
+      alias_method target, with_method
+
+      case
+        when public_method_defined?(without_method)
+          public target
+        when protected_method_defined?(without_method)
+          protected target
+        when private_method_defined?(without_method)
+          private target
+      end
+    end
+  end
+end

data/lib/backports/tools/arguments.rb

@@ -0,0 +1,69 @@
+module Backports
+  # Helper method to coerce a value into a specific class.
+  # Raises a TypeError if the coercion fails or the returned value
+  # is not of the right class.
+  # (from Rubinius)
+  def self.coerce_to(obj, cls, meth)
+    return obj if obj.kind_of?(cls)
+
+    begin
+      ret = obj.__send__(meth)
+    rescue Exception => e
+      raise TypeError, "Coercion error: #{obj.inspect}.#{meth} => #{cls} failed:\n" \
+                       "(#{e.message})"
+    end
+    raise TypeError, "Coercion error: obj.#{meth} did NOT return a #{cls} (was #{ret.class})" unless ret.kind_of? cls
+    ret
+  end
+
+  def self.coerce_to_int(obj)
+    coerce_to(obj, Integer, :to_int)
+  end
+
+  def self.coerce_to_ary(obj)
+    coerce_to(obj, Array, :to_ary)
+  end
+
+  def self.coerce_to_str(obj)
+    coerce_to(obj, String, :to_str)
+  end
+
+  def self.coerce_to_hash(obj)
+    coerce_to(obj, Hash, :to_hash)
+  end
+
+  def self.coerce_to_options(obj, *options)
+    hash = coerce_to_hash(obj)
+    hash.values_at(*options)
+  end
+
+  def self.coerce_to_option(obj, option)
+    coerce_to_options(obj, option)[0]
+  end
+
+  def self.is_array?(obj)
+    coerce_to(obj, Array, :to_ary) if obj.respond_to? :to_ary
+  end
+
+  def self.try_convert(obj, cls, meth)
+    return obj if obj.kind_of?(cls)
+    return nil unless obj.respond_to?(meth)
+    ret = obj.__send__(meth)
+    raise TypeError, "Coercion error: obj.#{meth} did NOT return a #{cls} (was #{ret.class})" unless ret.nil? || ret.kind_of?(cls)
+    ret
+  end
+
+  # Checks for a failed comparison (in which case it throws an ArgumentError)
+  # Additionally, it maps any negative value to -1 and any positive value to +1
+  # (from Rubinius)
+  def self.coerce_to_comparison(a, b, cmp = (a <=> b))
+    raise ArgumentError, "comparison of #{a} with #{b} failed" if cmp.nil?
+    return 1 if cmp > 0
+    return -1 if cmp < 0
+    0
+  end
+
+  # Used internally to make it easy to deal with optional arguments
+  # (from Rubinius)
+  Undefined = Object.new
+end

data/lib/backports/tools/extreme_object.rb

@@ -0,0 +1,12 @@
+module Backports
+  MOST_EXTREME_OBJECT_EVER = Object.new # :nodoc:
+  class << MOST_EXTREME_OBJECT_EVER
+    def < (whatever)
+      true
+    end
+
+    def > (whatever)
+      true
+    end
+  end
+end

data/lib/backports/tools/io.rb

@@ -0,0 +1,57 @@
+require 'backports/tools/arguments'
+module Backports
+  # Used internally to combine {IO|File} options hash into mode (String or Integer)
+  def self.combine_mode_and_option(mode = nil, options = Backports::Undefined)
+    # Can't backport autoclose, {internal|external|}encoding
+    mode, options = nil, mode if mode.respond_to?(:to_hash) && options == Backports::Undefined
+    options = {} if options == nil || options == Backports::Undefined
+    options = coerce_to_hash(options)
+    if mode && options[:mode]
+      raise ArgumentError, "mode specified twice"
+    end
+    mode ||= options[:mode] || "r"
+    mode = try_convert(mode, String, :to_str) || try_convert(mode, Integer, :to_int) || mode
+    if options[:textmode] || options[:binmode]
+      text = options[:textmode] || (mode.is_a?(String) && mode =~ /t/)
+      bin  = options[:binmode]  || (mode.is_a?(String) ? mode =~ /b/ : mode & File::Constants::BINARY != 0)
+      if text && bin
+        raise ArgumentError, "both textmode and binmode specified"
+      end
+      case
+        when !options[:binmode]
+        when mode.is_a?(String)
+          mode.insert(1, "b")
+        else
+          mode |= File::Constants::BINARY
+      end
+    end
+    mode
+  end
+
+  # Used internally to combine {IO|File} options hash into mode (String or Integer) and perm
+  def self.combine_mode_perm_and_option(mode = nil, perm = Backports::Undefined, options = Backports::Undefined)
+    mode, options = nil, mode if mode.respond_to?(:to_hash) && perm == Backports::Undefined
+    perm, options = nil, perm if perm.respond_to?(:to_hash) && options == Backports::Undefined
+    perm = nil if perm == Backports::Undefined
+    options = {} if options == Backports::Undefined
+    options = coerce_to_hash(options)
+    if perm && options[:perm]
+      raise ArgumentError, "perm specified twice"
+    end
+    [combine_mode_and_option(mode, options), perm || options[:perm]]
+  end
+
+  def self.write(binary, filename, string, offset, options)
+    offset, options = nil, offset if offset.respond_to?(:to_hash) && options == Backports::Undefined
+    options = {} if options == Backports::Undefined
+    options = coerce_to_hash(options)
+    File.open(filename, 'a+'){} if offset # insure existence
+    options = {:mode => offset.nil? ? "w" : "r+"}.merge(options)
+    args = options[:open_args] || [options]
+    File.open(filename, *Backports.combine_mode_perm_and_option(*args)) do |f|
+      f.binmode if binary && f.respond_to?(:binmode)
+      f.seek(offset) unless offset.nil?
+      f.write(string)
+    end
+  end
+end

data/lib/backports/tools/make_block_optional.rb

@@ -0,0 +1,43 @@
+require 'backports/tools/alias_method_chain'
+
+module Backports
+  # Metaprogramming utility to make block optional.
+  # Tests first if block is already optional when given options
+  def self.make_block_optional(mod, *methods)
+    mod = class << mod; self; end unless mod.is_a? Module
+    options = methods.last.is_a?(Hash) ? methods.pop : {}
+    methods.each do |selector|
+      unless mod.method_defined? selector
+        warn "#{mod}##{selector} is not defined, so block can't be made optional"
+        next
+      end
+      unless options[:force]
+        # Check if needed
+        test_on = options.fetch(:test_on)
+        result =  begin
+                    test_on.send(selector, *options.fetch(:arg, []))
+                  rescue LocalJumpError
+                    false
+                  end
+        next if result.class.name =~ /Enumerator$/
+      end
+      require 'enumerator'
+      arity = mod.instance_method(selector).arity
+      last_arg = []
+      if arity < 0
+        last_arg = ["*rest"]
+        arity = -1-arity
+      end
+      arg_sequence = ((0...arity).map{|i| "arg_#{i}"} + last_arg + ["&block"]).join(", ")
+
+      alias_method_chain(mod, selector, :optional_block) do |aliased_target, punctuation|
+        mod.module_eval <<-end_eval, __FILE__, __LINE__ + 1
+          def #{aliased_target}_with_optional_block#{punctuation}(#{arg_sequence})
+            return to_enum(:#{aliased_target}_without_optional_block#{punctuation}, #{arg_sequence}) unless block_given?
+            #{aliased_target}_without_optional_block#{punctuation}(#{arg_sequence})
+          end
+        end_eval
+      end
+    end
+  end
+end

data/lib/backports/tools/path.rb

@@ -0,0 +1,55 @@
+require 'backports/tools/alias_method_chain'
+require 'backports/tools/arguments'
+
+module Backports
+  # Metaprogramming utility to convert the first file argument to path
+  def self.convert_first_argument_to_path(klass, selector)
+    mod = class << klass; self; end
+    unless mod.method_defined? selector
+      warn "#{mod}##{selector} is not defined, so argument can't converted to path"
+      return
+    end
+    arity = mod.instance_method(selector).arity
+    last_arg = []
+    if arity < 0
+      last_arg = ["*rest"]
+      arity = -1-arity
+    end
+    arg_sequence = (["file"] + (1...arity).map{|i| "arg_#{i}"} + last_arg + ["&block"]).join(", ")
+
+    alias_method_chain(mod, selector, :potential_path_argument) do |aliased_target, punctuation|
+      mod.module_eval <<-end_eval, __FILE__, __LINE__ + 1
+        def #{aliased_target}_with_potential_path_argument#{punctuation}(#{arg_sequence})
+          file = Backports.convert_path(file)
+          #{aliased_target}_without_potential_path_argument#{punctuation}(#{arg_sequence})
+        end
+      end_eval
+    end
+  end
+
+  # Metaprogramming utility to convert all file arguments to paths
+  def self.convert_all_arguments_to_path(klass, selector, skip)
+    mod = class << klass; self; end
+    unless mod.method_defined? selector
+      warn "#{mod}##{selector} is not defined, so arguments can't converted to path"
+      return
+    end
+    first_args = (1..skip).map{|i| "arg_#{i}"}.join(",") + (skip > 0 ? "," : "")
+    alias_method_chain(mod, selector, :potential_path_arguments) do |aliased_target, punctuation|
+      mod.module_eval <<-end_eval, __FILE__, __LINE__ + 1
+        def #{aliased_target}_with_potential_path_arguments#{punctuation}(#{first_args}*files, &block)
+          files = files.map{|f| Backports.convert_path(f) }
+          #{aliased_target}_without_potential_path_arguments#{punctuation}(#{first_args}*files, &block)
+        end
+      end_eval
+    end
+  end
+
+  def self.convert_path(path)
+    try_convert(path, IO, :to_io) ||
+    begin
+      path = path.to_path if path.respond_to?(:to_path)
+      try_convert(path, String, :to_str) || path
+    end
+  end
+end

data/lib/backports/tools/require_relative_dir.rb

@@ -0,0 +1,13 @@
+module Backports
+  def self.require_relative_dir
+    dir = caller.first.split(/\.rb:\d/,2).first
+    short_path = dir[/.*(backports\/.*)/, 1] << '/'
+    Dir.entries(dir).
+        map{|f| Regexp.last_match(1) if /^(.*)\.rb$/ =~ f}.
+        compact.
+        sort.
+        each do |f|
+          require short_path + f
+        end
+  end
+end

data/lib/backports/tools/std_lib.rb

@@ -0,0 +1,59 @@
+module Backports
+  module StdLib
+    class LoadedFeatures
+      if RUBY_VERSION >= "1.9"
+        # Full paths are recorded in $LOADED_FEATURES.
+        @@our_loads = {}
+        # Check loaded features for one that matches "#{any of the load path}/#{feature}"
+        def include?(feature)
+          return true if @@our_loads[feature]
+          # Assume backported features are Ruby libraries (i.e. not C)
+          @loaded ||= $LOADED_FEATURES.group_by{|p| File.basename(p, ".rb")}
+          if fullpaths = @loaded[File.basename(feature, ".rb")]
+            fullpaths.any?{|fullpath|
+              base_dir, = fullpath.partition("/#{feature}")
+              $LOAD_PATH.include?(base_dir)
+            }
+          end
+        end
+
+        def self.mark_as_loaded(feature)
+          @@our_loads[feature] = true
+          # Nothing to do, the full path will be OK
+        end
+
+      else
+        # Requested features are recorded in $LOADED_FEATURES
+        def include?(feature)
+          # Assume backported features are Ruby libraries (i.e. not C)
+          $LOADED_FEATURES.include?("#{File.basename(feature, '.rb')}.rb")
+        end
+
+        def self.mark_as_loaded(feature)
+          $LOADED_FEATURES << "#{File.basename(feature, '.rb')}.rb"
+        end
+      end
+    end
+
+    class << self
+      attr_accessor :extended_lib
+
+      def extend_relative relative_dir="stdlib"
+        loaded = Backports::StdLib::LoadedFeatures.new
+        dir = File.expand_path(relative_dir, File.dirname(caller.first.split(/:\d/,2).first))
+        Dir.entries(dir).
+          map{|f| Regexp.last_match(1) if /^(.*)\.rb$/ =~ f}.
+          compact.
+          each do |f|
+            path = File.expand_path(f, dir)
+            if loaded.include?(f)
+              require path
+            else
+              @extended_lib[f] << path
+            end
+          end
+      end
+    end
+    self.extended_lib ||= Hash.new{|h, k| h[k] = []}
+  end
+end

data/lib/backports/tools/suppress_verbose_warnings.rb

@@ -0,0 +1,9 @@
+module Backports
+  def self.suppress_verbose_warnings
+    before = $VERBOSE
+    $VERBOSE = false if $VERBOSE # Set to false (default warning) but not nil (no warnings)
+    yield
+  ensure
+    $VERBOSE = before
+  end
+end

data/lib/backports/version.rb

@@ -1,3 +1,3 @@
 module Backports
-  VERSION = "3.6.0" unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+  VERSION = "3.6.1" unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
 end

data/spec/tags/1.8.7/core/module/include_spec.rb

@@ -0,0 +1,3 @@
+fails:Module#include imports constants to modules and classes
+fails:Module#include imports instance methods to modules and classes
+fails:Module#include does not import methods to modules and classes

metadata

@@ -1,38 +1,28 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: backports
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
-  segments: 
-  - 3
-  - 6
-  - 0
-  version: 3.6.0
+version: !ruby/object:Gem::Version
+  version: 3.6.1
 platform: ruby
-authors: 
-- "Marc-Andr\xC3\xA9 Lafortune"
+authors:
+- Marc-André Lafortune
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-02-15 00:00:00 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies: []
-
-description: Essential backports that enable many of the nice features of Ruby 1.8.7 up to 2.0.0 for earlier versions.
-email: 
+description: Essential backports that enable many of the nice features of Ruby 1.8.7
+  up to 2.1.0 for earlier versions.
+email:
 - github@marc-andre.ca
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .document
-- .gitignore
-- .gitmodules
-- .irbrc
-- .travis.yml
+files:
+- ".document"
+- ".gitignore"
+- ".gitmodules"
+- ".irbrc"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - Gemfile
 - Gemfile.lock
@@ -410,10 +400,6 @@ files:
 - lib/backports/2.1.0/module/include.rb
 - lib/backports/2.1.rb
 - lib/backports/basic_object.rb
-- lib/backports/extra/random/MT19937.rb
-- lib/backports/extra/random/bits_and_bytes.rb
-- lib/backports/extra/random/implementation.rb
-- lib/backports/extra/random/load.rb
 - lib/backports/force/array_map.rb
 - lib/backports/force/enumerable_map.rb
 - lib/backports/force/hash_select.rb
@@ -426,7 +412,22 @@ files:
 - lib/backports/rails/kernel.rb
 - lib/backports/rails/module.rb
 - lib/backports/rails/string.rb
+- lib/backports/random/MT19937.rb
+- lib/backports/random/bits_and_bytes.rb
+- lib/backports/random/implementation.rb
+- lib/backports/random/load.rb
+- lib/backports/std_lib.rb
 - lib/backports/tools.rb
+- lib/backports/tools/alias_method.rb
+- lib/backports/tools/alias_method_chain.rb
+- lib/backports/tools/arguments.rb
+- lib/backports/tools/extreme_object.rb
+- lib/backports/tools/io.rb
+- lib/backports/tools/make_block_optional.rb
+- lib/backports/tools/path.rb
+- lib/backports/tools/require_relative_dir.rb
+- lib/backports/tools/std_lib.rb
+- lib/backports/tools/suppress_verbose_warnings.rb
 - lib/backports/version.rb
 - set_version/1.8.7.rb
 - set_version/1.9.1.rb
@@ -525,6 +526,7 @@ files:
 - spec/tags/1.8.7/core/kernel/require_relative_spec.rb
 - spec/tags/1.8.7/core/math/log2_spec.rb
 - spec/tags/1.8.7/core/math/log_spec.rb
+- spec/tags/1.8.7/core/module/include_spec.rb
 - spec/tags/1.8.7/core/proc/curry_spec.rb
 - spec/tags/1.8.7/core/proc/yield_spec.rb
 - spec/tags/1.8.7/core/range/size_spec.rb
@@ -551,38 +553,28 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/marcandre/backports
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Backports of Ruby features for older Ruby.
-test_files: 
+test_files:
 - spec/tags/1.8.6/core/argf/each_line_spec.rb
 - spec/tags/1.8.6/core/argf/each_spec.rb
 - spec/tags/1.8.6/core/argf/lines_spec.rb
@@ -673,6 +665,7 @@ test_files:
 - spec/tags/1.8.7/core/kernel/require_relative_spec.rb
 - spec/tags/1.8.7/core/math/log2_spec.rb
 - spec/tags/1.8.7/core/math/log_spec.rb
+- spec/tags/1.8.7/core/module/include_spec.rb
 - spec/tags/1.8.7/core/proc/curry_spec.rb
 - spec/tags/1.8.7/core/proc/yield_spec.rb
 - spec/tags/1.8.7/core/range/size_spec.rb