duvet 0.0.0 → 0.1.0

data/README.md

@@ -6,7 +6,7 @@ Install with
 
 Then add this to the __very__ top of your `test/helper.rb` (or similar)
 
-    require 'duvet
+    require 'duvet'
     Duvet.start
 
 You can change the defaults by passing an options hash to Duvet.start, eg

data/Rakefile

@@ -5,8 +5,8 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "duvet"
-    gem.summary = %Q{Duvet a simple code coverage tool for 1.9}
-    gem.description = %Q{Duvet a simple code coverage tool for 1.9}
+    gem.summary = %Q{Duvet a simple code coverage tool for ruby 1.9}
+    gem.description = %Q{Duvet a simple code coverage tool for ruby 1.9}
     gem.email = "m@hawx.me"
     gem.homepage = "http://github.com/hawx/duvet"
     gem.authors = ["Joshua Hawxwell"]

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.1.0

data/duvet.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{duvet}
-  s.version = "0.0.0"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Hawxwell"]
-  s.date = %q{2010-09-01}
+  s.date = %q{2010-09-15}
   s.default_executable = %q{duvet}
-  s.description = %q{Duvet a simple code coverage tool for 1.9}
+  s.description = %q{Duvet a simple code coverage tool for ruby 1.9}
   s.email = %q{m@hawx.me}
   s.executables = ["duvet"]
   s.extra_rdoc_files = [
@@ -31,7 +31,9 @@ Gem::Specification.new do |s|
      "lib/duvet/cov.rb",
      "lib/duvet/covs.rb",
      "lib/duvet/ext.rb",
+     "lib/duvet/resources/dark.sass",
      "lib/duvet/resources/jquery.js",
+     "lib/duvet/resources/light.sass",
      "lib/duvet/resources/main.js",
      "lib/duvet/resources/plugins.js",
      "lib/duvet/resources/rcov.sass",
@@ -47,7 +49,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Duvet a simple code coverage tool for 1.9}
+  s.summary = %q{Duvet a simple code coverage tool for ruby 1.9}
   s.test_files = [
     "test/helper.rb",
      "test/test_duvet.rb"

data/lib/duvet/cov.rb

@@ -1,6 +1,6 @@
 module Duvet
   class Cov
-    attr_accessor :cov, :path
+    attr_accessor :path
     
     def initialize(path, cov)
       if path.include?(Dir.pwd)
@@ -13,9 +13,9 @@ module Duvet
       write
     end
     
-    # @return [Integer] number of lines in file
+    # @return [Array] lines in file
     def lines
-      @cov.length
+      @cov
     end
     
     # @return [Array] all lines which can be executed
@@ -23,9 +23,9 @@ module Duvet
       @cov.reject {|i| i.nil?}
     end
     
-    # @return [Integer] number of lines of code that can be executed
-    def lines_of_code
-      code_lines.length
+    # @return [Array] all lines which have been ran
+    def ran_lines
+      @cov.reject {|i| i.nil? || i.zero?}
     end
     
     # Gives a fraction from 0 to 1 of how many lines of code have 
@@ -34,22 +34,20 @@ module Duvet
     #
     # @return [Integer] lines of code executed as a fraction
     def code_coverage
-      ran_lines = code_lines.reject {|i| i.zero?}.length
-      ran_lines.to_f / lines_of_code.to_f
+      ran_lines.size.to_f / code_lines.size.to_f
     end
-    
-    # @return [String] #code_coverage as ??.??%
-    def code_coverage_percent
-      "%.2f%" % (code_coverage*100)
-    end
-    
+
     # Similar to #code_coverage but counts all lines, executable
     # or not.
     #
     # @return [Integer] lines executed as a fraction
     def total_coverage
-      ran_lines = @cov.reject {|i| i.nil? || i.zero?}.length
-      ran_lines.to_f / lines.to_f
+      ran_lines.size.to_f / lines.size.to_f
+    end
+    
+    # @return [String] #code_coverage as ??.??%
+    def code_coverage_percent
+      "%.2f%" % (code_coverage*100)
     end
     
     # @return [String] #total_coverage as ??.??%
@@ -76,8 +74,8 @@ module Duvet
     # @return [String]
     def report
       str = "For #{@path}\n\n" << source_report << "\n"
-      str << "total coverage: #{total_coverage}\n"
-      str << "code coverage:  #{code_coverage}\n"
+      str << "total coverage: #{total_coverage_percent}\n"
+      str << "code coverage:  #{code_coverage_percent}\n"
       str
     end
     
@@ -88,13 +86,14 @@ module Duvet
           "path" => @path,
           "url" => @path.file_name + '.html',
           "source" => @path.readlines,
-          "lines" => lines,
-          "lines_code" => lines_of_code
+          "lines" => lines.size,
+          "lines_code" => code_lines.size,
+          "lines_ran" => ran_lines.size
         },
         "coverage" => {
           "code" => code_coverage_percent,
           "total" => total_coverage_percent,
-          "lines" => @cov
+          "lines" => lines
         }
       }
     end

data/lib/duvet/covs.rb

@@ -25,26 +25,27 @@ module Duvet
     
     # @return [Integer]
     def total_lines
-      self.inject(0) {|a, e| a + e.cov.length }
+      self.inject(0) {|a, e| a + e.lines.size }
     end
     
     # @return [Integer]
     def total_code_lines
-      self.inject(0) {|a, e| a + e.lines_of_code }
+      self.inject(0) {|a, e| a + e.code_lines.size }
     end
     
-    # @return [String]
+    # @return [Integer]
+    def total_ran_lines
+      self.inject(0) {|a, e| a + e.ran_lines.size }
+    end
+    
+    # @return [String] total lines run / total lines, as percentage
     def total_total_cov
-      total_lines = self.map {|i| i.cov}.flatten
-      ran_lines = total_lines.reject {|i| i.nil? || i.zero?}
-      "%.2f%" % (ran_lines.size.to_f / total_lines.size.to_f*100)
+      "%.2f%" % (total_ran_lines.to_f / total_lines.to_f*100)
     end
     
-    # @return [String]
+    # @return [String] total lines run / total lines of code, as percentage
     def total_code_cov
-      total_lines = self.map {|i| i.code_lines}.flatten
-      ran_lines = total_lines.reject {|i| i.zero?}
-      "%.2f%" % (ran_lines.size.to_f / total_lines.size.to_f*100)
+      "%.2f%" % (total_ran_lines.to_f / total_code_lines.to_f*100)
     end
     
   # @endgroup
@@ -60,6 +61,7 @@ module Duvet
         'total' => {
           'lines' => total_lines,
           'lines_code' => total_code_lines,
+          'lines_ran' => total_ran_lines,
           'total_cov' => total_total_cov,
           'code_cov' => total_code_cov
         }
@@ -90,11 +92,7 @@ module Duvet
 
     # @todo Allow you to change style used
     def write_resources(dir, style)
-      __DIR__ = File.dirname(__FILE__)
-      res = {"#{__DIR__}/resources/jquery.js" => dir.to_p + 'jquery.js',
-             "#{__DIR__}/resources/main.js" => dir.to_p + 'main.js'}
-             
-      dirs = Dir.glob("#{__DIR__}/resources/*")
+      dirs = Dir.glob("#{File.dirname(__FILE__)}/resources/*")
       js = dirs.find_all {|i| i[-2..-1] == 'js'}
       sass = dirs.find_all {|i| i[-4..-1] == 'sass'}
       

data/lib/duvet/resources/dark.sass

@@ -0,0 +1,166 @@
+$text: #ddd
+
+$black: #222
+$dark-grey: #111
+$light-grey: #ccc
+$white: #ddd
+
+$excluded: #bbb
+$unran: #ce5256
+$ran: #8dd291
+
+// Main
+body
+  background: $black
+  color: $white
+  font: 12px/1.3em Helvetica
+  text-shadow: 0 1px 0 rgba(0, 0, 0, .5)
+
+a
+  text-decoration: none
+
+
+// Header
+header
+  margin: 2em .5em
+  
+  h1, h1 a
+    color: $light-grey
+    font-weight: normal
+    
+  h2
+    color: darken($light-grey, 20%)
+    font-size: 16px
+    font-weight: normal
+
+// Filter/Search Box
+#filter
+  position: absolute
+  color: $white
+  top: 20px
+  right: 8px
+  border: 1px solid darken($light-grey, 50%)
+  background: $black
+  -webkit-border-radius: 5px
+  padding: 3px
+    
+
+// Table
+.table-wrapper
+  min-width: 700px
+
+table
+  border: 1px solid darken($light-grey, 50%)
+  background: $dark-grey
+  border-collapse: collapse
+  width: 100%
+  margin-bottom: 1em
+
+table.source, pre, code
+  font: 11px/1.2em Menlo
+
+td pre
+  margin: 0
+
+
+// Summary
+.summary
+  margin-bottom: 1em
+  background: lighten($dark-grey, 10%)
+  
+  tbody
+    .name, .name a
+      color: $text
+  
+  tbody tr:hover 
+    background: lighten($dark-grey, 15%)
+
+  thead
+    background: $dark-grey
+    color: $light-grey
+    border-bottom: 1px solid darken($light-grey, 50%)
+
+  tr
+    text-align: left
+
+  th, td
+    padding: .5em
+    
+  .header::after
+    font-size: 10px
+    margin-left: 10px  
+    
+  .descending::after
+    content: '▼'
+    
+  .ascending::after
+    content: '▲'
+    
+  .lines, .loc, .ran, .cov, .code
+    width: 100px
+    
+// Totals
+.totals
+  border-top: 1px solid darken($light-grey, 50%)
+  background: darken($dark-grey, 10%)
+  font-weight: bold
+  
+  
+// Source
+.source tr
+  pre
+    margin-left: 3px
+
+  .count
+    background: $black
+    color: $white
+    -webkit-border-radius: 4px
+    -webkit-border-top-left-radius: 0px
+    -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .2)
+    border: 1px solid $dark-grey
+    display: block
+    padding: 3px
+    position: absolute
+    margin-top: -10px
+    margin-left: -15px
+    opacity: 0
+    
+  .no
+    color: $light-grey
+    background: $dark-grey
+    padding: 0 0 0 3px
+    width: 25px
+    border-right: 1px solid darken($light-grey, 50%)
+
+  &:hover 
+    .count
+      opacity: 1
+      
+    .no
+      color: $white
+      
+  // line colouring
+  &.excluded 
+    color: $excluded
+    &:hover
+      background: darken($excluded, 55%)
+    
+  &.unran 
+    color: $unran
+    &:hover
+      background: darken($unran, 40%)
+    
+  &.ran 
+    color: $ran
+    &:hover
+      background: darken($ran, 55%)
+    
+    
+// Footer
+footer
+  color: fade-out($white, .4)
+  
+  a
+    color: $white
+    
+    

data/lib/duvet/resources/light.sass

@@ -0,0 +1,163 @@
+$text: rgb(0, 0, 0)
+$blue: #4080C7
+
+$black: #000
+$dark-grey: darken($blue, 30%)
+$light-grey: #fcfcfc
+$white: #fff
+
+$excluded: #666
+$unran: #d20d20
+$ran: $blue
+
+// Main
+body
+  background: #fff
+  font: 12px/1.3em Helvetica
+  color: $black
+
+a
+  text-decoration: none
+
+
+// Header
+header
+  margin: 2em .5em
+  
+  h1, h1 a
+    color: $black
+    
+  h2
+    color: darken($blue, 20%)
+    font-size: 16px
+
+// Filter/Search Box
+#filter
+  position: absolute
+  top: 20px
+  right: 8px
+  border: 1px solid $dark-grey
+  background: $light-grey
+  -webkit-border-radius: 5px
+  padding: 3px
+  
+  &:focus
+    border: 1px solid transparent
+    
+
+// Table
+.table-wrapper
+  min-width: 700px
+
+table
+  border: 1px solid $dark-grey
+  background: $light-grey
+  border-collapse: collapse
+  width: 100%
+  margin-bottom: 1em
+
+table.source, pre, code
+  font: 11px/1.2em Menlo
+
+td pre
+  margin: 0
+
+
+// Summary
+.summary
+  margin-bottom: 1em
+  background: $light-grey
+  
+  tbody
+    .name, .name a
+      color: $text
+      font-weight: bold
+  
+  tbody tr:hover 
+    background: lighten($excluded, 55%)
+
+  thead
+    background: $dark-grey
+    color: $light-grey
+
+  tr
+    text-align: left
+
+  th, td
+    padding: .5em
+    
+  .header::after
+    font-size: 10px
+    margin-left: 10px  
+    
+  .descending::after
+    content: '▼'
+    
+  .ascending::after
+    content: '▲'
+    
+  .lines, .loc, .ran, .cov, .code
+    width: 100px
+    
+// Totals
+.totals
+  border-top: 1px solid black
+  background: $light-grey
+  font-weight: bold
+  
+  
+// Source
+.source tr
+  pre
+    margin-left: 3px
+
+  .count
+    background: $white
+    -webkit-border-radius: 4px
+    -webkit-border-top-left-radius: 0px
+    -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .2)
+    border: 1px solid black
+    display: block
+    padding: 3px
+    position: absolute
+    margin-top: -10px
+    margin-left: -15px
+    opacity: 0
+    color: $black
+    
+  .no
+    color: $dark-grey
+    background: darken($light-grey, 10%)
+    padding: 0 0 0 3px
+    border-right: 1px solid $dark-grey
+    width: 25px
+
+  &:hover 
+    .count
+      opacity: 1
+      
+  // line colouring
+  &.excluded 
+    color: $excluded
+    &:hover
+      background: lighten($excluded, 55%)
+    
+  &.unran 
+    color: $unran
+    &:hover
+      background: lighten($unran, 50%)
+    
+  &.ran 
+    color: $ran
+    &:hover
+      background: lighten($ran, 40%)
+    
+    
+// Footer
+footer
+  color: rgba(0, 0, 0, .6)
+  
+  a
+    color: rgb(0, 0, 0)
+    
+    

data/lib/duvet/resources/main.js

@@ -1,9 +1,10 @@
 $(document).ready(function() {
 
-  t = $('table');
+  t = $('table.sort');
   
   $('#filter').keyup(function() {
     $.uiTableFilter(t, this.value);
+    calculate_totals();
   });
   
   $('table.sort').tablesorter({
@@ -12,5 +13,44 @@ $(document).ready(function() {
     cssDesc: 'descending',
     widthFixed: true
   });
+  
+  
+  // Need to get the cov and code totals to be weighted, if possible, to
+  // the number of lines as in the ruby.
+  function calculate_totals(col) {
+    var sum = 0;
+    var rows = [];
+    
+    var lines = 0;
+    var loc = 0;
+    var ran = 0;
+    $('table.sort tbody tr').each(function(i) {
+      if ($(this).css("display") != "none") {
+        rows += $(this);
+        
+        $(this).children('td.lines').each(function(j) {
+          lines += parseFloat($(this).text());
+        });
+        $(this).children('td.loc').each(function(j) {
+          loc += parseFloat($(this).text());
+        });
+        $(this).children('td.ran').each(function(j) {
+          ran += parseFloat($(this).text());
+        });
+      }
+    });
+    var count = rows.length/15; // gets actual number of rows
+    
+    $('table.sort tfoot td.lines').text(lines);
+    $('table.sort tfoot td.loc').text(loc);
+    $('table.sort tfoot td.ran').text(ran);
+    if (lines > 0) {
+      $('table.sort tfoot td.cov').text((ran/lines*100).toFixed(2) + '%');
+      $('table.sort tfoot td.code').text((ran/loc*100).toFixed(2) + '%');
+    } else {
+      $('table.sort tfoot td.cov').text('0.00%');
+      $('table.sort tfoot td.code').text('0.00%');
+    }
+  }
 
 });

data/lib/duvet/resources/rcov.sass

@@ -93,10 +93,8 @@ td pre
   .ascending::after
     content: '▲'
     
-    
-  // Headers
-  .lines, .loc, .cov, .code
-    width: 110px
+  .lines, .loc, .ran, .cov, .code
+    width: 100px
     
 // Totals
 .totals
@@ -105,50 +103,52 @@ td pre
   font-weight: bold
   
   
-// Source  
-.no
-  color: $light-grey
-  background: $dark-grey
-  padding: 0 0 0 3px
-  width: 25px
-  
-tr:hover .no
-  color: $white
-
-.count
-  background: $white
-  -webkit-border-radius: 4px
-  -webkit-border-top-left-radius: 0px
-  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .2)
-  border: 1px solid black
-  display: block
-  padding: 3px
-  position: absolute
-  margin-top: -10px
-  margin-left: -15px
-  opacity: 0
-  
-tr:hover .count
-  opacity: 1
-  
-
-tr pre
-  margin-left: 3px
-
-.excluded 
-  background: $excluded
-  &:hover
-    background: darken($excluded, 10%)
-  
-.unran 
-  background: $unran
-  &:hover
-    background: darken($unran, 10%)
-  
-.ran 
-  background: $ran
-  &:hover
-    background: darken($ran, 10%)
+// Source
+.source tr
+  pre
+    margin-left: 3px
+
+  .count
+    background: $white
+    -webkit-border-radius: 4px
+    -webkit-border-top-left-radius: 0px
+    -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .2)
+    border: 1px solid black
+    display: block
+    padding: 3px
+    position: absolute
+    margin-top: -10px
+    margin-left: -15px
+    opacity: 0
+    
+  .no
+    color: $light-grey
+    background: $dark-grey
+    padding: 0 0 0 3px
+    width: 25px
+
+  &:hover 
+    .count
+      opacity: 1
+      
+    .no
+      color: $white
+      
+  // line colouring
+  &.excluded 
+    background: $excluded
+    &:hover
+      background: darken($excluded, 10%)
+    
+  &.unran 
+    background: $unran
+    &:hover
+      background: darken($unran, 10%)
+    
+  &.ran 
+    background: $ran
+    &:hover
+      background: darken($ran, 10%)
     
     
 // Footer

data/lib/duvet/templates/index.erb

@@ -23,6 +23,7 @@
             <th class="name">Name</th>
             <th class="lines">Total Lines</th>
             <th class="loc">Lines of Code</th>
+            <th class="ran">Lines Ran</td>
             <th class="cov">Total Coverage</th>
             <th class="code">Code Coverage</th>
           </tr>
@@ -30,20 +31,22 @@
         <tfoot>
           <tr class="totals">
             <td>Total</td>
-            <td><%= total['lines'] %></td>
-            <td><%= total['lines_code'] %></td>
-            <td><%= total['total_cov'] %></td>
-            <td><%= total['code_cov'] %></td>
+            <td class="lines"><%= total['lines'] %></td>
+            <td class="loc"><%= total['lines_code'] %></td>
+            <td class="ran"><%= total['lines_ran'] %></td>
+            <td class="cov"><%= total['total_cov'] %></td>
+            <td class="code"><%= total['code_cov'] %></td>
           </tr>
         </tfoot>
         <tbody>
           <% files.each do |f| %>
           <tr>
             <td class="name"><a href="<%= f['file']['url'] %>"><%= f['file']['path'] %></a></td>
-            <td><%= f['file']['lines'] %></td>
-            <td><%= f['file']['lines_code'] %></td>
-            <td><%= f['coverage']['total'] %></td>
-            <td><%= f['coverage']['code'] %></td>
+            <td class="lines"><%= f['file']['lines'] %></td>
+            <td class="loc"><%= f['file']['lines_code'] %></td>
+            <td class="ran"><%= f['file']['lines_ran'] %></td>
+            <td class="cov"><%= f['coverage']['total'] %></td>
+            <td class="code"><%= f['coverage']['code'] %></td>
           </tr>
           <% end %>
         </tbody>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: duvet
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 0
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Joshua Hawxwell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 +01:00
+date: 2010-09-15 00:00:00 +01:00
 default_executable: duvet
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
-description: Duvet a simple code coverage tool for 1.9
+description: Duvet a simple code coverage tool for ruby 1.9
 email: m@hawx.me
 executables: 
 - duvet
@@ -68,7 +68,9 @@ files:
 - lib/duvet/cov.rb
 - lib/duvet/covs.rb
 - lib/duvet/ext.rb
+- lib/duvet/resources/dark.sass
 - lib/duvet/resources/jquery.js
+- lib/duvet/resources/light.sass
 - lib/duvet/resources/main.js
 - lib/duvet/resources/plugins.js
 - lib/duvet/resources/rcov.sass
@@ -112,7 +114,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Duvet a simple code coverage tool for 1.9
+summary: Duvet a simple code coverage tool for ruby 1.9
 test_files: 
 - test/helper.rb
 - test/test_duvet.rb