leftovers 0.4.3 → 0.5.3

data/lib/leftovers/todo_reporter.rb

@@ -30,12 +30,9 @@ module Leftovers
     def report_instructions
       puts <<~MESSAGE
         generated #{path.basename}.
-        running leftovers again will read this file and
-        not alert you to any unused items mentioned in it.
+        running leftovers again will read this file and not alert you to any unused items mentioned in it.
 
-        commit this file so you/your team can gradually
-        address these items while still having leftovers
-        alert you to any newly unused items.
+        commit this file so you/your team can gradually address these items while still having leftovers alert you to any newly unused items.
       MESSAGE
     end
 
@@ -108,12 +105,18 @@ module Leftovers
     def generate_list(title, list)
       <<~YML
           # #{title}
-        #{list.map { |d| print_definition(d) }.join("\n")}
+        #{print_definition_list(list)}
 
       YML
     end
 
+    def print_definition_list(definition_list)
+      definition_list.map { |definition| print_definition(definition) }.join("\n")
+    end
+
     def print_definition(definition)
+      return print_definition_list(definition.definitions) if definition.is_a?(DefinitionSet)
+
       "  - #{definition.to_s.inspect} # #{definition.location_s} #{definition.source_line.strip}"
     end
 

data/lib/leftovers/value_processors/camelize.rb

@@ -16,7 +16,7 @@ module Leftovers
       rescue NoMethodError
         Leftovers.error <<~MESSAGE
           Tried using the String#camelize method, but the activesupport gem was not available and/or not required
-          `gem install activesupport`, and/or add `requires: 'active_support/core_ext/string'` to your .leftovers.yml
+          `gem install activesupport`, and/or add `requires: ['active_support', 'active_support/core_ext/string']` to your .leftovers.yml
         MESSAGE
       end
     end

data/lib/leftovers/value_processors/deconstantize.rb

@@ -16,7 +16,7 @@ module Leftovers
       rescue NoMethodError
         Leftovers.error <<~MESSAGE
           Tried using the String#deconstantize method, but the activesupport gem was not available and/or not required
-          `gem install activesupport`, and/or add `requires: 'active_support/core_ext/string'` to your .leftovers.yml
+          `gem install activesupport`, and/or add `requires: ['active_support', 'active_support/core_ext/string']` to your .leftovers.yml
         MESSAGE
       end
     end

data/lib/leftovers/value_processors/demodulize.rb

@@ -16,7 +16,7 @@ module Leftovers
       rescue NoMethodError
         Leftovers.error <<~MESSAGE
           Tried using the String#demodulize method, but the activesupport gem was not available and/or not required
-          `gem install activesupport`, and/or add `requires: 'active_support/core_ext/string'` to your .leftovers.yml
+          `gem install activesupport`, and/or add `requires: ['active_support', 'active_support/core_ext/string']` to your .leftovers.yml
         MESSAGE
       end
     end

data/lib/leftovers/value_processors/parameterize.rb

@@ -16,7 +16,7 @@ module Leftovers
       rescue NoMethodError
         Leftovers.error <<~MESSAGE
           Tried using the String#parameterize method, but the activesupport gem was not available and/or not required
-          `gem install activesupport`, and/or add `requires: 'active_support/core_ext/string'` to your .leftovers.yml
+          `gem install activesupport`, and/or add `requires: ['active_support', 'active_support/core_ext/string']` to your .leftovers.yml
         MESSAGE
       end
     end

data/lib/leftovers/value_processors/pluralize.rb

@@ -16,7 +16,7 @@ module Leftovers
       rescue NoMethodError
         Leftovers.error <<~MESSAGE
           Tried using the String#pluralize method, but the activesupport gem was not available and/or not required
-          `gem install activesupport`, and/or add `requires: 'active_support/core_ext/string'` to your .leftovers.yml
+          `gem install activesupport`, and/or add `requires: ['active_support', 'active_support/core_ext/string']` to your .leftovers.yml
         MESSAGE
       end
     end

data/lib/leftovers/value_processors/singularize.rb

@@ -16,7 +16,7 @@ module Leftovers
       rescue NoMethodError
         Leftovers.error <<~MESSAGE
           Tried using the String#singularize method, but the activesupport gem was not available and/or not required
-          `gem install activesupport`, and/or add `requires: 'active_support/core_ext/string'` to your .leftovers.yml
+          `gem install activesupport`, and/or add `requires: ['active_support', 'active_support/core_ext/string']` to your .leftovers.yml
         MESSAGE
       end
     end

data/lib/leftovers/value_processors/titleize.rb

@@ -16,7 +16,7 @@ module Leftovers
       rescue NoMethodError
         Leftovers.error <<~MESSAGE
           Tried using the String#titleize method, but the activesupport gem was not available and/or not required
-          `gem install activesupport`, and/or add `requires: 'active_support/core_ext/string'` to your .leftovers.yml
+          `gem install activesupport`, and/or add `requires: ['active_support', 'active_support/core_ext/string']` to your .leftovers.yml
         MESSAGE
       end
     end

data/lib/leftovers/value_processors/underscore.rb

@@ -16,7 +16,7 @@ module Leftovers
       rescue NoMethodError
         Leftovers.error <<~MESSAGE
           Tried using the String#underscore method, but the activesupport gem was not available and/or not required
-          `gem install activesupport`, and/or add `requires: 'active_support/core_ext/string'` to your .leftovers.yml
+          `gem install activesupport`, and/or add `requires: ['active_support', 'active_support/core_ext/string']` to your .leftovers.yml
         MESSAGE
       end
     end

data/lib/leftovers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Leftovers
-  VERSION = '0.4.3'
+  VERSION = '0.5.3'
 end

data/lib/leftovers.rb

@@ -3,8 +3,6 @@
 module Leftovers # rubocop:disable Metrics/ModuleLength
   class Error < ::StandardError; end
 
-  module_function
-
   autoload(:AST, "#{__dir__}/leftovers/ast")
   autoload(:Backports, "#{__dir__}/leftovers/backports")
   autoload(:CLI, "#{__dir__}/leftovers/cli")
@@ -32,124 +30,129 @@ module Leftovers # rubocop:disable Metrics/ModuleLength
   autoload(:VERSION, "#{__dir__}/leftovers/version")
 
   class << self
-    attr_accessor :parallel, :progress, :reporter
+    attr_accessor :parallel, :progress
+    attr_writer :reporter
     alias_method :parallel?, :parallel
     alias_method :progress?, :progress
-  end
 
-  def stdout
-    @stdout ||= $stdout
-  end
+    def stdout
+      @stdout ||= $stdout
+    end
 
-  def stderr
-    @stderr ||= $stderr
-  end
+    def stderr
+      @stderr ||= $stderr
+    end
 
-  def config
-    @config ||= Leftovers::MergedConfig.new(load_defaults: true)
-  end
+    def config
+      @config ||= Leftovers::MergedConfig.new(load_defaults: true)
+    end
 
-  def collector
-    @collector ||= Leftovers::Collector.new
-  end
+    def collector
+      @collector ||= Leftovers::Collector.new
+    end
 
-  def reporter
-    @reporter ||= Leftovers::Reporter.new
-  end
+    def reporter
+      @reporter ||= Leftovers::Reporter.new
+    end
 
-  def leftovers
-    @leftovers ||= begin
-      collector.collect
-      collector.definitions.reject(&:in_collection?)
+    def leftovers
+      @leftovers ||= begin
+        collector.collect
+        collector.definitions.reject(&:in_collection?)
+      end
     end
-  end
 
-  def run(stdout: StringIO.new, stderr: StringIO.new) # rubocop:disable Metrics/MethodLength
-    @stdout = stdout
-    @stderr = stderr
-    return reporter.report_success if leftovers.empty?
-
-    only_test = []
-    none = []
-    leftovers.sort_by(&:location_s).each do |definition|
-      if !definition.test? && definition.in_test_collection?
-        only_test << definition
-      else
-        none << definition
+    def run(stdout: StringIO.new, stderr: StringIO.new) # rubocop:disable Metrics/MethodLength
+      @stdout = stdout
+      @stderr = stderr
+      return reporter.report_success if leftovers.empty?
+
+      only_test = []
+      none = []
+      leftovers.sort_by(&:location_s).each do |definition|
+        if !definition.test? && definition.in_test_collection?
+          only_test << definition
+        else
+          none << definition
+        end
       end
+
+      reporter.report(only_test: only_test, none: none)
     end
 
-    reporter.report(only_test: only_test, none: none)
-  end
+    def reset # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+      remove_instance_variable(:@config) if defined?(@config)
+      remove_instance_variable(:@collector) if defined?(@collector)
+      remove_instance_variable(:@reporter) if defined?(@reporter)
+      remove_instance_variable(:@leftovers) if defined?(@leftovers)
+      remove_instance_variable(:@try_require_cache) if defined?(@try_require_cache)
+      remove_instance_variable(:@stdout) if defined?(@stdout)
+      remove_instance_variable(:@stderr) if defined?(@stderr)
+      remove_instance_variable(:@parallel) if defined?(@parallel)
+      remove_instance_variable(:@pwd) if defined?(@pwd)
+    end
 
-  def reset # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
-    remove_instance_variable(:@config) if defined?(@config)
-    remove_instance_variable(:@collector) if defined?(@collector)
-    remove_instance_variable(:@reporter) if defined?(@reporter)
-    remove_instance_variable(:@leftovers) if defined?(@leftovers)
-    remove_instance_variable(:@try_require) if defined?(@try_require)
-    remove_instance_variable(:@stdout) if defined?(@stdout)
-    remove_instance_variable(:@stderr) if defined?(@stderr)
-    remove_instance_variable(:@parallel) if defined?(@parallel)
-    remove_instance_variable(:@pwd) if defined?(@pwd)
-  end
+    def resolution_instructions_link
+      "https://github.com/robotdana/leftovers/tree/v#{Leftovers::VERSION}/README.md#how_to_resolve"
+    end
 
-  def resolution_instructions_link
-    "https://github.com/robotdana/leftovers/tree/v#{Leftovers::VERSION}/README.md#how_to_resolve"
-  end
+    def warn(message)
+      stderr.puts("\e[2K#{message}")
+    end
 
-  def warn(message)
-    stderr.puts("\e[2K#{message}")
-  end
+    def error(message)
+      warn(message)
+      exit 1
+    end
 
-  def error(message)
-    warn(message)
-    exit 1
-  end
+    def puts(message)
+      stdout.puts("\e[2K#{message}")
+    end
 
-  def puts(message)
-    stdout.puts("\e[2K#{message}")
-  end
+    def print(message)
+      stdout.print(message)
+    end
 
-  def print(message)
-    stdout.print(message)
-  end
+    def newline
+      stdout.puts('')
+    end
 
-  def newline
-    stdout.puts('')
-  end
+    def pwd
+      @pwd ||= Pathname.new(Dir.pwd + '/')
+    end
 
-  def pwd
-    @pwd ||= Pathname.new(Dir.pwd + '/')
-  end
+    def exit(status = 0)
+      throw :leftovers_exit, status
+    end
 
-  def exit(status = 0)
-    throw :leftovers_exit, status
-  end
+    def try_require(requirable, message: nil)
+      warn message if !try_require_cache(requirable) && message
+      try_require_cache(requirable)
+    end
 
-  def try_require(requirable, message: nil) # rubocop:disable Metrics/MethodLength
-    @try_require ||= {}
+    def each_or_self(value, &block)
+      return enum_for(__method__, value) unless block
 
-    @try_require[requirable] = begin
-      if @try_require.key?(requirable)
-        @try_require[requirable]
-      else
-        require requirable
-        true
+      case value
+      when nil then nil
+      when Array then value.each(&block)
+      else yield(value)
       end
-    rescue LoadError
-      false
     end
 
-    warn message if !@try_require[requirable] && message
-    @try_require[requirable]
-  end
+    private
 
-  def each_or_self(value, &block)
-    case value
-    when nil then nil
-    when Array then value.each(&block)
-    else yield(value)
+    def try_require_cache(requirable)
+      @try_require_cache ||= {}
+
+      @try_require_cache.fetch(requirable) do
+        begin
+          require requirable
+          @try_require_cache[requirable] = true
+        rescue LoadError
+          @try_require_cache[requirable] = false
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leftovers
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.3
 platform: ruby
 authors:
 - Dana Sherson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -291,6 +291,15 @@ files:
 - docs/Configuration.md
 - exe/leftovers
 - leftovers.gemspec
+- lib/.DS_Store
+- lib/config/actioncable.yml
+- lib/config/actionmailer.yml
+- lib/config/actionpack.yml
+- lib/config/actionview.yml
+- lib/config/activejob.yml
+- lib/config/activemodel.yml
+- lib/config/activerecord.yml
+- lib/config/activesupport.yml
 - lib/config/attr_encrypted.yml
 - lib/config/audited.yml
 - lib/config/builder.yml
@@ -343,17 +352,18 @@ files:
 - lib/leftovers/matcher_builders.rb
 - lib/leftovers/matcher_builders/and.rb
 - lib/leftovers/matcher_builders/and_not.rb
-- lib/leftovers/matcher_builders/argument_node_value.rb
 - lib/leftovers/matcher_builders/name.rb
 - lib/leftovers/matcher_builders/node.rb
 - lib/leftovers/matcher_builders/node_has_argument.rb
 - lib/leftovers/matcher_builders/node_has_keyword_argument.rb
 - lib/leftovers/matcher_builders/node_has_positional_argument.rb
+- lib/leftovers/matcher_builders/node_has_receiver.rb
 - lib/leftovers/matcher_builders/node_name.rb
 - lib/leftovers/matcher_builders/node_pair_name.rb
 - lib/leftovers/matcher_builders/node_pair_value.rb
 - lib/leftovers/matcher_builders/node_path.rb
 - lib/leftovers/matcher_builders/node_type.rb
+- lib/leftovers/matcher_builders/node_value.rb
 - lib/leftovers/matcher_builders/or.rb
 - lib/leftovers/matcher_builders/path.rb
 - lib/leftovers/matcher_builders/string.rb
@@ -367,6 +377,7 @@ files:
 - lib/leftovers/matchers/node_has_any_positional_argument_with_value.rb
 - lib/leftovers/matchers/node_has_positional_argument.rb
 - lib/leftovers/matchers/node_has_positional_argument_with_value.rb
+- lib/leftovers/matchers/node_has_receiver.rb
 - lib/leftovers/matchers/node_name.rb
 - lib/leftovers/matchers/node_pair_value.rb
 - lib/leftovers/matchers/node_path.rb
@@ -374,6 +385,7 @@ files:
 - lib/leftovers/matchers/node_type.rb
 - lib/leftovers/matchers/not.rb
 - lib/leftovers/matchers/or.rb
+- lib/leftovers/matchers/predicate.rb
 - lib/leftovers/merged_config.rb
 - lib/leftovers/parser.rb
 - lib/leftovers/processor_builders.rb
@@ -454,7 +466,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Find unused methods and classes/modules

data/lib/leftovers/matcher_builders/argument_node_value.rb

@@ -1,21 +0,0 @@
-# frozen-string-literal: true
-
-module Leftovers
-  module MatcherBuilders
-    module ArgumentNodeValue
-      def self.build(pattern)
-        ::Leftovers::MatcherBuilders::Or.each_or_self(pattern) do |pat|
-          case pat
-          when ::Integer, true, false, nil
-            ::Leftovers::Matchers::NodeScalarValue.new(pat)
-          when ::String, ::Hash
-            ::Leftovers::MatcherBuilders::NodeName.build(pat)
-          # :nocov:
-          else raise
-            # :nocov:
-          end
-        end
-      end
-    end
-  end
-end