rubocop 0.57.1 → 0.57.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e577b73a80f270f2f18699b1b34a563a60565d5c
-  data.tar.gz: 364776f0704be1ae1e85e158623f5ded6f81cc14
+  metadata.gz: '059456c464bec007ceecf522ade27bd7cf5e7c5a'
+  data.tar.gz: cfe7d827a44e1a84835870f38d25c4f9b13a4a00
 SHA512:
-  metadata.gz: ee89c88fe1ad2bca660483e3e47bd7a59783f0989ff9e5b67d51cf182bfc9cbe9ea8d82e26ae5da2215ddbf23cb5c5bbbb84c28c9831da5d1ae8e34d9ba6e464
-  data.tar.gz: f6d4fbf74aff8a775ed6ff8f0336de11c40885c270aece677d8e45ebb0dbe3079b13b3015979734650f6fb4de7bbd80897ecf1f34004176115a3383a4e11823c
+  metadata.gz: bdd27ccbc33113527d0d6bfbdc83cc48cf83d1a00b1162328b25fa67b062b7d13330bb5011628aab74dacbcb690610f26e4e209361c1565c4ff9341c4e32cb48
+  data.tar.gz: '092c870e83c677788d8d314a1869a84a2a505090fc5c703f10145d1ad513231087d539a497050d985e483cf869a46b8fb96424b3465933796683972f9b02928a'

data/README.md

@@ -51,7 +51,7 @@ haven't reached version 1.0 yet). To prevent an unwanted RuboCop update you
 might want to use a conservative version locking in your `Gemfile`:
 
 ```rb
-gem 'rubocop', '~> 0.57.1', require: false
+gem 'rubocop', '~> 0.57.2', require: false
 ```
 
 ## Quickstart

data/config/enabled.yml

@@ -92,7 +92,7 @@ Layout/CaseIndentation:
   Enabled: true
 
 Layout/ClosingHeredocIndentation:
-  Description: 'Checks the indenation of here document closings.'
+  Description: 'Checks the indentation of here document closings.'
   Enabled: true
 
 Layout/ClosingParenthesisIndentation:

data/lib/rubocop/ast/node.rb

@@ -467,7 +467,7 @@ module RuboCop
       end
 
       def parenthesized_call?
-        loc.begin && loc.begin.is?('(')
+        loc.respond_to?(:begin) && loc.begin && loc.begin.is?('(')
       end
 
       def chained?

data/lib/rubocop/cop/layout/closing_heredoc_indentation.rb

@@ -49,18 +49,18 @@ module RuboCop
       class ClosingHeredocIndentation < Cop
         include Heredoc
 
+        SIMPLE_HEREDOC = '<<'.freeze
         MSG = '`%<closing>s` is not aligned with `%<opening>s`.'.freeze
         MSG_ARG = '`%<closing>s` is not aligned with `%<opening>s` or ' \
                   'beginning of method definition.'.freeze
 
         def on_heredoc(node)
-          if node.loc.heredoc_body.source.empty? ||
+          return if heredoc_type(node) == SIMPLE_HEREDOC
+
+          if empty_heredoc?(node) ||
              contents_indentation(node) >= closing_indentation(node)
             return if opening_indentation(node) == closing_indentation(node)
-            return if node.argument? &&
-                      opening_indentation(
-                        find_node_used_heredoc_argument(node.parent)
-                      ) == closing_indentation(node)
+            return if argument_indentation_correct?(node)
           end
 
           add_offense(node, location: :heredoc_end)
@@ -78,6 +78,17 @@ module RuboCop
           indent_level(heredoc_opening(node))
         end
 
+        def empty_heredoc?(node)
+          node.loc.heredoc_body.source.empty? || !contents_indentation(node)
+        end
+
+        def argument_indentation_correct?(node)
+          node.argument? &&
+            opening_indentation(
+              find_node_used_heredoc_argument(node.parent)
+            ) == closing_indentation(node)
+        end
+
         def contents_indentation(node)
           source_lines = node.loc.heredoc_body.source.split("\n")
 

data/lib/rubocop/cop/layout/first_parameter_indentation.rb

@@ -2,6 +2,7 @@
 
 module RuboCop
   module Cop
+    # rubocop:disable Metrics/LineLength
     module Layout
       # This cop checks the indentation of the first parameter in a method call.
       # Parameters after the first one are checked by Layout/AlignParameters,
@@ -31,7 +32,9 @@ module RuboCop
       #   nested_first_param),
       #   second_param
       #
-      #   # Style: consistent
+      # @example EnforcedStyle: consistent
+      #   # The first parameter should always be indented one step more than the
+      #   # preceding line.
       #
       #   # good
       #   some_method(
@@ -55,7 +58,9 @@ module RuboCop
       #     nested_first_param),
       #   second_param
       #
-      #   # Style: consistent_relative_to_receiver
+      # @example EnforcedStyle: consistent_relative_to_receiver
+      #   # The first parameter should always be indented one level relative to
+      #   # the parent that is receiving the parameter
       #
       #   # good
       #   some_method(
@@ -79,7 +84,11 @@ module RuboCop
       #                 nested_first_param),
       #   second_params
       #
-      #   # Style: special_for_inner_method_call
+      # @example EnforcedStyle: special_for_inner_method_call
+      #   # The first parameter should normally be indented one step more than
+      #   # the preceding line, but if it's a parameter for a method call that
+      #   # is itself a parameter in a method call, then the inner parameter
+      #   # should be indented relative to the inner method.
       #
       #   # good
       #   some_method(
@@ -103,7 +112,10 @@ module RuboCop
       #                 nested_first_param),
       #   second_param
       #
-      #   # Style: special_for_inner_method_call_in_parentheses
+      # @example EnforcedStyle: special_for_inner_method_call_in_parentheses (default)
+      #   # Same as `special_for_inner_method_call` except that the special rule
+      #   # only applies if the outer method call encloses its arguments in
+      #   # parentheses.
       #
       #   # good
       #   some_method(
@@ -128,6 +140,7 @@ module RuboCop
       #   second_param
       #
       class FirstParameterIndentation < Cop
+        # rubocop:enable Metrics/LineLength
         include Alignment
         include ConfigurableEnforcedStyle
         include RangeHelp

data/lib/rubocop/cop/layout/indentation_consistency.rb

@@ -149,7 +149,7 @@ module RuboCop
         # is not an access modifier.
         def base_column_for_normal_style(node)
           first_child = node.children.first
-          return unless bare_access_modifier?(first_child)
+          return unless first_child && bare_access_modifier?(first_child)
 
           # If, as is most common, the access modifier is indented deeper than
           # the module (`access_modifier_indent > module_indent`) then the

data/lib/rubocop/cop/mixin/heredoc.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Cop
     # Common functionality for working with heredoc strings.
     module Heredoc
-      OPENING_DELIMITER = /<<[~-]?['"`]?([^'"`]+)['"`]?/
+      OPENING_DELIMITER = /(<<[~-]?)['"`]?([^'"`]+)['"`]?/
 
       def on_str(node)
         return unless node.heredoc?
@@ -21,7 +21,11 @@ module RuboCop
       private
 
       def delimiter_string(node)
-        node.source.match(OPENING_DELIMITER).captures.first
+        node.source.match(OPENING_DELIMITER).captures[1]
+      end
+
+      def heredoc_type(node)
+        node.source.match(OPENING_DELIMITER).captures[0]
       end
     end
   end

data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb

@@ -37,7 +37,7 @@ module RuboCop
         private
 
         def meaningful_delimiters?(node)
-          delimiters = delimiters(node)
+          delimiters = delimiter_string(node)
 
           return false unless delimiters =~ /\w/
 
@@ -46,10 +46,6 @@ module RuboCop
           end
         end
 
-        def delimiters(node)
-          node.source.match(OPENING_DELIMITER).captures.first
-        end
-
         def blacklisted_delimiters
           cop_config['Blacklist'] || []
         end

data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb

@@ -91,7 +91,8 @@ module RuboCop
         end
 
         def args_parenthesized?(node)
-          return false unless node.arguments.length == 1
+          return false unless node.arguments.one?
+
           node.arguments.first.parenthesized_call?
         end
       end

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.57.1'.freeze
+    STRING = '0.57.2'.freeze
 
     MSG = '%<version>s (using Parser %<parser_version>s, running on ' \
           '%<ruby_engine>s %<ruby_version>s %<ruby_platform>s)'.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.57.1
+  version: 0.57.2
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jaro_winkler