reek 3.10.1 → 3.10.2

data/lib/reek/context/attribute_context.rb

@@ -27,7 +27,9 @@ module Reek
         self.visibility = current_visibility
       end
 
-      private_attr_reader :send_expression
+      private
+
+      attr_reader :send_expression
     end
   end
 end

data/lib/reek/context/code_context.rb

@@ -3,7 +3,6 @@ require_relative '../ast/object_refs'
 require_relative 'statement_counter'
 
 require 'forwardable'
-require 'private_attr/everywhere'
 
 module Reek
   module Context
@@ -22,8 +21,6 @@ module Reek
 
       attr_reader :children, :parent, :exp, :statement_counter
 
-      private_attr_reader :refs
-
       # Initializes a new CodeContext.
       #
       # @param parent [CodeContext, nil] The parent context
@@ -158,6 +155,8 @@ module Reek
 
       private
 
+      attr_reader :refs
+
       def configuration_via_code_commment
         @configuration_via_code_commment ||= CodeComment.new(full_comment).config
       end

data/lib/reek/context/statement_counter.rb

@@ -1,12 +1,10 @@
 require_relative '../ast/node'
-require 'private_attr/everywhere'
 
 module Reek
   module Context
     # Responsible for counting the statements in a `CodeContext`.
     class StatementCounter
       attr_reader :value
-      private_attr_writer :value
 
       def initialize
         @value = 0
@@ -27,6 +25,10 @@ module Reek
       def decrease_by(number)
         self.value = value - number
       end
+
+      private
+
+      attr_writer :value
     end
   end
 end

data/lib/reek/context/visibility_tracker.rb

@@ -1,13 +1,9 @@
-require 'private_attr/everywhere'
-
 module Reek
   module Context
     # Responsible for tracking visibilities in regards to CodeContexts.
     class VisibilityTracker
-      private_attr_accessor :tracked_visibility
-
-      VISIBILITY_MODIFIERS = [:private, :public, :protected, :module_function]
-      VISIBILITY_MAP = { public_class_method: :public, private_class_method: :private }
+      VISIBILITY_MODIFIERS = [:private, :public, :protected, :module_function].freeze
+      VISIBILITY_MAP = { public_class_method: :public, private_class_method: :private }.freeze
 
       def initialize
         @tracked_visibility = :public
@@ -58,6 +54,10 @@ module Reek
       def set_child_visibility(child)
         child.apply_current_visibility tracked_visibility
       end
+
+      private
+
+      attr_accessor :tracked_visibility
     end
   end
 end

data/lib/reek/context_builder.rb

@@ -22,8 +22,6 @@ module Reek
   # :reek:UnusedPrivateMethod: { exclude: [ !ruby/regexp /process_/ ] }
   class ContextBuilder
     attr_reader :context_tree
-    private_attr_accessor :current_context
-    private_attr_reader :exp
 
     def initialize(syntax_tree)
       @exp = syntax_tree
@@ -33,6 +31,9 @@ module Reek
 
     private
 
+    attr_accessor :current_context
+    attr_reader :exp
+
     # Processes the given AST, memoizes it and returns a tree of nested
     # contexts.
     #
@@ -79,7 +80,7 @@ module Reek
       end
     end
 
-    alias_method :process_class, :process_module
+    alias process_class process_module
 
     # Handles `sclass` nodes
     #
@@ -194,7 +195,7 @@ module Reek
       process(exp)
     end
 
-    alias_method :process_ivasgn, :process_ivar
+    alias process_ivasgn process_ivar
 
     # Handles `self` nodes.
     #
@@ -260,7 +261,7 @@ module Reek
       process(exp)
     end
 
-    alias_method :process_kwbegin, :process_begin
+    alias process_kwbegin process_begin
 
     # Handles `if` nodes.
     #
@@ -309,7 +310,7 @@ module Reek
       process(exp)
     end
 
-    alias_method :process_until, :process_while
+    alias process_until process_while
 
     # Handles `for` nodes.
     #

data/lib/reek/examiner.rb

@@ -11,7 +11,6 @@ module Reek
   #
   # :reek:TooManyInstanceVariables: { max_instance_variables: 6 }
   class Examiner
-    private_attr_reader :collector, :source, :smell_repository
     #
     # Creates an Examiner which scans the given +source+ for code smells.
     #
@@ -72,6 +71,8 @@ module Reek
 
     private
 
+    attr_reader :collector, :source, :smell_repository
+
     def run
       syntax_tree = source.syntax_tree
       return unless syntax_tree

data/lib/reek/rake/task.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'private_attr/everywhere'
 require 'rake'
 require 'rake/tasklib'
 require 'pathname'
@@ -94,7 +93,7 @@ module Reek
 
       private
 
-      private_attr_reader :fail_on_error, :name, :verbose
+      attr_reader :fail_on_error, :name, :verbose
 
       def define_task
         desc 'Check for code smells'

data/lib/reek/report.rb

@@ -14,22 +14,22 @@ module Reek
       xml: XMLReport,
       text: TextReport,
       code_climate: CodeClimateReport
-    }
+    }.freeze
 
     LOCATION_FORMATTERS = {
       single_line: SingleLineLocationFormatter,
       plain: BlankLocationFormatter,
       numbers: DefaultLocationFormatter
-    }
+    }.freeze
 
     HEADING_FORMATTERS = {
       verbose: HeadingFormatter::Verbose,
-      quiet: HeadingFormatter::Quiet }
+      quiet: HeadingFormatter::Quiet }.freeze
 
     WARNING_FORMATTER_CLASSES = {
       wiki_links: WikiLinkWarningFormatter,
       simple: SimpleWarningFormatter
-    }
+    }.freeze
 
     # Map report format symbol to a report class.
     #

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

@@ -1,12 +1,9 @@
 require 'codeclimate_engine'
-require 'private_attr'
 
 module Reek
   module Report
     # Generates a hash in the structure specified by the Code Climate engine spec
     class CodeClimateFormatter
-      private_attr_reader :warning
-
       def initialize(warning)
         @warning = warning
       end
@@ -23,6 +20,8 @@ module Reek
 
       private
 
+      attr_reader :warning
+
       def description
         [warning.context, warning.message].join(' ')
       end

data/lib/reek/report/formatter.rb

@@ -1,4 +1,3 @@
-require 'private_attr/everywhere'
 require_relative 'location_formatter'
 require_relative 'code_climate/code_climate_formatter'
 
@@ -48,7 +47,9 @@ module Reek
         CodeClimateFormatter.new(warning).render
       end
 
-      private_attr_reader :location_formatter
+      private
+
+      attr_reader :location_formatter
     end
 
     #
@@ -56,7 +57,7 @@ module Reek
     # SimpleWarningFormatter.
     #
     class WikiLinkWarningFormatter < SimpleWarningFormatter
-      BASE_URL_FOR_HELP_LINK = 'https://github.com/troessner/reek/blob/master/docs/'
+      BASE_URL_FOR_HELP_LINK = 'https://github.com/troessner/reek/blob/master/docs/'.freeze
 
       def format(warning)
         "#{super} [#{explanatory_link(warning)}]"

data/lib/reek/report/report.rb

@@ -68,8 +68,8 @@ module Reek
 
       private
 
-      private_attr_reader :examiners, :heading_formatter, :report_formatter,
-                          :sort_by_issue_count, :warning_formatter
+      attr_reader :examiners, :heading_formatter, :report_formatter,
+                  :sort_by_issue_count, :warning_formatter
     end
 
     #

data/lib/reek/smells/control_parameter.rb

@@ -87,12 +87,12 @@ module Reek
 
         private
 
-        private_attr_reader :occurences, :param
+        attr_reader :occurences, :param
       end
 
       # Finds cases of ControlParameter in a particular node for a particular parameter
       class ControlParameterFinder
-        CONDITIONAL_NODE_TYPES = [:if, :case, :and, :or]
+        CONDITIONAL_NODE_TYPES = [:if, :case, :and, :or].freeze
 
         def initialize(node, param)
           @node = node
@@ -113,7 +113,7 @@ module Reek
 
         private
 
-        private_attr_reader :node, :param
+        attr_reader :node, :param
 
         def conditional_nodes
           node.body_nodes(CONDITIONAL_NODE_TYPES)
@@ -182,7 +182,7 @@ module Reek
 
         private
 
-        private_attr_reader :context
+        attr_reader :context
 
         def potential_parameters
           context.exp.parameter_names

data/lib/reek/smells/data_clump.rb

@@ -23,7 +23,7 @@ module Reek
       # reported as a DataClump unless there are more than this many
       # methods containing those parameters.
       #
-      MAX_COPIES_KEY = 'max_copies'
+      MAX_COPIES_KEY = 'max_copies'.freeze
       DEFAULT_MAX_COPIES = 2
 
       #
@@ -31,7 +31,7 @@ module Reek
       # size. No group of common parameters will be reported as
       # a DataClump unless it contains at least this many parameters.
       #
-      MIN_CLUMP_SIZE_KEY = 'min_clump_size'
+      MIN_CLUMP_SIZE_KEY = 'min_clump_size'.freeze
       DEFAULT_MIN_CLUMP_SIZE = 2
 
       def self.contexts # :nodoc:
@@ -112,7 +112,7 @@ module Reek
 
     private
 
-    private_attr_reader :candidate_methods, :max_copies, :min_clump_size
+    attr_reader :candidate_methods, :max_copies, :min_clump_size
   end
 
   # A method definition and a copy of its parameters
@@ -133,6 +133,6 @@ module Reek
 
     private
 
-    private_attr_reader :defn
+    attr_reader :defn
   end
 end

data/lib/reek/smells/duplicate_method_call.rb

@@ -20,14 +20,14 @@ module Reek
     class DuplicateMethodCall < SmellDetector
       # The name of the config field that sets the maximum number of
       # identical calls to be permitted within any single method.
-      MAX_ALLOWED_CALLS_KEY = 'max_calls'
+      MAX_ALLOWED_CALLS_KEY = 'max_calls'.freeze
       DEFAULT_MAX_CALLS = 1
 
       # The name of the config field that sets the names of any
       # methods for which identical calls should be to be permitted
       # within any single method.
-      ALLOW_CALLS_KEY = 'allow_calls'
-      DEFAULT_ALLOW_CALLS = []
+      ALLOW_CALLS_KEY = 'allow_calls'.freeze
+      DEFAULT_ALLOW_CALLS = [].freeze
 
       def self.smell_category
         'Duplication'
@@ -86,7 +86,7 @@ module Reek
 
         private
 
-        private_attr_reader :call_node, :occurences
+        attr_reader :call_node, :occurences
       end
 
       # Collects all calls in a given context
@@ -111,7 +111,7 @@ module Reek
 
         private
 
-        private_attr_reader :allow_calls, :max_allowed_calls
+        attr_reader :allow_calls, :max_allowed_calls
 
         # :reek:TooManyStatements: { max_statements: 6 }
         # :reek:DuplicateMethodCall: { max_calls: 2 }

data/lib/reek/smells/long_parameter_list.rb

@@ -16,7 +16,7 @@ module Reek
     class LongParameterList < SmellDetector
       # The name of the config field that sets the maximum number of
       # parameters permitted in any method or block.
-      MAX_ALLOWED_PARAMS_KEY = 'max_params'
+      MAX_ALLOWED_PARAMS_KEY = 'max_params'.freeze
       DEFAULT_MAX_ALLOWED_PARAMS = 3
 
       def self.default_config

data/lib/reek/smells/long_yield_list.rb

@@ -11,7 +11,7 @@ module Reek
     class LongYieldList < SmellDetector
       # The name of the config field that sets the maximum number of
       # parameters permitted in any method or block.
-      MAX_ALLOWED_PARAMS_KEY = 'max_params'
+      MAX_ALLOWED_PARAMS_KEY = 'max_params'.freeze
       DEFAULT_MAX_ALLOWED_PARAMS = 3
 
       def self.smell_category

data/lib/reek/smells/nested_iterators.rb

@@ -18,17 +18,15 @@ module Reek
         end
       end
 
-      private_attr_accessor :ignore_iterators
-
       # The name of the config field that sets the maximum depth
       # of nested iterators to be permitted within any single method.
-      MAX_ALLOWED_NESTING_KEY = 'max_allowed_nesting'
+      MAX_ALLOWED_NESTING_KEY = 'max_allowed_nesting'.freeze
       DEFAULT_MAX_ALLOWED_NESTING = 1
 
       # The name of the config field that sets the names of any
       # methods for which nesting should not be considered
-      IGNORE_ITERATORS_KEY = 'ignore_iterators'
-      DEFAULT_IGNORE_ITERATORS = ['tap']
+      IGNORE_ITERATORS_KEY = 'ignore_iterators'.freeze
+      DEFAULT_IGNORE_ITERATORS = ['tap'].freeze
 
       def self.default_config
         super.merge(
@@ -60,6 +58,8 @@ module Reek
 
       private
 
+      attr_accessor :ignore_iterators
+
       #
       # @return [Iterator|nil]
       #

data/lib/reek/smells/nil_check.rb

@@ -42,7 +42,7 @@ module Reek
 
         private
 
-        private_attr_reader :detector, :nodes
+        attr_reader :detector, :nodes
       end
 
       # Detect 'call' nodes which perform a nil check.

data/lib/reek/smells/repeated_conditional.rb

@@ -27,7 +27,7 @@ module Reek
     class RepeatedConditional < SmellDetector
       # The name of the config field that sets the maximum number of
       # identical conditionals permitted within any single class.
-      MAX_IDENTICAL_IFS_KEY = 'max_ifs'
+      MAX_IDENTICAL_IFS_KEY = 'max_ifs'.freeze
       DEFAULT_MAX_IFS = 2
 
       def self.smell_category

data/lib/reek/smells/smell_configuration.rb

@@ -1,5 +1,3 @@
-require 'private_attr/everywhere'
-
 module Reek
   module Smells
     #
@@ -8,11 +6,11 @@ module Reek
     class SmellConfiguration
       # The name of the config field that specifies whether a smell is
       # enabled. Set to +true+ or +false+.
-      ENABLED_KEY = 'enabled'
+      ENABLED_KEY = 'enabled'.freeze
 
       # The name of the config field that sets scope-specific overrides
       # for other values in the current smell detector's configuration.
-      OVERRIDES_KEY = 'overrides'
+      OVERRIDES_KEY = 'overrides'.freeze
 
       def initialize(hash)
         @options = hash
@@ -41,7 +39,7 @@ module Reek
 
       private
 
-      private_attr_reader :options
+      attr_reader :options
     end
 
     #
@@ -60,7 +58,7 @@ module Reek
 
       private
 
-      private_attr_reader :hash
+      attr_reader :hash
     end
   end
 end