flog 4.6.2 → 4.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0fc313dc7f3892e2ac94b838dc0b6aeaf7930e7594f182a0ddebec2c540da7b
-  data.tar.gz: 663fc807ac517de1f01a6ac633b0a76b3a4a8f70590a2bdc76d09d0c2ef0ef5e
+  metadata.gz: 57b6b9d470979f410d87a27dd593d85a9c3b526f65bc519d8795a5c0703a7b74
+  data.tar.gz: 3d0ad63ea53a0e69f3768ef311f981239fe3397d53b7c2514d97cc453f895d88
 SHA512:
-  metadata.gz: 7c18ca2c0517e1d9d0b618216d6385fbe1c7e28e9f10bd64455e0c70b68424a9e74f8aebe98e6487486a6d50550acf5d2210fc87378f54073e7db8d918acd398
-  data.tar.gz: 0a19ae61b73cb0f91ccbf245aeb2853e27f0765fc10586f1b6b333e71e3d97534a030a30c68a169f2a1f4e15d1433edb3c84b07cfb5ec19d1f4845f62bce8b6a
+  metadata.gz: 5615430b290aa01b6fd46b0154fdec668561ec0f0c044807ea09a0373a78b74984ad68504034fd99b75d307128bf4c21e187810aba5165cc257c582bf19b1e8d
+  data.tar.gz: 7b862060c2c4489cd4e43e38c5be5cdfbc79afc871feee741ada47d1a45d4bd590b2fcc01c0f3982d39ef305d2b76dc7417fbcd67c66bfcad758e6611523f7bb

checksums.yaml.gz.sig

@@ -1 +1 @@
-tI���bc|
G�<D��݋��.݈J�a*.a,�Xf��𢯕���r�ɂ�`9!ۚM�q��M>��y�y��5<7��U%��r;^��7�d�P�E������-�x��S�Zs`�0�Oݤj}"9���(����!R�?��&�4�F����=P��ɳAM�;M�l�-=:(C��F�#�%=�kX�f!������Մ$�u	&��ts�P
+�.�![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

data/History.rdoc

@@ -1,3 +1,31 @@
+=== 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:
+
+  * Removed --18 and --19 options to cmdline. No real value anymore.
+
+* 2 bug fixes:
+
+  * Fixed some sexp access under STRICT_SEXP=2.
+  * Fixed option / arg processing bug that caused a hang (reading from stdin).
+
 === 4.6.2 / 2018-02-14
 
 * 1 bug fix:

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.2" # :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,
   }
@@ -143,10 +144,12 @@ class Flog < MethodBasedSexpProcessor
   def dsl_name? args
     return false unless args and not args.empty?
 
-    first_arg = args.first
-    first_arg = first_arg[1] if first_arg[0] == :hash
+    first_arg, = args
+    first_arg = first_arg[1] if first_arg.sexp_type == :hash
 
-    [:lit, :str].include? first_arg[0] and first_arg[1]
+    type, value, * = first_arg
+
+    value if [:lit, :str].include? type
   end
 
   ##
@@ -286,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
@@ -362,7 +365,7 @@ class Flog < MethodBasedSexpProcessor
 
     add_to_score :block_pass
 
-    case arg.first
+    case arg.sexp_type
     when :lvar, :dvar, :ivar, :cvar, :self, :const, :colon2, :nil then # f(&b)
       # do nothing
     when :lit, :call then                                              # f(&:b)
@@ -400,6 +403,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
@@ -455,7 +474,7 @@ class Flog < MethodBasedSexpProcessor
     exp.delete 0 # { || ... } has 0 in arg slot
 
     if context == [:block, :iter] or context == [:iter] then
-      recv = exp.first
+      recv, = exp
 
       # DSL w/ names. eg task :name do ... end
       #   looks like s(:call, nil, :task, s(:lit, :name))
@@ -475,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/lib/flog_cli.rb

@@ -19,11 +19,11 @@ class FlogCLI
     expander = PathExpander.new args, "**/*.{rb,rake}"
     files = expander.process
 
+    options = parse_options args
+
     abort "no files or stdin (-) to process, aborting." if
       files.empty? and args.empty?
 
-    options = parse_options args
-
     flogger = new options
     flogger.flog(*files)
     flogger.report
@@ -131,14 +131,6 @@ class FlogCLI
         option[:verbose] = true
       end
 
-      opts.on("--18", "Use a ruby 1.8 parser.") do
-        option[:parser] = Ruby18Parser
-      end
-
-      opts.on("--19", "Use a ruby 1.9 parser.") do
-        option[:parser] = Ruby19Parser
-      end
-
       next if self.plugins.empty?
       opts.separator "Plugin options:"
 

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,15 +181,36 @@ 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_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 +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
@@ -351,6 +372,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

data.tar.gz.sig

@@ -1 +1 @@
-N�X��<~��x9ז���،:0�(Ԧ��o�=���o}D��)��X\���?��H�Ew���W��\��D �OB��Q͝V����
{�R��4��V��-F�Ԫ�8�p�-b�q[�1�l_z��v-�0�<�|�S�Q�[��I��O�u:S �8�Z�0]�=?��љ��H�"I����6��3��&��Esl�������u]o�+k�>��ߴ�6'�h�;�U!y�7HS�c����s�M��ws�
+	�&�ȣ�#�X�M�����b�����=���֭+h_���1����(yb1�F	W@V�!��r*fp?0(.O�9'��K�K<M�����6m�N�D���n�J��n����y]cfx�SI�����N����)D7/���+b���Q�W:������LDE��%��v>��"8S�T���C�����f��a��0-���s�J]Lz�	X'c5t ��(C��jY3n�λC���a�q�E�ˑ��^1�Qi�

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: flog
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.6.5
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE3MTEyMTIxMTExMFoXDTE4MTEyMTIxMTExMFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -21,15 +21,15 @@ cert_chain:
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAfAXSQpsW7YSxd1csRtA/M4Zt0AMXFMd76GJ8Lgtg8G0+VFbdChRyDuDb0kPlW
-  h9QQX/YABfCW8vxmssbMGrP+VGBAn7BbdTcfTlgCWrvMX1uL5aRL74nA4urKXqdW
-  a0nP70K4958P3GffBdtE3KGkU5xstFnXGajxuBRnL66E15KU0BNehVxdG258bdPu
-  EKN6MqBPftFiev3tuwqDV11r2GquDpniYcT+Mi8/PgeAgVT/afBeVgbB3KaZeTRR
-  AhXhF6Wi2GTMezlj5jlI5XV7WsJUSwTp/YiVvcmT74ZaCRvexm6EnNhkrvJJ1Xeu
-  V+HB+LYYhXWitInO/eXxDrFB
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
+  AQCKB5jfsuSnKb+t/Wrh3UpdkmX7TrEsjVmERC0pPqzQ5GQJgmEXDD7oMgaKXaAq
+  x2m+KSZDrqk7c8uho5OX6YMqg4KdxehfSLqqTZGoeV78qwf/jpPQZKTf+W9gUSJh
+  zsWpo4K50MP+QtdSbKXZwjAafpQ8hK0MnnZ/aeCsW9ov5vdXpYbf3dpg6ADXRGE7
+  lQY2y1tJ5/chqu6h7dQmnm2ABUqx9O+JcN9hbCYoA5i/EeubUEtFIh2w3SpO6YfB
+  JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
+  YsuyUzsMz6GQA4khyaMgKNSD
   -----END CERTIFICATE-----
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2022-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -80,33 +80,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        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
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        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.
@@ -135,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
@@ -153,9 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.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: []