flog 4.6.4 → 4.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f844d48c5a305a1d8faf442235c38c9a90c38fa75a877358f6b510aaab4283
-  data.tar.gz: 88823e4811831f69f7b1a6d4b4a863a9e07c3646ceb2037329d6f367c85e3bce
+  metadata.gz: 57b6b9d470979f410d87a27dd593d85a9c3b526f65bc519d8795a5c0703a7b74
+  data.tar.gz: 3d0ad63ea53a0e69f3768ef311f981239fe3397d53b7c2514d97cc453f895d88
 SHA512:
-  metadata.gz: aa7e986e752d38e6cb1f23752d777fdae88c9092c1c8068bc162ad1708a5bad54f394972fee904ce24faa1ed84bcb41104307546956742e444e7631c9115b2d0
-  data.tar.gz: 329c9e9d94b6a7df410e40fd3f013a32f6e22908819f4c8c66ce22ed2b3c98699163d8d636290df2ec46ca9a345bdeeef97ef33cafcee81187df4dfb0edca81d
+  metadata.gz: 5615430b290aa01b6fd46b0154fdec668561ec0f0c044807ea09a0373a78b74984ad68504034fd99b75d307128bf4c21e187810aba5165cc257c582bf19b1e8d
+  data.tar.gz: 7b862060c2c4489cd4e43e38c5be5cdfbc79afc871feee741ada47d1a45d4bd590b2fcc01c0f3982d39ef305d2b76dc7417fbcd67c66bfcad758e6611523f7bb

data/History.rdoc

@@ -1,3 +1,13 @@
+=== 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:

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

data/lib/flog.rb

@@ -11,7 +11,7 @@ class File
 end
 
 class Flog < MethodBasedSexpProcessor
-  VERSION = "4.6.4" # :nodoc:
+  VERSION = "4.6.5" # :nodoc:
 
   ##
   # Cut off point where the report should stop unless --all given.
@@ -38,6 +38,7 @@ class Flog < MethodBasedSexpProcessor
     :assignment     => 1,
     :block          => 1,
     :block_pass     => 1,
+    :block_call     => 1,
     :branch         => 1,
     :lit_fixnum     => 0.25,
     :sclass         => 5,
@@ -49,10 +50,10 @@ class Flog < MethodBasedSexpProcessor
                          2
                        when /^1\.9/ then
                          1.5
-                       when /^2\./ then
+                       when /^[23]\./ then
                          1
                        else
-                         5
+                         raise "Unhandled version #{RUBY_VERSION}"
                        end,
     :yield          => 1,
   }
@@ -288,7 +289,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
@@ -493,7 +494,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

@@ -135,7 +135,7 @@ class TestFlog < FlogTest
     bonus = case RUBY_VERSION
             when /^1\.8\.7/ then 0.4
             when /^1\.9/    then 0.3
-            when /^2\./     then 0.2
+            when /^[23]\./  then 0.2
             else raise "Unhandled version #{RUBY_VERSION}"
             end
 
@@ -166,7 +166,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,7 +181,7 @@ 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
 
@@ -324,7 +324,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
@@ -382,7 +382,7 @@ class TestFlog < FlogTest
              nil,
              s(:call, nil, :something))
 
-    assert_process sexp, 2.326, :something => 1.1, :task => 1.0, :branch => 1
+    assert_process sexp, 2.326, :something => 1.1, :task => 1.0, :block_call => 1
   end
 
   def test_process_iter_dsl_namespaced

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.4
+  version: 4.6.5
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE5MTIxMzAwMDIwNFoXDTIwMTIxMjAwMDIwNFowRTETMBEGA1UE
+  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
-  AQCkkcHqAa6IKLYGl93rn78J3L+LnqyxaA059n4IGMHWN5bv9KBQnIjOrpLadtYZ
-  vhWkunWDKdfVapBEq5+T4HzqnsEXC3aCv6JEKJY6Zw7iSzl0M8hozuzRr+w46wvT
-  fV2yTN6QTVxqbMsJJyjosks4ZdQYov2zdvQpt1HsLi+Qmckmg8SPZsd+T8uiiBCf
-  b+1ORSM5eEfBQenPXy83LZcoQz8i6zVB4aAfTGGdhxjoMGUEmSZ6xpkOzmnGa9QK
-  m5x9IDiApM+vCELNwDXXGNFEnQBBK+wAe4Pek8o1V1TTOxL1kGPewVOitX1p3xoN
-  h7iEjga8iM1LbZUfiISZ+WrB
+  AQCKB5jfsuSnKb+t/Wrh3UpdkmX7TrEsjVmERC0pPqzQ5GQJgmEXDD7oMgaKXaAq
+  x2m+KSZDrqk7c8uho5OX6YMqg4KdxehfSLqqTZGoeV78qwf/jpPQZKTf+W9gUSJh
+  zsWpo4K50MP+QtdSbKXZwjAafpQ8hK0MnnZ/aeCsW9ov5vdXpYbf3dpg6ADXRGE7
+  lQY2y1tJ5/chqu6h7dQmnm2ABUqx9O+JcN9hbCYoA5i/EeubUEtFIh2w3SpO6YfB
+  JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
+  YsuyUzsMz6GQA4khyaMgKNSD
   -----END CERTIFICATE-----
-date: 2019-12-15 00:00:00.000000000 Z
+date: 2022-04-09 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.20'
+        version: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.20'
+        version: '3.23'
 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.
@@ -144,7 +158,7 @@ licenses:
 metadata:
   homepage_uri: http://ruby.sadi.st/
   source_code_uri: https://github.com/seattlerb/flog
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -161,8 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Flog reports the most tortured code in an easy to read pain report
 test_files: []