Drop support for MRI 2.1

Drenmi · bbatsov · commit a707c23f9bb8 · 2018-06-18T12:29:57.000+03:00
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -10,7 +10,7 @@ AllCops:
     - 'vendor/**/*'
     - 'spec/fixtures/**/*'
     - 'tmp/**/*'
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.2
 
 Naming/PredicateName:
   # Method define macros for dynamically generated method.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ dist: trusty
 rvm:
   - jruby-9.2.0.0
   - jruby-head
-  - 2.1.10
   - 2.2.10
   - 2.3.7
   - 2.4.4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,9 @@
 * [#6006](https://github.com/bbatsov/rubocop/pull/6006): Remove `rake repl` task. ([@koic][])
 
 ## 0.57.2 (2018-06-12)
+### Changes
+
+* Drop support for MRI 2.1. ([@drenmi][])
 
 ### Bug fixes
 
diff --git a/Gemfile b/Gemfile
@@ -6,8 +6,7 @@ gemspec
 
 gem 'bump', require: false
 gem 'pry'
-# pry-byebug requires MRI 2.2.0 or higher.
-gem 'pry-byebug' if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.2.0'
+gem 'pry-byebug' if RUBY_ENGINE == 'ruby'
 gem 'rake', '~> 12.0'
 gem 'rspec', '~> 3.7'
 gem 'rubocop-rspec', '~> 1.26.0'
diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ You can read a ton more about RuboCop in its [official manual](http://docs.ruboc
 
 RuboCop supports the following Ruby implementations:
 
-* MRI 2.1+
+* MRI 2.2+
 * JRuby 9.0+
 
 The Rails cops support the following versions:
diff --git a/config/default.yml b/config/default.yml
@@ -130,7 +130,7 @@ AllCops:
   # followed by the Gemfile.lock or gems.locked file. (Although the Ruby version
   # is specified in the Gemfile or gems.rb file, RuboCop reads the final value
   # from the lock file.) If the Ruby version is still unresolved, RuboCop will
-  # use the oldest officially supported Ruby version (currently Ruby 2.1).
+  # use the oldest officially supported Ruby version (currently Ruby 2.2).
   TargetRubyVersion: ~
   # What version of Rails is the inspected code using?  If a value is specified
   # for TargetRailsVersion then it is used.  Acceptable values are specificed
diff --git a/lib/rubocop/config.rb b/lib/rubocop/config.rb
@@ -16,10 +16,10 @@ class Config
 
     COMMON_PARAMS = %w[Exclude Include Severity
                        AutoCorrect StyleGuide Details].freeze
-    # 2.1 is the oldest officially supported Ruby version.
-    DEFAULT_RUBY_VERSION = 2.1
-    KNOWN_RUBIES = [2.1, 2.2, 2.3, 2.4, 2.5].freeze
-    OBSOLETE_RUBIES = { 1.9 => '0.50', 2.0 => '0.50' }.freeze
+    # 2.2 is the oldest officially supported Ruby version.
+    DEFAULT_RUBY_VERSION = 2.2
+    KNOWN_RUBIES = [2.2, 2.3, 2.4, 2.5].freeze
+    OBSOLETE_RUBIES = { 1.9 => '0.50', 2.0 => '0.50', 2.1 => '0.58' }.freeze
     RUBY_VERSION_FILENAME = '.ruby-version'.freeze
     DEFAULT_RAILS_VERSION = 5.0
     OBSOLETE_COPS = {
diff --git a/lib/rubocop/config_loader.rb b/lib/rubocop/config_loader.rb
@@ -176,15 +176,11 @@ def read_file(absolute_path)
       end
 
       def yaml_safe_load(yaml_code, filename)
-        if YAML.respond_to?(:safe_load) # Ruby 2.1+
-          if defined?(SafeYAML) && SafeYAML.respond_to?(:load)
-            SafeYAML.load(yaml_code, filename,
-                          whitelisted_tags: %w[!ruby/regexp])
-          else
-            YAML.safe_load(yaml_code, [Regexp, Symbol], [], false, filename)
-          end
+        if defined?(SafeYAML) && SafeYAML.respond_to?(:load)
+          SafeYAML.load(yaml_code, filename,
+                        whitelisted_tags: %w[!ruby/regexp])
         else
-          YAML.load(yaml_code, filename) # rubocop:disable Security/YAMLLoad
+          YAML.safe_load(yaml_code, [Regexp, Symbol], [], false, filename)
         end
       end
     end
diff --git a/lib/rubocop/processed_source.rb b/lib/rubocop/processed_source.rb
@@ -163,12 +163,9 @@ def tokenize(parser)
       [ast, comments, tokens]
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    # rubocop:disable Metrics/MethodLength
     def parser_class(ruby_version)
       case ruby_version
-      when 2.1
-        require 'parser/ruby21'
-        Parser::Ruby21
       when 2.2
         require 'parser/ruby22'
         Parser::Ruby22
@@ -188,7 +185,7 @@ def parser_class(ruby_version)
         raise ArgumentError, "Unknown Ruby version: #{ruby_version.inspect}"
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength
 
     def create_parser(ruby_version)
       builder = RuboCop::AST::Builder.new
diff --git a/lib/rubocop/rspec/shared_contexts.rb b/lib/rubocop/rspec/shared_contexts.rb
@@ -59,10 +59,6 @@
   end
 end
 
-shared_context 'ruby 2.1', :ruby21 do
-  let(:ruby_version) { 2.1 }
-end
-
 shared_context 'ruby 2.2', :ruby22 do
   let(:ruby_version) { 2.2 }
 end
diff --git a/lib/rubocop/rspec/shared_examples.rb b/lib/rubocop/rspec/shared_examples.rb
@@ -9,29 +9,6 @@
   end
 end
 
-shared_examples_for 'mimics MRI 2.1' do |grep_mri_warning|
-  if RUBY_ENGINE == 'ruby' && RUBY_VERSION.start_with?('2.1')
-    it "mimics MRI #{RUBY_VERSION} built-in syntax checking" do
-      inspect_source(source)
-      offenses_by_mri = MRISyntaxChecker.offenses_for_source(
-        source, cop.name, grep_mri_warning
-      )
-
-      # Compare objects before comparing counts for clear failure output.
-      cop.offenses.each_with_index do |offense_by_cop, index|
-        offense_by_mri = offenses_by_mri[index]
-        # Exclude column attribute since MRI does not
-        # output column number.
-        %i[severity line cop_name].each do |a|
-          expect(offense_by_cop.send(a)).to eq(offense_by_mri.send(a))
-        end
-      end
-
-      expect(cop.offenses.count).to eq(offenses_by_mri.count)
-    end
-  end
-end
-
 shared_examples_for 'misaligned' do |annotated_source, used_style|
   config_to_allow_offenses = if used_style
                                { 'EnforcedStyleAlignWith' => used_style.to_s }
diff --git a/rubocop.gemspec b/rubocop.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.name = 'rubocop'
   s.version = RuboCop::Version::STRING
   s.platform = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 2.1.0'
+  s.required_ruby_version = '>= 2.2.0'
   s.authors = ['Bozhidar Batsov', 'Jonas Arvidsson', 'Yuji Nakayama']
   s.description = <<-DESCRIPTION
     Automatic Ruby code style checking tool.
@@ -43,8 +43,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('unicode-display_width', '~> 1.0', '>= 1.0.1')
 
   s.add_development_dependency('bundler', '~> 1.3')
-  # TODO: loosen rack dependency once Ruby 2.1.0 support is dropped.
-  # See https://git.io/vxWRB
-  s.add_development_dependency('rack', '>= 1.6.9', '< 2.0')
+  s.add_development_dependency('rack', '>= 2.0')
 end
 # rubocop:enable Metrics/BlockLength
diff --git a/spec/rubocop/cli/cli_autocorrect_spec.rb b/spec/rubocop/cli/cli_autocorrect_spec.rb
@@ -1270,7 +1270,7 @@ def self.some_method(foo, bar: 1)
     RUBY
     create_file('.rubocop.yml', <<-YAML.strip_indent)
       AllCops:
-        TargetRubyVersion: 2.1
+        TargetRubyVersion: 2.2
     YAML
     create_file('example.rb', src)
     expect(cli.run(%w[-a -f simple])).to eq(1)
diff --git a/spec/rubocop/cli_spec.rb b/spec/rubocop/cli_spec.rb
@@ -185,7 +185,7 @@ def and_with_args
     expect(cli.run(['--format', 'emacs', 'example.rb'])).to eq(1)
     expect($stdout.string)
       .to eq(["#{abs('example.rb')}:3:1: E: Lint/Syntax: unexpected " \
-              'token $end (Using Ruby 2.1 parser; configure using ' \
+              'token $end (Using Ruby 2.2 parser; configure using ' \
               '`TargetRubyVersion` parameter, under `AllCops`)',
               ''].join("\n"))
   end
@@ -1636,7 +1636,7 @@ def method(foo, bar, qux, fred, arg5, f) end #{'#' * 45}
           /\AError: Unknown Ruby version 2.6 found in `TargetRubyVersion`/
         )
         expect($stderr.string.strip).to match(
-          /Supported versions: 2.1, 2.2, 2.3, 2.4, 2.5/
+          /Supported versions: 2.2, 2.3, 2.4, 2.5/
         )
       end
     end
@@ -1658,7 +1658,7 @@ def method(foo, bar, qux, fred, arg5, f) end #{'#' * 45}
         )
 
         expect($stderr.string.strip).to match(
-          /Supported versions: 2.1, 2.2, 2.3, 2.4/
+          /Supported versions: 2.2, 2.3, 2.4/
         )
       end
     end
diff --git a/spec/rubocop/config_spec.rb b/spec/rubocop/config_spec.rb
@@ -802,7 +802,7 @@ def cop_enabled(cop_class)
 
   describe '#target_ruby_version', :isolated_environment do
     context 'when TargetRubyVersion is set' do
-      let(:ruby_version) { 2.1 }
+      let(:ruby_version) { 2.2 }
 
       let(:hash) do
         {
diff --git a/spec/rubocop/cop/layout/def_end_alignment_spec.rb b/spec/rubocop/cop/layout/def_end_alignment_spec.rb
@@ -34,7 +34,7 @@ def Test.test
     include_examples 'aligned', 'def',       'test',       'end'
     include_examples 'aligned', 'def',       'Test.test',  'end', 'defs'
 
-    context 'in ruby 2.1 or later' do
+    context 'in ruby 2.2 or later' do
       include_examples 'aligned', 'foo def', 'test', 'end'
       include_examples 'aligned', 'foo bar def', 'test', 'end'
 
@@ -88,7 +88,7 @@ def Test.test
     include_examples 'aligned', 'def', 'test',      'end'
     include_examples 'aligned', 'def', 'Test.test', 'end', 'defs'
 
-    context 'in ruby 2.1 or later' do
+    context 'in ruby 2.2 or later' do
       include_examples('aligned',
                        'foo def', 'test',
                        '    end')
diff --git a/spec/rubocop/cop/lint/shadowing_outer_local_variable_spec.rb b/spec/rubocop/cop/lint/shadowing_outer_local_variable_spec.rb
@@ -23,8 +23,6 @@ def some_method
         .to eq('Shadowing outer local variable - `foo`.')
       expect(cop.offenses.first.line).to eq(4)
     end
-
-    include_examples 'mimics MRI 2.1'
   end
 
   context 'when a splat block argument has same name ' \
@@ -47,8 +45,6 @@ def some_method
         .to eq('Shadowing outer local variable - `foo`.')
       expect(cop.offenses.first.line).to eq(4)
     end
-
-    include_examples 'mimics MRI 2.1'
   end
 
   context 'when a block block argument has same name ' \
@@ -73,8 +69,6 @@ def some_method
         .to eq('Shadowing outer local variable - `foo`.')
       expect(cop.offenses.first.line).to eq(4)
     end
-
-    include_examples 'mimics MRI 2.1'
   end
 
   context 'when a block local variable has same name ' \
@@ -98,8 +92,6 @@ def some_method
         .to eq('Shadowing outer local variable - `foo`.')
       expect(cop.offenses.first.line).to eq(4)
     end
-
-    include_examples 'mimics MRI 2.1', 'shadowing'
   end
 
   context 'when a block argument has different name ' \
@@ -116,7 +108,6 @@ def some_method
     end
 
     include_examples 'accepts'
-    include_examples 'mimics MRI 2.1'
   end
 
   context 'when an outer scope variable is reassigned in a block' do
@@ -133,7 +124,6 @@ def some_method
     end
 
     include_examples 'accepts'
-    include_examples 'mimics MRI 2.1'
   end
 
   context 'when an outer scope variable is referenced in a block' do
@@ -150,7 +140,6 @@ def some_method
     end
 
     include_examples 'accepts'
-    include_examples 'mimics MRI 2.1'
   end
 
   context 'when multiple block arguments have same name "_"' do
@@ -164,7 +153,6 @@ def some_method
     end
 
     include_examples 'accepts'
-    include_examples 'mimics MRI 2.1'
   end
 
   context 'when multiple block arguments have ' \
@@ -179,7 +167,6 @@ def some_method
     end
 
     include_examples 'accepts'
-    include_examples 'mimics MRI 2.1'
   end
 
   context 'when a block argument has same name "_" ' \
@@ -196,7 +183,6 @@ def some_method
     end
 
     include_examples 'accepts'
-    include_examples 'mimics MRI 2.1'
   end
 
   context 'when a block argument has a same name starts with "_" ' \
@@ -213,7 +199,6 @@ def some_method
     end
 
     include_examples 'accepts'
-    include_examples 'mimics MRI 2.1'
   end
 
   context 'when a method argument has same name ' \
@@ -230,6 +215,5 @@ def some_method(foo)
     end
 
     include_examples 'accepts'
-    include_examples 'mimics MRI 2.1'
   end
 end
diff --git a/spec/rubocop/cop/lint/unneeded_require_statement_spec.rb b/spec/rubocop/cop/lint/unneeded_require_statement_spec.rb
@@ -3,31 +3,21 @@
 RSpec.describe RuboCop::Cop::Lint::UnneededRequireStatement, :config do
   subject(:cop) { described_class.new(config) }
 
-  context 'target ruby version < 2.2', :ruby21 do
-    it "does not registers an offense when using `require 'enumerator'`" do
-      expect_no_offenses(<<-RUBY.strip_indent)
-        require 'enumerator'
-      RUBY
-    end
+  it "registers an offense when using `require 'enumerator'`" do
+    expect_offense(<<-RUBY.strip_indent)
+      require 'enumerator'
+      ^^^^^^^^^^^^^^^^^^^^ Remove unnecessary `require` statement.
+    RUBY
   end
 
-  context 'target ruby version >= 2.2', :ruby22 do
-    it "registers an offense when using `require 'enumerator'`" do
-      expect_offense(<<-RUBY.strip_indent)
-        require 'enumerator'
-        ^^^^^^^^^^^^^^^^^^^^ Remove unnecessary `require` statement.
-      RUBY
-    end
+  it 'autocorrects remove unnecessary require statement' do
+    new_source = autocorrect_source(<<-RUBY.strip_indent)
+      require 'enumerator'
+      require 'uri'
+    RUBY
 
-    it 'autocorrects remove unnecessary require statement' do
-      new_source = autocorrect_source(<<-RUBY.strip_indent)
-        require 'enumerator'
-        require 'uri'
-      RUBY
-
-      expect(new_source).to eq(<<-RUBY.strip_indent)
-        require 'uri'
-      RUBY
-    end
+    expect(new_source).to eq(<<-RUBY.strip_indent)
+      require 'uri'
+    RUBY
   end
 end
diff --git a/spec/rubocop/cop/lint/unused_method_argument_spec.rb b/spec/rubocop/cop/lint/unused_method_argument_spec.rb
@@ -70,17 +70,6 @@ def some_method(foo, bar)
       end
     end
 
-    context 'when a required keyword argument is unused', ruby: 2.1 do
-      it 'registers an offense but does not suggest underscore-prefix' do
-        expect_offense(<<-RUBY.strip_indent)
-          def self.some_method(foo, bar:)
-                                    ^^^ Unused method argument - `bar`.
-            puts foo
-          end
-        RUBY
-      end
-    end
-
     context 'when an optional keyword argument is unused' do
       it 'registers an offense but does not suggest underscore-prefix' do
         expect_offense(<<-RUBY.strip_indent)
diff --git a/spec/rubocop/cop/lint/useless_access_modifier_spec.rb b/spec/rubocop/cop/lint/useless_access_modifier_spec.rb
diff --git a/spec/rubocop/cop/lint/useless_assignment_spec.rb b/spec/rubocop/cop/lint/useless_assignment_spec.rb
diff --git a/spec/rubocop/cop/metrics/parameter_lists_spec.rb b/spec/rubocop/cop/metrics/parameter_lists_spec.rb
diff --git a/spec/rubocop/cop/style/hash_syntax_spec.rb b/spec/rubocop/cop/style/hash_syntax_spec.rb
