flog 4.8.0 → 4.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad09cd2ae98738c0d08e2e366636604774c3ae81a38c15e1feec23220b392243
-  data.tar.gz: b5e85e4f01c0d0297a3c929c93bab48bf393d813a048e34a6808353c1f56cfaf
+  metadata.gz: '07738fae525db950a36908c105a3ea7f4ef2735ad8ec39621332bb12dff927b8'
+  data.tar.gz: 0506b7754237f626888a17e8e17f9b54a74683a093ae24440fe6275cdc4fa6c0
 SHA512:
-  metadata.gz: 51a2c880e819dc4e31e62a94b990176f2d83fb755b78c5e0c84dcefa95ee1a87b5f4a2e610ad5af2e0e9986921c01b5e528f0e452c788e3c940c579e1b6a0273
-  data.tar.gz: b01ab52f28fcf8ee2c57927586abfc8e7c36bbb982e1e4c0ab2a8a8c1c367c00a48b0bd81c1f1ba96425c39f57bca5923e8a5a0d365af2453fec8cc93e24f8bf
+  metadata.gz: c6f3379c0fa7795f344bcc2d45bbbef81de04a6cc54ea77219651cb7215b4e402e3814265be85208c2ab174b220a150be1d63489ececed98c97683b15da5dfa5
+  data.tar.gz: '0493e8b1fcaa2868e2cd9f39cbe75dc51a2d196e78cf4cac8c94faadbff0c7494e18805dc0058a6a2488d6ceda7dad16015253d0b4d6e5f2bc1b8bdc915e57e8'

data/History.rdoc

@@ -1,3 +1,19 @@
+=== 4.9.1 / 2025-12-20
+
+* 4 bug fixes:
+
+  * Bumped dependency to prism to get some upstreamed fixes.
+  * Dropped ruby_parser dependency (now considered soft dep for --legacy flag).
+  * Minor cleanup of some of the upstreamed fixes.
+  * Re-add ruby_parser dependency until I can get a patch into prism to loosen it up.
+
+=== 4.9.0 / 2025-12-11
+
+* 2 minor enhancements:
+
+  * Bumped path_expander to 2.0.0.
+  * Switched to prism for ruby parsing. Use --legacy for RubyParser.
+
 === 4.8.0 / 2023-09-28
 
 * 2 minor enhancements:

data/Rakefile

@@ -3,9 +3,7 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.add_include_dirs("../../ruby_parser/dev/lib",
-                     "../../RubyInline/dev/lib",
-                     "../../sexp_processor/dev/lib",
+Hoe.add_include_dirs("../../sexp_processor/dev/lib",
                      "../../ZenTest/dev/lib",
                      "../../path_expander/dev/lib",
                      "lib")
@@ -24,10 +22,8 @@ Hoe.spec 'flog' do
   license "MIT"
 
   dependency "sexp_processor", "~> 4.8"
-  dependency "ruby_parser",    ["~> 3.1", "> 3.1.0"]
-  dependency "path_expander", "~> 1.0"
-
-  dependency "minitest",       "~> 5.0", :dev
+  dependency "prism",          "~> 1.7"
+  dependency "path_expander",  "~> 2.0"
 end
 
 task :debug do

data/bin/flog

@@ -1,6 +1,6 @@
-#!/usr/local/bin/ruby -w
+#!/usr/bin/env -S ruby -w
 
-require "flog_cli"
+require_relative "../lib/flog_cli"
 
 FlogCLI.run
 

data/lib/flog.rb

@@ -1,6 +1,10 @@
 require "sexp_processor"
-require "ruby_parser"
+require "prism"
+require "prism/translation/ruby_parser"
 require "timeout"
+require "racc" # for Racc::ParseError
+
+NotRubyParser = Class.new Prism::Translation::RubyParser
 
 ##
 # Flog is a SexpProcessor that calculates a ABC (assignments,
@@ -12,7 +16,7 @@ require "timeout"
 # thoroughly test.
 
 class Flog < MethodBasedSexpProcessor
-  VERSION = "4.8.0" # :nodoc:
+  VERSION = "4.9.1" # :nodoc:
 
   ##
   # Cut off point where the report should stop unless --all given.
@@ -209,7 +213,7 @@ class Flog < MethodBasedSexpProcessor
   # methods. Does not handle timeouts or syntax errors. See #flog_ruby.
 
   def flog_ruby! ruby, file="-", timeout = 10
-    @parser = (option[:parser] || RubyParser).new
+    @parser = option[:parser].new
 
     warn "** flogging #{file}" if option[:verbose]
 
@@ -230,6 +234,7 @@ class Flog < MethodBasedSexpProcessor
     @mass                = {}
     @parser              = nil
     @threshold           = option[:threshold] || DEFAULT_THRESHOLD
+    option[:parser]    ||= NotRubyParser
     self.auto_shift_type = true
     self.reset
   end

data/lib/flog_cli.rb

@@ -24,7 +24,7 @@ class FlogCLI
     load_plugins
 
     expander = PathExpander.new args, "**/*.{rb,rake}"
-    files = expander.process
+    files = expander.process.to_a
 
     options = parse_options args, extra
 
@@ -77,7 +77,7 @@ class FlogCLI
     option = {
       :quiet    => false,
       :continue => false,
-      :parser   => RubyParser,
+      :parser   => nil,
     }.merge extra_options
 
     OptionParser.new do |opts|
@@ -130,6 +130,11 @@ class FlogCLI
         option[:score] = true
       end
 
+      opts.on "--legacy" "Use RubyParser for parsing." do
+        require "ruby_parser"
+        option[:parser] = RubyParser
+      end
+
       opts.on("-tN", "--threshold=N", Integer, "Set the report cutoff threshold (def: 60%).") do |n|
         option[:threshold] = n / 100.0
       end

data/test/test_flog.rb

@@ -19,7 +19,7 @@ end
 
 class TestFlog < FlogTest
   def setup
-    @flog = Flog.new :parser => RubyParser
+    @flog = Flog.new parser: NotRubyParser
   end
 
   def test_add_to_score

data/test/test_flog_cli.rb

@@ -9,7 +9,7 @@ end
 
 class TestFlogCLI < FlogTest
   def setup
-    @flog = FlogCLI.new :parser => RubyParser
+    @flog = FlogCLI.new parser: NotRubyParser
   end
 
   def test_cls_parse_options

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: flog
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.9.1
 platform: ruby
 authors:
 - Ryan Davis
-autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBCTANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTIzMDEwMTA3NTExN1oXDTI0MDEwMTA3NTExN1owRTETMBEGA1UE
+  GRYDY29tMB4XDTI1MDEwNjIzMjcwMVoXDTI2MDEwNjIzMjcwMVowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +21,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQAkg3y+PBnBAPWdxxITm5sPHqdWQgSyCpRA20o4LTuWr8BWhSXBkfQNa7cY6fOn
-  xyM34VPzBFbExv6XOGDfOMFBVaYTHuN9peC/5/umL7kLl+nflXzL2QA7K6LYj5Bg
-  sM574Onr0dZDM6Vn69bzQ7rBIFDfK/OhlPzqKZad4nsdcsVH8ODCiT+ATMIZyz5K
-  WCnNtqlyiWXI8tdTpahDgcUwfcN/oN7v4K8iU5IbLJX6HQ5DKgmKjfb6XyMth16k
-  ROfWo9Uyp8ba/j9eVG14KkYRaLydAY1MNQk2yd3R5CGfeOpD1kttxjoypoUJ2dOG
-  nsNBRuQJ1UfiCG97a6DNm+Fr
+  AQAC0WQJcPOWPFwkojhzweilRVjTJ19UiLhiBTw3C1wJO3LVdBkWDmnnhAmKuX4D
+  r7vjQvESlABGIPdutI1Yl7mrHQzTkfLfXvNN6MT0nLChPyIYauT6SZZxubwJrUfA
+  7R0c2CJTIboZ0XaGpLsXqHEF1c29H7TV1QvVuqKAN2mCjh4N82QVn+ZKtys28AwT
+  6GfQX2fqLoi4KSc7xIzHKaNzqxeOICmJofk9w5VZ2rRN6yes8jvFYwz9HR41wdj8
+  bwfinv7Yp5fA6AysuZLhCykyfDuZVRrUp0Vb68YCKsLjJly/Theak+euNTxvHsB+
+  al9oSgPPHICMEX65qvLywitx
   -----END CERTIFICATE-----
-date: 2023-09-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -46,53 +45,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.8'
 - !ruby/object:Gem::Dependency
-  name: ruby_parser
+  name: prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: path_expander
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -119,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.3'
 description: |-
   Flog reports the most tortured code in an easy to read pain
   report. The higher the score, the more pain the code is in.
@@ -158,7 +137,6 @@ licenses:
 metadata:
   homepage_uri: http://ruby.sadi.st/
   source_code_uri: https://github.com/seattlerb/flog
-post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -175,8 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Flog reports the most tortured code in an easy to read pain report
 test_files: []

metadata.gz.sig

@@ -1,3 +1 @@
-&&���I[�	���W��nCf<�������Lf(�/J���ЮY���uI��S�ީI�V�Һ����RJ?�
-"�l)�,*IS8�`J��+Ҙ���r�Q�O�Fh` 
-�0�r��:�a7����1��A�w���`?�P��T��}��h�D*�NU�	Iu�f*ק@e)s�04
+Q�h�K�	��!Ԯ�6+���~R�26�)M�GK���#٠J��>4p������q;�z�W���)��q�(�w}i��=�wyC�6���\ڱ΀��(��a,��3[����#s�����,��&18����	j[��A�~�a�Ri��~��~�I����AI��[�d����X�C���(�3#|�<�ݨ0�u"����0�Nbu�e"�Y���̃�p�v<��/��