rubocop 0.39.0 → 0.40.0

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

@@ -17,19 +17,10 @@ module RuboCop
         QUESTION_MARK_SIZE = '?'.size
 
         def on_array(node)
-          array_elems = node.children
-
           if bracketed_array_of?(:str, node)
-            return if complex_content?(array_elems) ||
-                      comments_in_array?(node)
-            style_detected(:brackets, array_elems.size)
-
-            if style == :percent && array_elems.size >= min_size
-              add_offense(node, :expression, PERCENT_MSG)
-            end
-          elsif node.loc.begin && node.loc.begin.source =~ /\A%[wW]/
-            style_detected(:percent, array_elems.size)
-            add_offense(node, :expression, ARRAY_MSG) if style == :brackets
+            check_bracketed(node)
+          elsif percent_syntax?(node)
+            check_percent(node)
           end
         end
 
@@ -52,6 +43,29 @@ module RuboCop
 
         private
 
+        def check_bracketed(node)
+          array_elems = node.children
+
+          return if complex_content?(array_elems) ||
+                    comments_in_array?(node)
+          style_detected(:brackets, array_elems.size)
+
+          if style == :percent && array_elems.size >= min_size
+            add_offense(node, :expression, PERCENT_MSG)
+          end
+        end
+
+        def check_percent(node)
+          array_elems = node.children
+
+          style_detected(:percent, array_elems.size)
+          add_offense(node, :expression, ARRAY_MSG) if style == :brackets
+        end
+
+        def percent_syntax?(node)
+          node.loc.begin && node.loc.begin.source =~ /\A%[wW]/
+        end
+
         def comments_in_array?(node)
           comments = processed_source.comments
           array_range = node.source_range.to_a
@@ -101,26 +115,40 @@ module RuboCop
           cfg = config_to_allow_offenses
           return if cfg['Enabled'] == false
 
-          @largest_brackets ||= -Float::INFINITY
-          @smallest_percent ||= Float::INFINITY
-
-          if style == :percent
-            @smallest_percent = ary_size if ary_size < @smallest_percent
-          elsif ary_size > @largest_brackets
-            @largest_brackets = ary_size
-          end
+          largest_brackets = largest_brackets_size(style, ary_size)
+          smallest_percent = smallest_percent_size(style, ary_size)
 
           if cfg['EnforcedStyle'] == style.to_s
             # do nothing
           elsif cfg['EnforcedStyle'].nil?
             cfg['EnforcedStyle'] = style.to_s
-          elsif @smallest_percent <= @largest_brackets
+          elsif smallest_percent <= largest_brackets
             self.config_to_allow_offenses = { 'Enabled' => false }
           else
             cfg['EnforcedStyle'] = 'percent'
-            cfg['MinSize'] = @largest_brackets + 1
+            cfg['MinSize'] = largest_brackets + 1
           end
         end
+
+        def largest_brackets_size(style, ary_size)
+          @largest_brackets ||= -Float::INFINITY
+
+          if style == :brackets && ary_size > @largest_brackets
+            @largest_brackets = ary_size
+          end
+
+          @largest_brackets
+        end
+
+        def smallest_percent_size(style, ary_size)
+          @smallest_percent ||= Float::INFINITY
+
+          if style == :percent && ary_size < @smallest_percent
+            @smallest_percent = ary_size
+          end
+
+          @smallest_percent
+        end
       end
     end
   end

data/lib/rubocop/cop/util.rb

@@ -46,10 +46,6 @@ module RuboCop
         OPERATOR_METHODS.include?(symbol)
       end
 
-      def ternary_op?(node)
-        node.loc.respond_to?(:question)
-      end
-
       def strip_quotes(str)
         if str[0] == '"' || str[0] == "'"
           str[0] = ''

data/lib/rubocop/formatter/clang_style_formatter.rb

@@ -10,29 +10,45 @@ module RuboCop
       ELLIPSES = Rainbow('...').yellow.freeze
 
       def report_file(file, offenses)
-        offenses.each do |o|
-          output.printf("%s:%d:%d: %s: %s\n",
-                        cyan(smart_path(file)), o.line, o.real_column,
-                        colored_severity_code(o), message(o))
-
-          # rubocop:disable Lint/HandleExceptions
-          begin
-            location = o.location
-            source_line = location.source_line
-            next if source_line.blank?
-
-            if location.first_line == location.last_line
-              output.puts(source_line)
-            else
-              output.puts("#{source_line} #{ELLIPSES}")
-            end
-            output.puts("#{' ' * o.highlighted_area.begin_pos}" \
-                        "#{'^' * o.highlighted_area.size}")
-          rescue IndexError
-            # range is not on a valid line; perhaps the source file is empty
-          end
-          # rubocop:enable Lint/HandleExceptions
+        offenses.each { |offense| report_offense(file, offense) }
+      end
+
+      private
+
+      def report_offense(file, offense)
+        output.printf("%s:%d:%d: %s: %s\n",
+                      cyan(smart_path(file)), offense.line, offense.real_column,
+                      colored_severity_code(offense), message(offense))
+
+        # rubocop:disable Lint/HandleExceptions
+        begin
+          return unless valid_line?(offense)
+
+          report_line(offense.location)
+          report_highlighted_area(offense.highlighted_area)
+        rescue IndexError
+          # range is not on a valid line; perhaps the source file is empty
         end
+        # rubocop:enable Lint/HandleExceptions
+      end
+
+      def valid_line?(offense)
+        !offense.location.source_line.blank?
+      end
+
+      def report_line(location)
+        source_line = location.source_line
+
+        if location.first_line == location.last_line
+          output.puts(source_line)
+        else
+          output.puts("#{source_line} #{ELLIPSES}")
+        end
+      end
+
+      def report_highlighted_area(highlighted_area)
+        output.puts("#{' ' * highlighted_area.begin_pos}" \
+                    "#{'^' * highlighted_area.size}")
       end
     end
   end

data/lib/rubocop/options.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require 'optparse'
+require 'shellwords'
 
 module RuboCop
   # This class handles command line options.
@@ -14,7 +15,8 @@ module RuboCop
       @validator = OptionsValidator.new(@options)
     end
 
-    def parse(args)
+    def parse(command_line_args)
+      args = args_from_file.concat(args_from_env).concat(command_line_args)
       define_options(args).parse!(args)
       # The --no-color CLI option sets `color: false` so we don't want the
       # `no_color` key, which is created automatically.
@@ -31,6 +33,18 @@ module RuboCop
 
     private
 
+    def args_from_file
+      if File.exist?('.rubocop')
+        IO.readlines('.rubocop').map(&:strip)
+      else
+        []
+      end
+    end
+
+    def args_from_env
+      Shellwords.split(ENV.fetch('RUBOCOP_OPTS', ''))
+    end
+
     def define_options(args)
       OptionParser.new do |opts|
         opts.banner = 'Usage: rubocop [options] [file1, file2, ...]'
@@ -179,23 +193,44 @@ module RuboCop
     end
 
     def validate_compatibility
-      if @options.key?(:only) &&
-         (@options[:only] & %w(Lint/UnneededDisable UnneededDisable)).any?
+      if only_includes_unneeded_disable?
         raise ArgumentError, 'Lint/UnneededDisable can not be used with --only.'
       end
-      if @options.key?(:except) &&
-         (@options[:except] & %w(Lint/Syntax Syntax)).any?
+      if except_syntax?
         raise ArgumentError, 'Syntax checking can not be turned off.'
       end
-      if @options.key?(:cache) && !%w(true false).include?(@options[:cache])
+      unless boolean_or_empty_cache?
         raise ArgumentError, '-C/--cache argument must be true or false'
       end
-      if @options.key?(:no_offense_counts) && !@options.key?(:auto_gen_config)
+      if no_offense_counts_without_auto_gen_config?
         raise ArgumentError, '--no-offense-counts can only be used together ' \
-                            'with --auto-gen-config.'
+                             'with --auto-gen-config.'
       end
-      return if (incompat = @options.keys & Options::EXITING_OPTIONS).size <= 1
-      raise ArgumentError, "Incompatible cli options: #{incompat.inspect}"
+      return if incompatible_options.size <= 1
+      raise ArgumentError, 'Incompatible cli options: ' \
+                           "#{incompatible_options.inspect}"
+    end
+
+    def only_includes_unneeded_disable?
+      @options.key?(:only) &&
+        (@options[:only] & %w(Lint/UnneededDisable UnneededDisable)).any?
+    end
+
+    def except_syntax?
+      @options.key?(:except) &&
+        (@options[:except] & %w(Lint/Syntax Syntax)).any?
+    end
+
+    def boolean_or_empty_cache?
+      !@options.key?(:cache) || %w(true false).include?(@options[:cache])
+    end
+
+    def no_offense_counts_without_auto_gen_config?
+      @options.key?(:no_offense_counts) && !@options.key?(:auto_gen_config)
+    end
+
+    def incompatible_options
+      @incompatible_options ||= @options.keys & Options::EXITING_OPTIONS
     end
 
     def validate_exclude_limit_option(args)

data/lib/rubocop/path_util.rb

@@ -15,47 +15,15 @@ module RuboCop
       path_name.relative_path_from(Pathname.new(base_dir)).to_s
     end
 
-    # TODO: The old way of matching patterns is flawed, so a new one has been
-    # introduced. We keep supporting the old way for a while and issue
-    # deprecation warnings when a pattern is used that produced a match with
-    # the old way but doesn't match with the new.
-    def match_path?(pattern, path, config_path)
+    def match_path?(pattern, path)
       case pattern
       when String
-        basename = File.basename(path)
-        old_match = basename == pattern || File.fnmatch?(pattern, path)
-        new_match = File.fnmatch?(pattern, path, File::FNM_PATHNAME)
-        if old_match && !new_match
-          # Patterns like dir/**/* will produce an old match for files
-          # beginning with dot, but not a new match. That's a special case,
-          # though. Not what we want to handle here. And this is a match that
-          # we overrule. Only patterns like dir/**/.* can be used to match dot
-          # files. Hidden directories (starting with a dot) will also produce
-          # an old match, just like hidden files.
-          return false if path.split(File::SEPARATOR).any? { |s| hidden?(s) }
-
-          issue_deprecation_warning(basename, pattern, config_path)
-        end
-        old_match || new_match
+        File.fnmatch?(pattern, path, File::FNM_PATHNAME)
       when Regexp
         path =~ pattern
       end
     end
 
-    def issue_deprecation_warning(basename, pattern, config_path)
-      instruction = if basename == pattern
-                      ". Change to '**/#{pattern}'."
-                    elsif pattern.end_with?('**')
-                      ". Change to '#{pattern}/*'."
-                    end
-      warn("Warning: Deprecated pattern style '#{pattern}' in " \
-           "#{config_path}#{instruction}")
-    end
-
-    def hidden?(path_component)
-      path_component =~ /^\.[^.]/
-    end
-
     # Returns true for an absolute Unix or Windows path.
     def absolute?(path)
       path =~ %r{\A([A-Z]:)?/}

data/lib/rubocop/result_cache.rb

@@ -128,10 +128,16 @@ module RuboCop
         begin
           lib_root = File.join(File.dirname(__FILE__), '..')
           bin_root = File.join(lib_root, '..', 'bin')
-          source = Find.find(lib_root, bin_root).sort.map do |path|
-            IO.read(path) if File.file?(path)
-          end
-          Digest::MD5.hexdigest(source.join)
+
+          # These are all the files we have `require`d plus everything in the
+          # bin directory. A change to any of them could affect the cop output
+          # so we include them in the cache hash.
+          source_files = $LOADED_FEATURES + Find.find(bin_root).to_a
+          sources = source_files
+                    .select { |path| File.file?(path) }
+                    .sort
+                    .map { |path| IO.read(path) }
+          Digest::MD5.hexdigest(sources.join)
         end
     end
 

data/lib/rubocop/runner.rb

@@ -102,10 +102,12 @@ module RuboCop
          # given, because these options override configuration.
          (@options[:except] || []).empty? && (@options[:only] || []).empty?
         config = @config_store.for(file)
-        if config['Lint/UnneededDisable']['Enabled']
+        if config.cop_enabled?(Cop::Lint::UnneededDisable)
           cop = Cop::Lint::UnneededDisable.new(config, @options)
-          cop.check(offenses, source.disabled_line_ranges, source.comments)
-          offenses += cop.offenses
+          if cop.relevant_file?(file)
+            cop.check(offenses, source.disabled_line_ranges, source.comments)
+            offenses += cop.offenses
+          end
         end
       end
 

data/lib/rubocop/version.rb

@@ -4,7 +4,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.39.0'.freeze
+    STRING = '0.40.0'.freeze
 
     MSG = '%s (using Parser %s, running on %s %s %s)'.freeze
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.40.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -38,7 +38,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0.7
+        version: 2.3.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -48,7 +48,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0.7
+        version: 2.3.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -195,6 +195,7 @@ files:
 - lib/rubocop/cop/lint/unused_block_argument.rb
 - lib/rubocop/cop/lint/unused_method_argument.rb
 - lib/rubocop/cop/lint/useless_access_modifier.rb
+- lib/rubocop/cop/lint/useless_array_splat.rb
 - lib/rubocop/cop/lint/useless_assignment.rb
 - lib/rubocop/cop/lint/useless_comparison.rb
 - lib/rubocop/cop/lint/useless_else_without_rescue.rb
@@ -281,6 +282,7 @@ files:
 - lib/rubocop/cop/rails/read_write_attribute.rb
 - lib/rubocop/cop/rails/scope_args.rb
 - lib/rubocop/cop/rails/time_zone.rb
+- lib/rubocop/cop/rails/uniq_before_pluck.rb
 - lib/rubocop/cop/rails/validation.rb
 - lib/rubocop/cop/severity.rb
 - lib/rubocop/cop/style/access_modifier_indentation.rb
@@ -325,6 +327,7 @@ files:
 - lib/rubocop/cop/style/double_negation.rb
 - lib/rubocop/cop/style/each_with_object.rb
 - lib/rubocop/cop/style/else_alignment.rb
+- lib/rubocop/cop/style/empty_case_condition.rb
 - lib/rubocop/cop/style/empty_else.rb
 - lib/rubocop/cop/style/empty_line_between_defs.rb
 - lib/rubocop/cop/style/empty_lines.rb