duvet 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/duvet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{duvet}
-  s.version = "0.1.0"
+  s.version = "0.2.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-15}
+  s.date = %q{2010-11-12}
   s.default_executable = %q{duvet}
   s.description = %q{Duvet a simple code coverage tool for ruby 1.9}
   s.email = %q{m@hawx.me}
@@ -31,14 +31,14 @@ 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",
-     "lib/duvet/templates/file.erb",
-     "lib/duvet/templates/index.erb",
+     "templates/css/dark.sass",
+     "templates/css/light.sass",
+     "templates/css/rcov.sass",
+     "templates/html/file.haml",
+     "templates/html/index.haml",
+     "templates/js/jquery.js",
+     "templates/js/main.js",
+     "templates/js/plugins.js",
      "test/helper.rb",
      "test/test_duvet.rb",
      "test_duvet/lib/klass.rb",

data/lib/duvet.rb

@@ -1,4 +1,4 @@
-$:.unshift File.dirname(__FILE__)
+$: << File.join(File.dirname(__FILE__), '..')
 
 # Add this to test/helper.rb at the before __anything__ else
 #
@@ -9,6 +9,7 @@ require 'coverage'
 require 'ostruct'
 require 'erubis'
 require 'pathname'
+require 'haml'
 require 'sass'
 
 require 'duvet/ext'
@@ -21,6 +22,8 @@ module Duvet
   attr_accessor :opts
   
   DEFAULTS = {:dir => 'cov', :style => 'rcov'}
+  
+  TEMPLATE_PATH = File.join File.dirname(__FILE__), '..', 'templates'
 
   # Start tracking
   def self.start(opts={})

data/lib/duvet/cov.rb

@@ -3,14 +3,14 @@ module Duvet
     attr_accessor :path
     
     def initialize(path, cov)
-      if path.include?(Dir.pwd)
-        @path = path.to_p.relative_path_from(Pathname.pwd)
-      else
-        @path = path.to_p
+      @path = Pathname.new(path)
+      if @path.to_s.include?(Dir.pwd)
+        a = Dir.pwd.size+1
+        @path = Pathname.new(path[a..-1])
+        #@path = @path.relative_path_from(Pathname.getwd)
       end
-
+      
       @cov = cov
-      write
     end
     
     # @return [Array] lines in file
@@ -83,7 +83,7 @@ module Duvet
     def data
       {
         "file" => {
-          "path" => @path,
+          "path" => @path.to_s,
           "url" => @path.file_name + '.html',
           "source" => @path.readlines,
           "lines" => lines.size,
@@ -103,14 +103,16 @@ module Duvet
     #
     # @return [String]
     def format
-      template = File.read(File.join( File.dirname(__FILE__), "templates", "file.erb" ))
-      e = Erubis::Eruby.new(template).result(Duvet.template_hash.merge(self.data))
-      e
+      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
     end
     
     def write(dir='cov')
-      f = File.new((dir.to_p + @path.file_name).to_s + '.html', "w" )
-      f.write(format)
+      pa = (dir.to_p + @path.file_name).to_s + '.html'
+      File.new(pa, 'w')
+      File.open(pa, 'w') {|f| f.puts(self.format) }
     end
   
   end

data/lib/duvet/covs.rb

@@ -2,9 +2,9 @@ module Duvet
   class Covs < Array
   
     def initialize(cov)
-      replace []
-      cov.each do |p, c|
-        self << Cov.new(p, c)
+      self.replace []
+      cov.each do |path, c|
+        self << Cov.new(path, c)
       end
     end
   
@@ -69,9 +69,10 @@ module Duvet
     end
     
     def format(dir='cov')
-      template = File.read(File.join( File.dirname(__FILE__), "templates", "index.erb" ))
-      e = Erubis::Eruby.new(template).result(Duvet.template_hash.merge(self.data))
-      e
+      template = File.read File.join(TEMPLATE_PATH, 'html', 'index.haml')
+      haml_engine = Haml::Engine.new(template)
+      output = haml_engine.render(nil, Duvet.template_hash.merge(self.data))
+      output
     end
     
     def write(dir='cov', style='rcov')
@@ -92,23 +93,22 @@ module Duvet
 
     # @todo Allow you to change style used
     def write_resources(dir, style)
-      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'}
-      
-      js.each do |i|
-        write_path = dir.to_p + i.to_p.basename
-        f = File.new(write_path, "w")
-        f.write(File.read(i))
-      end
-      
-      sass.each do |i|
+      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))
+      end
 
     end
   

data/templates/html/file.haml

@@ -0,0 +1,69 @@
+!!!
+%html{:lang => "en"}
+  %head
+    %meta{:charset => "utf-8"}
+    %title= file['path']
+    %link{:rel => "stylesheet", :href => "styles.css"}
+    %script{:type => "text/javascript", :src => "jquery.js"}
+    %script{:type => "text/javascript", :src => "plugins.js"}
+    %script{:type => "text/javascript", :src => "main.js"}
+    
+  %body
+    %header
+      %h1
+        %a{:href => "index.html"} Coverage
+      %h2= file['path']
+      
+    .table-wrapper
+      %table{:class => "summary", :border => "none"}
+        %thead
+          %tr
+            %th Name
+            %th Total Lines
+            %th Lines of Code
+            %th Total Coverage
+            %th Code Coverage
+          
+        %tbody
+          %tr
+            %td{:class => "name"}= file['path']
+            %td= file['lines']
+            %td= file['lines_code']
+            %td= coverage['total']
+            %td= coverage['code']
+          
+    .table-wrapper
+      %table{:class => "source", :border => "none"}
+        - file['source'].zip(coverage['lines']).each_with_index do |(line, count), i|
+          - if count.nil?
+            %tr{:class => "excluded"}
+              %td{:class => "no"}= i
+              %td
+                %pre
+                  %code= line.gsub("\n", "")
+  
+          - elsif count.zero?
+            %tr{:class => "unran"}
+              %td{:class => "no"}= i
+              %td
+                %pre
+                  %code= line.gsub("\n", "")
+              %td
+                %span{:class => "count"}= count
+                  
+          - else
+            %tr{:class => "ran"}
+              %td{:class => "no"}= i
+              %td
+                %pre
+                  %code= line.gsub("\n", "")
+              %td
+                %span{:class => "count"}= count
+            
+            
+                
+    %footer
+      %span
+        Generated on #{time} with
+        %a{:href => "http://github.com/hawx/duvet"}= "#{name} #{version}"
+              

data/templates/html/index.haml

@@ -0,0 +1,52 @@
+!!!
+%html{:lang => "en"}
+  %head
+    %meta{:charset => "utf-8"}
+    %title Coverage
+    %link{:rel => "stylesheet", :href => "styles.css"}
+    %script{:type => "text/javascript", :src => "jquery.js"}
+    %script{:type => "text/javascript", :src => "plugins.js"}
+    %script{:type => "text/javascript", :src => "main.js"}
+    
+  %body
+    %header
+      %h1 Coverage
+      
+    %input{:id => "filter", :name => "filter", :type => "text", :placeholder => "Filter"}
+      
+    .table-wrapper
+      %table{:class => "summary sort", :border => "none"}
+        %thead
+          %tr
+            %th{:class => "name"} Name
+            %th{:class => "lines"} Total Lines
+            %th{:class => "loc"} Lines of Code
+            %th{:class => "cov"} Total Coverage
+            %th{:class => "code"} Code Coverage
+          
+        %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']
+          
+        %tbody
+          - files.each do |f|
+            %tr
+              %td{:class => "name"}
+                %a{:href => "#{f['file']['url']}"}= f['file']['path']
+                
+              %td{:class => "lines"}= f['file']['lines']
+              %td{:class => "loc"}= f['file']['lines_code']
+              %td{:class => "ran"}= f['file']['lines_ran']
+              %td{:class => "cov"}= f['coverage']['total']
+              %td{:class => "code"}= f['coverage']['code']
+                
+    %footer
+      %span
+        Generated on #{time} with
+        %a{:href => "http://github.com/hawx/duvet"}= "#{name} #{version}"
+              

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: duvet
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Joshua Hawxwell
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +01:00
+date: 2010-11-12 00:00:00 +00:00
 default_executable: duvet
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -68,14 +65,14 @@ 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
-- lib/duvet/templates/file.erb
-- lib/duvet/templates/index.erb
+- templates/css/dark.sass
+- templates/css/light.sass
+- templates/css/rcov.sass
+- templates/html/file.haml
+- templates/html/index.haml
+- templates/js/jquery.js
+- templates/js/main.js
+- templates/js/plugins.js
 - test/helper.rb
 - test/test_duvet.rb
 - test_duvet/lib/klass.rb
@@ -95,7 +92,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -104,7 +100,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/lib/duvet/templates/file.erb

@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title><%= file['path'] %></title>
-    <link rel="stylesheet" href="styles.css" type="text/css" />
-    <script type="text/javascript" src="jquery.js"></script>
-    <script type="text/javascript" src="plugins.js"></script>
-    <script type="text/javascript" src="main.js"></script>
-  </head>
-  <body>
-  
-    <header>
-      <h1><a href="index.html">Coverage</a></h1>
-      <h2><%= file['path'] %></h2>
-    </header>
-    
-    <div class="table-wrapper">
-      <table class="summary" border="none">
-        <thead>
-          <tr>
-            <th>Name</th>
-            <th>Total Lines</th>
-            <th>Lines of Code</th>
-            <th>Total Coverage</th>
-            <th>Code Coverage</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td class="name"><%= file['path'] %></td>
-            <td><%= file['lines'] %></td>
-            <td><%= file['lines_code'] %></td>
-            <td><%= coverage['total'] %></td>
-            <td><%= coverage['code'] %></td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-  
-    <div class="table-wrapper">
-      <table class="source" border="none">
-      <% file["source"].zip(coverage["lines"]).each_with_index do |(line, count), i| %>
-        <% if count.nil? %>
-          <tr class="excluded">
-        <% elsif count.zero? %>
-          <tr class="unran">
-        <% else %>
-          <tr class="ran">
-        <% end %>
-          <td class="no"><%= i %></td>
-          <td><pre><code><%= line.gsub("\n", "") %></code></pre></td>
-          <td><% if count %><span class="count"><%= count %></span><% end %></td>
-        </tr>
-      <% end %>
-      </table>
-    </div>
-    
-    <footer>
-      <span>Generated on <%= time %> with </span><a href="http://github.com/hawx/duvet"><%= name %> <%= version %></a>
-    </footer>
-    
-  </body>
-</html>

data/lib/duvet/templates/index.erb

@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>Coverage</title>
-    <link rel="stylesheet" href="styles.css" type="text/css" />
-    <script type="text/javascript" src="jquery.js"></script>
-    <script type="text/javascript" src="plugins.js"></script>
-    <script type="text/javascript" src="main.js"></script>
-  </head>
-  <body>
-  
-    <header>
-      <h1>Coverage</h1>
-    </header>
-    
-    <input id="filter" name="filter" type="text" placeholder="Filter">
-    
-    <div class="table-wrapper">
-      <table class="summary sort" border="none">
-        <thead>
-          <tr>
-            <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>
-        </thead>
-        <tfoot>
-          <tr class="totals">
-            <td>Total</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 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>
-      </table>
-    </div>
-    
-    <footer>
-      <span>Generated on <%= time %> with </span><a href="http://github.com/hawx/duvet"><%= name %> <%= version %></a>
-    </footer>
-    
-  </body>
-</html>