reek 3.2 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51661975b3fe585a7de62a86ef3bdd470999cf9d
-  data.tar.gz: d47b8fc50a340c0effa99b2d19f2bf6b460d8531
+  metadata.gz: fe2528f9142f9b45b13b25d3c5b05913ef16f190
+  data.tar.gz: b3d969d1feedbe459e2f073f86cbb4d2fb6774da
 SHA512:
-  metadata.gz: 1ad047b74e7063afa1ecf570d94e9522bc3b4da8e671abd72c06a7e318b9dc47c5faac7570b67afbca9ffc1c8b766e973594b241c04c62b16914a26d80d57830
-  data.tar.gz: 6801060d336d6ba4d605797cf32ad6f5df7be22fd44b41964c22b21c73d6a387e902dc63a6c119ec55f5bbf166179c93b471342fd91a33254179ad83567dc812
+  metadata.gz: d7a4a4ea2e5bf9cff1a99fa6ca67cc2709bc9cb806f0296acdc7b91ab3a8f7a59217b5d680cad008e33cf0f7887fd62299660f9efde81a978da6ea6b633eae41
+  data.tar.gz: 86b336f6aa1c9d9a4e3db2734ac01b35406bd389cef54fa1f67f1b7bbc707847ddabbbc318c257a0f16a8573a96ed08c12a2b9c06d9ee66a0ace9cfd9e03c5e3

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 3.2.1 (2015-08-17)
+
+* Revert 864f0a9 to hotfix issues/642
+
 ## 3.2.0 (2015-08-17)
 
 * (mvz) Detect attribute writers created with `attr` in Attribute smell

data/lib/reek/ast/ast_node_class_map.rb

@@ -13,7 +13,7 @@ module Reek
       end
 
       def klass_for(type)
-        klass_map[type] ||= Class.new(Node).tap do |klass|
+        @klass_map[type] ||= Class.new(Node).tap do |klass|
           extension = extension_map[type]
           klass.send :include, extension if extension
         end
@@ -31,10 +31,6 @@ module Reek
             Hash[assoc]
           end
       end
-
-      private
-
-      private_attr_reader :klass_map
     end
   end
 end

data/lib/reek/ast/node.rb

@@ -17,12 +17,12 @@ module Reek
       end
 
       def full_comment
-        comments.map(&:text).join("\n")
+        @comments.map(&:text).join("\n")
       end
 
       def leading_comment
         line = location.line
-        comment_lines = comments.select do |comment|
+        comment_lines = @comments.select do |comment|
           comment.location.line < line
         end
         comment_lines.map(&:text).join("\n")
@@ -120,8 +120,6 @@ module Reek
 
       private
 
-      private_attr_reader :comments
-
       def each_sexp
         children.each { |elem| yield elem if elem.is_a? ::Parser::AST::Node }
       end

data/lib/reek/ast/object_refs.rb

@@ -11,25 +11,21 @@ module Reek
       end
 
       def most_popular
-        max = refs.values.map(&:size).max
-        refs.select { |_name, refs| refs.size == max }
+        max = @refs.values.map(&:size).max
+        @refs.select { |_name, refs| refs.size == max }
       end
 
       def record_reference_to(name, line: nil)
-        refs[name] << ObjectRef.new(name, line)
+        @refs[name] << ObjectRef.new(name, line)
       end
 
       def references_to(name)
-        refs[name]
+        @refs[name]
       end
 
       def self_is_max?
-        refs.empty? || most_popular.keys.include?(:self)
+        @refs.empty? || most_popular.keys.include?(:self)
       end
-
-      private
-
-      private_attr_reader :refs
     end
   end
 end

data/lib/reek/ast/reference_collector.rb

@@ -18,16 +18,14 @@ module Reek
 
       private
 
-      private_attr_reader :ast
-
       def explicit_self_calls
         [:self, :zsuper, :ivar, :ivasgn].flat_map do |node_type|
-          ast.each_node(node_type, STOP_NODES)
+          @ast.each_node(node_type, STOP_NODES)
         end
       end
 
       def implicit_self_calls
-        ast.each_node(:send, STOP_NODES).reject(&:receiver)
+        @ast.each_node(:send, STOP_NODES).reject(&:receiver)
       end
     end
   end

data/lib/reek/cli/application.rb

@@ -20,9 +20,9 @@ module Reek
         @status = STATUS_SUCCESS
         options_parser = Options.new(argv)
         begin
-          options = options_parser.parse
-          @command = ReekCommand.new(OptionInterpreter.new(options))
-          @configuration = Configuration::AppConfiguration.new(options)
+          @options = options_parser.parse
+          @command = ReekCommand.new(OptionInterpreter.new(@options))
+          @configuration = Configuration::AppConfiguration.new @options
         rescue OptionParser::InvalidOption, Reek::Configuration::ConfigFileException => error
           $stderr.puts "Error: #{error}"
           @status = STATUS_ERROR
@@ -30,9 +30,9 @@ module Reek
       end
 
       def execute
-        return status if error_occured?
-        command.execute self
-        status
+        return @status if error_occured?
+        @command.execute self
+        @status
       end
 
       def output(text)
@@ -40,20 +40,17 @@ module Reek
       end
 
       def report_success
-        self.status = STATUS_SUCCESS
+        @status = STATUS_SUCCESS
       end
 
       def report_smells
-        self.status = STATUS_SMELLS
+        @status = STATUS_SMELLS
       end
 
       private
 
-      private_attr_accessor :status
-      private_attr_reader :command
-
       def error_occured?
-        status == STATUS_ERROR
+        @status == STATUS_ERROR
       end
     end
   end

data/lib/reek/cli/command.rb

@@ -10,10 +10,6 @@ module Reek
       def initialize(options)
         @options = options
       end
-
-      private
-
-      private_attr_reader :options
     end
   end
 end

data/lib/reek/cli/input.rb

@@ -26,9 +26,9 @@ module Reek
       end
 
       def no_source_files_given?
-        # At this point we have deleted all options from argv. The only remaining entries
-        # are paths to the source files. If argv is empty, this means that no files were given.
-        argv.empty?
+        # At this point we have deleted all options from @argv. The only remaining entries
+        # are paths to the source files. If @argv is empty, this means that no files were given.
+        @argv.empty?
       end
 
       def working_directory_as_source
@@ -36,7 +36,7 @@ module Reek
       end
 
       def sources_from_argv
-        Source::SourceLocator.new(argv).sources
+        Source::SourceLocator.new(@argv).sources
       end
 
       def source_from_pipe

data/lib/reek/cli/option_interpreter.rb

@@ -13,11 +13,11 @@ module Reek
 
       extend Forwardable
 
-      def_delegators :options, :smells_to_detect
+      def_delegators :@options, :smells_to_detect
 
       def initialize(options)
         @options = options
-        @argv = options.argv
+        @argv = @options.argv
       end
 
       def reporter
@@ -30,7 +30,7 @@ module Reek
       end
 
       def report_class
-        Report.report_class(options.report_format)
+        Report.report_class(@options.report_format)
       end
 
       def warning_formatter
@@ -38,24 +38,20 @@ module Reek
       end
 
       def warning_formatter_class
-        Report.warning_formatter_class(options.show_links ? :wiki_links : :simple)
+        Report.warning_formatter_class(@options.show_links ? :wiki_links : :simple)
       end
 
       def location_formatter
-        Report.location_formatter(options.location_format)
+        Report.location_formatter(@options.location_format)
       end
 
       def heading_formatter
-        Report.heading_formatter(options.show_empty ? :verbose : :quiet)
+        Report.heading_formatter(@options.show_empty ? :verbose : :quiet)
       end
 
       def sort_by_issue_count
-        options.sorting == :smelliness
+        @options.sorting == :smelliness
       end
-
-      private
-
-      private_attr_reader :argv, :options
     end
   end
 end

data/lib/reek/cli/options.rb

@@ -23,16 +23,14 @@ module Reek
       end
 
       def parse
-        parser.parse!(argv)
-        options.argv = argv
-        Rainbow.enabled = options.colored
-        options
+        @parser.parse!(@argv)
+        @options.argv = @argv
+        Rainbow.enabled = @options.colored
+        @options
       end
 
       private
 
-      private_attr_reader :argv, :options, :parser
-
       def color_support?
         $stdout.tty?
       end
@@ -46,8 +44,8 @@ module Reek
       end
 
       def set_banner
-        program_name = parser.program_name
-        parser.banner = <<-EOB.gsub(/^[ ]+/, '')
+        program_name = @parser.program_name
+        @parser.banner = <<-EOB.gsub(/^[ ]+/, '')
           Usage: #{program_name} [options] [files]
 
           Examples:
@@ -62,29 +60,29 @@ module Reek
       end
 
       def set_alternative_formatter_options
-        parser.separator "\nReport format:"
-        parser.on(
+        @parser.separator "\nReport format:"
+        @parser.on(
           '-f', '--format FORMAT', [:html, :text, :yaml, :json, :xml],
           'Report smells in the given format:',
           '  html', '  text (default)', '  yaml', '  json', '  xml'
         ) do |opt|
-          options.report_format = opt
+          @options.report_format = opt
         end
       end
 
       def set_configuration_options
-        parser.separator 'Configuration:'
-        parser.on('-c', '--config FILE', 'Read configuration options from FILE') do |file|
+        @parser.separator 'Configuration:'
+        @parser.on('-c', '--config FILE', 'Read configuration options from FILE') do |file|
           raise ArgumentError, "Config file #{file} doesn't exist" unless File.exist?(file)
-          options.config_file = Pathname.new(file)
+          @options.config_file = Pathname.new(file)
         end
-        parser.on('--smell SMELL', 'Detect smell SMELL (default: all enabled smells)') do |smell|
-          options.smells_to_detect << smell
+        @parser.on('--smell SMELL', 'Detect smell SMELL (default: all enabled smells)') do |smell|
+          @options.smells_to_detect << smell
         end
       end
 
       def set_report_formatting_options
-        parser.separator "\nText format options:"
+        @parser.separator "\nText format options:"
         set_up_color_option
         set_up_verbosity_options
         set_up_location_formatting_options
@@ -92,50 +90,50 @@ module Reek
       end
 
       def set_up_color_option
-        parser.on('--[no-]color', 'Use colors for the output (default: true)') do |opt|
-          options.colored = opt
+        @parser.on('--[no-]color', 'Use colors for the output (default: true)') do |opt|
+          @options.colored = opt
         end
       end
 
       def set_up_verbosity_options
-        parser.on('-V', '--[no-]empty-headings',
-                  'Show headings for smell-free source files (default: false)') do |show_empty|
-          options.show_empty = show_empty
+        @parser.on('-V', '--[no-]empty-headings',
+                   'Show headings for smell-free source files (default: false)') do |show_empty|
+          @options.show_empty = show_empty
         end
-        parser.on('-U', '--[no-]wiki-links',
-                  'Show link to related wiki page for each smell (default: false)') do |show_links|
-          options.show_links = show_links
+        @parser.on('-U', '--[no-]wiki-links',
+                   'Show link to related wiki page for each smell (default: false)') do |show_links|
+          @options.show_links = show_links
         end
       end
 
       def set_up_location_formatting_options
-        parser.on('-n', '--[no-]line-numbers',
-                  'Show line numbers in the output (default: true)') do |show_numbers|
-          options.location_format = show_numbers ? :numbers : :plain
+        @parser.on('-n', '--[no-]line-numbers',
+                   'Show line numbers in the output (default: true)') do |show_numbers|
+          @options.location_format = show_numbers ? :numbers : :plain
         end
-        parser.on('-s', '--single-line',
-                  'Show location in editor-compatible single-line-per-smell format') do
-          options.location_format = :single_line
+        @parser.on('-s', '--single-line',
+                   'Show location in editor-compatible single-line-per-smell format') do
+          @options.location_format = :single_line
         end
       end
 
       def set_up_sorting_option
-        parser.on('--sort-by SORTING', [:smelliness, :none],
-                  'Sort reported files by the given criterium:',
-                  '  smelliness ("smelliest" files first)',
-                  '  none (default - output in processing order)') do |sorting|
-          options.sorting = sorting
-        end
+        @parser.on('--sort-by SORTING', [:smelliness, :none],
+                   'Sort reported files by the given criterium:',
+                   '  smelliness ("smelliest" files first)',
+                   '  none (default - output in processing order)') do |sorting|
+                     @options.sorting = sorting
+                   end
       end
 
       def set_utility_options
-        parser.separator "\nUtility options:"
-        parser.on_tail('-h', '--help', 'Show this message') do
-          puts parser
+        @parser.separator "\nUtility options:"
+        @parser.on_tail('-h', '--help', 'Show this message') do
+          puts @parser
           exit
         end
-        parser.on_tail('-v', '--version', 'Show version') do
-          puts "#{parser.program_name} #{Reek::Version::STRING}\n"
+        @parser.on_tail('-v', '--version', 'Show version') do
+          puts "#{@parser.program_name} #{Reek::Version::STRING}\n"
           exit
         end
       end

data/lib/reek/cli/reek_command.rb

@@ -10,7 +10,7 @@ module Reek
     # @api private
     class ReekCommand < Command
       def execute(app)
-        options.sources.each do |source|
+        @options.sources.each do |source|
           reporter.add_examiner Examiner.new(source, smell_names, configuration: app.configuration)
         end
         reporter.smells? ? app.report_smells : app.report_success
@@ -20,11 +20,11 @@ module Reek
       private
 
       def reporter
-        @reporter ||= options.reporter
+        @reporter ||= @options.reporter
       end
 
       def smell_names
-        @smell_names ||= options.smells_to_detect
+        @smell_names ||= @options.smells_to_detect
       end
     end
   end

data/lib/reek/cli/warning_collector.rb

@@ -8,20 +8,16 @@ module Reek
     # @api private
     class WarningCollector
       def initialize
-        @warnings_set = Set.new
+        @warnings = Set.new
       end
 
       def found_smell(warning)
-        warnings_set.add(warning)
+        @warnings.add(warning)
       end
 
       def warnings
-        warnings_set.to_a.sort
+        @warnings.to_a.sort
       end
-
-      private
-
-      private_attr_reader :warnings_set
     end
   end
 end