reek 5.4.0 → 6.0.1

data/features/reports/json.feature

@@ -24,7 +24,7 @@ Feature: Report smells using simple JSON layout
               "context": "Smelly#x",
               "lines": [ 4 ],
               "message": "has the name 'x'",
-              "documentation_link": "https://github.com/troessner/reek/blob/v5.4.0/docs/Uncommunicative-Method-Name.md",
+              "documentation_link": "https://github.com/troessner/reek/blob/v6.0.1/docs/Uncommunicative-Method-Name.md",
               "name": "x"
           },
           {
@@ -33,7 +33,7 @@ Feature: Report smells using simple JSON layout
               "context": "Smelly#x",
               "lines": [ 5 ],
               "message": "has the variable name 'y'",
-              "documentation_link": "https://github.com/troessner/reek/blob/v5.4.0/docs/Uncommunicative-Variable-Name.md",
+              "documentation_link": "https://github.com/troessner/reek/blob/v6.0.1/docs/Uncommunicative-Variable-Name.md",
               "name": "y"
           }
       ]
@@ -53,7 +53,7 @@ Feature: Report smells using simple JSON layout
                   1
               ],
               "message": "has no descriptive comment",
-              "documentation_link": "https://github.com/troessner/reek/blob/v5.4.0/docs/Irresponsible-Module.md"
+              "documentation_link": "https://github.com/troessner/reek/blob/v6.0.1/docs/Irresponsible-Module.md"
           }
       ]
       """

data/features/reports/reports.feature

@@ -182,8 +182,8 @@ Feature: Correctly formatted reports
     And it reports:
       """
       smelly.rb -- 2 warnings:
-        [4]:UncommunicativeMethodName: Smelly#x has the name 'x' [https://github.com/troessner/reek/blob/v5.4.0/docs/Uncommunicative-Method-Name.md]
-        [5]:UncommunicativeVariableName: Smelly#x has the variable name 'y' [https://github.com/troessner/reek/blob/v5.4.0/docs/Uncommunicative-Variable-Name.md]
+        [4]:UncommunicativeMethodName: Smelly#x has the name 'x' [https://github.com/troessner/reek/blob/v6.0.1/docs/Uncommunicative-Method-Name.md]
+        [5]:UncommunicativeVariableName: Smelly#x has the variable name 'y' [https://github.com/troessner/reek/blob/v6.0.1/docs/Uncommunicative-Variable-Name.md]
       """
 
     Examples:
@@ -209,8 +209,8 @@ Feature: Correctly formatted reports
     And it reports:
       """
       smelly.rb -- 2 warnings:
-        UncommunicativeMethodName: Smelly#x has the name 'x' [https://github.com/troessner/reek/blob/v5.4.0/docs/Uncommunicative-Method-Name.md]
-        UncommunicativeVariableName: Smelly#x has the variable name 'y' [https://github.com/troessner/reek/blob/v5.4.0/docs/Uncommunicative-Variable-Name.md]
+        UncommunicativeMethodName: Smelly#x has the name 'x' [https://github.com/troessner/reek/blob/v6.0.1/docs/Uncommunicative-Method-Name.md]
+        UncommunicativeVariableName: Smelly#x has the variable name 'y' [https://github.com/troessner/reek/blob/v6.0.1/docs/Uncommunicative-Variable-Name.md]
       """
 
     Examples:

data/features/reports/yaml.feature

@@ -25,7 +25,7 @@ Feature: Report smells using simple YAML layout
         smell_type: UncommunicativeMethodName
         source: smelly.rb
         name: x
-        documentation_link: https://github.com/troessner/reek/blob/v5.4.0/docs/Uncommunicative-Method-Name.md
+        documentation_link: https://github.com/troessner/reek/blob/v6.0.1/docs/Uncommunicative-Method-Name.md
       - context: Smelly#x
         lines:
         - 5
@@ -33,7 +33,7 @@ Feature: Report smells using simple YAML layout
         smell_type: UncommunicativeVariableName
         source: smelly.rb
         name: y
-        documentation_link: https://github.com/troessner/reek/blob/v5.4.0/docs/Uncommunicative-Variable-Name.md
+        documentation_link: https://github.com/troessner/reek/blob/v6.0.1/docs/Uncommunicative-Variable-Name.md
       """
 
   Scenario: Indicate smells and print them as yaml when using STDIN
@@ -48,5 +48,5 @@ Feature: Report smells using simple YAML layout
         lines:
         - 1
         message: has no descriptive comment
-        documentation_link: https://github.com/troessner/reek/blob/v5.4.0/docs/Irresponsible-Module.md
+        documentation_link: https://github.com/troessner/reek/blob/v6.0.1/docs/Irresponsible-Module.md
       """

data/features/step_definitions/reek_steps.rb

@@ -2,6 +2,10 @@ When /^I run reek (.*)$/ do |args|
   reek(args)
 end
 
+When 'I run the code climate reek runner' do
+  run_command_and_stop 'code_climate_reek'
+end
+
 When /^I pass "([^\"]*)" to reek *(.*)$/ do |stdin, args|
   reek_with_pipe(stdin, args)
 end

data/features/support/env.rb

@@ -1,11 +1,10 @@
 require_relative '../../lib/reek'
 require_relative '../../lib/reek/cli/application'
 require 'aruba/cucumber'
-require 'active_support/core_ext/string/strip'
 
 begin
   require 'pry-byebug'
-rescue LoadError # rubocop:disable Lint/HandleExceptions
+rescue LoadError # rubocop:disable Lint/SuppressedException
 end
 
 #

data/lib/reek/ast/sexp_extensions/arguments.rb

@@ -93,6 +93,17 @@ module Reek
       module ShadowargNode
         include ArgNodeBase
       end
+
+      # Utility methods for :forward_args nodes.
+      # rubocop:disable Naming/ClassAndModuleCamelCase
+      module Forward_ArgsNode
+        include ArgNodeBase
+
+        def anonymous_splat?
+          true
+        end
+      end
+      # rubocop:enable Naming/ClassAndModuleCamelCase
     end
   end
 end

data/lib/reek/cli/command/todo_list_command.rb

@@ -40,13 +40,18 @@ module Reek
         def groups
           @groups ||=
             begin
-              todos = smells.group_by(&:smell_class).map do |smell_class, smells_for_class|
+              todos = DetectorRepository.smell_types.map do |smell_class|
+                smells_for_class = grouped_smells[smell_class.smell_type] or next
                 smell_class.todo_configuration_for(smells_for_class)
               end
-              todos.inject(&:merge)
+              todos.compact.inject(&:merge)
             end
         end
 
+        def grouped_smells
+          @grouped_smells ||= smells.group_by(&:smell_type)
+        end
+
         # :reek:FeatureEnvy
         def write_to_file
           File.open(DEFAULT_CONFIGURATION_FILE_NAME, 'w') do |configuration_file|

data/lib/reek/cli/options.rb

@@ -131,9 +131,9 @@ module Reek
       def set_alternative_formatter_options
         parser.separator "\nReport format:"
         parser.on(
-          '-f', '--format FORMAT', [:html, :text, :yaml, :json, :xml, :code_climate],
+          '-f', '--format FORMAT', [:html, :text, :yaml, :json, :xml],
           'Report smells in the given format:',
-          '  html', '  text (default)', '  yaml', '  json', '  xml', '  code_climate') do |opt|
+          '  html', '  text (default)', '  yaml', '  json', '  xml') do |opt|
           self.report_format = opt
         end
       end

data/lib/reek/code_comment.rb

@@ -6,6 +6,7 @@ require_relative 'smell_detectors/base_detector'
 require_relative 'errors/bad_detector_in_comment_error'
 require_relative 'errors/bad_detector_configuration_key_in_comment_error'
 require_relative 'errors/garbage_detector_configuration_in_comment_error'
+require_relative 'errors/legacy_comment_separator_error'
 
 module Reek
   #
@@ -14,12 +15,10 @@ module Reek
   #
   class CodeComment
     CONFIGURATION_REGEX = /
-                          :reek: # prefix
-                          (\w+)  # smell detector e.g.: UncommunicativeVariableName
-                          (
-                            \s*
-                            (\{.*?\}) # optional details in hash style e.g.: { max_methods: 30 }
-                          )?
+                          :reek:     # prefix
+                          (\w+)      # smell detector e.g.: UncommunicativeVariableName
+                          (:?\s*)    # separator
+                          (\{.*?\})? # details in hash style e.g.: { max_methods: 30 }
                          /x.freeze
     SANITIZE_REGEX                 = /(#|\n|\s)+/.freeze # Matches '#', newlines and > 1 whitespaces.
     DISABLE_DETECTOR_CONFIGURATION = '{ enabled: false }'
@@ -38,7 +37,8 @@ module Reek
       @source            = source
       @config            = Hash.new { |hash, key| hash[key] = {} }
 
-      @original_comment.scan(CONFIGURATION_REGEX) do |detector_name, _option_string, options|
+      @original_comment.scan(CONFIGURATION_REGEX) do |detector_name, separator, options|
+        escalate_legacy_separator separator
         CodeCommentValidator.new(detector_name:    detector_name,
                                  original_comment: original_comment,
                                  line:             line,
@@ -64,6 +64,14 @@ module Reek
         strip
     end
 
+    def escalate_legacy_separator(separator)
+      return unless separator.start_with? ':'
+
+      raise Errors::LegacyCommentSeparatorError.new(original_comment: original_comment,
+                                                    source: source,
+                                                    line: line)
+    end
+
     #
     # A typical configuration via code comment looks like this:
     #
@@ -88,25 +96,22 @@ module Reek
       # @param source [String] path to source file or "string"
       # @param options [String] the configuration options as String for the detector that were
       #   extracted from the original comment
-      def initialize(detector_name:, original_comment:, line:, source:, options: {})
+      def initialize(detector_name:, original_comment:, line:, source:, options:)
         @detector_name    = detector_name
         @original_comment = original_comment
         @line             = line
         @source           = source
         @options          = options
-        @detector_class   = nil # We only know this one after our first initial checks
-        @parsed_options   = nil # We only know this one after our first initial checks
       end
 
       #
       # Method can raise the following errors:
+      #   * Errors::LegacyCommentSeparatorError
       #   * Errors::BadDetectorInCommentError
       #   * Errors::GarbageDetectorConfigurationInCommentError
       #   * Errors::BadDetectorConfigurationKeyInCommentError
       # @return [undefined]
       def validate
-        escalate_bad_detector
-        escalate_bad_detector_configuration
         escalate_unknown_configuration_key
       end
 
@@ -116,39 +121,41 @@ module Reek
                   :original_comment,
                   :line,
                   :source,
-                  :options,
-                  :detector_class,
-                  :parsed_options
-
-      def escalate_bad_detector
-        return if SmellDetectors::BaseDetector.valid_detector?(detector_name)
-
-        raise Errors::BadDetectorInCommentError, detector_name: detector_name,
-                                                 original_comment: original_comment,
-                                                 source: source,
-                                                 line: line
-      end
+                  :separator,
+                  :options
 
-      def escalate_bad_detector_configuration
-        @parsed_options = YAML.safe_load(options || CodeComment::DISABLE_DETECTOR_CONFIGURATION,
-                                         permitted_classes: [Regexp])
+      def parsed_options
+        @parsed_options ||= YAML.safe_load(options || CodeComment::DISABLE_DETECTOR_CONFIGURATION,
+                                           permitted_classes: [Regexp])
       rescue Psych::SyntaxError
-        raise Errors::GarbageDetectorConfigurationInCommentError, detector_name: detector_name,
-                                                                  original_comment: original_comment,
-                                                                  source: source,
-                                                                  line: line
+        raise Errors::GarbageDetectorConfigurationInCommentError.new(detector_name: detector_name,
+                                                                     original_comment: original_comment,
+                                                                     source: source,
+                                                                     line: line)
       end
 
       def escalate_unknown_configuration_key
-        @detector_class = SmellDetectors::BaseDetector.to_detector(detector_name)
-
         return if given_keys_legit?
 
-        raise Errors::BadDetectorConfigurationKeyInCommentError, detector_name: detector_name,
-                                                                 offensive_keys: configuration_keys_difference,
-                                                                 original_comment: original_comment,
-                                                                 source: source,
-                                                                 line: line
+        raise Errors::BadDetectorConfigurationKeyInCommentError.new(detector_name: detector_name,
+                                                                    offensive_keys: configuration_keys_difference,
+                                                                    original_comment: original_comment,
+                                                                    source: source,
+                                                                    line: line)
+      end
+
+      def detector_class
+        @detector_class ||= SmellDetectors::BaseDetector.to_detector(detector_name)
+      rescue NameError
+        raise Errors::BadDetectorInCommentError.new(detector_name: detector_name,
+                                                    original_comment: original_comment,
+                                                    source: source,
+                                                    line: line)
+      end
+
+      # @return [Boolean] comment uses legacy three-colon format
+      def legacy_format?
+        separator.start_with? ':'
       end
 
       # @return [Boolean] all keys in code comment are applicable to the detector in question

data/lib/reek/configuration/configuration_converter.rb

@@ -74,7 +74,7 @@ module Reek
         return unless configuration[DETECTORS_KEY]
 
         configuration[DETECTORS_KEY].tap do |detectors|
-          detectors.keys.each do |detector|
+          detectors.each_key do |detector|
             convertible_attributes(detectors[detector]).each do |attribute|
               detectors[detector][attribute] = detectors[detector][attribute].map do |item|
                 to_regex item
@@ -94,7 +94,7 @@ module Reek
         return unless configuration[DIRECTORIES_KEY]
 
         configuration[DIRECTORIES_KEY].tap do |directories|
-          directories.keys.each do |directory|
+          directories.each_key do |directory|
             directories[directory].each do |detector, configuration|
               convertible_attributes(configuration).each do |attribute|
                 directories[directory][detector][attribute] = directories[directory][detector][attribute].map do |item|

data/lib/reek/configuration/directory_directives.rb

@@ -53,10 +53,16 @@ module Reek
       # @quality :reek:FeatureEnvy
       def best_match_for(source_base_dir)
         keys.
-          select { |pathname| source_base_dir.to_s.match(glob_to_regexp(pathname.to_s)) }.
+          select do |pathname|
+            match?(source_base_dir, pathname) || match?(source_base_dir, pathname.expand_path)
+          end.
           max_by { |pathname| pathname.to_s.length }
       end
 
+      def match?(source_base_dir, pathname)
+        source_base_dir.to_s.match(glob_to_regexp(pathname.to_s))
+      end
+
       # Transform a glob pattern to a regexp.
       #
       # It changes:

data/lib/reek/errors/legacy_comment_separator_error.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require_relative 'base_error'
+
+module Reek
+  module Errors
+    # Gets raised for old-style comment configuration format.
+    class LegacyCommentSeparatorError < BaseError
+      MESSAGE = <<-MESSAGE
+        Error: You are using the legacy configuration format (including three
+        colons) to configure Reek in one your source code comments.
+
+        The source is '%<source>s' and the comment belongs to the expression
+        starting in line %<line>d.
+
+        Here's the original comment:
+
+        %<comment>s
+
+        Please see the Reek docs for information on how to configure Reek via
+        source code comments: #{DocumentationLink.build('Smell Suppression')}
+
+        Update the offensive comment and re-run Reek.
+
+      MESSAGE
+
+      def initialize(source:, line:, original_comment:)
+        message = format(MESSAGE,
+                         source: source,
+                         line: line,
+                         comment: original_comment)
+        super message
+      end
+    end
+  end
+end

data/lib/reek/examiner.rb

@@ -105,11 +105,11 @@ module Reek
     rescue Errors::BaseError
       raise
     rescue EncodingError
-      raise Errors::EncodingError, origin: origin
+      raise Errors::EncodingError.new(origin: origin)
     rescue Parser::SyntaxError
-      raise Errors::SyntaxError, origin: origin
+      raise Errors::SyntaxError.new(origin: origin)
     rescue StandardError
-      raise Errors::IncomprehensibleSourceError, origin: origin
+      raise Errors::IncomprehensibleSourceError.new(origin: origin)
     end
 
     def syntax_tree

data/lib/reek/report.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'report/code_climate'
 require_relative 'report/html_report'
 require_relative 'report/json_report'
 require_relative 'report/text_report'
@@ -17,12 +16,11 @@ module Reek
   # Reek reporting functionality.
   module Report
     REPORT_CLASSES = {
-      yaml:         YAMLReport,
-      json:         JSONReport,
-      html:         HTMLReport,
-      xml:          XMLReport,
-      text:         TextReport,
-      code_climate: CodeClimateReport
+      yaml: YAMLReport,
+      json: JSONReport,
+      html: HTMLReport,
+      xml:  XMLReport,
+      text: TextReport
     }.freeze
 
     LOCATION_FORMATTERS = {

data/lib/reek/report/code_climate/code_climate_report.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../base_report'
+require_relative 'code_climate_formatter'
 
 module Reek
   module Report
@@ -12,7 +13,7 @@ module Reek
     class CodeClimateReport < BaseReport
       def show(out = $stdout)
         smells.map do |smell|
-          out.print warning_formatter.format_code_climate_hash(smell)
+          out.print CodeClimateFormatter.new(smell).render
         end
       end
     end

data/lib/reek/report/simple_warning_formatter.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'code_climate/code_climate_formatter'
-
 module Reek
   module Report
     #
@@ -17,11 +15,6 @@ module Reek
         "#{location_formatter.format(warning)}#{warning.base_message}"
       end
 
-      # @quality :reek:UtilityFunction
-      def format_code_climate_hash(warning)
-        CodeClimateFormatter.new(warning).render
-      end
-
       def format_list(warnings)
         warnings.map { |warning| "  #{format(warning)}" }.join("\n")
       end