rubocop 1.10.0 → 1.14.0

data/lib/rubocop/target_ruby.rb

@@ -4,11 +4,11 @@ module RuboCop
   # The kind of Ruby that code inspected by RuboCop is written in.
   # @api private
   class TargetRuby
-    KNOWN_RUBIES = [2.4, 2.5, 2.6, 2.7, 3.0].freeze
+    KNOWN_RUBIES = [2.5, 2.6, 2.7, 3.0, 3.1].freeze
     DEFAULT_VERSION = KNOWN_RUBIES.first
 
     OBSOLETE_RUBIES = {
-      1.9 => '0.41', 2.0 => '0.50', 2.1 => '0.57', 2.2 => '0.68', 2.3 => '0.81'
+      1.9 => '0.41', 2.0 => '0.50', 2.1 => '0.57', 2.2 => '0.68', 2.3 => '0.81', 2.4 => '1.12'
     }.freeze
     private_constant :KNOWN_RUBIES, :OBSOLETE_RUBIES
 
@@ -65,15 +65,11 @@ module RuboCop
         file = version_file
         return unless file && File.file?(file)
 
-        File.read(file).match(pattern) do |md|
-          md[:version].to_f
-        end
+        File.read(file).match(pattern) { |md| md[:version].to_f }
       end
 
       def version_file
-        @version_file ||=
-          @config.find_file_upwards(filename,
-                                    @config.base_dir_for_path_parameters)
+        @version_file ||= @config.find_file_upwards(filename, @config.base_dir_for_path_parameters)
       end
     end
 
@@ -147,10 +143,12 @@ module RuboCop
 
       GEMSPEC_EXTENSION = '.gemspec'
 
+      # @!method required_ruby_version(node)
       def_node_search :required_ruby_version, <<~PATTERN
         (send _ :required_ruby_version= $_)
       PATTERN
 
+      # @!method gem_requirement?(node)
       def_node_matcher :gem_requirement?, <<~PATTERN
         (send (const(const _ :Gem):Requirement) :new $str)
       PATTERN
@@ -165,14 +163,10 @@ module RuboCop
         file = gemspec_filepath
         return unless file && File.file?(file)
 
-        version = version_from_gemspec_file(file)
-        return if version.nil?
-
-        requirement = version.children.last
-        return version_from_array(version) if version.array_type?
-        return version_from_array(requirement) if gem_requirement? version
+        right_hand_side = version_from_gemspec_file(file)
+        return if right_hand_side.nil?
 
-        version_from_str(version.str_content)
+        find_minimal_known_ruby(right_hand_side)
       end
 
       def gemspec_filename
@@ -192,15 +186,25 @@ module RuboCop
         required_ruby_version(processed_source.ast).first
       end
 
+      def version_from_right_hand_side(right_hand_side)
+        if right_hand_side.array_type?
+          version_from_array(right_hand_side)
+        elsif gem_requirement?(right_hand_side)
+          right_hand_side.children.last.value
+        else
+          right_hand_side.value
+        end
+      end
+
       def version_from_array(array)
-        versions = array.children.map { |v| version_from_str(v.is_a?(String) ? v : v.str_content) }
-        versions.compact.min
+        array.children.map(&:value)
       end
 
-      def version_from_str(str)
-        str.match(/^(?:>=|<=)?\s*(?<version>\d+(?:\.\d+)*)/) do |md|
-          md[:version].to_f
-        end
+      def find_minimal_known_ruby(right_hand_side)
+        version = version_from_right_hand_side(right_hand_side)
+        requirement = Gem::Requirement.new(version)
+
+        KNOWN_RUBIES.detect { |v| requirement.satisfied_by?(Gem::Version.new("#{v}.99")) }
       end
     end
 

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.10.0'
+    STRING = '1.14.0'
 
     MSG = '%<version>s (using Parser %<parser_version>s, '\
           'rubocop-ast %<rubocop_ast_version>s, ' \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -100,7 +100,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -110,7 +110,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -221,6 +221,7 @@ files:
 - lib/rubocop/cop/base.rb
 - lib/rubocop/cop/bundler/duplicated_gem.rb
 - lib/rubocop/cop/bundler/gem_comment.rb
+- lib/rubocop/cop/bundler/gem_version.rb
 - lib/rubocop/cop/bundler/insecure_protocol_source.rb
 - lib/rubocop/cop/bundler/ordered_gems.rb
 - lib/rubocop/cop/commissioner.rb
@@ -258,6 +259,7 @@ files:
 - lib/rubocop/cop/internal_affairs/example_description.rb
 - lib/rubocop/cop/internal_affairs/method_name_equal.rb
 - lib/rubocop/cop/internal_affairs/node_destructuring.rb
+- lib/rubocop/cop/internal_affairs/node_matcher_directive.rb
 - lib/rubocop/cop/internal_affairs/node_type_predicate.rb
 - lib/rubocop/cop/internal_affairs/offense_location_keyword.rb
 - lib/rubocop/cop/internal_affairs/redundant_described_class_as_subject.rb
@@ -330,7 +332,9 @@ files:
 - lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb
 - lib/rubocop/cop/layout/multiline_operation_indentation.rb
 - lib/rubocop/cop/layout/parameter_alignment.rb
+- lib/rubocop/cop/layout/redundant_line_break.rb
 - lib/rubocop/cop/layout/rescue_ensure_alignment.rb
+- lib/rubocop/cop/layout/single_line_block_chain.rb
 - lib/rubocop/cop/layout/space_after_colon.rb
 - lib/rubocop/cop/layout/space_after_comma.rb
 - lib/rubocop/cop/layout/space_after_method_name.rb
@@ -522,6 +526,7 @@ files:
 - lib/rubocop/cop/mixin/enforce_superclass.rb
 - lib/rubocop/cop/mixin/first_element_line_break.rb
 - lib/rubocop/cop/mixin/frozen_string_literal.rb
+- lib/rubocop/cop/mixin/gem_declaration.rb
 - lib/rubocop/cop/mixin/hash_alignment_styles.rb
 - lib/rubocop/cop/mixin/hash_transform_method.rb
 - lib/rubocop/cop/mixin/heredoc.rb
@@ -600,6 +605,7 @@ files:
 - lib/rubocop/cop/style/bare_percent_literals.rb
 - lib/rubocop/cop/style/begin_block.rb
 - lib/rubocop/cop/style/bisected_attr_accessor.rb
+- lib/rubocop/cop/style/bisected_attr_accessor/macro.rb
 - lib/rubocop/cop/style/block_comments.rb
 - lib/rubocop/cop/style/block_delimiters.rb
 - lib/rubocop/cop/style/case_equality.rb
@@ -767,6 +773,7 @@ files:
 - lib/rubocop/cop/style/stabby_lambda_parentheses.rb
 - lib/rubocop/cop/style/static_class.rb
 - lib/rubocop/cop/style/stderr_puts.rb
+- lib/rubocop/cop/style/string_chars.rb
 - lib/rubocop/cop/style/string_concatenation.rb
 - lib/rubocop/cop/style/string_hash_keys.rb
 - lib/rubocop/cop/style/string_literals.rb
@@ -790,6 +797,7 @@ files:
 - lib/rubocop/cop/style/trailing_underscore_variable.rb
 - lib/rubocop/cop/style/trivial_accessors.rb
 - lib/rubocop/cop/style/unless_else.rb
+- lib/rubocop/cop/style/unless_logical_operators.rb
 - lib/rubocop/cop/style/unpack_first.rb
 - lib/rubocop/cop/style/variable_interpolation.rb
 - lib/rubocop/cop/style/when_then.rb
@@ -810,7 +818,6 @@ files:
 - lib/rubocop/cop/variable_force/variable.rb
 - lib/rubocop/cop/variable_force/variable_table.rb
 - lib/rubocop/cops_documentation_generator.rb
-- lib/rubocop/core_ext/hash.rb
 - lib/rubocop/core_ext/string.rb
 - lib/rubocop/directive_comment.rb
 - lib/rubocop/error.rb
@@ -861,15 +868,15 @@ files:
 - lib/rubocop/version.rb
 - lib/rubocop/warning.rb
 - lib/rubocop/yaml_duplication_checker.rb
-homepage: https://github.com/rubocop-hq/rubocop
+homepage: https://github.com/rubocop/rubocop
 licenses:
 - MIT
 metadata:
   homepage_uri: https://rubocop.org/
-  changelog_uri: https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md
-  source_code_uri: https://github.com/rubocop-hq/rubocop/
-  documentation_uri: https://docs.rubocop.org/rubocop/1.10/
-  bug_tracker_uri: https://github.com/rubocop-hq/rubocop/issues
+  changelog_uri: https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/rubocop/rubocop/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.14/
+  bug_tracker_uri: https://github.com/rubocop/rubocop/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -878,7 +885,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/rubocop/core_ext/hash.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-# Extensions to the core Hash class
-class Hash
-  unless method_defined?(:slice)
-    # Adds `Hash#slice` for Ruby 2.4.
-    # Returns a hash containing a subset of keys. If a given key is not
-    # in the hash, it will not be returned.
-    #
-    # @return [Hash] hash containing only the keys given.
-    #
-    # @example
-    #   { one: 1, two: 2 }.slice(:two, :three) #=> { two: 2 }
-    def slice(*keys)
-      h = {}
-      keys.each { |k| h[k] = self[k] if key?(k) }
-      h
-    end
-  end
-end