duvet 0.2.2 → 0.3.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Joshua Hawxwell
+Copyright (c) 2010 Joshua Hawxwell
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -11,15 +11,17 @@ Then add this to the __very__ top of your `test/helper.rb` (or similar)
 
 You can change the defaults by passing an options hash to Duvet.start, eg
 
-    Duvet.start({:dir => 'coverage', :filter => 'app/lib'})
+    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.
 
+You can see what the output of running duvet on itself is [here](http://hawx.github.com/duvet).
+
 
 ## Credits
 
-This gem was created because I read this blog post http://engineering.attinteractive.com/2010/08/code-coverage-in-ruby-1-9/.
+This gem was created because I read this blog post <http://engineering.attinteractive.com/2010/08/code-coverage-in-ruby-1-9/>.
 
 ## Copyright
 

data/Rakefile

@@ -5,10 +5,10 @@ require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+  # test.verbose = true
 end
 
-task :test => :check_dependencies
+# task :test => :check_dependencies
 
 task :default => :test
 

data/lib/duvet.rb

@@ -11,12 +11,11 @@ require 'pathname'
 require 'haml'
 require 'sass'
 
-require 'duvet/ext'
+require 'duvet/core_ext'
 require 'duvet/covs'
 require 'duvet/cov'
 require 'duvet/version'
 
-
 module Duvet
 
   attr_accessor :opts
@@ -28,7 +27,7 @@ module Duvet
   # Start tracking
   def self.start(opts={})
     @opts = DEFAULTS.merge(opts)
-  
+    
     Coverage.start
     @running = true
   end

data/lib/duvet/cov.rb

@@ -5,7 +5,7 @@ module Duvet
     def initialize(path, cov)
       @path = Pathname.new(path)
       if @path.to_s.include?(Dir.pwd)
-        a = Dir.pwd.size+1
+        a = Dir.pwd.size + 1
         @path = Pathname.new(path[a..-1])
         #@path = @path.relative_path_from(Pathname.getwd)
       end
@@ -32,8 +32,9 @@ module Duvet
     # been executed. It ignores all lines that couldn't be executed
     # such as comments.
     #
-    # @return [Integer] lines of code executed as a fraction
+    # @return [Float] lines of code executed as a fraction
     def code_coverage
+      return 0.0 if code_lines.size.zero?
       ran_lines.size.to_f / code_lines.size.to_f
     end
 
@@ -42,6 +43,7 @@ module Duvet
     #
     # @return [Integer] lines executed as a fraction
     def total_coverage
+      return 0.0 if lines.size.zero?
       ran_lines.size.to_f / lines.size.to_f
     end
     
@@ -55,27 +57,11 @@ module Duvet
       "%.2f%" % (total_coverage*100)
     end
     
-    # Creates a report showing the source code.
-    #
-    # @return [String] a report showing line number, source and 
-    #   times run
-    def source_report
-      source = @path.readlines
-      str = ""
-      source.zip(@cov).each_with_index do |a, i|
-        line, count = a[0], a[1]
-        str << "#{i}| #{line.gsub("\n", "")}"
-        str << " #=> #{count}" if count
-        str << "\n"
-      end
-      str
-    end
-    
     # @return [String]
     def report
-      str = "For #{@path}\n\n" << source_report << "\n"
-      str << "total coverage: #{total_coverage_percent}\n"
-      str << "code coverage:  #{code_coverage_percent}\n"
+      str = "#{@path}\n"
+      str << "  total: #{total_coverage_percent}\n"
+      str << "  code:  #{code_coverage_percent}\n\n"
       str
     end
     

data/lib/duvet/test_helper.rb

@@ -0,0 +1,16 @@
+# 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/lib/duvet/version.rb

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

data/templates/css/rcov.sass

@@ -9,9 +9,15 @@ $unran: #ce8b8c
 $ran: #bed2be
 
 // Main
+html
+  margin: 0
+  padding: 0
+  width: 100%
+
 body
   background: #f4f2ed
   font: 12px/1.3em Helvetica
+  margin: 8px
 
 a
   text-decoration: none
@@ -20,6 +26,7 @@ a
 // Header
 header
   margin: 2em .5em
+  text-shadow: 0 1px 0 rgba(255, 255, 255, .5)
   
   h1, h1 a
     color: $dark-grey
@@ -33,13 +40,18 @@ header
   position: absolute
   top: 20px
   right: 8px
-  border: 1px solid black
-  background: #eee
-  -webkit-border-radius: 5px
-  padding: 3px
+  border: 1px solid rgb(120, 120, 120)
+  background: rgb(240, 240, 240)
+  -webkit-border-radius: 3px
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, .1), 0 1px 0 white
+  -webkit-transition: all .2s
+  padding: 4px
+  width: 180px
   
   &:focus
-    border: 1px solid transparent
+    outline: none
+    background: rgb(244, 244, 244)
+    border: 1px solid rgb(100, 100, 100)
     
 
 // Table
@@ -48,10 +60,11 @@ header
 
 table
   border: 1px solid grey
-  background: $light-grey
+  background: $excluded
   border-collapse: collapse
   width: 100%
   margin-bottom: 1em
+  -webkit-box-shadow: 0 1px 0 white
 
 table.source, pre, code
   font: 11px/1.2em Menlo
@@ -76,6 +89,9 @@ td pre
   thead
     background: $dark-grey
     color: $light-grey
+    
+    th
+      cursor: pointer
 
   tr
     text-align: left
@@ -98,7 +114,7 @@ td pre
     
 // Totals
 .totals
-  border-top: 1px solid black
+  border-top: 1px solid grey
   background: darken($excluded, 10%)
   font-weight: bold
   
@@ -154,6 +170,7 @@ td pre
 // Footer
 footer
   color: rgba(0, 0, 0, .6)
+  text-shadow: 0 1px 0 rgba(255, 255, 255, .5)
   
   a
     color: rgb(0, 0, 0)

data/templates/html/file.haml

@@ -44,6 +44,8 @@
                 %pre 
                   %code
                     #{line}
+                    
+              %td
   
           - else
             %tr{:class => (count.zero? ? "unran" : "ran") }
@@ -54,13 +56,13 @@
                   %code
                     #{line}
   
-                %td
-                  %span{:class => "count"}= count
+              %td
+                %span{:class => "count"}= count
             
             
                 
     %footer
       %span
-        Generated on #{time} with
+        Generated at #{time} with
         %a{:href => "http://github.com/hawx/duvet"}= "#{name} #{version}"
               

data/templates/html/index.haml

@@ -12,7 +12,7 @@
     %header
       %h1 Coverage
       
-    %input{:id => "filter", :name => "filter", :type => "text", :placeholder => "Filter"}
+    %input{:id => "filter", :name => "filter", :type => "text", :placeholder => "Filter..."}
       
     .table-wrapper
       %table{:class => "summary sort", :border => "none"}
@@ -48,6 +48,6 @@
                 
     %footer
       %span
-        Generated on #{time} with
+        Generated at #{time} with
         %a{:href => "http://github.com/hawx/duvet"}= "#{name} #{version}"
               

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duvet
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-16 00:00:00.000000000 +01:00
+date: 2011-04-22 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2153122340 !ruby/object:Gem::Requirement
+  requirement: &2153468120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.25
   type: :runtime
   prerelease: false
-  version_requirements: *2153122340
+  version_requirements: *2153468120
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  requirement: &2153121880 !ruby/object:Gem::Requirement
+  requirement: &2153467660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153121880
+  version_requirements: *2153467660
 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
@@ -44,9 +44,10 @@ files:
 - README.md
 - Rakefile
 - LICENSE
+- lib/duvet/core_ext.rb
 - lib/duvet/cov.rb
 - lib/duvet/covs.rb
-- lib/duvet/ext.rb
+- lib/duvet/test_helper.rb
 - lib/duvet/version.rb
 - lib/duvet.rb
 - templates/css/dark.sass