backports 3.0.2 → 3.0.3

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - "1.8.6"
+  - "1.8.7"
+  - "1.9.2"
+  - "1.9.3"
+  - "2.0.0"
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+
+bundle exec rake test

data/README.rdoc

@@ -67,6 +67,7 @@ Additionally, the following Ruby 1.9 features have been backported:
 
 * Enumerable
   * +each_with_object+
+  * +each_with_index+ (with arguments)
 
 * Enumerator
   * +new+ (with block)

data/lib/backports/1.8.7/enumerable.rb

@@ -57,17 +57,6 @@ module Enumerable
     ary
   end unless method_defined? :drop_while
 
-  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  if instance_method(:each_with_index).arity.zero?
-    def each_with_index_with_optional_args_and_block(*args)
-      return to_enum(:each_with_index, *args) unless block_given?
-      idx = 0
-      each(*args) { |o| yield(o, idx); idx += 1 }
-      self
-    end
-    Backports.alias_method_chain self, :each_with_index, :optional_args_and_block
-  end
-
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def find_index(obj = Backports::Undefined)
     if obj != Backports::Undefined

data/lib/backports/1.8.7/regexp.rb

@@ -1,7 +1,7 @@
 class Regexp
   # Standard in Ruby 1.8.7+. See official documentation[http://www.ruby-doc.org/core-1.8.7/classes/Regexp.html]
-  class << self
-    unless (union(%w(a b)) rescue false)
+  unless (union(%w(a b)) rescue false)
+    class << self
       def union_with_array_argument(*arg)
         return union_without_array_argument(*arg) unless arg.size == 1
         union_without_array_argument(*arg.first)
@@ -9,4 +9,4 @@ class Regexp
       Backports.alias_method_chain self, :union, :array_argument
     end
   end
-end
+end

data/lib/backports/1.8.7/string.rb

@@ -79,7 +79,7 @@ class String
   end unless method_defined? :start_with?
 
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
-  unless ("abc".upto("def", true) rescue false)
+  unless ("abc".upto("def", true){} rescue false)
     def upto_with_exclusive(to, excl=false)
       return upto_without_exclusive(to){|s| yield s} if block_given? && !excl
       enum = Range.new(self, to, excl).to_enum

data/lib/backports/1.9.1/enumerable.rb

@@ -1,8 +1,19 @@
 module Enumerable
-  # Standard in Ruby 1.8.8. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.9.1. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def each_with_object(memo)
     return to_enum(:each_with_object, memo) unless block_given?
     each {|obj| yield obj, memo}
     memo
   end unless method_defined? :each_with_object
-end
+
+  # Standard in Ruby 1.9.1. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  if instance_method(:each_with_index).arity.zero?
+    def each_with_index_with_optional_args_and_block(*args)
+      return to_enum(:each_with_index, *args) unless block_given?
+      idx = 0
+      each(*args) { |o| yield(o, idx); idx += 1 }
+      self
+    end
+    Backports.alias_method_chain self, :each_with_index, :optional_args_and_block
+  end
+end

data/lib/backports/1.9.1/math.rb

@@ -1,7 +1,7 @@
 module Math
-  class << self
+  unless (log(2, 2) rescue false)
     # Standard in Ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Math.html]
-    unless (log(2, 2) rescue false)
+    class << self
       def log_with_optional_base(numeric, base = Backports::Undefined)
         if base.equal?(Backports::Undefined)
           # Math.log(n) in 1.9.1 no longer accepts string arguments as it
@@ -15,11 +15,11 @@ module Math
         end
       end
       Backports.alias_method_chain self, :log, :optional_base
-    end
 
-    # Standard in Ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Math.html]
-    def log2(numeric)
-      log(numeric, 2)
-    end unless method_defined? :log2
+      # Standard in Ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Math.html]
+      def log2(numeric)
+        log(numeric, 2)
+      end unless method_defined? :log2
+    end
   end
 end

data/lib/backports/version.rb

@@ -1,3 +1,3 @@
 module Backports
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

data/test/std_lib_loading_test.rb

@@ -14,24 +14,24 @@ module Kernel
   end
 end
 
-require 'matrix'
+require 'set'
 require File.expand_path(File.dirname(__FILE__) + "/test_helper")
 
 class StdLibLoadingTest < Test::Unit::TestCase
   def test_load_correctly_after_requiring_backports
-    path = File.expand_path("../../lib/backports/1.9.2/stdlib/set.rb", __FILE__)
+    path = File.expand_path("../../lib/backports/1.9.2/stdlib/matrix.rb", __FILE__)
     assert_equal false,  $LOADED_FEATURES.include?(path)
-    assert_equal true,  require('set')
-    assert_equal true,  $bogus.include?("set")
+    assert_equal true,  require('matrix')
+    assert_equal true,  $bogus.include?("matrix")
     assert_equal true,  $LOADED_FEATURES.include?(path)
-    assert_equal false, require('set')
+    assert_equal false, require('matrix')
   end
 
   def test_load_correctly_before_requiring_backports_test
-    assert_equal true,  $bogus.include?("matrix")
-    path = File.expand_path("../../lib/backports/1.9.2/stdlib/matrix.rb", __FILE__)
+    assert_equal true,  $bogus.include?("set")
+    path = File.expand_path("../../lib/backports/1.9.2/stdlib/set.rb", __FILE__)
     assert_equal true,  $LOADED_FEATURES.include?(path)
-    assert_equal false, require('matrix')
+    assert_equal false, require('set')
   end
 
   def test_not_interfere_for_libraries_without_backports_test

data/test/test__me_first.rb

@@ -0,0 +1,51 @@
+require 'test/unit'
+
+class TestBackport < Test::Unit::TestCase
+
+  def class_signature(klass)
+    Hash[
+      klass.instance_methods.map{|m| [m, klass.instance_method(m)] } +
+      klass.methods.map{|m| [".#{m}", klass.method(m) ]}
+    ]
+  end
+
+  CLASSES = [Array, Binding, Dir, Enumerable, Fixnum, Float, GC,
+      Hash, Integer, IO, Kernel, Math, MatchData, Method, Module, Numeric,
+      ObjectSpace, Proc, Process, Range, Regexp, String, Struct, Symbol] +
+    [ENV, ARGF].map{|obj| class << obj; self; end }
+
+  case RUBY_VERSION
+    when '1.8.6'
+    when '1.8.7'
+      CLASSES << Enumerable::Enumerator
+    else
+      CLASSES << Enumerator
+  end
+
+  def digest
+    Hash[
+      CLASSES.map { |klass| [klass, class_signature(klass)] }
+    ]
+  end
+
+  def digest_delta(before, after)
+    delta = {}
+    before.each do |klass, methods|
+      compare = after[klass]
+      d = methods.map do |name, unbound|
+        name unless unbound == compare[name]
+      end
+      d.compact!
+      delta[klass] = d unless d.empty?
+    end
+    delta unless delta.empty?
+  end
+
+  def test_backports_wont_override_unnecessarily
+    before = digest
+    require "./lib/backports/#{RUBY_VERSION}"
+    after = digest
+    assert_nil digest_delta(before, after)
+  end
+end
+

data/test/test_lazy.rb

@@ -1,6 +1,7 @@
 # This is copied & modified from MRI
 require 'test/unit'
 #require_relative 'envutil'
+require './lib/backports'
 
 class TestLazyEnumerator < Test::Unit::TestCase
   class Step

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backports
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -22,6 +22,7 @@ files:
 - .document
 - .gitignore
 - .irbrc
+- .travis.yml
 - CHANGELOG.rdoc
 - LICENSE.txt
 - README.rdoc
@@ -129,6 +130,7 @@ files:
 - lib/backports/version.rb
 - test/README
 - test/std_lib_loading_test.rb
+- test/test__me_first.rb
 - test/test_helper.rb
 - test/test_lazy.rb
 - test/test_socket_interaction.rb
@@ -159,7 +161,7 @@ summary: Backports of Ruby features for older Ruby.
 test_files:
 - test/README
 - test/std_lib_loading_test.rb
+- test/test__me_first.rb
 - test/test_helper.rb
 - test/test_lazy.rb
 - test/test_socket_interaction.rb
-has_rdoc: