edouard-metric_fu 1.0.3.5 → 1.0.3.6

data/lib/base/configuration.rb

@@ -122,7 +122,7 @@ module MetricFu
                                                         '..', '..')
       @template_directory =  File.join(@metric_fu_root_directory, 
                                        'lib', 'templates') 
-      @template_class = StandardTemplate
+      @template_class = AwesomeTemplate
       set_metrics
       set_code_dirs
       @flay     = { :dirs_to_flay => @code_dirs  } 

data/lib/generators/saikuro.rb

@@ -1,19 +1,19 @@
 module MetricFu
-
+ 
 class Saikuro < Generator
-
-
+ 
+ 
   def emit
-    relative_path = [File.dirname(__FILE__), '..', '..', 
+    relative_path = [File.dirname(__FILE__), '..', '..',
                      'vendor', 'saikuro', 'saikuro.rb']
     saikuro = File.expand_path(File.join(relative_path))
-    
+ 
     format_directories
-    
+ 
     options_string = MetricFu.saikuro.inject("") do |options, option|
-      options + "--#{option.join(' ')} " 
+      options + "--#{option.join(' ')} "
     end
-    
+ 
     sh %{ruby "#{saikuro}" #{options_string}} do |ok, response|
       unless ok
         puts "Saikuro failed with exit status: #{response.exitstatus}"
@@ -21,20 +21,20 @@ class Saikuro < Generator
       end
     end
   end
-  
+ 
   def format_directories
-    dirs = MetricFu.saikuro[:input_directory]#.join(" | ")
+    dirs = MetricFu.saikuro[:input_directory].join(" | ")
     dirs = "\"#{dirs}\""
     MetricFu.saikuro[:input_directory] = dirs
   end
-
+ 
   def analyze
     @files = []
     saikuro_results.each do |path|
       if Saikuro::SFile.is_valid_text_file?(path)
-        file = Saikuro::SFile.new(path) 
-        if file 
-          @files << file 
+        file = Saikuro::SFile.new(path)
+        if file
+          @files << file
         end
       end
     end
@@ -50,51 +50,51 @@ class Saikuro < Generator
     @classes = klasses.sort_by {|k| k.complexity.to_i}
     @classes.reverse!
     meths = []
-    @files.each {|f| 
+    @files.each {|f|
       f.elements.each {|el|
         el.defs.each {|defn|
           defn.name = "#{el.name}##{defn.name}"
-          meths <<  defn}
+          meths << defn}
       }
     }
     meths = meths.sort_by {|meth| meth.complexity.to_i}
     @meths = meths.reverse
-    
+ 
   end
-
+ 
   def to_h
     files = @files.map do |file|
       my_file = file.to_h
       my_file[:filename] = file.filename
-      my_file 
+      my_file
     end
-    {:saikuro => {:files => files, 
+    {:saikuro => {:files => files,
                   :classes => @classes.map {|c| c.to_h},
-                  :methods => @meths.map {|m| m.to_h} 
+                  :methods => @meths.map {|m| m.to_h}
                  }
-    }  
+    }
   end
-
+ 
   def saikuro_results
     Dir.glob("#{metric_directory}/**/*.html")
   end
-
+ 
   private
-
-
+ 
+ 
 end
-
+ 
 class Saikuro::SFile
-
+ 
   attr_reader :elements
-  
+ 
   def initialize(path)
     @path = path
     @file_handle = File.open(@path, "r")
     @elements = []
     get_elements
   end
-
+ 
   def self.is_valid_text_file?(path)
     File.open(path, "r") do |f|
       unless f.readline.match /--/
@@ -104,24 +104,29 @@ class Saikuro::SFile
       end
     end
   end
-
+ 
   def filename
     File.basename(@path, '_cyclo.html')
   end
-
+ 
   def to_h
     merge_classes
     {:classes => @elements}
   end
-
+ 
   def get_elements
     begin
       while ( line = @file_handle.readline) do
+       element ||= nil
         if line.match /START/
+         unless element.nil?
+           @elements << element
+            element = nil
+          end
           line = @file_handle.readline
           element = Saikuro::ParsingElement.new(line)
         elsif line.match /END/
-          @elements << element 
+          @elements << element unless element.nil?
           element = nil
         else
           element << line
@@ -131,8 +136,8 @@ class Saikuro::SFile
       nil
     end
   end
-
-
+ 
+ 
   def merge_classes
     new_elements = []
     get_class_names.each do |target_class|
@@ -145,20 +150,20 @@ class Saikuro::SFile
         lines += el.lines.to_i
         defns << el.defs
       end
-
+ 
       new_element = {:class_name => target_class,
                      :complexity => complexity,
-                     :lines      => lines,
+                     :lines => lines,
                      :methods => defns.flatten.map {|d| d.to_h}}
       new_element[:methods] = new_element[:methods].
                               sort_by {|x| x[:complexity] }.
                               reverse
-
+ 
       new_elements << new_element
     end
     @elements = new_elements if new_elements
   end
-
+ 
   def get_class_names
     class_names = []
     @elements.each do |element|
@@ -168,31 +173,31 @@ class Saikuro::SFile
     end
     class_names
   end
-
+ 
 end
-
+ 
 class Saikuro::ParsingElement
   TYPE_REGEX=/Type:(.*) Name/
   NAME_REGEX=/Name:(.*) Complexity/
   COMPLEXITY_REGEX=/Complexity:(.*) Lines/
   LINES_REGEX=/Lines:(.*)/
-
+ 
   attr_reader :complexity, :lines, :defs, :element_type
   attr_accessor :name
-
+ 
   def initialize(line)
     @line = line
     @element_type = line.match(TYPE_REGEX)[1].strip
     @name = line.match(NAME_REGEX)[1].strip
-    @complexity  = line.match(COMPLEXITY_REGEX)[1].strip
+    @complexity = line.match(COMPLEXITY_REGEX)[1].strip
     @lines = line.match(LINES_REGEX)[1].strip
     @defs = []
   end
-
+ 
   def <<(line)
-    @defs << Saikuro::ParsingElement.new(line) 
+    @defs << Saikuro::ParsingElement.new(line)
   end
-
+ 
   def to_h
     base = {:name => @name, :complexity => @complexity.to_i, :lines => @lines.to_i}
     unless @defs.empty?
@@ -206,6 +211,6 @@ class Saikuro::ParsingElement
     return base
   end
 end
-
-
+ 
+ 
 end

data/lib/templates/awesome/flog.html.erb

@@ -12,7 +12,7 @@
   </tr>
     <% @flog[:pages].each do |page| %>
     <tr>
-      <td><%= page[:path] %></td>
+      <td><a href="#<%= page[:path].gsub(/[^a-z]+/, '_') %>"><%= page[:path] %></a></td>
       <td><%= page[:score].round %></td>
       <td><%= page[:scanned_methods].length %></td>
       <td><%= page[:average_score].round %></td>
@@ -22,7 +22,7 @@
 </table>
 
 <% @flog[:pages].each do |page| %>
-  <h2><%= page[:path] %></h2>
+  <h2 id="<%= page[:path].gsub(/[^a-z]+/, '_') %>"><%= page[:path] %></h2>
     <% page[:scanned_methods].each do |sm| %>
       <p><%= sm[:name] %></p>
       <table>

data/lib/templates/awesome/layout.html.erb

@@ -14,7 +14,7 @@
   </head>
   <body>
     <div id='header'>
-      <h1><a href="/">metrics</a> | <%= @name %></h1>
+      <h1><a href="/">metrics</a> | <a href="index.html"><%= @name %></a></h1>
       <address class='watermark'>
         built with
         <a href='http://metric-fu.rubyforge.org/'>metric-fu</a>

data/lib/templates/awesome/rcov.html.erb

@@ -9,15 +9,15 @@
   <% count = 0 %>
   <% @rcov.each_pair do |fname, file| %>
     <tr>
-      <td><%= fname %></td>
+      <td><a href="#<%= fname.gsub(/[^a-z]+/, '_') %>"><%= fname %></a></td>
       <td><%= file[:percent_run] %></td>
     </tr>
     <% count += 1 %>
   <% end %>
 </table>
 
-<% @rcov.each_pair do |fname, file| %>
-  <h2> <%= fname %></h2>
+<% @rcov.sort_by{|k,v| v[:percent_run]}.each_pair do |fname, file| %>
+  <h2 id="<%= fname.gsub(/[^a-z]+/, '_') %>"> <%= fname %></h2>
   <div class="rcov_overflow">
     <table class="rcov_code">
     <% file[:lines].each do |line| %>

data/spec/base/configuration_spec.rb

@@ -129,7 +129,7 @@ describe MetricFu::Configuration do
     end
     
     it 'should set @template_class to StandardTemplate' do
-      template_class.should == StandardTemplate
+      template_class.should == AwesomeTemplate
     end
 
     it 'should set @flay to {:dirs_to_flay => @code_dirs}' do

data/spec/generators/saikuro_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-
+ 
 describe Saikuro do
   describe "to_h method" do
     before :all do
@@ -10,44 +10,54 @@ describe Saikuro do
       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 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 find the complexity of a method" do
       @output[:saikuro][:methods].first[:complexity].should == 4
     end
-  
+ 
     it "should find the lines of a method" do
       @output[:saikuro][:methods].first[:lines].should == 15
     end
   end
-  
+ 
   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
+ 
+  describe Saikuro::SFile do
+    describe "getting elements from a Saikuro result file" do
+     it "should parse nested START/END sections" do
+       path = File.join(File.dirname(__FILE__), "..", "resources", "saikuro_sfiles", "thing.rb_cyclo.html")
+        sfile = Saikuro::SFile.new path
+       sfile.elements.map { |e| e.complexity }.sort.should eql(["0","0","2"])
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: edouard-metric_fu
 version: !ruby/object:Gem::Version 
-  version: 1.0.3.5
+  version: 1.0.3.6
 platform: ruby
 authors: 
 - Jake Scruggs
@@ -10,6 +10,7 @@ authors:
 - Petrik de Heus
 - Grant McInnes
 - Nick Quaranto
+- "\xC3\x89douard Bri\xC3\xA8re"
 autorequire: 
 bindir: bin
 cert_chain: []