Merge pull request #2787 from rspec/drop-old-rubies

Drop Ruby < 2.3 support

Author: JonRowe

Changelog.md

@@ -1,5 +1,9 @@
 ### Development
 
+Breaking Changes:
+
+* Ruby < 2.3 is no longer supported. (Phil Pirozhkov, #2787)
+
 Enhancements:
 
 * Improve pluralisation of words ending with `s` (like process). (Joshua Pinter, #2779)

Gemfile

@@ -12,14 +12,6 @@ branch = File.read(File.expand_path("../maintenance-branch", __FILE__)).chomp
   end
 end
 
-if RUBY_VERSION < '1.9.3'
-  gem 'rake', '< 11.0.0' # rake 11 requires Ruby 1.9.3 or later
-elsif RUBY_VERSION < '2.0.0'
-  gem 'rake', '< 12.0.0' # rake 12 requires Ruby 2.0.0 or later
-else
-  gem 'rake', '> 12.3.2'
-end
-
 if ENV['DIFF_LCS_VERSION']
   gem 'diff-lcs', ENV['DIFF_LCS_VERSION']
 else
@@ -34,37 +26,10 @@ group :documentation do
   gem 'github-markup', :platform => :mri
 end
 
-if RUBY_VERSION < '2.0.0' || RUBY_ENGINE == 'java'
-  gem 'json', '< 2.0.0'
-else
-  gem 'json', '> 2.3.0'
-end
+# Until 1.13.2 is released due to Rubygems usage
+gem 'ffi', '~> 1.12.0'
 
-if RUBY_VERSION < '2.2.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
-  gem 'ffi', '< 1.10'
-elsif RUBY_VERSION < '2.0'
-  gem 'ffi', '< 1.9.19' # ffi dropped Ruby 1.8 support in 1.9.19
-elsif RUBY_VERSION < '2.3.0'
-  gem 'ffi', '~> 1.12.0'
-else
-  # Until 1.13.2 is released due to Rubygems usage
-  gem 'ffi', '~> 1.12.0'
-end
-
-if RUBY_VERSION < '2.3.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
-  gem "childprocess", "< 1.0.0"
-end
-
-platforms :jruby do
-  if RUBY_VERSION < '1.9.0'
-    # Pin jruby-openssl on older J Ruby
-    gem "jruby-openssl", "< 0.10.0"
-    # Pin child-process on older J Ruby
-    gem "childprocess", "< 1.0.0"
-  else
-    gem "jruby-openssl"
-  end
-end
+gem "jruby-openssl", platforms: :jruby
 
 gem 'simplecov', '~> 0.8'
 
@@ -73,14 +38,11 @@ if RUBY_VERSION >= '2.4' && RUBY_ENGINE == 'ruby'
   gem "rubocop", "~> 0.52.1"
 end
 
-gem 'test-unit', '~> 3.0' if RUBY_VERSION.to_f >= 2.2
+gem 'test-unit', '~> 3.0'
 
 # Version 5.12 of minitest requires Ruby 2.4
 if RUBY_VERSION < '2.4.0'
   gem 'minitest', '< 5.12.0'
 end
 
-
-gem 'contracts', '< 0.16' if RUBY_VERSION < '1.9.0'
-
 eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')

Gemfile-custom.sample

@@ -8,12 +8,6 @@ group :development do
   platform :mri do
     gem 'rb-fsevent', '~> 0.9.0'
     gem 'ruby-prof', '~> 0.13.0'
-
-    case RUBY_VERSION
-    when /^1.8/
-      gem 'ruby-debug'
-    when /^1.9/
-      gem 'debugger'
-    end
+    gem 'pry-byebug'
   end
 end

cucumber.yml

@@ -1,6 +1,2 @@
-<%
-exclusions = []
-exclusions << ' --tags ~@no-jruby' if RUBY_PLATFORM == 'java'
-%>
-default: --require features --strict --format progress --tags ~@wip<%= exclusions.join %> features
+default: --require features --strict --format progress --tags ~@wip features
 wip:     --require features --tags @wip:30 --wip features

features/expectation_framework_integration/configure_expectation_framework.feature

@@ -72,7 +72,6 @@ Feature: configure expectation framework
       """
     And  the output should contain "3 examples, 1 failure"
 
-  @broken-on-jruby-9000
   Scenario: Configure minitest assertions
     Given rspec-expectations is not installed
       And a file named "example_spec.rb" with:

features/step_definitions/additional_cli_steps.rb

@@ -232,13 +232,7 @@
 
 module Normalization
   def normalize_failure_output(text)
-    whitespace_normalized = text.lines.map { |line| line.sub(/\s+$/, '').sub(/:in .*$/, '') }.join
-
-    # 1.8.7 and JRuby produce slightly different output for `Hash#fetch` errors, so we
-    # convert it to the same output here to match our expectation.
-    whitespace_normalized.
-      sub("IndexError", "KeyError").
-      sub(/key not found.*$/, "key not found")
+    text.lines.map { |line| line.sub(/\s+$/, '').sub(/:in .*$/, '') }.join
   end
 end
 

features/step_definitions/core_standalone_steps.rb

@@ -1,9 +1,7 @@
 Given(/^only rspec-core is installed$/) do
-  if RUBY_VERSION.to_f >= 1.9 # --disable-gems is invalid on 1.8.7
-    # Ensure the gem versions of rspec-mocks and rspec-expectations
-    # won't be loaded if available on the developers machine.
-    set_environment_variable('RUBYOPT', ENV['RUBYOPT'] + ' --disable-gems')
-  end
+  # Ensure the gem versions of rspec-mocks and rspec-expectations
+  # won't be loaded if available on the developers machine.
+  set_environment_variable('RUBYOPT', ENV['RUBYOPT'] + ' --disable-gems')
 
   # This will make `require_expect_syntax_in_aruba_specs.rb` (loaded
   # automatically when the specs run) remove rspec-mocks and

features/support/jruby.rb

@@ -12,7 +12,6 @@
   warnings
 
   set
-  flat_map
   filter_manager
   dsl
   notifications
@@ -101,10 +100,9 @@ def self.configure
   # The example being executed.
   #
   # The primary audience for this method is library authors who need access
-  # to the example currently being executed and also want to support all
-  # versions of RSpec 2 and 3.
+  # to the example currently being executed and also want to support RSpec 2.
   #
-  # @example
+  # @example support for RSpec version 2
   #
   #     RSpec.configure do |c|
   #       # context.example is deprecated, but RSpec.current_example is not

lib/rspec/core.rb

@@ -1,4 +1,5 @@
 RSpec::Support.require_rspec_core "shell_escape"
+RSpec::Support.require_rspec_support 'ruby_features'
 require 'shellwords'
 
 module RSpec
@@ -63,6 +64,7 @@ def spec_opts_without_bisect
       private
 
         include RSpec::Core::ShellEscape
+
         # On JRuby, Open3.popen3 does not handle shellescaped args properly:
         # https://github.com/jruby/jruby/issues/2767
         if RSpec::Support::Ruby.jruby?