flog 4.6.5 → 4.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57b6b9d470979f410d87a27dd593d85a9c3b526f65bc519d8795a5c0703a7b74
-  data.tar.gz: 3d0ad63ea53a0e69f3768ef311f981239fe3397d53b7c2514d97cc453f895d88
+  metadata.gz: a6889c4ee131417e7461cd689e54af4a037d36ee3a854e037c9e453e7a19dee0
+  data.tar.gz: ee5fc40d4423a82b4b48db87b9bd02fac8006f4b5ac6e6f4701005a82412b451
 SHA512:
-  metadata.gz: 5615430b290aa01b6fd46b0154fdec668561ec0f0c044807ea09a0373a78b74984ad68504034fd99b75d307128bf4c21e187810aba5165cc257c582bf19b1e8d
-  data.tar.gz: 7b862060c2c4489cd4e43e38c5be5cdfbc79afc871feee741ada47d1a45d4bd590b2fcc01c0f3982d39ef305d2b76dc7417fbcd67c66bfcad758e6611523f7bb
+  metadata.gz: a6b0a38246e5869182caf800b6e1bacb4bd442c06746d8aac8c4223528d58bf8c588909689f5424f05de6cfbe1ed97f12d89025fe2d3a2b195ea6508326d8691
+  data.tar.gz: 485e289aec33bf39a30b8361d42eaec662de13bbca5c72b3058a9f0e31375ce1b55cacb270b00551b671e59f031f9b861af50b03abeb155af4d079d0f325dbbf

checksums.yaml.gz.sig

@@ -1 +1 @@
-�.�![m�0H�;�/�ᐘF�t�s��L�	�vʀ�����
F?c�*���lMWĜ��K�ҘM�%F��>a��[T>;4$-_<�S:�m�/祼���I�_I}�c����Ȟ��x�r��~~oC���rR��i�:�ס� ���}��f�̞d��[�y/bw	D)IF>3Dc3<�M+��qԥ�捌�%n��P( ��-y
+��c��A﷿PMt���w���?��胠�ov_:O4�kDM�����1��2	����e��(��˙�������D���l�=!ڡ��\G�_����veÙ��3��|����L�\�P�U�̪;z���RoUI9�l{�E۳I���6�l���#>�7��r��h�`�/2Ё�;@�2O�}N�@3Q����.-Ԡ�n~j�k;[`�Wp���/İ`�T�1����,4e$�t��0�z'��fGHL"�

data/History.rdoc

@@ -1,3 +1,14 @@
+=== 4.6.6 / 2022-07-03
+
+* 1 minor enhancement:
+
+  * Added support for to_proc w/ hash(?!?). (t-kinoshita)
+
+* 2 bug fixes:
+
+  * Removed to_proc_normal (eg &:sym/call) as benchmarks are much better.
+  * ruby3: Fixed anonymous block pass. (prtngn)
+
 === 4.6.5 / 2022-04-09
 
 * 1 minor enhancement:

data/Rakefile

@@ -54,9 +54,12 @@ task :debug do
       exit 0
     end
     flog.flog file
-  else
+  elsif ruby
     flog.flog_ruby ruby, "-"
     flog.calculate_total_scores
+  else
+    flog.flog
+    flog.calculate_total_scores
   end
 
   flog.report

data/lib/flog.rb

@@ -11,7 +11,7 @@ class File
 end
 
 class Flog < MethodBasedSexpProcessor
-  VERSION = "4.6.5" # :nodoc:
+  VERSION = "4.6.6" # :nodoc:
 
   ##
   # Cut off point where the report should stop unless --all given.
@@ -45,16 +45,6 @@ class Flog < MethodBasedSexpProcessor
     :super          => 1,
     :to_proc_icky!  => 10,
     :to_proc_lasgn  => 15,
-    :to_proc_normal => case RUBY_VERSION
-                       when /^1\.8\.7/ then
-                         2
-                       when /^1\.9/ then
-                         1.5
-                       when /^[23]\./ then
-                         1
-                       else
-                         raise "Unhandled version #{RUBY_VERSION}"
-                       end,
     :yield          => 1,
   }
 
@@ -176,9 +166,9 @@ class Flog < MethodBasedSexpProcessor
 
   def flog(*files)
     files.each do |file|
-      next unless file == '-' or File.readable? file
+      next unless file == "-" or File.readable? file
 
-      ruby = file == '-' ? $stdin.read : File.binread(file)
+      ruby = file == "-" ? $stdin.read : File.binread(file)
 
       flog_ruby ruby, file
     end
@@ -199,7 +189,7 @@ class Flog < MethodBasedSexpProcessor
     q = option[:quiet]
     if e.inspect =~ /<\%|%\>/ or ruby =~ /<\%|%\>/ then
       return if q
-      warn "#{e.inspect} at #{e.backtrace.first(5).join(', ')}"
+      warn "#{e.inspect} at #{e.backtrace.first(5).join(", ")}"
       warn "\n...stupid lemmings and their bad erb templates... skipping"
     else
       warn "ERROR: parsing ruby file #{file}" unless q
@@ -365,18 +355,23 @@ class Flog < MethodBasedSexpProcessor
 
     add_to_score :block_pass
 
+    return s() unless arg
+
     case arg.sexp_type
     when :lvar, :dvar, :ivar, :cvar, :self, :const, :colon2, :nil then # f(&b)
       # do nothing
-    when :lit, :call then                                              # f(&:b)
-      add_to_score :to_proc_normal
+    when :lit then                                                     # f(&:b)
+      # do nothing -- this now costs about the same as a block
+    when :call then                                                    # f(&x.b)
+      # do nothing -- I don't like the indirection, but that's already scored
     when :lasgn then                                                   # f(&l=b)
       add_to_score :to_proc_lasgn
-    when :iter, :dsym, :dstr, *BRANCHING then                          # below
+    when :iter, :dsym, :dstr, :hash, *BRANCHING then                   # below
       # f(&proc { ... })
       # f(&"#{...}")
       # f(&:"#{...}")
       # f(&if ... then ... end") and all other branching forms
+      # f(&{ a: 42 })  WHY?!?
       add_to_score :to_proc_icky!
     else
       raise({:block_pass_even_ickier! => arg}.inspect)

data/test/test_flog.rb

@@ -127,25 +127,24 @@ class TestFlog < FlogTest
     assert_process sexp, 1.1, :branch => 1.1 # 10% penalty over process_and
   end
 
-  def test_process_block_pass
+  def test_process_block_pass__call
     sexp = s(:call, nil, :a,
              s(:block_pass,
                s(:call, nil, :b)))
 
-    bonus = case RUBY_VERSION
-            when /^1\.8\.7/ then 0.4
-            when /^1\.9/    then 0.3
-            when /^[23]\./  then 0.2
-            else raise "Unhandled version #{RUBY_VERSION}"
-            end
+    assert_process(sexp, 3.4,
+                   :a              => 1.0,
+                   :block_pass     => 1.2,
+                   :b              => 1.2)
+  end
 
-    bonus += Flog::OTHER_SCORES[:to_proc_normal]
+  def test_process_block_pass__to_proc
+    sexp = s(:call, nil, :a,
+             s(:block_pass, s(:lit, :to_i)))
 
-    assert_process(sexp, 3.4 + bonus,
+    assert_process(sexp, 2.2,
                    :a              => 1.0,
-                   :block_pass     => 1.2,
-                   :b              => 1.2,
-                   :to_proc_normal => 0.0 + bonus)
+                   :block_pass     => 1.2)
   end
 
   def test_process_block_pass_colon2
@@ -158,6 +157,17 @@ class TestFlog < FlogTest
                    :block_pass     => 1.2)
   end
 
+  def test_process_block_pass__hash_wtf
+    sexp = s(:call, nil, :a,
+             s(:block_pass,
+               s(:hash, s(:lit, :a), s(:lit, :b))))
+
+    assert_process(sexp, 14.2,
+                   :a              => 1.0,
+                   :block_pass     => 1.2,
+                   :to_proc_icky!  => 12.0)
+  end
+
   def test_process_block_pass_iter
     sexp = s(:block_pass,
              s(:iter, s(:call, nil, :lambda), nil, s(:lit, 1)))
@@ -185,6 +195,13 @@ class TestFlog < FlogTest
                    :to_proc_lasgn => 15.0)
   end
 
+  def test_process_block_pass__nil
+    sexp = s(:block_pass)
+
+    assert_process(sexp, 1.0,
+                   :block_pass    =>  1.0)
+  end
+
   def test_process_call
     sexp = s(:call, nil, :a)                                       # a
     assert_process sexp, 1.0, :a => 1.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flog
 version: !ruby/object:Gem::Version
-  version: 4.6.5
+  version: 4.6.6
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
   YsuyUzsMz6GQA4khyaMgKNSD
   -----END CERTIFICATE-----
-date: 2022-04-09 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -119,14 +119,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '3.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '3.24'
 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.
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.12
 signing_key:
 specification_version: 4
 summary: Flog reports the most tortured code in an easy to read pain report