jscruggs-metric_fu 1.0.1 → 1.0.2

data/HISTORY

@@ -1,3 +1,9 @@
+=== MetricFu 1.0.2 / 2009-5-11
+
+* Fixing problems with Reek new line character (thanks to all who pointed this out)
+* Flog now recognizes namespaces in method names thanks to Daniel Guettler
+* Saikuro now looks at multiple directories, again.
+
 === MetricFu 1.0.1 / 2009-5-3
 
 * metrics:all task no longer requires a MetricFu::Configuration.run {} if you want to accept the defaults

data/lib/generators/flog.rb

@@ -4,7 +4,7 @@ module MetricFu
     attr_reader :pages
 
     SCORE_FORMAT = "%0.2f"
-    METHOD_LINE_REGEX = /(\d+\.\d+):\s+([A-Za-z]+#.*)/
+    METHOD_LINE_REGEX = /(\d+\.\d+):\s+([A-Za-z:]+#.*)/
     OPERATOR_LINE_REGEX = /\s*(\d+\.\d+):\s(.*)$/
 
     def emit

data/lib/generators/reek.rb

@@ -15,10 +15,11 @@ module MetricFu
         file_path = file_path.gsub('"', ' ').strip
         code_smells = match.map do |smell|
           match_object = smell.match(REEK_REGEX)
+          next unless match_object
           {:method => match_object[1].strip,
            :message => match_object[2].strip,
            :type => match_object[3].strip}
-        end
+        end.compact
         {:file_path => file_path, :code_smells => code_smells}
       end
     end

data/lib/generators/roodi.rb

@@ -1,12 +1,8 @@
 module MetricFu
-  
-    
   class Roodi < Generator
-
     def emit
       files_to_analyze = MetricFu.roodi[:dirs_to_roodi].map{|dir| Dir[File.join(dir, "**/*.rb")] }
       @output = `roodi #{files_to_analyze.join(" ")}`
-
     end
 
     def analyze

data/lib/generators/saikuro.rb

@@ -7,9 +7,13 @@ class Saikuro < Generator
     relative_path = [File.dirname(__FILE__), '..', '..', 
                      'vendor', 'saikuro', 'saikuro.rb']
     saikuro = File.expand_path(File.join(relative_path))
-    options_string = MetricFu.saikuro.inject("") do |o, h|
-      o + "--#{h.join(' ')} " 
-    end  
+    
+    format_directories
+    
+    options_string = MetricFu.saikuro.inject("") do |options, option|
+      options + "--#{option.join(' ')} " 
+    end
+    
     sh %{ruby "#{saikuro}" #{options_string}} do |ok, response|
       unless ok
         puts "Saikuro failed with exit status: #{response.exitstatus}"
@@ -17,6 +21,12 @@ class Saikuro < Generator
       end
     end
   end
+  
+  def format_directories
+    dirs = MetricFu.saikuro[:input_directory].join(" | ")
+    dirs = "\"#{dirs}\""
+    MetricFu.saikuro[:input_directory] = dirs
+  end
 
   def analyze
     @files = []

data/spec/generators/flog_spec.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-
 describe Flog do
   before :each do
     @text = <<-HERE
@@ -157,6 +156,18 @@ describe Flog do
     it "should find the scanned method opperators scores" do
       @flog_page.scanned_methods.first.operators.first.score.should == 9.2
     end
+    
+    it "should find the name of the method even if namespaced" do
+      text = <<-HERE
+      157.9: flog total
+       11.3: flog/method average
+
+       34.8: SomeNamespace::UsersController#create
+      HERE
+        flog = MetricFu::Flog.new('base_dir')
+        flog_page = flog.parse(text)
+        flog_page.scanned_methods.first.name.should == "SomeNamespace::UsersController#create"
+    end
   end
   
   describe "to_h function" do

data/spec/generators/reek_spec.rb

@@ -15,6 +15,9 @@ ApplicationController#start_background_task/block/block is nested (Nested Iterat
 
 "app/controllers/link_targets_controller.rb" -- 1 warnings:
 LinkTargetsController#authorize_user calls current_user.role multiple times (Duplication)
+
+"app/controllers/newline_controller.rb" -- 1 warnings:
+NewlineController#some_method calls current_user.<< "new line\n" multiple times (Duplication)
       HERE
       MetricFu::Configuration.run {}
       File.stub!(:directory?).and_return(true)
@@ -24,23 +27,32 @@ LinkTargetsController#authorize_user calls current_user.role multiple times (Dup
     end
       
     it "should find the code smell's method name" do
-      first_smell = @matches.first[:code_smells].first
-      first_smell[:method].should == "ActivityReportsController#authorize_user"
+      smell = @matches.first[:code_smells].first
+      smell[:method].should == "ActivityReportsController#authorize_user"
     end
     
     it "should find the code smell's type" do
-      first_smell = @matches[1][:code_smells].first
-      first_smell[:type].should == "Nested Iterators"
+      smell = @matches[1][:code_smells].first
+      smell[:type].should == "Nested Iterators"
     end
     
     it "should find the code smell's message" do
-      first_smell = @matches[1][:code_smells].first
-      first_smell[:message].should == "is nested"
+      smell = @matches[1][:code_smells].first
+      smell[:message].should == "is nested"
     end
     
     it "should find the code smell's type" do
-      first_smell = @matches.first
-      first_smell[:file_path].should == "app/controllers/activity_reports_controller.rb"
+      smell = @matches.first
+      smell[:file_path].should == "app/controllers/activity_reports_controller.rb"
+    end
+    
+    it "should NOT insert nil smells into the array when there's a newline in the method call" do
+      @matches.last[:code_smells].should == @matches.last[:code_smells].compact
+      @matches.last.should == {:file_path=>"app/controllers/newline_controller.rb", 
+                                :code_smells=>[{:type=>"Duplication", 
+                                                  :method=>"\"", 
+                                                  :message=>"multiple times"}]}
+      # Note: hopefully a temporary solution until I figure out how to deal with newlines in the method call more effectively -Jake 5/11/2009
     end
   end
   

data/spec/generators/saikuro_spec.rb

@@ -1,35 +1,53 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Saikuro do
-    
-  before :all do
-    MetricFu::Configuration.run {}
-    File.stub!(:directory?).and_return(true)
-    saikuro = MetricFu::Saikuro.new
-    saikuro.stub!(:metric_directory).and_return(File.join(File.dirname(__FILE__), "..", "resources", "saikuro"))
-    saikuro.analyze
-    @output = saikuro.to_h
-  end
+  describe "to_h method" do
+    before :all do
+      MetricFu::Configuration.run {}
+      File.stub!(:directory?).and_return(true)
+      saikuro = MetricFu::Saikuro.new
+      saikuro.stub!(:metric_directory).and_return(File.join(File.dirname(__FILE__), "..", "resources", "saikuro"))
+      saikuro.analyze
+      @output = saikuro.to_h
+    end
   
-  it "should find the filename of a file" do
-    @output[:saikuro][:files].first[:filename].should == 'users_controller.rb'
-  end
+    it "should find the filename of a file" do
+      @output[:saikuro][:files].first[:filename].should == 'users_controller.rb'
+    end
   
-  it "should find the name of the classes" do
-    @output[:saikuro][:classes].first[:name].should == "UsersController"
-    @output[:saikuro][:classes][1][:name].should == "SessionsController"
-  end
+    it "should find the name of the classes" do
+      @output[:saikuro][:classes].first[:name].should == "UsersController"
+      @output[:saikuro][:classes][1][:name].should == "SessionsController"
+    end
   
-  it "should put the most complex method first" do
-    @output[:saikuro][:methods].first[:name].should == "UsersController#create"
-    @output[:saikuro][:methods].first[:complexity].should == 4
-  end
+    it "should put the most complex method first" do
+      @output[:saikuro][:methods].first[:name].should == "UsersController#create"
+      @output[:saikuro][:methods].first[:complexity].should == 4
+    end
+  
+    it "should find the complexity of a method" do
+      @output[:saikuro][:methods].first[:complexity].should == 4
+    end
   
-  it "should find the complexity of a method" do
-    @output[:saikuro][:methods].first[:complexity].should == 4
+    it "should find the lines of a method" do
+      @output[:saikuro][:methods].first[:lines].should == 15
+    end
   end
   
-  it "should find the lines of a method" do
-    @output[:saikuro][:methods].first[:lines].should == 15
+  describe "emit method" do
+    it "should format the directories" do
+      MetricFu::Configuration.run {}
+      File.stub!(:directory?).and_return(true)
+      saikuro = MetricFu::Saikuro.new
+      
+      MetricFu.saikuro[:input_directory] = ["app", "lib"]
+      
+      File.stub!(:dirname).and_return('..')
+      File.stub!(:expand_path)
+      
+      saikuro.should_receive(:sh).with(/"app \| lib"/)
+      
+      saikuro.emit
+    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jscruggs-metric_fu
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Jake Scruggs