debride 1.14.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a714288d6ecf460fcc966b8affc300f4bfe72da8e7d955e1345d757fbe389e9
-  data.tar.gz: '0608d18319513d0193482b503def7a86b7fc1544dfffb1048849d74b0b0d1728'
+  metadata.gz: a141179f7eaccb00427a5f08718c4feb5f4cc71f088c85c9fa5ca9a2a9d11320
+  data.tar.gz: 90cf53e502fb9174beaba59f09f45c1c316c2c0179f5c35509523af2c0c49cb8
 SHA512:
-  metadata.gz: c7faa53a9d8aaa8e1f6bb5673ac7619a357a34d75636eaaab43fc017814cac33805dcb0904385d19a4e1d32b95ccc6a01877083a379ee74e6c91847b4713e278
-  data.tar.gz: ec449e3d4d5bdae20271e58d54da4dce6050866e56493d68f7ce236bb7829e51f342185576c5a772ee6e140e1855557598bd9062c5b9cc6f4d2112ea3fc16ed7
+  metadata.gz: e716a26676e9a6e3eef63dff026138910c7bd49ff4e89c0741f6be172cfe1e470a01944db3912555efc0e34a981fd6903164ee6a139795ed78e507bfa4911d7d
+  data.tar.gz: b4d27a4b57292cfd04ee94849cc42fbb281a9446ee850f5c3e049fdf4a6cc6fde04eeca89092dbf08147f52e5ba1dbf644145a62ea12eb9a95bd6557f2cc15ad

data/History.rdoc

@@ -1,3 +1,24 @@
+=== 1.15.1 / 2026-01-26
+
+* 1 bug fix:
+
+  * Namespace NotRubyParser to avoid problems with bundler's horrid eager loading. (nateberkopec)
+
+=== 1.15.0 / 2026-01-02
+
+* 1 minor enhancement:
+
+  * Added process_hash to handle hash shortcut syntax in case it is a call. (TSMMark)
+
+* 6 bug fixes:
+
+  * Bump prism dependency to 1.7+.
+  * Load debride with require_relative in bin/debride.
+  * Minor fixes for prism 1.7 and ruby 4.0.
+  * Oops! Fixed --legacy option definition.
+  * Properly handle scope/alias_method with interoplation. (alagos)
+  * Removed prism patches now that they've been upstreamed.
+
 === 1.14.0 / 2025-12-11
 
 * 2 minor enhancements:

data/Rakefile

@@ -11,7 +11,7 @@ Hoe::add_include_dirs("../../sexp_processor/dev/lib",
                       "../../path_expander/dev/lib",
                       "lib")
 
-Hoe.plugin :isolate
+Hoe.plugin :isolate_binaries
 Hoe.plugin :seattlerb
 Hoe.plugin :rdoc
 Hoe.plugin :cov
@@ -21,7 +21,7 @@ Hoe.spec "debride" do
   license "MIT"
 
   dependency "sexp_processor", "~> 4.17"
-  dependency "prism",          "~> 1.5"
+  dependency "prism",          "~> 1.7"
   dependency "path_expander",  "~> 2.0"
 end
 

data/bin/debride

@@ -1,5 +1,5 @@
 #!/usr/bin/env -S ruby -w
 
-require "debride"
+require_relative "../lib/debride"
 
 Debride.run(ARGV).report

data/lib/debride.rb

@@ -3,6 +3,7 @@
 require "optparse"
 require "set"
 require "stringio"
+require "timeout"
 
 require "sexp_processor"
 require "path_expander"
@@ -10,23 +11,15 @@ require "path_expander"
 require "prism"
 require "prism/translation/ruby_parser"
 
-unless Prism::Translation::RubyParser.method_defined? :process then
-  class Prism::Translation::RubyParser # compatibility layer
-    def process(ruby, file, timeout=nil) =
-      Timeout.timeout(timeout) { parse ruby, file }
-  end
-end
-
-class NotRubyParser < Prism::Translation::RubyParser # compatibility layer
-end
-
 ##
 # A static code analyzer that points out possible dead methods.
 
 class Debride < MethodBasedSexpProcessor
-  VERSION = "1.14.0" # :nodoc:
+  VERSION = "1.15.1" # :nodoc:
   PROJECT = "debride"
 
+  NotRubyParser = Class.new Prism::Translation::RubyParser # compatibility layer :nodoc:
+
   def self.load_plugins proj = PROJECT
     unless defined? @@plugins then
       @@plugins = []
@@ -108,8 +101,8 @@ class Debride < MethodBasedSexpProcessor
     end
 
     parser = option[:parser].new
-    parser.process(file, path, option[:timeout])
-  rescue Racc::ParseError, RegexpError => e
+    parser.process file, path, option[:timeout]
+  rescue RubyParser::SyntaxError, RegexpError => e
     warn "Parse Error parsing #{path}. Skipping."
     warn "  #{e.message}"
   rescue Timeout::Error
@@ -172,7 +165,7 @@ class Debride < MethodBasedSexpProcessor
         options[:minimum] = n
       end
 
-      opts.on "--legacy" "Use RubyParser for parsing." do
+      opts.on "--legacy", "Use RubyParser for parsing." do
         require "ruby_parser"
         option[:parser] = RubyParser
       end
@@ -349,27 +342,30 @@ class Debride < MethodBasedSexpProcessor
       end
     when *RAILS_MACRO_METHODS
       # s(:call, nil, :has_one, s(:lit, :has_one_relation), ...)
-      _, _, _, (_, name), * = sexp
+      _, _, _, name, * = sexp
 
       # try to detect route scope vs model scope
       if context.include? :module or context.include? :class then
-        file, line = sexp.file, sexp.line
-        record_method name, file, line
+        if string_like? name then
+          file, line = sexp.file, sexp.line
+          record_method name.last, file, line
+        end
       end
     when /_path$/ then
       method_name = method_name.to_s.delete_suffix("_path").to_sym if option[:rails]
     when /^deliver_/ then
       method_name = method_name.to_s.delete_prefix("deliver_").to_sym if option[:rails]
     when :alias_method then
+      # s(:call, nil, :alias_method, lhs, rhs)
       _, _, _, lhs, rhs = sexp
 
-      if Sexp === lhs and Sexp === rhs then
-        lhs = lhs.last
-        rhs = rhs.last
+      if string_like? lhs and string_like? rhs then
+        lhs = lhs.last.to_sym
+        rhs = rhs.last.to_sym
 
         record_method lhs, sexp.file, sexp.line
 
-        called << rhs
+        called << rhs # TODO: why?
       end
     end
 
@@ -380,6 +376,10 @@ class Debride < MethodBasedSexpProcessor
     sexp
   end
 
+  def string_like? s
+    Sexp === s and %i[lit str].include?(s.sexp_type)
+  end
+
   def process_alias exp
     _, (_, lhs), (_, rhs) = exp
 
@@ -482,6 +482,21 @@ class Debride < MethodBasedSexpProcessor
 
   alias process_safe_call process_call
 
+  def process_hash sexp
+    _, *pairs = sexp
+
+    pairs.each_slice 2 do |k, v|
+      if v.nil? && k.sexp_type == :lit then
+        called << k.last
+      else
+        process k
+        process v
+      end
+    end
+
+    sexp
+  end
+
   ##
   # Calculate the difference between known methods and called methods.
 
@@ -520,23 +535,24 @@ class Debride < MethodBasedSexpProcessor
   def missing_locations
     focus = option[:focus]
 
-    missing.map { |klass, meths|
-      bad = meths.map { |meth|
-        location =
-          method_locations["#{klass}##{meth}"] ||
-          method_locations["#{klass}::#{meth}"]
+    missing
+      .map { |klass, meths|
+        bad = meths.map { |meth|
+          location =
+            method_locations["#{klass}##{meth}"] ||
+            method_locations["#{klass}::#{meth}"]
 
-        if focus then
-          path = location[/(.+):\d+/, 1]
+          if focus then
+            path = location[/(.+):\d+/, 1]
 
-          next unless File.fnmatch(focus, path)
-        end
+            next unless File.fnmatch(focus, path)
+          end
 
-        [meth, location]
-      }.compact
+          [meth, location]
+        }.compact
 
-      [klass, bad]
-    }
+        [klass, bad]
+      }
       .to_h
       .reject { |k,v| v.empty? }
   end

data/test/test_debride.rb

@@ -20,6 +20,7 @@ class TestDebride < Minitest::Test
                 :process_const,
                 :process_defn,
                 :process_defs,
+                :process_hash,
                 :process_op_asgn2,
                 :process_rb,
                 :process_safe_call,
@@ -46,13 +47,15 @@ class TestDebride < Minitest::Test
     assert_equal exp_arg, arg
   end
 
-  def assert_process exp, ruby, opts = {}
+  def assert_process exp, ruby, called:nil, **opts
     io = StringIO.new ruby
 
     debride = Debride.new opts
     debride.process debride.process_rb io
 
     assert_equal exp, debride.missing
+    assert_equal Set[*called], debride.called if called
+
     debride
   end
 
@@ -240,6 +243,40 @@ class TestDebride < Minitest::Test
     assert_process [], s
   end
 
+  def test_call__alias_method__symbol
+    ruby = <<~'RUBY'
+      class QuarterPounder
+        alias_method :get_x, :x
+      end
+    RUBY
+
+    exp = [["QuarterPounder", [:get_x]]]
+
+    assert_process exp, ruby, called:%i[x alias_method]
+  end
+
+  def test_call__alias_method__string
+    ruby = <<~'RUBY'
+      class QuarterPounder
+        alias_method "get_x", "x"
+      end
+    RUBY
+
+    exp = [["QuarterPounder", [:get_x]]]
+
+    assert_process exp, ruby, called:%i[x alias_method]
+  end
+
+  def test_call__alias_method__interpolated
+    ruby = <<~'RUBY'
+      class QuarterPounder
+        alias_method "get_#{integr}", integr
+      end
+    RUBY
+
+    assert_process [], ruby, called:%i[integr alias_method]
+  end
+
   def test_alias_method_chain
     ruby = <<-RUBY.strip
       class QuarterPounder
@@ -352,6 +389,42 @@ class TestDebride < Minitest::Test
     assert_process [], ruby
   end
 
+  def test_hash__shorthand
+    ruby = <<-RUBY.strip
+      class Seattle
+        def self.status
+          { raining: }
+        end
+
+        def self.raining
+          true
+        end
+      end
+
+      Seattle.status
+    RUBY
+
+    assert_process [], ruby
+  end
+
+  def test_hash__not_shorthand
+    ruby = <<-RUBY.strip
+      class Seattle
+        def self.status
+          { missing: }
+        end
+
+        def self.raining
+          true
+        end
+      end
+
+      Seattle.status
+    RUBY
+
+    assert_process [["Seattle", [:raining]]], ruby
+  end
+
   def test_safe_navigation_operator
     ruby = <<-RUBY.strip
       class Seattle
@@ -412,7 +485,7 @@ class TestDebride < Minitest::Test
   end
 
   def test_rails_dsl_macro_definitions
-    ruby = <<-RUBY.strip
+    ruby = <<~'RUBY'
       class RailsModel
         has_one :has_one_relation
         has_one :uncalled_has_one_relation
@@ -424,6 +497,9 @@ class TestDebride < Minitest::Test
         has_and_belongs_to_many :uncalled_has_and_belongs_to_many_relation
         scope :scope_method
         scope :uncalled_scope_method
+        scope :"interpolated_#{method}"
+        scope "another_#{method}"
+        scope "yet_another_#{method}".to_sym
 
         def instance_method_caller
           has_one_relation

data.tar.gz.sig

@@ -1,4 +1,4 @@
-��Y�=n���vRv�N�-4~����n�����Q6����R�;��Tځ̿��\�Q��Lը�E�Ÿ�<*�Ԑ�7JU�Q��kHc��ץ�\����*3��c�/�
-��ݐmm2�}|61�����}-MC�g��`F��P*���
-I��€Fގ<� QK�E��L��nۗێ��m�ta���L�I:
--T���o���<��fRL�S�U�q�g��? T>�P~F���QD�Z|����lz�+�?�H�
+�b����k�$���i���~�
+�>�p��h[��
+�ۯ�7~��\V?�*[~����	ٕ�)�^$[��I73�E}Q(�k�So����S��w^ �-&�ɧrrѓGV�����]�+ ���(0vq��WJȻC4��軺?��o?�B�BP�u�p�G^.���D@��o��q4�Χ�P!��5�w5��c?�B��?O?�ᐟ�W�
+�c�m9��q�w/)֛L�(�W�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: debride
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -9,9 +9,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBCTANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBCjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTI1MDEwNjIzMjcwMVoXDTI2MDEwNjIzMjcwMVowRTETMBEGA1UE
+  GRYDY29tMB4XDTI2MDEwNzAxMDkxNFoXDTI3MDEwNzAxMDkxNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -21,12 +21,12 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQAC0WQJcPOWPFwkojhzweilRVjTJ19UiLhiBTw3C1wJO3LVdBkWDmnnhAmKuX4D
-  r7vjQvESlABGIPdutI1Yl7mrHQzTkfLfXvNN6MT0nLChPyIYauT6SZZxubwJrUfA
-  7R0c2CJTIboZ0XaGpLsXqHEF1c29H7TV1QvVuqKAN2mCjh4N82QVn+ZKtys28AwT
-  6GfQX2fqLoi4KSc7xIzHKaNzqxeOICmJofk9w5VZ2rRN6yes8jvFYwz9HR41wdj8
-  bwfinv7Yp5fA6AysuZLhCykyfDuZVRrUp0Vb68YCKsLjJly/Theak+euNTxvHsB+
-  al9oSgPPHICMEX65qvLywitx
+  AQA/X8/PKTTc/IkYQEUL6XWtfK8fAfbuLJzmLcz6f2ZWrtBvPsYvqRuwI1bWUtil
+  2ibJEfIuSIHX6BsUTX18+hlaIussf6EWq/YkE7e2BKmgQE42vSOZMce0kCEAPbx0
+  rQtqonfWTHQ8UbQ7GqCL3gDQ0QDD2B+HUlb4uaCZ2icxqa/eOtxMvHC2tj+h0xKY
+  xL84ipM5kr0bHGf9/MRZJWcw51urueNycBXu1Xh+pEN8qBmYsFRR4SIODLClybAO
+  6cbm2PyPQgKNiqE4H+IQrDVHd9bJs1XgLElk3qoaJBWXc/5fy0J1imYb25UqmiHG
+  snGe1hrppvBRdcyEzvhfIPjI
   -----END CERTIFICATE-----
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: path_expander
   requirement: !ruby/object:Gem::Requirement
@@ -78,20 +78,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.5'
 description: Analyze code for potentially uncalled / dead methods, now with auto-removal.
 email:
 - ryand-ruby@zenspider.com