rubocop 0.21.0 → 0.22.0

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

@@ -18,10 +18,9 @@ module Rubocop
                  elsif trivial_writer?(method_name, args, body)
                    'writer'
                  end
-          if kind
-            add_offense(node, :keyword,
-                        format(MSG, kind, kind))
-          end
+          return unless kind
+
+          add_offense(node, :keyword, format(MSG, kind, kind))
         end
 
         def exact_name_match?

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

@@ -13,10 +13,9 @@ module Rubocop
 
           # discard ternary ops and modifier if/unless nodes
           return unless loc.respond_to?(:keyword) && loc.respond_to?(:else)
+          return unless loc.keyword.is?('unless') && loc.else
 
-          if loc.keyword.is?('unless') && loc.else
-            add_offense(node, :expression)
-          end
+          add_offense(node, :expression)
         end
       end
     end

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

@@ -18,10 +18,10 @@ module Rubocop
 
         def on_percent_literal(node, types)
           type = type(node)
-          if types.include?(type) &&
+          return unless types.include?(type) &&
             node.children.none? { |x| x.type == :dstr }
-            add_offense(node, :expression)
-          end
+
+          add_offense(node, :expression)
         end
       end
     end

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

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+module Rubocop
+  module Cop
+    module Style
+      # This cop checks for usage of the %x() syntax when `` would do.
+      class UnneededPercentX < Cop
+        MSG = 'Do not use `%x` unless the command string contains backquotes.'
+
+        def on_xstr(node)
+          add_offense(node, :expression) if node.loc.expression.source !~ /`/
+        end
+
+        private
+
+        def autocorrect(node)
+          string, = *node
+          @corrections << lambda do |corrector|
+            corrector.replace(node.loc.expression,
+                              "`#{string.loc.expression.source}`")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,9 +8,9 @@ module Rubocop
         MSG = 'Never use `when x;`. Use `when x then` instead.'
 
         def on_when(node)
-          if node.loc.begin && node.loc.begin.is?(';')
-            add_offense(node, :begin)
-          end
+          return unless node.loc.begin && node.loc.begin.is?(';')
+
+          add_offense(node, :begin)
         end
 
         def autocorrect(node)

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

@@ -15,13 +15,10 @@ module Rubocop
 
         def handle(node)
           length = node.loc.expression.source.lines.to_a.size
+          return unless length > 1
+          return unless  node.loc.begin && node.loc.begin.is?('do')
 
-          if length > 1
-            if node.loc.begin && node.loc.begin.is?('do')
-              add_offense(node, :begin,
-                          error_message(node.type))
-            end
-          end
+          add_offense(node, :begin, error_message(node.type))
         end
 
         private

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

@@ -16,10 +16,11 @@ module Rubocop
 
         def on_array(node)
           array_elems = node.children
-          if array_of?(:str, node) && !complex_content?(array_elems) &&
+          return unless array_of?(:str, node) &&
+            !complex_content?(array_elems) &&
             array_elems.size > min_size && !comments_in_array?(node)
-            add_offense(node, :expression) { self.max = array_elems.size }
-          end
+
+          add_offense(node, :expression) { self.max = array_elems.size }
         end
 
         private
@@ -41,10 +42,10 @@ module Rubocop
         def complex_content?(arr_sexp)
           arr_sexp.each do |s|
             source = s.loc.expression.source
-            unless source.start_with?('?') # %W(\r \n) can replace [?\r, ?\n]
-              str_content = Util.strip_quotes(source)
-              return true unless str_content =~ /\A[\w-]+\z/
-            end
+            next if source.start_with?('?') # %W(\r \n) can replace [?\r, ?\n]
+
+            str_content = Util.strip_quotes(source)
+            return true unless str_content =~ /\A[\w-]+\z/
           end
 
           false

data/lib/rubocop/cop/team.rb

@@ -43,9 +43,8 @@ module Rubocop
       def cops
         @cops ||= begin
           @cop_classes.each_with_object([]) do |cop_class, instances|
-            if cop_enabled?(cop_class)
-              instances << cop_class.new(@config, @options)
-            end
+            next unless cop_enabled?(cop_class)
+            instances << cop_class.new(@config, @options)
           end
         end
       end
@@ -69,9 +68,8 @@ module Rubocop
         @updated_source_file = false
         return unless autocorrect?
 
-        corrections = cops.reduce([]) do |array, cop|
-          array.concat(cop.corrections)
-          array
+        corrections = cops.each_with_object([]) do |cop, array|
+          array.concat(cop.corrections) if cop.relevant_file?(buffer.name)
         end
 
         corrector = Corrector.new(buffer, corrections)
@@ -81,11 +79,11 @@ module Rubocop
                        autocorrect_one_cop(buffer, cops)
                      end
 
-        unless new_source == buffer.source
-          filename = buffer.name
-          File.open(filename, 'w') { |f| f.write(new_source) }
-          @updated_source_file = true
-        end
+        return if new_source == buffer.source
+
+        filename = buffer.name
+        File.open(filename, 'w') { |f| f.write(new_source) }
+        @updated_source_file = true
       end
 
       # Does a slower but safer auto-correction run by correcting for just one

data/lib/rubocop/cop/util.rb

@@ -116,9 +116,8 @@ module Rubocop
         return if Array(excludes).include?(sexp.type)
 
         sexp.children.each do |elem|
-          if elem.is_a?(Parser::AST::Node)
-            on_node(syms, elem, excludes) { |s| yield s }
-          end
+          next unless elem.is_a?(Parser::AST::Node)
+          on_node(syms, elem, excludes) { |s| yield s }
         end
       end
 

data/lib/rubocop/cop/variable_force.rb

@@ -168,9 +168,8 @@ module Rubocop
         variable_names = regexp.named_captures.keys
 
         variable_names.each do |name|
-          unless variable_table.variable_exist?(name)
-            variable_table.declare_variable(name, node)
-          end
+          next if variable_table.variable_exist?(name)
+          variable_table.declare_variable(name, node)
         end
 
         process_node(rhs_node)

data/lib/rubocop/cop/variable_force/variable_table.rb

@@ -109,10 +109,9 @@ module Rubocop
         end
 
         def accessible_variables
-          scope_stack.reverse_each.reduce([]) do |variables, scope|
+          scope_stack.reverse_each.each_with_object([]) do |scope, variables|
             variables.concat(scope.variables.values)
             break variables unless scope.node.type == :block
-            variables
           end
         end
 

data/lib/rubocop/file_inspector.rb

@@ -26,6 +26,7 @@ module Rubocop
           o.severity >= fail_level
         end
         inspected_files << file
+        break if @options[:fail_fast] && any_failed
       end
 
       formatter_set.finished(inspected_files.freeze)
@@ -65,6 +66,10 @@ module Rubocop
       # are made. This is because automatic corrections can introduce new
       # offenses. In the normal case the loop is only executed once.
       loop do
+        # The offenses that couldn't be corrected will be found again so we
+        # only keep the corrected ones in order to avoid duplicate reporting.
+        offenses.select!(&:corrected?)
+
         new_offenses, updated_source_file =
           inspect_file(processed_source, config_store)
         offenses += new_offenses.reject { |n| offenses.include?(n) }

data/lib/rubocop/formatter/clang_style_formatter.rb

@@ -13,11 +13,10 @@ module Rubocop
                         colored_severity_code(o), message(o))
 
           source_line = o.location.source_line
+          next if source_line.blank?
 
-          unless source_line.blank?
-            output.puts(source_line)
-            output.puts(highlight_line(o.location))
-          end
+          output.puts(source_line)
+          output.puts(highlight_line(o.location))
         end
       end
 

data/lib/rubocop/formatter/disabled_config_formatter.rb

@@ -53,12 +53,12 @@ module Rubocop
         end
 
         default_cfg = Rubocop::ConfigLoader.default_configuration[cop_name]
-        if default_cfg
-          params = default_cfg.keys - %w(Description Enabled) - cfg.keys
-          unless params.empty?
-            output.puts "# Configuration parameters: #{params.join(', ')}."
-          end
-        end
+        return unless default_cfg
+
+        params = default_cfg.keys - %w(Description Enabled) - cfg.keys
+        return if params.empty?
+
+        output.puts "# Configuration parameters: #{params.join(', ')}."
       end
     end
   end

data/lib/rubocop/options.rb

@@ -35,6 +35,9 @@ module Rubocop
       show_cops:        ['Shows the given cops, or all cops by',
                          'default, and their configurations for the',
                          'current directory.'],
+      fail_fast:        ['Inspect files in order of modification',
+                         'time and stop after the first file',
+                         'containing offenses.'],
       debug:             'Display debug info.',
       display_cop_names: 'Display cop names in offense messages.',
       rails:             'Run extra Rails cops.',
@@ -126,6 +129,7 @@ module Rubocop
     end
 
     def add_boolean_flags(opts)
+      option(opts, '-F', '--fail-fast')
       option(opts, '-d', '--debug')
       option(opts, '-D', '--display-cop-names')
       option(opts, '-R', '--rails')
@@ -161,10 +165,10 @@ module Rubocop
       # Currently we don't make -s/--silent option raise error
       # since those are mostly used by external tools.
       rejected = args.reject! { |a| %w(-s --silent).include?(a) }
-      if rejected
-        warn '-s/--silent options is dropped. ' \
-             '`emacs` and `files` formatters no longer display summary.'
-      end
+      return unless rejected
+
+      warn '-s/--silent options is dropped. ' \
+           '`emacs` and `files` formatters no longer display summary.'
     end
 
     def convert_deprecated_options(args)
@@ -189,17 +193,16 @@ module Rubocop
 
     def validate_only_option
       @options[:only].each do |cop_to_run|
-        if Cop::Cop.all.none? { |c| c.cop_name == cop_to_run }
-          fail ArgumentError, "Unrecognized cop name: #{cop_to_run}."
-        end
+        next unless Cop::Cop.all.none? { |c| c.cop_name == cop_to_run }
+        fail ArgumentError, "Unrecognized cop name: #{cop_to_run}."
       end
     end
 
     def validate_auto_gen_config_option(args)
-      if args.any?
-        warn '--auto-gen-config can not be combined with any other arguments.'
-        exit(1)
-      end
+      return unless args.any?
+
+      warn '--auto-gen-config can not be combined with any other arguments.'
+      exit(1)
     end
   end
 end

data/lib/rubocop/target_finder.rb

@@ -6,7 +6,11 @@ module Rubocop
   class TargetFinder
     def initialize(config_store, options = {})
       @config_store = config_store
-      @options = { force_exclusion: false, debug: false }.merge(options)
+      @options = {
+        force_exclusion: false,
+        debug: false,
+        fail_level: false
+      }.merge(options)
     end
 
     def force_exclusion?
@@ -17,6 +21,10 @@ module Rubocop
       @options[:debug]
     end
 
+    def fail_fast?
+      @options[:fail_fast]
+    end
+
     # Generate a list of target files by expanding globbing patterns
     # (if any). If args is empty, recursively find all Ruby source
     # files under the current directory
@@ -61,6 +69,9 @@ module Rubocop
         @config_store.for(file).file_to_include?(file)
       end
 
+      # Most recently modified file first.
+      target_files.sort_by! { |path| -File.mtime(path).to_i } if fail_fast?
+
       target_files
     end
 

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module Rubocop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.21.0'
+    STRING = '0.22.0'
 
     MSG = '%s (using Parser %s, running on %s %s %s)'
 

data/relnotes/v0.21.0.md

@@ -43,3 +43,14 @@ Below is the list of all the gory details. Enjoy!
 * [#993](https://github.com/bbatsov/rubocop/issues/993): Do not report any offenses for the contents of an empty file. ([@jonas054][])
 * [#1016](https://github.com/bbatsov/rubocop/issues/1016): Fix a false positive in `ConditionPosition` regarding statement modifiers. ([@bbatsov][])
 * [#1014](https://github.com/bbatsov/rubocop/issues/1014): Fix handling of strings nested in `dstr` nodes. ([@bbatsov][])
+
+[@bbatsov]: https://github.com/bbatsov
+[@jonas054]: https://github.com/jonas054
+[@yujinakayama]: https://github.com/yujinakayama
+[@geniou]: https://github.com/geniou
+[@mockdeep]: https://github.com/mockdeep
+[@tamird]: https://github.com/tamird
+[@bquorning]: https://github.com/bquorning
+[@bcobb]: https://github.com/bcobb
+[@irrationalfab]: https://github.com/irrationalfab
+[@sfeldon]: https://github.com/sfeldon

data/relnotes/v0.22.0.md

@@ -0,0 +1,77 @@
+This release brings a few new cops, extended auto-correction support and plenty of bug fixes.
+
+Below is the list of all the gory details. Enjoy!
+
+### New features
+
+* [#974](https://github.com/bbatsov/rubocop/pull/974): New cop `CommentIndentation` checks indentation of comments. ([@jonas054][])
+* Add new cop `EachWithObject` to prefer `each_with_object` over `inject` or `reduce`. ([@geniou][])
+* [#1010](https://github.com/bbatsov/rubocop/issues/1010): New Cop `Next` check for conditions at the end of an interation and propose to use `next` instead. ([@geniou][])
+* The `GuardClause` cop now also looks for unless and it is configurable how many lines the body of an if / unless needs to have to not be ignored. ([@geniou][])
+* [#835](https://github.com/bbatsov/rubocop/issues/835): New cop `UnneededPercentX` checks for `%x` when backquotes would do. ([@jonas054][])
+* Add auto-correct to `UnusedBlockArgument` and `UnusedMethodArgument` cops. ([@hannestyden][])
+* [#1074](https://github.com/bbatsov/rubocop/issues/1074): New cop `SpaceBeforeComment` checks for missing space between code and a comment on the same line. ([@jonas054][])
+* [#1089](https://github.com/bbatsov/rubocop/pull/1089): New option `-F`/`--fail-fast` inspects files in modification time order and stop after the first file with offenses. ([@jonas054][])
+
+### Changes
+
+* `NonNilCheck` offense reporting and autocorrect are configurable to include semantic changes. ([@hannestyden][])
+* The parameters `AllCops/Excludes` and `AllCops/Includes` with final `s` only give a warning and don't halt `rubocop` execution. ([@jonas054][])
+* The `GuardClause` cop is no longer irgnoring a one-line body by default - see configuration. ([@geniou][])
+* [#1050](https://github.com/bbatsov/rubocop/issues/1050): Rename `rubocop-todo.yml` file to `.rubocop_todo.yml`. ([@geniou][])
+* [#1064](https://github.com/bbatsov/rubocop/issues/1064): Adjust default max line length to 80. ([@bbatsov][])
+
+### Bugs fixed
+
+* Allow assignment in `AlignParameters` cop. ([@tommeier][])
+* Fix `Void` and `SpaceAroundOperators` for short call syntax `lambda.()`. ([@biinari][])
+* Fix `Delegate` for delegation with assignment or constant. ([@geniou][])
+* [#1032](https://github.com/bbatsov/rubocop/issues/1032): Avoid duplicate reporting when code moves around due to `--auto-correct`. ([@jonas054][])
+* [#1036](https://github.com/bbatsov/rubocop/issues/1036): Handle strings like `__FILE__` in `LineEndConcatenation`. ([@bbatsov][])
+* [#1006](https://github.com/bbatsov/rubocop/issues/1006): Fix LineEndConcatenation to handle chained concatenations. ([@barunio][])
+* [#1066](https://github.com/bbatsov/rubocop/issues/1066): Fix auto-correct for `NegatedIf` when the condition has parentheses around it. ([@jonas054][])
+* Fix `AlignParameters` `with_fixed_indentation` for multi-line method calls. ([@molawson][])
+* Fix problem that appears in some installations when reading empty YAML files. ([@jonas054][])
+* [#1022](https://github.com/bbatsov/rubocop/issues/1022): A Cop will no longer auto-correct a file that's excluded through an `Exclude` setting in the cop's configuration. ([@jonas054][])
+* Fix paths in `Exclude` config section not being recognized on Windows. ([@wndhydrnt][])
+* [#1094](https://github.com/bbatsov/rubocop/issues/1094): Fix ClassAndModuleChildren for classes with a single method. ([@geniou][])
+
+[@bbatsov]: https://github.com/bbatsov
+[@jonas054]: https://github.com/jonas054
+[@yujinakayama]: https://github.com/yujinakayama
+[@dblock]: https://github.com/dblock
+[@nevir]: https://github.com/nevir
+[@daviddavis]: https://github.com/daviddavis
+[@sds]: https://github.com/sds
+[@fancyremarker]: https://github.com/fancyremarker
+[@sinisterchipmunk]: https://github.com/sinisterchipmunk
+[@vonTronje]: https://github.com/vonTronje
+[@agrimm]: https://github.com/agrimm
+[@pmenglund]: https://github.com/pmenglund
+[@chulkilee]: https://github.com/chulkilee
+[@codez]: https://github.com/codez
+[@emou]: https://github.com/emou
+[@skanev]: http://github.com/skanev
+[@claco]: http://github.com/claco
+[@rifraf]: http://github.com/rifraf
+[@scottmatthewman]: https://github.com/scottmatthewman
+[@ma2gedev]: http://github.com/ma2gedev
+[@jeremyolliver]: https://github.com/jeremyolliver
+[@hannestyden]: https://github.com/hannestyden
+[@geniou]: https://github.com/geniou
+[@jkogara]: https://github.com/jkogara
+[@tmorris-fiksu]: https://github.com/tmorris-fiksu
+[@mockdeep]: https://github.com/mockdeep
+[@hiroponz]: https://github.com/hiroponz
+[@tamird]: https://github.com/tamird
+[@fshowalter]: https://github.com/fshowalter
+[@cschramm]: https://github.com/cschramm
+[@bquorning]: https://github.com/bquorning
+[@bcobb]: https://github.com/bcobb
+[@irrationalfab]: https://github.com/irrationalfab
+[@tommeier]: https://github.com/tommeier
+[@sfeldon]: https://github.com/sfeldon
+[@biinari]: https://github.com/biinari
+[@barunio]: https://github.com/barunio
+[@molawson]: https://github.com/molawson
+[@wndhydrnt]: https://github.com/wndhydrnt