flog 4.3.2 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c488f428a039d38dd1263898d31c8c0fa0797b1
-  data.tar.gz: a34343c3166a0976e863fd400622e64283331230
+  metadata.gz: 25fa9b8cb31c93fceda987510781fe35652fde29
+  data.tar.gz: af74743f09f07af514a3a0f449eafd2ed0491b8f
 SHA512:
-  metadata.gz: 4a6f64d1b22c3bf419ad1810ddb33ead999fca60751f718b584bed2da4a73da5c29ce5ce432f5977cb8942c6a021c236b87e097bdde9ae5b439c3d9edcb9c969
-  data.tar.gz: ecf3a6ff9166e6b3b4493e99b406f8006643d9ae777b424929bcd5f365ff329a05296a1f43004441c419f43b850af8bd9f8a8f16ae1a69aa241906f31dbc9770
+  metadata.gz: 43271946cdbbb803730059201ac21e1ba3c83764256b54251a6b7fd5e97eaf14fa810636e25e77b5182b6f135bf4b872b76f1ceb2180b2fc749f7fe47f5d99f0
+  data.tar.gz: d68f5e52e637dd54597c28e980b97874e148f67986ca33fffc03541a84512f106ada386fe483c43e87d852ec843e6d2466ebd9db4e35eb690c8b76062ed77f97

checksums.yaml.gz.sig

@@ -1,2 +1,4 @@
-
-C�jm�;�4�wK��s�i��/8�äi�	�a���c��Xc�p2B{O��[��7����e���
����8]�Ó�ebF0���>]3�<J�?sh�U�"O�*�-ET͎�j&��8)v �s���F���	O
�P��W �5�*&���Ќ�Y9}��X[�]�KNw(R}͓����B�u��V�*�O�>�K|����C�B%>�.P�G�:uDh�iu�j�ewǸ��4*?dM��u�
+:�1�_�6���;b3���uc��^C悽4��C��|�
+}���>��/K��/Hέc4�͉�7�����).
+�Ek�����Z�x���4]G3V!(iz�y��v���!����"�Y�i��k��'LP}�'E�d�%&^CU��+.U��x�=�ܛ��rԌޠ�}�{�/�AƊN��S:��URs��8�Qq���sc�{���(��	�GAy]W��
+��P�-������.j����

data/.autotest

@@ -6,6 +6,7 @@ require 'autotest/rcov' if ENV['RCOV']
 Autotest.add_hook :initialize do |at|
   at.libs << ":../../ruby_parser/dev/lib"
   at.libs << ":../../sexp_processor/dev/lib"
+  at.libs << ":../../path_expander/dev/lib"
 
   at.add_mapping(/^spec\/.*_spec\.rb$/) do |filename, _|
     filename

data/{History.txt → History.rdoc}

@@ -1,3 +1,9 @@
+=== 4.4.0 / 2016-05-16
+
+* 1 minor enhancement:
+
+  * Switched to path_expander to deal with cmdline args. See path_expander for details.
+
 === 4.3.2 / 2015-01-30
 
 * 1 bug fix:

data/Manifest.txt

@@ -1,7 +1,7 @@
 .autotest
-History.txt
+History.rdoc
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 bin/flog
 lib/flog.rb

data/{README.txt → README.rdoc}

@@ -13,6 +13,10 @@ report. The higher the score, the more pain the code is in.
 == FEATURES/PROBLEMS:
 
 * Easy to read reporting of complexity/pain.
+* Uses path_expander, so you can use:
+  * dir_arg -- expand a directory automatically
+  * @file_of_args -- persist arguments in a file
+  * -path_to_subtract -- ignore intersecting subsets of files/directories
 
 == SYNOPSIS:
 
@@ -27,8 +31,9 @@ report. The higher the score, the more pain the code is in.
 
 == REQUIREMENTS:
 
-* ruby2ruby (only for -v)
+* ruby2ruby (soft dependency: only for -v)
 * ruby_parser
+* path_expander
 
 == INSTALL:
 

data/Rakefile

@@ -8,9 +8,11 @@ Hoe.add_include_dirs("../../ruby_parser/dev/lib",
                      "../../sexp_processor/dev/lib",
                      "../../ZenTest/dev/lib",
                      "../../minitest/dev/lib",
+                     "../../path_expander/dev/lib",
                      "lib")
 
 Hoe.plugin :seattlerb
+Hoe.plugin :rdoc
 
 Hoe.spec 'flog' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
@@ -20,6 +22,7 @@ Hoe.spec 'flog' do
 
   dependency "sexp_processor", "~> 4.4"
   dependency "ruby_parser",    ["~> 3.1", "> 3.1.0"]
+  dependency "path_expander", "~> 1.0"
 end
 
 task :debug do

data/bin/flog

@@ -2,14 +2,6 @@
 
 require "flog_cli"
 
-FlogCLI.load_plugins
-
-options = FlogCLI.parse_options ARGV
-
-ARGV << "-" if ARGV.empty?
-
-flogger = FlogCLI.new options
-flogger.flog ARGV
-flogger.report
+FlogCLI.run
 
 exit 0

data/lib/flog.rb

@@ -11,7 +11,7 @@ class File
 end
 
 class Flog < MethodBasedSexpProcessor
-  VERSION = "4.3.2" # :nodoc:
+  VERSION = "4.4.0" # :nodoc:
 
   ##
   # Cut off point where the report should stop unless --all given.
@@ -166,7 +166,7 @@ class Flog < MethodBasedSexpProcessor
   # Flog the given files. Deals with "-", and syntax errors.
   #
   # Not as smart as FlogCLI's #flog method as it doesn't traverse
-  # dirs. Use FlogCLI.expand_dirs_to_files or see FlogCLI#flog.
+  # dirs. Use PathExpander to expand dirs into files.
 
   def flog(*files)
     files.each do |file|

data/lib/flog_cli.rb

@@ -2,6 +2,7 @@ require "rubygems"
 require "optparse"
 require "forwardable"
 
+require "path_expander"
 require "flog"
 
 class FlogCLI
@@ -12,21 +13,17 @@ class FlogCLI
   def_delegators :@flog, :threshold, :total_score, :no_method, :calculate_total_scores
   def_delegators :@flog, :max_method
 
-  ##
-  # Expands +*dirs+ to all files within that match ruby and rake extensions.
-  # --
-  # REFACTOR: from flay
+  def self.run args = ARGV
+    load_plugins
 
-  def self.expand_dirs_to_files *dirs
-    extensions = %w[rb rake]
+    expander = PathExpander.new args, "**/*.{rb,rake}"
+    files = expander.process
 
-    dirs.flatten.map { |p|
-      if File.directory? p then
-        Dir[File.join(p, '**', "*.{#{extensions.join(',')}}")]
-      else
-        p
-      end
-    }.flatten.sort
+    options = parse_options args
+
+    flogger = new options
+    flogger.flog(*files)
+    flogger.report
   end
 
   ##
@@ -157,11 +154,12 @@ class FlogCLI
   end
 
   ##
-  # Flog the given files or directories. Smart. Deals with "-", syntax
-  # errors, and traversing subdirectories intelligently.
+  # Flog the given files. Deals with "-", syntax errors, and
+  # traversing subdirectories intelligently. Use PathExpander to
+  # process dirs into files.
 
-  def flog(*files_or_dirs)
-    files = FlogCLI.expand_dirs_to_files(*files_or_dirs)
+  def flog(*files)
+    files << "-" if files.empty?
     @flog.flog(*files)
   end
 

data/lib/flog_task.rb

@@ -53,7 +53,11 @@ class FlogTask < Rake::TaskLib
     task name do
       require "flog_cli"
       flog = FlogCLI.new :continue => true, :quiet => true, :methods => @methods_only
-      flog.flog(*dirs)
+
+      expander = PathExpander.new dirs, "**/*.{rb,rake}"
+      files = expander.process
+
+      flog.flog(*files)
 
       desc, score = flog.send method
       desc, score = "total", desc unless score # total only returns a number

data/test/test_flog.rb

@@ -38,7 +38,7 @@ class TestFlog < FlogTest
   def test_average
     test_process_and
 
-    assert_equal 1.0, @flog.average
+    assert_in_epsilon 1.0, @flog.average
   end
 
   def test_flog
@@ -47,7 +47,7 @@ class TestFlog < FlogTest
     exp = { "main#none" => { :+ => 1.0, :lit_fixnum => 0.6 } }
     assert_equal exp, @flog.calls
 
-    assert_equal 1.6, @flog.total_score unless @flog.option[:methods]
+    assert_in_epsilon 1.6, @flog.total_score unless @flog.option[:methods]
     assert_equal 3, @flog.mass["-"]
   end
 
@@ -61,7 +61,7 @@ class TestFlog < FlogTest
     exp = { "main#none" => { :+ => 1.0, :lit_fixnum => 0.6 } }
     assert_equal exp, @flog.calls
 
-    assert_equal 1.6, @flog.total_score unless @flog.option[:methods]
+    assert_in_epsilon 1.6, @flog.total_score unless @flog.option[:methods]
     assert_equal 3, @flog.mass[file]
   end
 
@@ -81,11 +81,11 @@ class TestFlog < FlogTest
   end
 
   def test_penalize_by
-    assert_equal 1, @flog.multiplier
+    assert_in_epsilon 1, @flog.multiplier
     @flog.penalize_by 2 do
-      assert_equal 3, @flog.multiplier
+      assert_in_epsilon 3, @flog.multiplier
     end
-    assert_equal 1, @flog.multiplier
+    assert_in_epsilon 1, @flog.multiplier
   end
 
   def test_process_alias
@@ -461,18 +461,18 @@ class TestFlog < FlogTest
   end
 
   def test_score_method
-    assert_equal 3.0, @flog.score_method(:blah       => 3.0)
-    assert_equal 4.0, @flog.score_method(:assignment => 4.0)
-    assert_equal 2.0, @flog.score_method(:branch     => 2.0)
-    assert_equal 5.0, @flog.score_method(:blah       => 3.0, # distance formula
-                                         :branch     => 4.0)
+    assert_in_epsilon 3.0, @flog.score_method(:blah       => 3.0)
+    assert_in_epsilon 4.0, @flog.score_method(:assignment => 4.0)
+    assert_in_epsilon 2.0, @flog.score_method(:branch     => 2.0)
+    assert_in_epsilon 5.0, @flog.score_method(:blah       => 3.0, # distance formula
+                                              :branch     => 4.0)
   end
 
   def test_total_score
     @flog.add_to_score "blah", 2
     @flog.calculate_total_scores
 
-    assert_equal 2.0, @flog.total_score
+    assert_in_epsilon 2.0, @flog.total_score
   end
 
   def test_max_method
@@ -494,7 +494,7 @@ class TestFlog < FlogTest
     }
     @flog.calculate_total_scores
 
-    assert_equal 16.0, @flog.max_score
+    assert_in_epsilon 16.0, @flog.max_score
   end
 
   def assert_hash_in_epsilon exp, act
@@ -527,7 +527,7 @@ class TestFlog < FlogTest
 
   def test_threshold
     test_flog
-    assert_equal Flog::THRESHOLD * 1.6, @flog.threshold
+    assert_in_epsilon Flog::THRESHOLD * 1.6, @flog.threshold
   end
 
   def test_no_threshold
@@ -561,8 +561,8 @@ class TestFlog < FlogTest
 
     assert_equal({ 'User#blah' => 'user.rb:3' }, @flog.method_locations)
     assert_equal({ "User#blah" => 2.2 }, @flog.totals)
-    assert_equal(2.2, @flog.total_score)
-    assert_equal(1.0, @flog.multiplier)
+    assert_in_epsilon(2.2, @flog.total_score)
+    assert_in_epsilon(1.0, @flog.multiplier)
     assert_equal({ "User#blah" => { :* => 1.2, :puts => 1.0 } }, @flog.calls)
     assert_equal({ "User" => 2.2 }, @flog.scores)
 
@@ -583,8 +583,8 @@ class TestFlog < FlogTest
 
     assert_equal({ 'Coder#happy?' => 'coder.rb:3' }, @flog.method_locations)
     assert_equal({ "Coder#happy?" => 1.0 }, @flog.totals)
-    assert_equal(1.0, @flog.total_score)
-    assert_equal(1.0, @flog.multiplier)
+    assert_in_epsilon(1.0, @flog.total_score)
+    assert_in_epsilon(1.0, @flog.multiplier)
     assert_equal({ "Coder#happy?" => { :sample => 1.0 } }, @flog.calls)
     assert_equal({ "Coder" => 1.0 }, @flog.scores)
   end

data/test/test_flog_cli.rb

@@ -12,13 +12,6 @@ class TestFlogCLI < FlogTest
     @flog = FlogCLI.new :parser => RubyParser
   end
 
-  def test_cls_expand_dirs_to_files
-    expected = %w(lib/flog.rb lib/flog_cli.rb lib/flog_task.rb lib/gauntlet_flog.rb)
-    assert_equal expected, FlogCLI.expand_dirs_to_files('lib')
-    expected = %w(Rakefile)
-    assert_equal expected, FlogCLI.expand_dirs_to_files('Rakefile')
-  end
-
   def test_cls_parse_options
     # defaults
     opts = FlogCLI.parse_options
@@ -92,7 +85,7 @@ class TestFlogCLI < FlogTest
     expected = "\n     1.6: main#none\n"
 
     assert_equal expected, o.string
-    assert_equal 1.6, @flog.totals["main#none"]
+    assert_in_epsilon 1.6, @flog.totals["main#none"]
   end
 
   def test_output_details_grouped
@@ -134,7 +127,7 @@ class TestFlogCLI < FlogTest
 "
 
     assert_equal expected, o.string
-    assert_equal 1.6, @flog.totals["main#none"]
+    assert_in_epsilon 1.6, @flog.totals["main#none"]
   end
 
   def test_report
@@ -165,7 +158,7 @@ class TestFlogCLI < FlogTest
     @flog.option[:all] = true
     @flog.calculate_total_scores
 
-    assert_equal 1.6, @flog.total_score unless @flog.option[:methods]
+    assert_in_epsilon 1.6, @flog.total_score unless @flog.option[:methods]
     assert_equal 3, @flog.mass["-"]
 
     o = StringIO.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flog
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.4.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE0MDkxNzIzMDcwN1oXDTE1MDkxNzIzMDcwN1owRTETMBEGA1UE
+  GRYDY29tMB4XDTE1MDkxOTIwNTEyMloXDTE2MDkxODIwNTEyMlowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAFoDJRokCQdxFfOrmsKX41KOFlU/zjrbDVM9hgB/Ur999M6OXGSi8FitXNtMwY
-  FVjsiAPeU7HaWVVcZkj6IhINelTkXsxgGz/qCzjHy3iUMuZWw36cS0fiWJ5rvH+e
-  hD7uXxJSFuyf1riDGI1aeWbQ74WMwvNstOxLUMiV5a1fzBhlxPqb537ubDjq/M/h
-  zPUFPVYeL5KjDHLCqI2FwIk2sEMOQgjpXHzl+3NlD2LUgUhHDMevmgVua0e2GT1B
-  xJcC6UN6NHMOVMyAXsr2HR0gRRx4ofN1LoP2KhXzSr8UMvQYlwPmE0N5GQv1b5AO
-  VpzF30vNaJK6ZT7xlIsIlwmH
+  AQB+Hx8xUgrpZa4P8H8gR8zme5kISwQrG80MbpqJV6/G3/ZicRFhN5sjwu0uHGue
+  bd9Cymf6oIRwHVarJux2M32T6bL07Hmi07w2QaPc3MnMKB/D46SRZ2JSSGPFRBTc
+  SilobMRoGs/7B15uGFUEnNrCB/ltMqhwwSx1r++UQPfeySHEV9uqu03E5Vb7J37O
+  2Er6PLXHRiYsIycD1LkMi6YnixdITRHmrqJYE2rsjaIfpIehiusVAPHkNf7qbpHq
+  qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
+  NLq5jm1fq6Y9Uolu3RJbmycf
   -----END CERTIFICATE-----
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -66,19 +66,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: path_expander
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.5'
-  type: :development
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.15'
 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.
@@ -116,15 +116,14 @@ executables:
 - flog
 extensions: []
 extra_rdoc_files:
-- History.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 files:
 - .autotest
-- .gemtest
-- History.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - bin/flog
 - lib/flog.rb
@@ -140,7 +139,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
-- README.txt
+- README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -159,6 +158,4 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Flog reports the most tortured code in an easy to read pain report
-test_files:
-- test/test_flog.rb
-- test/test_flog_cli.rb
+test_files: []