flog 4.6.3 → 4.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71073335bad47948fc2c595a09ae883aeb2fbc119056c9ddd9922c374d278199
-  data.tar.gz: 5c224d4e435702cd05363f78a5103139f43aed18a6e257c50f6917215bdd2ffa
+  metadata.gz: a6889c4ee131417e7461cd689e54af4a037d36ee3a854e037c9e453e7a19dee0
+  data.tar.gz: ee5fc40d4423a82b4b48db87b9bd02fac8006f4b5ac6e6f4701005a82412b451
 SHA512:
-  metadata.gz: da67084a75b7bbff54bb536abaeaac2b63be971cd1d11b74cafd340175b70a2a0d149d840300cd920100c2e691d5e68ed95a72f8fe1c80602def3647f761c0d3
-  data.tar.gz: 2b2b77800a343ae038ebe6499720bc7fcc18f3fff899c07c5d14c011f1456d4d2d8bceab33da9ce6ceff8d7c96d907942842696812081d0d1bd7293ff9357bd7
+  metadata.gz: a6b0a38246e5869182caf800b6e1bacb4bd442c06746d8aac8c4223528d58bf8c588909689f5424f05de6cfbe1ed97f12d89025fe2d3a2b195ea6508326d8691
+  data.tar.gz: 485e289aec33bf39a30b8361d42eaec662de13bbca5c72b3058a9f0e31375ce1b55cacb270b00551b671e59f031f9b861af50b03abeb155af4d079d0f325dbbf

data/History.rdoc

@@ -1,3 +1,31 @@
+=== 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:
+
+  * Changed :iter scoring from branch to block_call (same score).
+
+* 1 bug fix:
+
+  * Fixed support for ruby 3 (only affected block_pass / to_proc_normal).
+
+=== 4.6.4 / 2019-12-14
+
+* 2 minor enhancements:
+
+  * Added basic support for safe_call (nic-potter).
+  * Added extra complexity penalty to safe_call processing.
+
 === 4.6.3 / 2019-09-14
 
 * 1 minor enhancement:

data/Rakefile

@@ -7,12 +7,13 @@ Hoe.add_include_dirs("../../ruby_parser/dev/lib",
                      "../../RubyInline/dev/lib",
                      "../../sexp_processor/dev/lib",
                      "../../ZenTest/dev/lib",
-                     "../../minitest/dev/lib",
                      "../../path_expander/dev/lib",
                      "lib")
 
 Hoe.plugin :seattlerb
+Hoe.plugin :isolate
 Hoe.plugin :rdoc
+Hoe.plugin :bundler
 
 Hoe.spec 'flog' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
@@ -25,6 +26,8 @@ Hoe.spec 'flog' do
   dependency "sexp_processor", "~> 4.8"
   dependency "ruby_parser",    ["~> 3.1", "> 3.1.0"]
   dependency "path_expander", "~> 1.0"
+
+  dependency "minitest",       "~> 5.0", :dev
 end
 
 task :debug do
@@ -51,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.3" # :nodoc:
+  VERSION = "4.6.6" # :nodoc:
 
   ##
   # Cut off point where the report should stop unless --all given.
@@ -38,22 +38,13 @@ class Flog < MethodBasedSexpProcessor
     :assignment     => 1,
     :block          => 1,
     :block_pass     => 1,
+    :block_call     => 1,
     :branch         => 1,
     :lit_fixnum     => 0.25,
     :sclass         => 5,
     :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 /^2\./ then
-                         1
-                       else
-                         5
-                       end,
     :yield          => 1,
   }
 
@@ -175,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
@@ -198,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
@@ -288,7 +279,7 @@ class Flog < MethodBasedSexpProcessor
     tally.each do |cat, score|
       case cat
       when :assignment then a += score
-      when :branch     then b += score
+      when :branch, :block_call then b += score
       else                  c += score
       end
     end
@@ -364,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)
@@ -402,6 +398,22 @@ class Flog < MethodBasedSexpProcessor
     s()
   end
 
+  def process_safe_call(exp)
+    penalize_by 0.3 do
+      process exp.shift # recv
+    end
+
+    name = exp.shift
+
+    penalize_by 0.2 do
+      process_until_empty exp
+    end
+
+    add_to_score name, SCORES[name]
+
+    s()
+  end
+
   def process_case(exp)
     add_to_score :branch
     process exp.shift # recv
@@ -477,7 +489,7 @@ class Flog < MethodBasedSexpProcessor
       end
     end
 
-    add_to_score :branch
+    add_to_score :block_call
 
     process exp.shift # no penalty for LHS
 

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 /^2\./     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)))
@@ -166,7 +176,7 @@ class TestFlog < FlogTest
                    :lit_fixnum    =>  0.275,
                    :block_pass    =>  1.0,
                    :lambda        =>  1.0,
-                   :branch        =>  1.0,
+                   :block_call    =>  1.0,
                    :to_proc_icky! => 10.0)
   end
 
@@ -181,15 +191,43 @@ class TestFlog < FlogTest
                    :block_pass    =>  1.0,
                    :lambda        =>  1.0,
                    :assignment    =>  1.0,
-                   :branch        =>  1.0,
+                   :block_call    =>  1.0,
                    :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)
+    sexp = s(:call, nil, :a)                                       # a
     assert_process sexp, 1.0, :a => 1.0
   end
 
+  def test_process_call2
+    sexp = s(:call, s(:call, nil, :a), :b)                         # a.b
+    assert_process sexp, 2.2, :a => 1.2, :b => 1.0
+  end
+
+  def test_process_call3
+    sexp = s(:call, s(:call, s(:call, nil, :a), :b), :c)           # a.b.c
+    assert_process sexp, 3.6, :a => 1.4, :b => 1.2, :c => 1.0
+  end
+
+  def test_process_safe_call2
+    sexp = s(:safe_call, s(:call, nil, :a), :b)                    # a&.b
+    assert_process sexp, 2.3, :a => 1.3, :b => 1.0
+  end
+
+  def test_process_safe_call3
+    sexp = s(:safe_call, s(:safe_call, s(:call, nil, :a), :b), :c) # a&.b&.c
+
+    assert_process sexp, 3.9, :a => 1.6, :b => 1.3, :c => 1.0
+  end
+
   def test_process_case
     case :a
     when :a
@@ -303,7 +341,7 @@ class TestFlog < FlogTest
              s(:call, nil, :loop), nil,
              s(:if, s(:true), s(:break), nil))
 
-    assert_process sexp, 2.326, :loop => 1.0, :branch => 2.1
+    assert_process sexp, 2.326, :loop => 1.0, :branch => 1.1, :block_call => 1
   end
 
   def test_process_iter_dsl
@@ -351,6 +389,19 @@ class TestFlog < FlogTest
     assert_process sexp, 2.3, :something => 1.0, :task => 1.0, :lit_fixnum => 0.3
   end
 
+  def test_process_iter_dsl_hash_when_hash_empty
+    # task({}) do
+    #   something
+    # end
+
+    sexp = s(:iter,
+             s(:call, nil, :task, s(:hash)),
+             nil,
+             s(:call, nil, :something))
+
+    assert_process sexp, 2.326, :something => 1.1, :task => 1.0, :block_call => 1
+  end
+
   def test_process_iter_dsl_namespaced
     # namespace :blah do
     #   task :woot => 42 do

data/test/test_flog_cli.rb

@@ -1,4 +1,4 @@
-require "test/test_flog"
+require "test_flog"
 require "flog_cli"
 
 class FlogCLI

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: flog
 version: !ruby/object:Gem::Version
-  version: 4.6.3
+  version: 4.6.6
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE4MTIwNDIxMzAxNFoXDTE5MTIwNDIxMzAxNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCbJwLmpJR2PomLU+Zzw3KRzH/hbyUWc/ftru71AopZ1fy4iY9J/BW5QYKVYwbP
-  V0FSBWtvfI/RdwfKGtuGhPKECZgmLieGuZ3XCc09qPu1bdg7i/tu1p0t0c6163ku
-  nDMDIC/t/DAFK0TY9I3HswuyZGbLW7rgF0DmiuZdN/RPhHq2pOLMLXJmFclCb/im
-  9yToml/06TJdUJ5p64mkBs0TzaK66DIB1Smd3PdtfZqoRV+EwaXMdx0Hb3zdR1JR
-  Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
-  UfBugfLD19bu3nvL+zTAGx/U
+  AQCKB5jfsuSnKb+t/Wrh3UpdkmX7TrEsjVmERC0pPqzQ5GQJgmEXDD7oMgaKXaAq
+  x2m+KSZDrqk7c8uho5OX6YMqg4KdxehfSLqqTZGoeV78qwf/jpPQZKTf+W9gUSJh
+  zsWpo4K50MP+QtdSbKXZwjAafpQ8hK0MnnZ/aeCsW9ov5vdXpYbf3dpg6ADXRGE7
+  lQY2y1tJ5/chqu6h7dQmnm2ABUqx9O+JcN9hbCYoA5i/EeubUEtFIh2w3SpO6YfB
+  JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
+  YsuyUzsMz6GQA4khyaMgKNSD
   -----END CERTIFICATE-----
-date: 2019-09-15 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -49,22 +49,22 @@ dependencies:
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 3.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 3.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: path_expander
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +79,20 @@ dependencies:
     - - "~>"
       - !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'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -105,14 +119,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
+        version: '3.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
+        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.
@@ -141,8 +155,10 @@ files:
 homepage: http://ruby.sadi.st/
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: http://ruby.sadi.st/
+  source_code_uri: https://github.com/seattlerb/flog
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -159,8 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.12
+signing_key:
 specification_version: 4
 summary: Flog reports the most tortured code in an easy to read pain report
 test_files: []