flog 2.5.0 → 2.5.1

data/History.txt

@@ -1,3 +1,15 @@
+=== 2.5.1 / 2011-02-18
+
+* 3 minor enhancements:
+
+  * Added RegexpError to error handler.
+  * Improved error output and suggest --continue
+  * Record the flog score for the full class name, not just suffix. (dkubb)
+
+* 1 bug fix:
+
+  * Fixed block_pass when passed a multi-level const (xavier)
+
 === 2.5.0 / 2010-09-01
 
 * 1 major enhancement:

data/lib/flog.rb

@@ -4,7 +4,7 @@ require 'ruby_parser'
 require 'optparse'
 
 class Flog < SexpProcessor
-  VERSION = '2.5.0'
+  VERSION = '2.5.1'
 
   THRESHOLD = 0.60
   SCORES = Hash.new 1
@@ -242,12 +242,15 @@ class Flog < SexpProcessor
         next unless ast
         mass[file] = ast.mass
         process ast
-      rescue SyntaxError, Racc::ParseError => e
+      rescue RegexpError, SyntaxError, Racc::ParseError => e
         if e.inspect =~ /<%|%>/ or ruby =~ /<%|%>/ then
           warn "#{e.inspect} at #{e.backtrace.first(5).join(', ')}"
           warn "\n...stupid lemmings and their bad erb templates... skipping"
         else
-          raise e unless option[:continue]
+          unless option[:continue] then
+            warn "ERROR! Aborting. You may want to run with --continue."
+            raise e
+          end
           warn file
           warn "#{e.inspect} at #{e.backtrace.first(5).join(', ')}"
         end
@@ -292,21 +295,24 @@ class Flog < SexpProcessor
   # none.
 
   def klass_name
-    name = @class_stack.first || @@no_class
+    name = @class_stack.first
     if Sexp === name then
-      name = case name.first
-             when :colon2 then
-               name = name.flatten
-               name.delete :const
-               name.delete :colon2
-               name.join("::")
-             when :colon3 then
-               name.last.to_s
-             else
-               name
-             end
+      case name.first
+      when :colon2 then
+        name = name.flatten
+        name.delete :const
+        name.delete :colon2
+        name.join("::")
+      when :colon3 then
+        name.last.to_s
+      else
+        name
+      end
+    elsif @class_stack.any?
+      @class_stack.reverse.join("::")
+    else
+      @@no_class
     end
-    name
   end
 
   ##
@@ -509,7 +515,7 @@ class Flog < SexpProcessor
     add_to_score :block_pass
 
     case arg.first
-    when :lvar, :dvar, :ivar, :cvar, :self, :const, :nil then
+    when :lvar, :dvar, :ivar, :cvar, :self, :const, :colon2, :nil then
       # do nothing
     when :lit, :call then
       add_to_score :to_proc_normal

data/lib/flog_task.rb

@@ -20,6 +20,7 @@ class FlogTask < Rake::TaskLib
   def define
     desc "Analyze for code complexity in: #{dirs.join(', ')}"
     task name do
+      require "flog"
       flog = Flog.new
       flog.flog(*dirs)
       flog.report if verbose

data/test/test_flog.rb

@@ -8,16 +8,16 @@ class TestFlog < MiniTest::Unit::TestCase
 
   def test_add_to_score
     assert_empty @flog.calls
-    @flog.class_stack  << "MyKlass"
+    @flog.class_stack  << "Base" << "MyKlass"
     @flog.method_stack << "mymethod"
     @flog.add_to_score "blah", 42
 
-    expected = {"MyKlass#mymethod" => {"blah" => 42.0}}
+    expected = {"MyKlass::Base#mymethod" => {"blah" => 42.0}}
     assert_equal expected, @flog.calls
 
     @flog.add_to_score "blah", 2
 
-    expected["MyKlass#mymethod"]["blah"] = 44.0
+    expected["MyKlass::Base#mymethod"]["blah"] = 44.0
     assert_equal expected, @flog.calls
   end
 
@@ -129,8 +129,8 @@ class TestFlog < MiniTest::Unit::TestCase
   def test_in_klass
     assert_empty @flog.class_stack
 
-    @flog.in_klass "xxx" do
-      assert_equal ["xxx"], @flog.class_stack
+    @flog.in_klass "xxx::yyy" do
+      assert_equal ["xxx::yyy"], @flog.class_stack
     end
 
     assert_empty @flog.class_stack
@@ -152,8 +152,8 @@ class TestFlog < MiniTest::Unit::TestCase
   def test_klass_name
     assert_equal :main, @flog.klass_name
 
-    @flog.class_stack << "whatevs"
-    assert_equal "whatevs", @flog.klass_name
+    @flog.class_stack << "whatevs" << "flog"
+    assert_equal "flog::whatevs", @flog.klass_name
   end
 
   def test_klass_name_sexp
@@ -305,6 +305,17 @@ class TestFlog < MiniTest::Unit::TestCase
                  :to_proc_normal => 6.0)
   end
 
+  def test_process_block_pass_colon2
+    sexp = s(:call, nil, :a,
+             s(:arglist,
+               s(:block_pass,
+                 s(:colon2, s(:const, :A), :B))))
+
+    util_process(sexp, 2.2,
+                 :a              => 1.0,
+                 :block_pass     => 1.2)
+  end
+
   def test_process_block_pass_iter
     sexp = s(:block_pass,
              s(:iter, s(:call, nil, :lambda, s(:arglist)), nil, s(:lit, 1)))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flog
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 2
   - 5
-  - 0
-  version: 2.5.0
+  - 1
+  version: 2.5.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2010-09-01 00:00:00 -07:00
+date: 2011-02-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,53 +70,37 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: minitest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 11
         segments: 
         - 2
         - 0
-        - 4
-        version: 2.0.4
+        - 2
+        version: 2.0.2
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: hoe
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 41
         segments: 
+        - 2
+        - 9
         - 1
-        - 7
-        - 1
-        version: 1.7.1
+        version: 2.9.1
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 6
-        - 2
-        version: 2.6.2
-  type: :development
-  version_requirements: *id005
 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,6 +125,7 @@ files:
 - lib/flog_task.rb
 - lib/gauntlet_flog.rb
 - test/test_flog.rb
+- .gemtest
 has_rdoc: true
 homepage: http://ruby.sadi.st/
 licenses: []
@@ -172,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Flog reports the most tortured code in an easy to read pain report