flog 3.0.0.b2 → 3.0.0.b3

data/History.txt

@@ -1,3 +1,12 @@
+=== 3.0.0.b3 / 2012-10-22
+
+* 4 minor enhancements:
+
+  * Added .rake as a supported extension.
+  * Create a new parser for every file, preventing state barkification
+  * Extended DSL support to include hash args (eg task :blah => :dep).
+  * Extended DSL support to report nested names (eg namespace(blah)::task#woot)
+
 === 3.0.0.b2 / 2012-08-07
 
 * 1 bug fix:

data/lib/flog.rb

@@ -12,7 +12,7 @@ class File
 end
 
 class Flog < SexpProcessor
-  VERSION = '3.0.0.b2'
+  VERSION = '3.0.0.b3'
 
   THRESHOLD = 0.60
   SCORES = Hash.new 1
@@ -118,7 +118,7 @@ class Flog < SexpProcessor
 
   # REFACTOR: from flay
   def self.expand_dirs_to_files *dirs
-    extensions = ['rb']
+    extensions = %w[rb rake]
 
     dirs.flatten.map { |p|
       if File.directory? p then
@@ -255,6 +255,7 @@ class Flog < SexpProcessor
         ruby = file == '-' ? $stdin.read : File.binread(file)
         warn "** flogging #{file}" if option[:verbose]
 
+        @parser = option[:parser].new
         ast = @parser.process(ruby, file)
         next unless ast
         mass[file] = ast.mass
@@ -317,7 +318,7 @@ class Flog < SexpProcessor
     @method_stack        = []
     @method_locations    = {}
     @mass                = {}
-    @parser              = option[:parser].new
+    @parser              = nil
     self.auto_shift_type = true
     self.reset
   end
@@ -332,7 +333,7 @@ class Flog < SexpProcessor
     if Sexp === name then
       raise "you shouldn't see me"
     elsif @class_stack.any?
-      @class_stack.reverse.join("::")
+      @class_stack.reverse.join("::").sub(/\([^\)]+\)$/, '')
     else
       @@no_class
     end
@@ -637,6 +638,15 @@ class Flog < SexpProcessor
     s()
   end
 
+  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
+
+    [:lit, :str].include? first_arg[0] and first_arg[1]
+  end
+
   def process_iter(exp)
     context = (self.context - [:class, :module, :scope])
     context = context.uniq.sort_by { |s| s.to_s }
@@ -646,10 +656,14 @@ class Flog < SexpProcessor
 
       # DSL w/ names. eg task :name do ... end
       #   looks like s(:call, nil, :task, s(:lit, :name))
-      t, r, m, a = recv
-      if (t == :call and r == nil and a and [:lit, :str].include? a[0]) then
-        submsg = a[1]
-        in_klass m do                             # :task
+      #           or s(:call, nil, :task, s(:str, "name"))
+      #           or s(:call, nil, :task, s(:hash, s(:lit, :name) ...))
+
+      t, r, m, *a = recv
+
+      if t == :call and r == nil and submsg = dsl_name?(a) then
+        m = "#{m}(#{submsg})" if m and [String, Symbol].include?(submsg.class)
+        in_klass m do                             # :task/namespace
           in_method submsg, exp.file, exp.line do # :name
             process_until_empty exp
           end

data/test/test_flog.rb

@@ -458,6 +458,57 @@ class TestFlog < MiniTest::Unit::TestCase
     util_process sexp, 2.0, :something => 1.0, :task => 1.0
   end
 
+  def test_process_iter_dsl_hash
+    # task :woot => 42 do
+    #   something
+    # end
+
+    sexp = s(:iter,
+             s(:call, nil, :task, s(:hash, s(:lit, :woot), s(:lit, 42))),
+             nil,
+             s(:call, nil, :something))
+
+    @klass, @meth = "task", "#woot"
+
+    util_process sexp, 2.3, :something => 1.0, :task => 1.0, :lit_fixnum => 0.3
+  end
+
+  def test_process_iter_dsl_namespaced
+    # namespace :blah do
+    #   task :woot => 42 do
+    #     something
+    #   end
+    # end
+
+    sexp = s(:iter,
+             s(:call, nil, :namespace, s(:lit, :blah)),
+             nil,
+             s(:iter,
+               s(:call, nil, :task, s(:hash, s(:lit, :woot), s(:lit, 42))),
+               nil,
+               s(:call, nil, :something)))
+
+    @klass, @meth = "namespace(blah)::task", "woot"
+
+    score = 3.3
+    hash  = {
+      "namespace(blah)::task#woot" => {
+        :something  => 1.0,
+        :lit_fixnum => 0.3,
+        :task       => 1.0,
+      },
+      "namespace#blah" => {
+        :namespace => 1.0,
+      },
+    }
+
+    setup
+    @flog.process sexp
+
+    assert_equal hash, @flog.calls
+    assert_in_delta score, @flog.total
+  end
+
   def test_process_lit
     sexp = s(:lit, :y)
     util_process sexp, 0.0

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: flog
 version: !ruby/object:Gem::Version 
-  hash: -1937524008
+  hash: -2106459430
   prerelease: 6
   segments: 
   - 3
   - 0
   - 0
   - b
-  - 2
-  version: 3.0.0.b2
+  - 3
+  version: 3.0.0.b3
 platform: ruby
 authors: 
 - Ryan Davis
@@ -38,7 +38,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-08-07 00:00:00 Z
+date: 2012-10-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -63,7 +63,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1937540908
+        hash: -2106476332
         segments: 
         - 3
         - 0
@@ -81,11 +81,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 25
         segments: 
-        - 3
-        - 3
-        version: "3.3"
+        - 4
+        - 1
+        version: "4.1"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -111,11 +111,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 3
-        - 0
-        version: "3.0"
+        - 1
+        version: "3.1"
   type: :development
   version_requirements: *id005
 description: |-