rubocop 1.4.1 → 1.6.0

data/lib/rubocop/ext/regexp_node.rb

@@ -15,20 +15,37 @@ module RuboCop
       # see `ext/regexp_parser`.
       attr_reader :parsed_tree
 
-      def assign_properties(*)
-        super
+      if Gem::Version.new(Regexp::Parser::VERSION) >= Gem::Version.new('2.0')
+        def assign_properties(*)
+          super
 
-        str = with_interpolations_blanked
-        begin
-          @parsed_tree = Regexp::Parser.parse(str, options: options)
-        rescue StandardError
-          @parsed_tree = nil
-        else
+          str = with_interpolations_blanked
+          @parsed_tree = begin
+            Regexp::Parser.parse(str, options: options)
+          rescue StandardError
+            nil
+          end
           origin = loc.begin.end
-          source = @parsed_tree.to_s
-          @parsed_tree.each_expression(true) do |e|
-            e.origin = origin
-            e.source = source
+          @parsed_tree&.each_expression(true) { |e| e.origin = origin }
+        end
+      # Please remove this `else` branch when support for regexp_parser 1.8 will be dropped.
+      # It's for compatibility with regexp_arser 1.8 and will never be maintained.
+      else
+        def assign_properties(*)
+          super
+
+          str = with_interpolations_blanked
+          begin
+            @parsed_tree = Regexp::Parser.parse(str, options: options)
+          rescue StandardError
+            @parsed_tree = nil
+          else
+            origin = loc.begin.end
+            source = @parsed_tree.to_s
+            @parsed_tree.each_expression(true) do |e|
+              e.origin = origin
+              e.source = source
+            end
           end
         end
       end

data/lib/rubocop/ext/regexp_parser.rb

@@ -20,17 +20,28 @@ module RuboCop
       module Expression
         # Add `expression` and `loc` to all `regexp_parser` nodes
         module Base
-          attr_accessor :origin, :source
+          attr_accessor :origin
 
-          def start_index
-            # ts is a byte index; convert it to a character index
-            @start_index ||= source.byteslice(0, ts).length
-          end
+          if Gem::Version.new(Regexp::Parser::VERSION) >= Gem::Version.new('2.0')
+            # Shortcut to `loc.expression`
+            def expression
+              @expression ||= origin.adjust(begin_pos: ts, end_pos: ts + full_length)
+            end
+          # Please remove this `else` branch when support for regexp_parser 1.8 will be dropped.
+          # It's for compatibility with regexp_arser 1.8 and will never be maintained.
+          else
+            attr_accessor :source
+
+            def start_index
+              # ts is a byte index; convert it to a character index
+              @start_index ||= source.byteslice(0, ts).length
+            end
 
-          # Shortcut to `loc.expression`
-          def expression
-            @expression ||= begin
-              origin.adjust(begin_pos: start_index, end_pos: start_index + full_length)
+            # Shortcut to `loc.expression`
+            def expression
+              @expression ||= begin
+                origin.adjust(begin_pos: start_index, end_pos: start_index + full_length)
+              end
             end
           end
 

data/lib/rubocop/formatter/emacs_style_formatter.rb

@@ -27,6 +27,8 @@ module RuboCop
             "[Todo] #{offense.message}"
           elsif offense.corrected?
             "[Corrected] #{offense.message}"
+          elsif offense.correctable?
+            "[Correctable] #{offense.message}"
           else
             offense.message
           end

data/lib/rubocop/formatter/simple_text_formatter.rb

@@ -90,6 +90,8 @@ module RuboCop
             green('[Todo] ')
           elsif offense.corrected?
             green('[Corrected] ')
+          elsif offense.correctable?
+            yellow('[Correctable] ')
           else
             ''
           end

data/lib/rubocop/formatter/tap_formatter.rb

@@ -71,6 +71,8 @@ module RuboCop
             '[Todo] '
           elsif offense.corrected?
             '[Corrected] '
+          elsif offense.correctable?
+            '[Correctable] '
           else
             ''
           end

data/lib/rubocop/lockfile.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module RuboCop
+  # Encapsulation of a lockfile for use when checking for gems.
+  # Does not actually resolve gems, just parses the lockfile.
+  # @api private
+  class Lockfile
+    # Gems that the bundle depends on
+    def dependencies
+      return [] unless parser
+
+      parser.dependencies.values
+    end
+
+    # All activated gems, including transitive dependencies
+    def gems
+      return [] unless parser
+
+      # `Bundler::LockfileParser` returns `Bundler::LazySpecification` objects
+      # which are not resolved, so extract the dependencies from them
+      parser.dependencies.values.concat(parser.specs.flat_map(&:dependencies))
+    end
+
+    def includes_gem?(name)
+      gems.any? { |gem| gem.name == name }
+    end
+
+    private
+
+    def parser
+      return unless defined?(Bundler) && Bundler.default_lockfile
+      return @parser if defined?(@parser)
+
+      lockfile = Bundler.read_file(Bundler.default_lockfile)
+      @parser = lockfile ? Bundler::LockfileParser.new(lockfile) : nil
+    rescue Bundler::BundlerError
+      nil
+    end
+  end
+end

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.4.1'
+    STRING = '1.6.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.4.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -67,6 +67,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,6 +77,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -94,14 +100,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +184,7 @@ files:
 - assets/logo.png
 - assets/output.html.erb
 - config/default.yml
+- config/obsoletion.yml
 - exe/rubocop
 - lib/rubocop.rb
 - lib/rubocop/ast_aliases.rb
@@ -183,6 +196,7 @@ files:
 - lib/rubocop/cli/command/execute_runner.rb
 - lib/rubocop/cli/command/init_dotfile.rb
 - lib/rubocop/cli/command/show_cops.rb
+- lib/rubocop/cli/command/suggest_extensions.rb
 - lib/rubocop/cli/command/version.rb
 - lib/rubocop/cli/environment.rb
 - lib/rubocop/comment_config.rb
@@ -190,6 +204,15 @@ files:
 - lib/rubocop/config_loader.rb
 - lib/rubocop/config_loader_resolver.rb
 - lib/rubocop/config_obsoletion.rb
+- lib/rubocop/config_obsoletion/changed_enforced_styles.rb
+- lib/rubocop/config_obsoletion/changed_parameter.rb
+- lib/rubocop/config_obsoletion/cop_rule.rb
+- lib/rubocop/config_obsoletion/extracted_cop.rb
+- lib/rubocop/config_obsoletion/parameter_rule.rb
+- lib/rubocop/config_obsoletion/removed_cop.rb
+- lib/rubocop/config_obsoletion/renamed_cop.rb
+- lib/rubocop/config_obsoletion/rule.rb
+- lib/rubocop/config_obsoletion/split_cop.rb
 - lib/rubocop/config_regeneration.rb
 - lib/rubocop/config_store.rb
 - lib/rubocop/config_validator.rb
@@ -426,6 +449,7 @@ files:
 - lib/rubocop/cop/lint/top_level_return_with_argument.rb
 - lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb
 - lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb
+- lib/rubocop/cop/lint/unexpected_block_arity.rb
 - lib/rubocop/cop/lint/unified_integer.rb
 - lib/rubocop/cop/lint/unmodified_reduce_accumulator.rb
 - lib/rubocop/cop/lint/unreachable_code.rb
@@ -454,6 +478,7 @@ files:
 - lib/rubocop/cop/metrics/utils/abc_size_calculator.rb
 - lib/rubocop/cop/metrics/utils/code_length_calculator.rb
 - lib/rubocop/cop/metrics/utils/iterating_block.rb
+- lib/rubocop/cop/metrics/utils/repeated_attribute_discount.rb
 - lib/rubocop/cop/metrics/utils/repeated_csend_discount.rb
 - lib/rubocop/cop/migration/department_name.rb
 - lib/rubocop/cop/mixin/alignment.rb
@@ -764,6 +789,7 @@ 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
@@ -792,6 +818,7 @@ files:
 - lib/rubocop/formatter/tap_formatter.rb
 - lib/rubocop/formatter/text_util.rb
 - lib/rubocop/formatter/worst_offenders_formatter.rb
+- lib/rubocop/lockfile.rb
 - lib/rubocop/magic_comment.rb
 - lib/rubocop/name_similarity.rb
 - lib/rubocop/options.rb
@@ -819,7 +846,7 @@ 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.4/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.6/
   bug_tracker_uri: https://github.com/rubocop-hq/rubocop/issues
 post_install_message: 
 rdoc_options: []