duvet 0.3.0 → 0.3.1

data/README.md

@@ -14,7 +14,8 @@ You can change the defaults by passing an options hash to Duvet.start, eg
     Duvet.start :dir => 'coverage', :filter => 'app/lib'
 
 `:dir` is the directory to write the coverage to.
-`:filter` allows you to display only coverage for files that include the string.
+`:filter` allows you to display only coverage for files that include the string, or you can
+match against a regular expression for more control.
 
 You can see what the output of running duvet on itself is [here](http://hawx.github.com/duvet).
 

data/lib/duvet.rb

@@ -1,12 +1,10 @@
-$: << File.join(File.dirname(__FILE__), '..')
-
 # Add this to test/helper.rb at the before __anything__ else
 #
 #   require 'duvet'
 #   Duvet.start
 #
+
 require 'coverage'
-require 'ostruct'
 require 'pathname'
 require 'haml'
 require 'sass'
@@ -22,7 +20,13 @@ module Duvet
   
   DEFAULTS = {:dir => 'cov', :style => 'rcov'}
   
-  TEMPLATE_PATH = File.join File.dirname(__FILE__), '..', 'templates'
+  TEMPLATE_PATH = Pathname.new(__FILE__).dirname + '..' + 'templates'
+  
+  TEMPLATE_HASH = {
+    'time' => Time.now,
+    'version' => VERSION,
+    'name' => 'duvet'
+  }
 
   # Start tracking
   def self.start(opts={})
@@ -37,8 +41,9 @@ module Duvet
     cov = Coverage.result if running?
     if @opts[:filter]
       filtered = {}
+      @opts[:filter] = /#{@opts[:filter]}/ unless @opts[:filter].is_a?(Regexp)
       cov.each do |k, v|
-        if k.include?(@opts[:filter])
+        if @opts[:filter] =~ k
           filtered[k] = v
         end
       end
@@ -51,7 +56,7 @@ module Duvet
   
   # Write results
   def self.write
-    self.result.write(@opts[:dir], @opts[:style]) if running?
+    self.result.write(Pathname.new(@opts[:dir])) if running?
   end
   
   # Proc to call when exiting
@@ -64,15 +69,6 @@ module Duvet
   def self.running?
     @running
   end
-  
-  # @return [Hash] hash to merge for templating
-  def self.template_hash
-    {
-      'time' => Time.now,
-      'version' => VERSION,
-      'name' => 'duvet'
-    }
-  end
 
 end
 

data/lib/duvet/core_ext.rb

@@ -15,14 +15,3 @@ class Pathname
   end
 
 end
-
-class String
-  
-  # Converts the String to a Pathname object
-  #  
-  # @return [Pathname]
-  def to_p
-    Pathname.new(self)    
-  end
-  
-end

data/lib/duvet/cov.rb

@@ -91,14 +91,13 @@ module Duvet
     def format
       template = File.read File.join(TEMPLATE_PATH, 'html', 'file.haml')
       haml_engine = Haml::Engine.new(template)
-      output = haml_engine.render(nil, Duvet.template_hash.merge(self.data))
+      output = haml_engine.render(nil, TEMPLATE_HASH.merge(self.data))
       output
     end
     
-    def write(dir='cov')
-      pa = (dir.to_p + @path.file_name).to_s + '.html'
-      File.new(pa, 'w')
-      File.open(pa, 'w') {|f| f.puts(self.format) }
+    def write(dir)
+      path = (dir + @path.file_name).to_s + '.html'
+      File.open(path, 'w') {|f| f.write(self.format) }
     end
   
   end

data/lib/duvet/covs.rb

@@ -9,107 +9,43 @@ module Duvet
     end
   
     def report
-      self.each do |i|
-        puts i.report
-      end
-    end
-    
-    def format
-      self.each do |i|
-        puts i.format
-      end
-    end
-    
-    
-  # @group Totals
-    
-    # @return [Integer]
-    def total_lines
-      self.inject(0) {|a, e| a + e.lines.size }
-    end
-    
-    # @return [Integer]
-    def total_code_lines
-      self.inject(0) {|a, e| a + e.code_lines.size }
-    end
-    
-    # @return [Integer]
-    def total_ran_lines
-      self.inject(0) {|a, e| a + e.ran_lines.size }
+      map {|i| i.report }.join('')
     end
     
-    # @return [String] total lines run / total lines, as percentage
-    def total_total_cov
-      "%.2f%" % (total_ran_lines.to_f / total_lines.to_f*100)
-    end
-    
-    # @return [String] total lines run / total lines of code, as percentage
-    def total_code_cov
-      "%.2f%" % (total_ran_lines.to_f / total_code_lines.to_f*100)
-    end
-    
-  # @endgroup
-    
-    
     def data
-      r = []
-      self.each do |i|
-        r << i.data
-      end
-      {
-        'files' => r,
-        'total' => {
-          'lines' => total_lines,
-          'lines_code' => total_code_lines,
-          'lines_ran' => total_ran_lines,
-          'total_cov' => total_total_cov,
-          'code_cov' => total_code_cov
-        }
-      }
+      { 'files' => map {|i| i.data } }
     end
     
-    def format(dir='cov')
-      template = File.read File.join(TEMPLATE_PATH, 'html', 'index.haml')
+    def format
+      template = (TEMPLATE_PATH + 'html' + 'index.haml').read
       haml_engine = Haml::Engine.new(template)
-      output = haml_engine.render(nil, Duvet.template_hash.merge(self.data))
-      output
+      haml_engine.render(nil, TEMPLATE_HASH.merge(self.data))
     end
     
-    def write(dir='cov', style='rcov')
-      if self.size > 0
-        FileUtils.mkdir_p dir
-      
-        f = File.new( dir.to_p + 'index.html', "w")
-        f.write(format)
+    def write(dir)
+      if size > 0
+        FileUtils.mkdir_p(dir)
+        File.open(dir + 'index.html', 'w') {|f| f.write(format) }
+        
+        each {|c| c.write(dir) }
         
-        self.each do |i|
-          i.write(dir)
-        end
-        write_resources(dir, style)
+        write_resources(dir)
       else
-        warn "no files"
+        warn "No files to create coverage for."
       end
     end
 
     # @todo Allow you to change style used
-    def write_resources(dir, style)
-      js_dir = File.join(TEMPLATE_PATH, 'js')
-      css_dir = File.join(TEMPLATE_PATH, 'css')
-    
-      Dir.glob("#{css_dir}/*").each do |i|
-        if i.include?(style)
-          write_path = dir.to_p + 'styles.css'
-          f = File.new(write_path, "w")
-          f.write Sass::Engine.new( File.read(i) ).render
-        end
-      end
-      
-      Dir.glob("#{js_dir}/*").each do |i|
-        write_path = dir.to_p + i.to_p.basename
-        f = File.new(write_path, "w")
-        f.write(File.read(i))
+    def write_resources(dir)
+      Pathname.glob(TEMPLATE_PATH + 'css' + '*').each do |i|
+        f = File.new(dir + 'styles.css', 'w')
+        f.write Sass::Engine.new(i.read).render
       end
 
+      Pathname.glob(TEMPLATE_PATH + 'js' + '*').each do |i|
+        f = File.new(dir + i.basename, 'w')
+        f.write(i.read)
+      end
     end
   
   end

data/lib/duvet/version.rb

@@ -1,3 +1,3 @@
 module Duvet
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/templates/html/index.haml

@@ -28,11 +28,11 @@
         %tfoot
           %tr{:class => "totals"}
             %td Total
-            %td{:class => "lines"}= total['lines']
-            %td{:class => "loc"}= total['lines_code']
-            %td{:class => "ran"}= total['lines_ran']
-            %td{:class => "cov"}= total['total_cov']
-            %td{:class => "code"}= total['code_cov']
+            %td{:class => "lines"}
+            %td{:class => "loc"}
+            %td{:class => "ran"}
+            %td{:class => "cov"}
+            %td{:class => "code"}
           
         %tbody
           - files.each do |f|

data/templates/js/main.js

@@ -1,9 +1,7 @@
 $(document).ready(function() {
-
-  t = $('table.sort');
   
   $('#filter').keyup(function() {
-    $.uiTableFilter(t, this.value);
+    $.uiTableFilter($('table.sort'), this.value);
     calculate_totals();
   });
   
@@ -17,7 +15,7 @@ $(document).ready(function() {
   
   // 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) {
+  function calculate_totals() {
     var sum = 0;
     var rows = [];
     
@@ -52,5 +50,7 @@ $(document).ready(function() {
       $('table.sort tfoot td.code').text('0.00%');
     }
   }
+  
+  calculate_totals();
 
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duvet
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2153468120 !ruby/object:Gem::Requirement
+  requirement: &2152746840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.25
   type: :runtime
   prerelease: false
-  version_requirements: *2153468120
+  version_requirements: *2152746840
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  requirement: &2153467660 !ruby/object:Gem::Requirement
+  requirement: &2152746380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153467660
+  version_requirements: *2152746380
 description: ! "    A simple code coverage tool for Ruby 1.9. Add 'Duvet.start' to
   the top\n    of your test helper, to have it write code coverage stuff to 'cov/'.\n"
 email: m@hawx.me
@@ -47,12 +47,9 @@ files:
 - lib/duvet/core_ext.rb
 - lib/duvet/cov.rb
 - lib/duvet/covs.rb
-- lib/duvet/test_helper.rb
 - lib/duvet/version.rb
 - lib/duvet.rb
-- templates/css/dark.sass
-- templates/css/light.sass
-- templates/css/rcov.sass
+- templates/css/styles.sass
 - templates/html/file.haml
 - templates/html/index.haml
 - templates/js/jquery.js

data/lib/duvet/test_helper.rb

@@ -1,16 +0,0 @@
-# Allows duvet to generate it's own code coverage
-
-require 'coverage'
-
-module Duvet
-
-  DEFAULTS = {:dir => 'cov', :style => 'rcov'}
-
-  def self.start(opts={})
-    @opts = DEFAULTS.merge(opts)
-    
-    Coverage.start
-    @running = true
-  end
-
-end

data/templates/css/dark.sass

@@ -1,166 +0,0 @@
-$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/templates/css/light.sass

@@ -1,163 +0,0 @@
-$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)
-    
-