flog 3.1.0 → 3.2.0

data.tar.gz.sig

@@ -1 +1,3 @@
-;����%D��C.�`R�m�L���F����Ž�_�V�E W/2fE�h��]��l��B����ԑ|���A��7C�7�Y���O��/�+��qʵ��٨5F%�$�qY�
+B�_�ƀ}scň��^�RGu\Q9]�0���L�0���1��X�F�k�НF?���>c�F~�m3�3�0;Y�%�ON��
+�^_��
+�A���P�a-c�Hj��WLc��8:���]��nu�DHϙ�F.u_n~Ümt$k�8x�	�'��z��u�c
]r�:+�BS�
�ȧl�C��OQ��o�@J�xW����>OL��VW���?��u'|�d�xP�|��{⪰��v���uט�R�l��;^��۸�8��

data/History.txt

@@ -1,3 +1,16 @@
+=== 3.2.0 / 2012-12-18
+
+* 4 minor enhancements:
+
+  * Ensure rake/tasklib is loaded when defining FlogTask. (ferrous26)
+  * Fixed reporting / recording of methods in singleton class blocks. (mihu)
+  * Refactored error handling code to flog_ruby. Calls flog_ruby! for actual work
+  * Refactored ruby processing code to flog_ruby!
+
+* 1 bug fix:
+
+  * Fixed flogging of || iters. (JacobNinja)
+
 === 3.1.0 / 2012-11-16
 
 * 4 minor enhancements:

data/Rakefile

@@ -24,4 +24,15 @@ Hoe.spec 'flog' do
   dependency 'ruby_parser',    '~> 3.0.0'
 end
 
+task :debug do
+  require "flog"
+
+  file = ENV["F"] || "-"
+  ruby = file == "-" ? ENV["R"] : File.read(file)
+
+  @flog = Flog.new :parser => RubyParser
+  @flog.flog_ruby ruby, file
+  @flog.report
+end
+
 # vim: syntax=ruby

data/lib/flog.rb

@@ -13,7 +13,7 @@ class File
 end
 
 class Flog < SexpProcessor
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 
   THRESHOLD = 0.60
   SCORES = Hash.new 1
@@ -79,7 +79,7 @@ class Flog < SexpProcessor
   @@no_method = :none
 
   attr_accessor :multiplier
-  attr_reader :calls, :option, :class_stack, :method_stack, :mass
+  attr_reader :calls, :option, :class_stack, :method_stack, :mass, :sclass
   attr_reader :method_locations
 
   def self.plugins
@@ -251,42 +251,53 @@ class Flog < SexpProcessor
     files = Flog.expand_dirs_to_files(*files_or_dirs)
 
     files.each do |file|
-      begin
-        # TODO: replace File.open to deal with "-"
-        ruby = file == '-' ? $stdin.read : File.binread(file)
-        warn "** flogging #{file}" if option[:verbose]
-
-        @parser = (option[:parser] || RubyParser).new
+      ruby = file == '-' ? $stdin.read : File.binread(file)
 
-        begin
-          ast = @parser.process(ruby, file)
-        rescue Timeout::Error
-          warn "TIMEOUT parsing #{file}. Skipping."
-        end
+      flog_ruby ruby, file
+    end
+  end
 
-        next unless ast
-        mass[file] = ast.mass
-        process ast
-      rescue RubyParser::SyntaxError, Racc::ParseError => e
-        q = option[:quiet]
-        if e.inspect =~ /<\%|%\>/ or ruby =~ /<\%|%\>/ then
-          return if q
-          warn "#{e.inspect} at #{e.backtrace.first(5).join(', ')}"
-          warn "\n...stupid lemmings and their bad erb templates... skipping"
-        else
-          warn "ERROR: parsing ruby file #{file}" unless q
-          unless option[:continue] then
-            warn "ERROR! Aborting. You may want to run with --continue."
-            raise e
-          end
-          return if q
-          warn "%s: %s at:\n  %s" % [e.class, e.message.strip,
-                                     e.backtrace.first(5).join("\n  ")]
-        end
+  ##
+  # Flog the given ruby source, optionally using file to provide paths
+  # for methods. Smart. Handles syntax errors and timeouts so you
+  # don't have to.
+
+  def flog_ruby ruby, file="-", timeout = 10
+    flog_ruby! ruby, file, timeout
+  rescue Timeout::Error
+    warn "TIMEOUT parsing #{file}. Skipping."
+  rescue RubyParser::SyntaxError, Racc::ParseError => e
+    q = option[:quiet]
+    if e.inspect =~ /<\%|%\>/ or ruby =~ /<\%|%\>/ then
+      return if q
+      warn "#{e.inspect} at #{e.backtrace.first(5).join(', ')}"
+      warn "\n...stupid lemmings and their bad erb templates... skipping"
+    else
+      warn "ERROR: parsing ruby file #{file}" unless q
+      unless option[:continue] then
+        warn "ERROR! Aborting. You may want to run with --continue."
+        raise e
       end
+      return if q
+      warn "%s: %s at:\n  %s" % [e.class, e.message.strip,
+                                 e.backtrace.first(5).join("\n  ")]
     end
   end
 
+  ##
+  # Flog the given ruby source, optionally using file to provide paths for
+  # methods. Does not handle timeouts or syntax errors. See #flog_ruby.
+
+  def flog_ruby! ruby, file="-", timeout = 10
+    @parser = (option[:parser] || RubyParser).new
+
+    warn "** flogging #{file}" if option[:verbose]
+
+    ast = @parser.process ruby, file, timeout
+    mass[file] = ast.mass
+    process ast
+  end
+
   ##
   # Adds name to the class stack, for the duration of the block
 
@@ -324,6 +335,7 @@ class Flog < SexpProcessor
   def initialize option = {}
     super()
     @option              = option
+    @sclass              = nil
     @class_stack         = []
     @method_stack        = []
     @method_locations    = {}
@@ -621,7 +633,8 @@ class Flog < SexpProcessor
   alias :process_lasgn :process_dasgn_curr
 
   def process_defn(exp)
-    in_method exp.shift, exp.file, exp.line do
+    name = @sclass ? "::#{exp.shift}" : exp.shift
+    in_method name, exp.file, exp.line do
       process_until_empty exp
     end
     s()
@@ -669,6 +682,8 @@ class Flog < SexpProcessor
     context = (self.context - [:class, :module, :scope])
     context = context.uniq.sort_by { |s| s.to_s }
 
+    exp.delete 0 # { || ... } has 0 in arg slot
+
     if context == [:block, :iter] or context == [:iter] then
       recv = exp.first
 
@@ -692,8 +707,6 @@ class Flog < SexpProcessor
 
     add_to_score :branch
 
-    exp.delete 0 # { || ... } has 0 in arg slot
-
     process exp.shift # no penalty for LHS
 
     penalize_by 0.1 do
@@ -736,10 +749,12 @@ class Flog < SexpProcessor
   end
 
   def process_sclass(exp)
+    @sclass = true
     penalize_by 0.5 do
       process exp.shift # recv
       process_until_empty exp
     end
+    @sclass = nil
 
     add_to_score :sclass
     s()

data/lib/flog_task.rb

@@ -1,3 +1,5 @@
+require 'rake/tasklib'
+
 class FlogTask < Rake::TaskLib
   attr_accessor :name
   attr_accessor :dirs

data/test/test_flog.rb

@@ -114,6 +114,19 @@ class TestFlog < MiniTest::Unit::TestCase
   ensure
     $stdin = old_stdin
   end
+  
+  def test_flog_ruby
+    ruby = "2 + 3"
+    file = "sample.rb"
+
+    @flog.flog_ruby ruby, file
+
+    exp = { "main#none" => { :+ => 1.0, :lit_fixnum => 0.6 } }
+    assert_equal exp, @flog.calls
+
+    assert_equal 1.6, @flog.total unless @flog.option[:methods]
+    assert_equal 3, @flog.mass[file]
+  end
 
   def test_flog_erb
     old_stdin = $stdin
@@ -399,6 +412,21 @@ class TestFlog < MiniTest::Unit::TestCase
     util_process sexp, 0.275, :lit_fixnum => 0.275
   end
 
+  def test_process_defn_in_self
+    sexp = s(:sclass, s(:self),
+             s(:defn, :x,
+               s(:args, :y),
+                 s(:lit, 42)))
+
+    setup
+    @flog.process sexp
+
+    exp = {'main::x' => {:lit_fixnum => 0.375}, 'main#none' => {:sclass => 5.0}}
+    assert_equal exp, @flog.calls
+
+    assert_in_delta 5.375, @flog.total
+  end
+
   def test_process_defs
     @meth = "::x" # HACK, I don't like this
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flog
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 15
   prerelease: 
   segments: 
   - 3
-  - 1
+  - 2
   - 0
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-11-17 00:00:00 Z
+date: 2012-12-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -77,11 +77,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 4
-        - 2
-        version: "4.2"
+        - 3
+        version: "4.3"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -107,11 +107,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 15
         segments: 
         - 3
-        - 3
-        version: "3.3"
+        - 4
+        version: "3.4"
   type: :development
   version_requirements: *id005
 description: |-