leftovers 0.11.2 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 315c6cd9bf74247b3a2833ab260854e397d8cc24bee3c12f3bc56d6d63e1c126
-  data.tar.gz: 8f2c20446893d35ca268b7506f34e164038c86860c1ffa3bce5e94b83058a188
+  metadata.gz: 7e52a1e28bb2607d09a74d36c1602a7bdbabd0f7ec58f542bd836b1d509f9c8a
+  data.tar.gz: 73df5d8f0694d5bd44c6a99f9268f64474cebc4f1097a2261233fee3596e235f
 SHA512:
-  metadata.gz: 8e9461b01555758b8f7f5de3c15e262fff559aaffc1045d9cfb0c121e68822a8ad4187599eae19154758f1418ec8fd859b2ccf47839b4831d4caab5f26662d53
-  data.tar.gz: 81ee36d822947afbb3b626b9b09363b1ae9528aead85ac0312f80e7f07cc6867a0ef575255c02d723fa0f0dc46042b161d337cd3f5ee6a71e9075dc5eaec19f8
+  metadata.gz: 07a7d1443f20c26d39b3e030fc86469435fb6a067fb292d6c2c5bef8b4f7a34f19f7899c20c4d38f588612f6ea0b4e028d74319879cb14a7fa043deaf1ef7566
+  data.tar.gz: 1ab0edb8d8382e3c4fdef6cbd5dc78c57cd87a391baba773f1ced92fb3080528f8a80dd642c4c4f1db9c08c863b2532079d8bd764931b4b659a4e12d61fe357a

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.12.1
+
+- handle anonymous block arguments e.g. `def method(&); other_method(&); end`. thanks @sclarsen and @orien and @juanlujoanne
+
+# v0.12.0
+- improve error handling when a file can't be processed
+- fail rather than warn when encountering a syntax error in a file being processed
+
 # v0.11.2
 
 - add `has_block: true/false` for matching method calls with a block.

data/lib/leftovers/cli.rb

@@ -9,11 +9,14 @@ module Leftovers
     end
 
     def run
-      catch(:leftovers_exit) do
-        parse_options
-
-        runner.run
-      end
+      parse_options
+
+      runner.run
+    rescue ::Leftovers::Error => e
+      Leftovers.warn("\e[31m#{e.class}: #{e.message}\e[0m\n\n#{e.backtrace.join("\n")}")
+      1
+    rescue ::Leftovers::Exit => e
+      e.status # what why?
     end
 
     private

data/lib/leftovers/collection.rb

@@ -59,8 +59,8 @@ module Leftovers
     end
 
     def freeze_calls
-      @calls = @calls.to_set.freeze
-      @test_calls = @test_calls.to_set.freeze
+      @calls = @calls.to_set.compare_by_identity.freeze
+      @test_calls = @test_calls.to_set.compare_by_identity.freeze
     end
   end
 end

data/lib/leftovers/file_collector/node_processor/error.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Leftovers
+  class FileCollector
+    class NodeProcessor
+      class Error < ::Leftovers::FileCollector::Error
+        attr_reader :node
+
+        def initialize(message, node)
+          super(message)
+          @node = node
+        end
+      end
+    end
+  end
+end

data/lib/leftovers/file_collector/node_processor.rb

@@ -4,7 +4,17 @@ require 'parser'
 
 module Leftovers
   class FileCollector
-    class NodeProcessor < ::Parser::AST::Processor
+    class NodeProcessor < ::Parser::AST::Processor # rubocop:disable Metrics/ClassLength
+      include Autoloader
+
+      def process(ast)
+        super
+      rescue FileCollector::Error
+        raise
+      rescue StandardError => e
+        raise Error.new(e.message, ast)
+      end
+
       def initialize(collector) # rubocop:disable Lint/MissingSuper # there isn't one to call
         @collector = collector
       end
@@ -100,7 +110,7 @@ module Leftovers
       # grab e.g. :to_s in each(&:to_s)
       def on_block_pass(node)
         super
-        return unless node.first.sym?
+        return unless node.first&.sym?
 
         @collector.calls << node.first.to_sym
       end

data/lib/leftovers/file_collector.rb

@@ -4,6 +4,8 @@ require 'set'
 
 module Leftovers
   class FileCollector
+    class Error < ::Leftovers::Error; end
+
     include Autoloader
 
     attr_reader :calls, :allow_lines, :test_lines, :dynamic_lines
@@ -35,15 +37,27 @@ module Leftovers
       list
     end
 
-    def collect(ruby = @ruby, line = 1)
+    def collect(ruby = @ruby, line = 1) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       ast, comments = Parser.parse_with_comments(ruby, @file.relative_path, line)
       CommentsProcessor.process(comments, self)
       NodeProcessor.new(self).process(ast)
     rescue ::Parser::SyntaxError => e
-      ::Leftovers.warn(
-        "\e[31m#{filename}:#{e.diagnostic.location.line}:#{e.diagnostic.location.column} " \
-          "SyntaxError: #{e.message}\e[0m"
-      )
+      raise Error, <<~MESSAGE.chomp, e.backtrace
+        SyntaxError: #{e.message}
+          when processing #{filename}:#{e.diagnostic.location.line}:#{e.diagnostic.location.column}
+      MESSAGE
+    rescue NodeProcessor::Error => e
+      raise Error, <<~MESSAGE.chomp, e.backtrace
+        #{e.cause.class}: #{e.message}
+          when processing #{e.node} at #{filename}:#{e.node.loc.line}:#{e.node.loc.column}
+      MESSAGE
+    rescue Error
+      raise
+    rescue ::StandardError => e
+      raise Error, <<~MESSAGE.chomp, e.backtrace
+        #{e.class}: #{e.message}
+          when processing #{filename}
+      MESSAGE
     end
 
     def collect_subfile(string, location)
@@ -112,9 +126,6 @@ module Leftovers
 
     def collect_dynamic(node)
       ::Leftovers.config.dynamic.process(nil, node, node, self)
-    rescue ::StandardError => e
-      raise Error, "#{e.class}: #{e.message}\n" \
-        "when processing #{node} at #{filename}:#{node.loc.line}:#{node.loc.column}", e.backtrace
     end
 
     private

data/lib/leftovers/matcher_builders/node_type.rb

@@ -15,8 +15,14 @@ module Leftovers
           when :Array then Matchers::NodeType.new(:array)
           when :Hash then Matchers::NodeType.new(:hash)
           when :Proc then Matchers::NodeIsProc
-          when :Method then Matchers::NodeType.new(::Set[:send, :csend, :def, :defs])
-          when :Constant then Matchers::NodeType.new(::Set[:const, :class, :module, :casgn])
+          when :Method
+            Matchers::NodeType.new(
+              ::Set[:send, :csend, :def, :defs].compare_by_identity.freeze
+            )
+          when :Constant
+            Matchers::NodeType.new(
+              ::Set[:const, :class, :module, :casgn].compare_by_identity.freeze
+            )
           # :nocov:
           else raise UnexpectedCase, "Unhandled value #{type.inspect}"
             # :nocov:

data/lib/leftovers/matcher_builders/or.rb

@@ -66,7 +66,7 @@ module Leftovers
         end
 
         def build_grouped(set: nil, regexp: nil, nil: nil, **matcher_classes) # rubocop:disable Lint/UnusedMethodArgument i want to throw away nils
-          set = set.to_set.compare_by_identity if set.is_a?(::Array)
+          set = set.to_set.compare_by_identity.freeze if set.is_a?(::Array)
           regexp = ::Regexp.union(regexp) if regexp.is_a?(::Array)
           matcher_classes = matcher_classes.each_value.flat_map do |matchers|
             build_grouped_for_matcher(matchers)

data/lib/leftovers/merged_config.rb

@@ -17,7 +17,7 @@ module Leftovers
 
     def initialize(load_defaults: false)
       @configs = []
-      @loaded_configs = ::Set.new
+      @loaded_configs = ::Set.new.compare_by_identity
       return unless load_defaults
 
       self << :ruby

data/lib/leftovers/version.rb

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

data/lib/leftovers.rb

@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 
 module Leftovers
+  class Exit < ::StandardError
+    attr_reader :status
+
+    def initialize(status) # rubocop:disable Lint/MissingSuper
+      @status = status
+    end
+  end
+
   require_relative 'leftovers/autoloader'
   include Autoloader
 
@@ -44,7 +52,7 @@ module Leftovers
     def error(message, did_you_mean = nil)
       warn("\e[31m#{message}\e[0m")
       warn("\n#{did_you_mean}") if did_you_mean
-      exit 1
+      raise Exit, 1
     end
 
     def puts(message)
@@ -60,7 +68,7 @@ module Leftovers
     end
 
     def exit(status = 0)
-      throw :leftovers_exit, status
+      raise Exit, status
     end
 
     def try_require(requirable, message: nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leftovers
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.1
 platform: ruby
 authors:
 - Dana Sherson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-12 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -439,6 +439,7 @@ files:
 - lib/leftovers/file_collector.rb
 - lib/leftovers/file_collector/comments_processor.rb
 - lib/leftovers/file_collector/node_processor.rb
+- lib/leftovers/file_collector/node_processor/error.rb
 - lib/leftovers/file_list.rb
 - lib/leftovers/matcher_builders.rb
 - lib/leftovers/matcher_builders/and.rb
@@ -584,7 +585,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Find unused methods and classes/modules