flog 4.6.6 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6889c4ee131417e7461cd689e54af4a037d36ee3a854e037c9e453e7a19dee0
-  data.tar.gz: ee5fc40d4423a82b4b48db87b9bd02fac8006f4b5ac6e6f4701005a82412b451
+  metadata.gz: bde1a28d5e030ce021a8f20e9d7e877714e2c91e030b7560c3da7337a8a1e916
+  data.tar.gz: 6b4dffe1d2a47f688deb1665a0a31a4c9ef5b901add108aac37489c97cb8f7ee
 SHA512:
-  metadata.gz: a6b0a38246e5869182caf800b6e1bacb4bd442c06746d8aac8c4223528d58bf8c588909689f5424f05de6cfbe1ed97f12d89025fe2d3a2b195ea6508326d8691
-  data.tar.gz: 485e289aec33bf39a30b8361d42eaec662de13bbca5c72b3058a9f0e31375ce1b55cacb270b00551b671e59f031f9b861af50b03abeb155af4d079d0f325dbbf
+  metadata.gz: 56c6a3005252c00d8d61257f35f6eb9bf3d07b232acb316ebf5807dee9144c6bc76f24478ba64a000885677e1ba04d3d0af5ad8677934f90a5f8a965a2227f87
+  data.tar.gz: 876c48e4a05cf087fb924f5c10977870facdec0f07c3cabd09eccee03360fca82d19a3b5a708e2a9bd51cd57f109d525b29cc50d22399fac17df3062b0d3c272

checksums.yaml.gz.sig

@@ -1 +1 @@
-��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"�
+-�2�\��*��&�+��)�	������C���fY�v��B��g `\5;K��M�'�O+������	�ns�{Je�.�dw�q{h����g�	�~*������;����/�/ɄD�)X#�pz�o��δ(������\��w���$n��zG3>3_\f�$ǘ.y��ymaeȽɰ YGW���:�>.�r�k�yh�M�(���Y:�1�P��6�j��OP�/����i����~HS0L�

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 4.7.0 / 2023-07-18
+
+* 3 minor enhancements:
+
+  * Extend flog to process complex numbers. (petergoldstein)
+  * Only penalize magic numbers if they're not assigned to a const (excludes 0/-1).
+  * Renamed :lit_fixnum to :magic_number.
+
 === 4.6.6 / 2022-07-03
 
 * 1 minor enhancement:

data/lib/flog.rb

@@ -11,7 +11,7 @@ class File
 end
 
 class Flog < MethodBasedSexpProcessor
-  VERSION = "4.6.6" # :nodoc:
+  VERSION = "4.7.0" # :nodoc:
 
   ##
   # Cut off point where the report should stop unless --all given.
@@ -40,7 +40,7 @@ class Flog < MethodBasedSexpProcessor
     :block_pass     => 1,
     :block_call     => 1,
     :branch         => 1,
-    :lit_fixnum     => 0.25,
+    :magic_number   => 0.25,
     :sclass         => 5,
     :super          => 1,
     :to_proc_icky!  => 10,
@@ -508,9 +508,9 @@ class Flog < MethodBasedSexpProcessor
     when 0, -1 then
       # ignore those because they're used as array indicies instead of
       # first/last
-    when Integer, Rational then
-      add_to_score :lit_fixnum
-    when Float, Symbol, Regexp, Range then
+    when Integer, Float, Rational, Complex then
+      add_to_score :magic_number unless context[1] == :cdecl
+    when Symbol, Regexp, Range then
       # do nothing
     else
       raise "Unhandled lit: #{value.inspect}:#{value.class}"

data/test/test_flog.rb

@@ -44,7 +44,7 @@ class TestFlog < FlogTest
   def test_flog
     setup_flog
 
-    exp = { "main#none" => { :+ => 1.0, :lit_fixnum => 0.6 } }
+    exp = { "main#none" => { :+ => 1.0, :magic_number => 0.6 } }
     assert_equal exp, @flog.calls
 
     assert_in_epsilon 1.6, @flog.total_score unless @flog.option[:methods]
@@ -58,7 +58,7 @@ class TestFlog < FlogTest
     @flog.flog_ruby ruby, file
     @flog.calculate_total_scores
 
-    exp = { "main#none" => { :+ => 1.0, :lit_fixnum => 0.6 } }
+    exp = { "main#none" => { :+ => 1.0, :magic_number => 0.6 } }
     assert_equal exp, @flog.calls
 
     assert_in_epsilon 1.6, @flog.total_score unless @flog.option[:methods]
@@ -173,7 +173,7 @@ class TestFlog < FlogTest
              s(:iter, s(:call, nil, :lambda), nil, s(:lit, 1)))
 
     assert_process(sexp, 12.316,
-                   :lit_fixnum    =>  0.275,
+                   :magic_number    =>  0.275,
                    :block_pass    =>  1.0,
                    :lambda        =>  1.0,
                    :block_call    =>  1.0,
@@ -187,7 +187,7 @@ class TestFlog < FlogTest
                s(:iter, s(:call, nil, :lambda), nil, s(:lit, 1))))
 
     assert_process(sexp, 17.333,
-                   :lit_fixnum    =>  0.275,
+                   :magic_number    =>  0.275,
                    :block_pass    =>  1.0,
                    :lambda        =>  1.0,
                    :assignment    =>  1.0,
@@ -250,7 +250,7 @@ class TestFlog < FlogTest
              s(:colon2, s(:const, :X), :Y), nil,
              s(:scope, s(:lit, 42)))
 
-    assert_process sexp, 0.25, :lit_fixnum => 0.25
+    assert_process sexp, 0.25, :magic_number => 0.25
   end
 
   # TODO:
@@ -275,7 +275,7 @@ class TestFlog < FlogTest
                s(:block,
                  s(:lit, 42))))
 
-    assert_process sexp, 0.275, :lit_fixnum => 0.275
+    assert_process sexp, 0.275, :magic_number => 0.275
   end
 
   def test_process_defn_in_self
@@ -288,7 +288,7 @@ class TestFlog < FlogTest
     @flog.process sexp
     @flog.calculate_total_scores
 
-    exp = {'main::x' => {:lit_fixnum => 0.375}, 'main#none' => {:sclass => 5.0}}
+    exp = {'main::x' => {:magic_number => 0.375}, 'main#none' => {:sclass => 5.0}}
     assert_equal exp, @flog.calls
 
     assert_in_delta 5.375, @flog.total_score
@@ -305,7 +305,7 @@ class TestFlog < FlogTest
     @flog.process sexp
     @flog.calculate_total_scores
 
-    exp = {'main::x' => {:lit_fixnum => 0.375}, 'main#none' => {:sclass => 12.5}}
+    exp = {'main::x' => {:magic_number => 0.375}, 'main#none' => {:sclass => 12.5}}
     assert_equal exp, @flog.calls
 
     assert_in_delta 12.875, @flog.total_score
@@ -320,7 +320,7 @@ class TestFlog < FlogTest
                s(:block,
                  s(:lit, 42))))
 
-    assert_process sexp, 0.275, :lit_fixnum => 0.275
+    assert_process sexp, 0.275, :magic_number => 0.275
   end
 
   # FIX: huh? over-refactored?
@@ -386,7 +386,7 @@ class TestFlog < FlogTest
 
     @klass, @meth = "task", "#woot"
 
-    assert_process sexp, 2.3, :something => 1.0, :task => 1.0, :lit_fixnum => 0.3
+    assert_process sexp, 2.3, :something => 1.0, :task => 1.0, :magic_number => 0.3
   end
 
   def test_process_iter_dsl_hash_when_hash_empty
@@ -423,7 +423,7 @@ class TestFlog < FlogTest
     hash  = {
       "namespace(blah)::task#woot" => {
         :something  => 1.0,
-        :lit_fixnum => 0.3,
+        :magic_number => 0.3,
         :task       => 1.0,
       },
       "namespace#blah" => {
@@ -446,14 +446,29 @@ class TestFlog < FlogTest
 
   def test_process_lit_int
     sexp = s(:lit, 42)
-    assert_process sexp, 0.25, :lit_fixnum => 0.25
+    assert_process sexp, 0.25, :magic_number => 0.25
+  end
+
+  def test_process_lit_int__const
+    sexp = s(:cdecl, :X, s(:lit, 42))
+    assert_process sexp, 0.0
   end
 
   def test_process_lit_float # and other lits
-    sexp = s(:lit, 3.1415) # TODO: consider penalizing floats if not in cdecl
+    sexp = s(:lit, 3.1415)
+    assert_process sexp, 0.25, :magic_number => 0.25
+  end
+
+  def test_process_lit_float__const
+    sexp = s(:cdecl, :X, s(:lit, 3.1415))
     assert_process sexp, 0.0
   end
 
+  def test_process_lit_complex
+    sexp = s(:lit, (0+1i))
+    assert_process sexp, 0.25
+  end
+
   def test_process_lit_bad
     assert_raises RuntimeError do
       @flog.process s(:lit, Object.new)
@@ -475,12 +490,12 @@ class TestFlog < FlogTest
              s(:colon2, s(:const, :X), :Y),
              s(:scope, s(:lit, 42)))
 
-    assert_process sexp, 0.25, :lit_fixnum => 0.25
+    assert_process sexp, 0.25, :magic_number => 0.25
   end
 
   def test_process_sclass
     sexp = s(:sclass, s(:self), s(:scope, s(:lit, 42)))
-    assert_process sexp, 5.375, :sclass => 5.0, :lit_fixnum => 0.375
+    assert_process sexp, 5.375, :sclass => 5.0, :magic_number => 0.375
   end
 
   def test_process_super
@@ -488,7 +503,7 @@ class TestFlog < FlogTest
     assert_process sexp, 1.0, :super => 1.0
 
     sexp = s(:super, s(:lit, 42))
-    assert_process sexp, 1.25, :super => 1.0, :lit_fixnum => 0.25
+    assert_process sexp, 1.25, :super => 1.0, :magic_number => 0.25
   end
 
   def test_process_while
@@ -505,10 +520,10 @@ class TestFlog < FlogTest
     assert_process sexp, 1.00, :yield => 1.0
 
     sexp = s(:yield, s(:lit, 4))
-    assert_process sexp, 1.25, :yield => 1.0, :lit_fixnum => 0.25
+    assert_process sexp, 1.25, :yield => 1.0, :magic_number => 0.25
 
     sexp = s(:yield, s(:lit, 42), s(:lit, 24))
-    assert_process sexp, 1.50, :yield => 1.0, :lit_fixnum => 0.50
+    assert_process sexp, 1.50, :yield => 1.0, :magic_number => 0.50
   end
 
   def test_score_method
@@ -617,7 +632,7 @@ class TestFlog < FlogTest
     @flog.calculate_total_scores
     @flog.calculate
 
-    assert_equal({ 'User#blah' => 'user.rb:3-4' }, @flog.method_locations)
+    assert_equal({ 'User#blah' => 'user.rb:3-5' }, @flog.method_locations)
     assert_equal({ "User#blah" => 2.2 }, @flog.totals)
     assert_in_epsilon(2.2, @flog.total_score)
     assert_in_epsilon(1.0, @flog.multiplier)
@@ -639,7 +654,7 @@ class TestFlog < FlogTest
     @flog.calculate_total_scores
     @flog.calculate
 
-    assert_equal({ 'Coder#happy?' => 'coder.rb:3-4' }, @flog.method_locations)
+    assert_equal({ 'Coder#happy?' => 'coder.rb:3-5' }, @flog.method_locations)
     assert_equal({ "Coder#happy?" => 1.0 }, @flog.totals)
     assert_in_epsilon(1.0, @flog.total_score)
     assert_in_epsilon(1.0, @flog.multiplier)

data/test/test_flog_cli.rb

@@ -135,7 +135,7 @@ class TestFlogCLI < FlogTest
 
     expected = "\n     1.6: main#none
      1.0:   +
-     0.6:   lit_fixnum
+     0.6:   magic_number
 
 "
 
@@ -165,7 +165,7 @@ class TestFlogCLI < FlogTest
 
     @flog.flog "-"
 
-    exp = { "main#none" => { :+ => 1.0, :lit_fixnum => 0.6 } }
+    exp = { "main#none" => { :+ => 1.0, :magic_number => 0.6 } }
     assert_equal exp, @flog.calls
 
     @flog.option[:all] = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flog
 version: !ruby/object:Gem::Version
-  version: 4.6.6
+  version: 4.7.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIzMDEwMTA3NTExN1oXDTI0MDEwMTA3NTExN1owRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   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
+  AQAkg3y+PBnBAPWdxxITm5sPHqdWQgSyCpRA20o4LTuWr8BWhSXBkfQNa7cY6fOn
+  xyM34VPzBFbExv6XOGDfOMFBVaYTHuN9peC/5/umL7kLl+nflXzL2QA7K6LYj5Bg
+  sM574Onr0dZDM6Vn69bzQ7rBIFDfK/OhlPzqKZad4nsdcsVH8ODCiT+ATMIZyz5K
+  WCnNtqlyiWXI8tdTpahDgcUwfcN/oN7v4K8iU5IbLJX6HQ5DKgmKjfb6XyMth16k
+  ROfWo9Uyp8ba/j9eVG14KkYRaLydAY1MNQk2yd3R5CGfeOpD1kttxjoypoUJ2dOG
+  nsNBRuQJ1UfiCG97a6DNm+Fr
   -----END CERTIFICATE-----
-date: 2022-07-04 00:00:00.000000000 Z
+date: 2023-07-18 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.24'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.24'
+        version: '4.0'
 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.12
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Flog reports the most tortured code in an easy to read pain report

metadata.gz.sig

@@ -1,2 +1 @@
-�|�f�(��
U��z{|��-
4¡��&�/w*���TL�Ai'�(T��]�:��F���Y[�R�����@����]Lɵ�AF�0%_�4�����|��O���6Q%`;d��/K$&�*��|�5Ͻ�i��Mג$VG���S.xq�<��B���WZG�����D���
-�Y�<��.�qEN�c���j��&��������D��P�H��f�1ɤ	I�[����t�B]����y�#��ؙMK�ӷl�J�>P�7�
+a���M�˒zl�m�e��h��ᱣ�{(�8�C���m��lJ%(ߞ%��J�#�دW(�{u`B��ĩ�o7�<q�Nr��D���"�q