Merge pull request #86 from hsbt/removed-ruby18-support

Removed EOL'ed Ruby version support.

.travis.yml

@@ -11,7 +11,6 @@ notifications:
   email:
   - [email protected]
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.8
@@ -25,5 +24,6 @@ rvm:
 script: ruby -Ilib bin/rake
 matrix:
   allow_failures:
+    - rvm: jruby-1.7.20
     - rvm: jruby-9.0.4.0
     - rvm: jruby-head

Manifest.txt

@@ -71,7 +71,6 @@ lib/rake/ext/core.rb
 lib/rake/ext/module.rb
 lib/rake/ext/pathname.rb
 lib/rake/ext/string.rb
-lib/rake/ext/time.rb
 lib/rake/file_creation_task.rb
 lib/rake/file_list.rb
 lib/rake/file_task.rb
@@ -94,7 +93,6 @@ lib/rake/pseudo_status.rb
 lib/rake/rake_module.rb
 lib/rake/rake_test_loader.rb
 lib/rake/rdoctask.rb
-lib/rake/ruby182_test_unit_fix.rb
 lib/rake/rule_recursion_overflow_error.rb
 lib/rake/runtest.rb
 lib/rake/scope.rb

Rakefile

@@ -25,7 +25,7 @@ hoe = Hoe.spec 'rake' do
   developer 'Eric Hodel', '[email protected]'
   developer 'Jim Weirich', ''
 
-  require_ruby_version     '>= 1.8.7'
+  require_ruby_version     '>= 1.9.3'
   require_rubygems_version '>= 1.3.2'
 
   dependency 'minitest', '~> 5.0', :developer
@@ -78,4 +78,3 @@ begin
 rescue LoadError
   warn 'run `rake newb` to install rdoc'
 end
-

lib/rake.rb

@@ -40,7 +40,6 @@ module Rake
 
 require 'rake/ext/module'
 require 'rake/ext/string'
-require 'rake/ext/time'
 
 require 'rake/win32'
 

lib/rake/alt_system.rb

@@ -41,70 +41,8 @@ def define_module_function(name, &block)
     end
   end
 
-  if WINDOWS && RUBY_VERSION < "1.9.0"
-    RUNNABLE_EXTS = %w[com exe bat cmd]
-    RUNNABLE_PATTERN = %r!\.(#{RUNNABLE_EXTS.join('|')})\Z!i
-
-    define_module_function :kernel_system, &Kernel.method(:system)
-    define_module_function :kernel_backticks, &Kernel.method(:'`')
-
-    module_function
-
-    def repair_command(cmd)
-      "call " + (
-        if cmd =~ %r!\A\s*\".*?\"!
-          # already quoted
-          cmd
-        elsif match = cmd.match(%r!\A\s*(\S+)!)
-          if match[1] =~ %r!/!
-            # avoid x/y.bat interpretation as x with option /y
-            %Q!"#{match[1]}"! + match.post_match
-          else
-            # a shell command will fail if quoted
-            cmd
-          end
-        else
-          # empty or whitespace
-          cmd
-        end
-      )
-    end
-
-    def find_runnable(file)
-      if file =~ RUNNABLE_PATTERN
-        file
-      else
-        RUNNABLE_EXTS.each { |ext|
-          test = "#{file}.#{ext}"
-          return test if File.exist?(test)
-        }
-        nil
-      end
-    end
-
-    def system(cmd, *args)
-      repaired = (
-        if args.empty?
-          [repair_command(cmd)]
-        elsif runnable = find_runnable(cmd)
-          [File.expand_path(runnable), *args]
-        else
-          # non-existent file
-          [cmd, *args]
-        end
-      )
-      kernel_system(*repaired)
-    end
-
-    def backticks(cmd)
-      kernel_backticks(repair_command(cmd))
-    end
-
-    define_module_function :'`', &method(:backticks)
-  else
-    # Non-Windows or ruby-1.9+: same as Kernel versions
-    define_module_function :system, &Kernel.method(:system)
-    define_module_function :backticks, &Kernel.method(:'`')
-    define_module_function :'`', &Kernel.method(:'`')
-  end
+  # Non-Windows or ruby-1.9+: same as Kernel versions
+  define_module_function :system, &Kernel.method(:system)
+  define_module_function :backticks, &Kernel.method(:'`')
+  define_module_function :'`', &Kernel.method(:'`')
 end

lib/rake/testtask.rb

@@ -150,15 +150,6 @@ def file_list # :nodoc:
       end
     end
 
-    def fix # :nodoc:
-      case ruby_version
-      when '1.8.2'
-        "\"#{find_file 'rake/ruby182_test_unit_fix'}\""
-      else
-        nil
-      end || ''
-    end
-
     def ruby_version # :nodoc:
       RUBY_VERSION
     end
@@ -168,7 +159,7 @@ def run_code # :nodoc:
       when :direct
         "-e \"ARGV.each{|f| require f}\""
       when :testrb
-        "-S testrb #{fix}"
+        "-S testrb"
       when :rake
         "#{rake_include_arg} \"#{rake_loader}\""
       end

test/test_rake_functional.rb

@@ -476,7 +476,7 @@ def test_stand_alone_filelist
   # predicate function can be used to skip tests or assertions as
   # needed.
   def uncertain_exit_status?
-    RUBY_VERSION < "1.9" || defined?(JRUBY_VERSION)
+    defined?(JRUBY_VERSION)
   end
 
 end

test/test_rake_test_task.rb

@@ -115,26 +115,6 @@ def test_run_code_rake_default_gem
     end
   end
 
-  def test_run_code_testrb_ruby_1_8_2
-    test_task = Rake::TestTask.new do |t|
-      t.loader = :testrb
-    end
-
-    def test_task.ruby_version() '1.8.2' end
-
-    assert_match(/^-S testrb +".*"$/, test_task.run_code)
-  end
-
-  def test_run_code_testrb_ruby_1_8_6
-    test_task = Rake::TestTask.new do |t|
-      t.loader = :testrb
-    end
-
-    def test_task.ruby_version() '1.8.6' end
-
-    assert_match(/^-S testrb +$/, test_task.run_code)
-  end
-
   def test_test_files_equals
     tt = Rake::TestTask.new do |t|
       t.test_files = FileList['a.rb', 'b.rb']