RubyGems - rubocop - Versions diffs - 0.22.0 → 0.23.0 - Mend

rubocop 0.22.0 → 0.23.0

Potentially problematic release.

This version of rubocop might be problematic. Click here for more details.

Files changed (484) hide show

data/lib/rubocop.rb CHANGED

@@ -163,6 +163,7 @@ require 'rubocop/cop/style/indent_array'
 require 'rubocop/cop/style/indent_hash'
 require 'rubocop/cop/style/indentation_consistency'
 require 'rubocop/cop/style/indentation_width'
+require 'rubocop/cop/style/inline_comment'
 require 'rubocop/cop/style/lambda'
 require 'rubocop/cop/style/lambda_call'
 require 'rubocop/cop/style/leading_comment_space'

data/lib/rubocop/cli.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   # The CLI is a class responsible of handling all the command line interface
   # logic.
   class CLI
@@ -34,6 +34,10 @@ module Rubocop
       inspector.display_error_summary
       !any_failed && !wants_to_quit ? 0 : 1
+    rescue Cop::AmbiguousCopName => e
+      $stderr.puts "Ambiguous cop name #{e.message} needs namespace " \
+                   'qualifier.'
+      return 1
     rescue => e
       $stderr.puts e.message
       $stderr.puts e.backtrace
@@ -65,8 +69,8 @@ module Rubocop
     def handle_exiting_options
       return unless Options::EXITING_OPTIONS.any? { |o| @options.key? o }
-      puts Rubocop::Version.version(false) if @options[:version]
-      puts Rubocop::Version.version(true) if @options[:verbose_version]
+      puts RuboCop::Version.version(false) if @options[:version]
+      puts RuboCop::Version.version(true) if @options[:verbose_version]
       print_available_cops if @options[:show_cops]
       exit(0)
     end

data/lib/rubocop/comment_config.rb CHANGED

@@ -1,11 +1,11 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   # This class parses the special `rubocop:disable` comments in a source
   # and provides a way to check if each cop is enabled at arbitrary line.
   class CommentConfig
     COMMENT_DIRECTIVE_REGEXP = Regexp.new(
-      '\A# rubocop : ((?:dis|en)able)\b ((?:\w+,? )+)'.gsub(' ', '\s*')
+      '\A# rubocop : ((?:dis|en)able)\b ((?:[\w/]+,? )+)'.gsub(' ', '\s*')
     )
     attr_reader :processed_source
@@ -75,6 +75,8 @@ module Rubocop
         single_line = !comment_only_line?(comment_line_number)
         cop_names.each do |cop_name|
+          cop_name = Cop::Cop.qualified_cop_name(cop_name,
+                                                 processed_source.buffer.name)
           yield cop_name, disabled, comment_line_number, single_line
         end
       end

data/lib/rubocop/config.rb CHANGED

@@ -3,7 +3,7 @@
 require 'delegate'
 require 'pathname'
-module Rubocop
+module RuboCop
   # This class represents the configuration of the RuboCop application
   # and all its cops. A Config is associated with a YAML configuration
   # file from which it was read. Several different Configs can be used
@@ -66,7 +66,8 @@ module Rubocop
     def for_cop(cop)
       cop = cop.cop_name if cop.respond_to?(:cop_name)
-      self[cop]
+      @for_cop ||= {}
+      @for_cop[cop] ||= self[Cop::Cop.qualified_cop_name(cop, loaded_path)]
     end
     def cop_enabled?(cop)
@@ -79,10 +80,21 @@ module Rubocop
       warn "Warning: #{e.message}".color(:red)
     end
+    def add_missing_namespaces
+      keys.each do |k|
+        q = Cop::Cop.qualified_cop_name(k, loaded_path)
+        next if q == k
+        self[q] = self[k]
+        delete(k)
+      end
+    end
     # TODO: This should be a private method
     def validate
       # Don't validate RuboCop's own files. Avoids inifinite recursion.
-      return if @loaded_path.start_with?(ConfigLoader::RUBOCOP_HOME)
+      return if @loaded_path.start_with?(File.join(ConfigLoader::RUBOCOP_HOME,
+                                                   'config'))
       default_config = ConfigLoader.default_configuration

data/lib/rubocop/config_loader.rb CHANGED

@@ -5,10 +5,12 @@ require 'pathname'
 # Psych can give an error when reading an empty file, so we use syck in Ruby
 # versions where it's available. Also, the problem with empty files does not
-# appear in Ruby 2.
-YAML::ENGINE.yamler = 'syck' if RUBY_VERSION < '2.0.0'
+# appear in Ruby 2 or in JRuby 1.9 mode.
+if RUBY_VERSION < '2.0.0' && RUBY_PLATFORM != 'java'
+  YAML::ENGINE.yamler = 'syck'
+end
-module Rubocop
+module RuboCop
   # This class represents the configuration of the RuboCop application
   # and all its cops. A Config is associated with a YAML configuration
   # file from which it was read. Several different Configs can be used
@@ -34,6 +36,8 @@ module Rubocop
         resolve_inheritance(path, hash)
+        Array(hash.delete('require')).each { |r| require(r) }
         hash.delete('inherit_from')
         config = Config.new(hash, path)
@@ -41,6 +45,7 @@ module Rubocop
           warn("#{path} - #{deprecation_message}")
         end
+        config.add_missing_namespaces
         config.warn_unless_valid
         config.make_excludes_absolute
         config

data/lib/rubocop/config_store.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   # Handles caching of configurations and association of inspected
   # ruby files to configurations.
   class ConfigStore

data/lib/rubocop/cop/commissioner.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Commissioner class is responsible for processing the AST and delegating
     # work to the specified cops.

data/lib/rubocop/cop/cop.rb CHANGED

@@ -1,8 +1,9 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     class CorrectionNotPossible < Exception; end
+    class AmbiguousCopName < Exception; end
     # Store for all cops with helper functions
     class CopStore < ::Array
@@ -56,6 +57,19 @@ module Rubocop
         @all.clone
       end
+      def self.qualified_cop_name(name, origin)
+        return name if name.include?('/')
+        found_ns = @all.types.map(&:capitalize).select do |ns|
+          @all.map(&:cop_name).include?("#{ns}/#{name}")
+        end
+        case found_ns.size
+        when 0 then name # No namespace found. Deal with it later in caller.
+        when 1 then "#{found_ns.first}/#{name}"
+        else fail AmbiguousCopName, "`#{name}` used in #{origin}"
+        end
+      end
       def self.non_rails
         @all.without_type(:rails)
       end
@@ -65,7 +79,7 @@ module Rubocop
       end
       def self.cop_name
-        name.to_s.split('::').last
+        @cop_name ||= name.to_s.split('::').last(2).join('/')
       end
       def self.cop_type

data/lib/rubocop/cop/corrector.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # This class takes a source buffer and rewrite its source
     # based on the different correction rules supplied.

data/lib/rubocop/cop/force.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # A scaffold for concrete forces.
     class Force

data/lib/rubocop/cop/ignored_node.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # Handles adding and checking ignored nodes.
     module IgnoredNode

data/lib/rubocop/cop/lint/ambiguous_operator.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for ambiguous operators in the first argument of a

data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for ambiguous regexp literals in the first argument of

data/lib/rubocop/cop/lint/assignment_in_condition.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for assignments in the conditions of

data/lib/rubocop/cop/lint/block_alignment.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks whether the end keywords are aligned properly for do

data/lib/rubocop/cop/lint/condition_position.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for conditions that are not on the same line as

data/lib/rubocop/cop/lint/debugger.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for calls to debugger or pry.

data/lib/rubocop/cop/lint/deprecated_class_methods.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for uses of the deprecated class method usages.

data/lib/rubocop/cop/lint/else_layout.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for odd else block layout - like

data/lib/rubocop/cop/lint/empty_ensure.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for empty `ensure` blocks

data/lib/rubocop/cop/lint/empty_interpolation.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for empty interpolation.

data/lib/rubocop/cop/lint/end_alignment.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks whether the end keywords are aligned properly.

data/lib/rubocop/cop/lint/end_in_method.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for END blocks in method definitions.

data/lib/rubocop/cop/lint/ensure_return.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for *return* from an *ensure* block.

data/lib/rubocop/cop/lint/eval.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for the use of *Kernel#eval*.

data/lib/rubocop/cop/lint/handle_exceptions.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for *rescue* blocks with no body.

data/lib/rubocop/cop/lint/invalid_character_literal.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for invalid character literals with a non-escaped

data/lib/rubocop/cop/lint/literal_in_condition.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for literals used as the conditions or as

data/lib/rubocop/cop/lint/literal_in_interpolation.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for interpolated literals.

data/lib/rubocop/cop/lint/loop.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for uses of *begin...end while/until something*.

data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # Checks for space between a the name of a called method and a left

data/lib/rubocop/cop/lint/require_parentheses.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for expressions where there is a call to a predicate

data/lib/rubocop/cop/lint/rescue_exception.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for *rescue* blocks targeting the Exception class.

data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop looks for use of the same name as outer local variables

data/lib/rubocop/cop/lint/space_before_first_arg.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # Checks for space between a method name and the first argument for

data/lib/rubocop/cop/lint/string_conversion_in_interpolation.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This cop checks for string conversion in string interpolation,

data/lib/rubocop/cop/lint/syntax.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Lint
       # This is actually not a cop and inspects nothing. It just provides