kjeldahl-metric_fu 1.1.5.1 → 1.1.5.2

data/lib/base/base_template.rb

@@ -116,11 +116,23 @@ module MetricFu
     def file_url(name, line) # :nodoc:
       filename = File.expand_path(name.gsub(/^\//, ''))
       if MetricFu.configuration.platform.include?('darwin')
-        "txmt://open/?url=file://#{filename}" << (line ? "&line=#{line}" : "")
+        "txmt://open/?url=file://#{filename}" << (line ? "&amp;line=#{line}" : "")
       else 
        "file://#{filename}"
       end
     end
+    
+    # Replaces <,> and & with their entities
+    def encode(content)
+      content.gsub!('&', '&amp;')
+      {'<' => '&lt;', '>' => '&gt;'}.each_pair { |s,r| content.gsub!(s,r)}
+      content
+    end
+
+    def graph_image(file, html_options = {})
+      attributes = {:alt => 'Graph image'}.merge(html_options).map{|k,v| "#{k}='#{v}'"}
+      "<img src='#{file}?#{rand(2000)}' #{attributes}/>"
+    end
 
     # Provides a brain dead way to cycle between two values during
     # an iteration of some sort.  Pass in the first_value, the second_value,

data/lib/generators/rcov.rb

@@ -87,7 +87,11 @@ module MetricFu
 
     def to_h
       global_percent_run = ((@global_total_lines_run.to_f / @global_total_lines.to_f) * 100)
-      {:rcov => @rcov.merge({:global_percent_run => round_to_tenths(global_percent_run) })}   
+      result = @rcov.merge({:global_percent_run => round_to_tenths(global_percent_run) })
+      def result.files
+        select {|k,v| k != :global_percent_run}
+      end
+      {:rcov => result}   
     end
     
     private

data/lib/templates/awesome/awesome_template.rb

@@ -2,7 +2,8 @@ class AwesomeTemplate < MetricFu::Template
 
   def write
     # Getting rid of the crap before and after the project name from integrity
-    @name = File.basename(Dir.pwd).gsub(/^\w+-|-\w+$/, "")
+    dir = MetricFu.configuration.is_cruise_control_rb? ? File.join(Dir.pwd, '..') : Dir.pwd
+    @name =  File.basename(File.expand_path(dir)).gsub(/^\w+-|-\w+$/, "")
 
     report.each_pair do |section, contents|
       if template_exists?(section)

data/lib/templates/awesome/css/integrity.css

@@ -210,6 +210,9 @@ a {
           color: #337022; }
         #content #projects li a.failed {
           color: #ff1100; }
+        #content #projects li a span.totals {
+          font-size: 0.5em;
+          padding-left: 1em;}
       #content #projects li .meta {
         position: absolute;
         right: .6em;

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

@@ -2,7 +2,7 @@
 
 <p><a href='http://ruby.sadi.st/Flay.html'>Flay</a> analyzes ruby code for structural similarities.</p>
 
-<img src="flay.png?<%= Time.now %>">
+<%= graph_image('flay.png', :alt => "Structural similarities graph") %>
 
 <h4>Total Score (lower is better): <%= @flay[:total_score] %></h4>
 
@@ -19,7 +19,7 @@
           <%= link_to_filename(file[:name], file[:line]) %><br/>
         <% end %>
       </td>
-      <td><%= match[:reason] %></td>
+      <td><%= encode(match[:reason]) %></td>
     </tr>
     <% count += 1 %>
   <% end %>

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

@@ -1,7 +1,7 @@
 <h3>Flog Results</h3>
 <p><a href='http://ruby.sadi.st/Flog.html'>Flog</a> measures code complexity.</p>
 
-<img src="flog.png?<%= Time.now %>">
+<%= graph_image('flog.png', :alt => "Code complexity graph") %>
 
 <h2>Total Flog score for all methods: <%= @flog[:total]%></h2>
 <h2>Average Flog score for all methods: <%= @flog[:average]%></h2>
@@ -28,7 +28,7 @@
 <% @flog[:pages].each do |page| %>
   <h2 id="<%= page[:path].gsub(/[^a-z]+/, '_') %>"><%= link_to_filename page[:path] %></h2>
     <% page[:scanned_methods].each do |sm| %>
-      <p><%= sm[:name] %></p>
+      <p><%= encode(sm[:name]) %></p>
       <p>Total Score: <%=sm[:score]%></p>
       <table>
         <tr>
@@ -38,7 +38,7 @@
         <% sm[:operators].each do |operator| %>
           <tr>
             <td><%= operator[:score] %></td>
-            <td><%= operator[:operator] %></td>
+            <td><%= encode(operator[:operator]) %></td>
           </tr>
         <% end %>
       </table>

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

@@ -4,13 +4,13 @@
   <li class='even failure'><a href="churn.html">Churn</a></li>
 <% end %>
 <% if @flay %>
-  <li class='even failure'><a href="flay.html">Flay</a></li>
+  <li class='even failure'><a href="flay.html">Flay <span class='totals'><%= @flay[:total_score] %></span></a></li>
 <% end %>
 <% if @flog %>
-  <li class='even failure'><a href="flog.html">Flog</a></li>
+  <li class='even failure'><a href="flog.html">Flog <span class='totals'><%= @flog[:total]%> / <%= @flog[:average]%></span></a></li>
 <% end %>
 <% if @rcov %>
-  <li class='even failure'><a href="rcov.html">Rcov</a></li>
+  <li class='even failure'><a href="rcov.html">Rcov <span class='totals'><%= @rcov[:global_percent_run] %>%</span></a> </li>
 <% end %>
 <% if @reek %>
   <li class='even failure'><a href="reek.html">Reek</a></li>
@@ -22,7 +22,7 @@
   <li class='even failure'><a href="saikuro.html">Saikuro</a></li>
 <% end %>
 <% if @stats %>
-  <li class='even failure'><a href="stats.html">Stats</a></li>
+  <li class='even failure'><a href="stats.html">Stats Code <span class='totals'><%=@stats[:codeLOC]%> lines</span></a></li>
 <% end %>
 </ul>
 <p>Generated on <%= Time.now.localtime %></p>	

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

@@ -4,13 +4,13 @@
     <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
     <meta content='en' http-equiv='Content-Language' />
     <title>metrics</title>
-    <style>
+    <style type="text/css">
     <%= inline_css("css/reset.css") %>
     <%= inline_css("css/buttons.css") %>
     <%= inline_css("css/integrity.css") %>
     <%= inline_css("css/default.css") %>
     </style>
-    <link REL="SHORTCUT ICON" HREF="/favicon.ico">
+    <link rel="SHORTCUT ICON" href="/favicon.ico"/>
   </head>
   <body>
     <div id='header'>

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

@@ -2,16 +2,16 @@
 
 <p>C0 code coverage information.</p>
 
-<img src="rcov.png?<%= Time.now %>">
+<%= graph_image('rcov.png', :alt => "C0 coverage graph") %>
 
-<p>Total Coverage: <%= @rcov.delete(:global_percent_run) %>% </p>
+<p>Total Coverage: <%= @rcov[:global_percent_run] %>% </p>
 <table>
   <tr>
     <th>File Path</th>
     <th>Percent run</th>
   </tr>
   <% count = 0 %>
-  <% @rcov.sort_by{ |k,v| v[:percent_run] }.each do |fname, file| %>
+  <% @rcov.files.sort_by{ |k,v| v[:percent_run] }.each do |fname, file| %>
     <tr>
       <td><a href="#<%= fname.gsub(/[^a-z]+/, '_') %>"><%= fname %></a></td>
       <td><%= file[:percent_run] %></td>
@@ -20,14 +20,14 @@
   <% end %>
 </table>
 
-<% @rcov.sort_by{ |k,v| v[:percent_run] }.each do |fname, file| %>
+<% @rcov.files.sort_by{ |k,v| v[:percent_run] }.each do |fname, file| %>
   <h2 id="<%= fname.gsub(/[^a-z]+/, '_') %>"> <%= fname %></h2>
   <div class="rcov_overflow">
     <table class="rcov_code">
     <% file[:lines].each_with_index do |line, index| %>
       <tr>
         <% css_class = line[:was_run] ? "rcov_run" : "rcov_not_run" %>
-        <td class="<%= css_class %>"><%= link_to_filename(fname, index + 1, "<pre>#{line[:content]}</pre>") %></td>
+        <td class="<%= css_class %>"><pre><%= link_to_filename(fname, index + 1, encode(line[:content])) %></pre></td>
       </tr>
     <% end %>
     </table>

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

@@ -2,7 +2,7 @@
 
 <p><a href="http://reek.rubyforge.org/">Reek</a> detects common code smells in ruby code.</p>
 
-<img src="reek.png?<%= Time.now %>">
+<%= graph_image('reek.png', :alt => "Code smells graph") %>
 
 <table>
   <tr>
@@ -17,13 +17,13 @@
       <tr class='<%= cycle("light", "dark", count) %>'>
         <td><%= link_to_filename(match[:file_path]) %></td>
         <td>
-          <%= smell[:method] %>
+          <%= encode(smell[:method]) %>
         </td>
         <td>
-          <%= smell[:message] %>
+          <%= encode(smell[:message]) %>
         </td>
         <td>
-          <%= smell[:type] %>
+          <%= encode(smell[:type]) %>
         </td>
       </tr>
       <% count += 1 %>

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

@@ -2,7 +2,7 @@
 
 <p><a href="http://roodi.rubyforge.org/">Roodi</a> parses your Ruby code and warns you about design issues you have based on the checks that is has configured.</p>
 
-<img src="roodi.png?<%= Time.now %>">
+<%= graph_image('roodi.png') %>
 
 <table>
   <tr>
@@ -13,7 +13,7 @@
   <% @roodi[:problems].each do |problem| %>
     <tr class='<%= cycle("light", "dark", count) %>'>
       <td><%= link_to_filename(problem[:file], problem[:line]) %></td>
-      <td><%= problem[:problem] %></td>
+      <td><%= encode(problem[:problem]) %></td>
     </tr>
     <% count += 1 %>
   <% end %>

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

@@ -10,7 +10,7 @@
     </tr>
     <% @saikuro[:methods].each do |method| %>
     <tr>
-      <td><%= method[:name] %></td>
+      <td><%= encode(method[:name]) %></td>
       <td><%= method[:complexity] %></td>
       <td><%= method[:lines] %></td>
     </tr>
@@ -28,7 +28,7 @@
     </tr>
     <% @saikuro[:classes].each do |klass| %>
     <tr>
-      <td><%= klass[:name] %></td>
+      <td><%= encode(klass[:name]) %></td>
       <td><%= klass[:complexity] %></td>
       <td><%= klass[:lines] %></td>
     </tr>
@@ -53,7 +53,7 @@
           <% klass[:methods].each do |method| %>
             <tr>
               <td>
-                <%= method[:name] %>
+                <%= encode(method[:name]) %>
               </td>
               <td>
                 <%= method[:complexity] %> 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kjeldahl-metric_fu
 version: !ruby/object:Gem::Version 
-  version: 1.1.5.1
+  version: 1.1.5.2
 platform: ruby
 authors: 
 - Jake Scruggs