coco 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a95f8e7a9b475c43d6a2af585819051272e62f5
-  data.tar.gz: 44d95676351a0d9ce9d6c2a2c1ffc8c6249bfccc
+  metadata.gz: 0f3f3919f636ca63d3f48631e04e2f5a2d803844
+  data.tar.gz: cf8c9967b7790f2c9794fa92006b1a818265c68e
 SHA512:
-  metadata.gz: 7f8b890410e93672ef60c2aaa03182d092da05076cc3fdca6826a875be5b7676d6f8f8dfa5b524758f2e4e9ea3e186c9a5a459d20d33485f39030f9daa2f11ed
-  data.tar.gz: 090258b598f8f079dc645bea11de2e82ad2e72770ea36e97e03efaecd4fe49cca002128cd484c5f285561cbe0fefa97f9e9b93ae23ac7d6f8cff7c92aafa30f0
+  metadata.gz: 95d444f5b8268451ab0f3e2ae044233a6540f0741b41d68adf7089a0b48f708db9e5365e722affde368c0e9748874d45533d55405d90a02f01992f8bc1130f4e
+  data.tar.gz: ca9e2c8ac2e133c3c2ff13d281b0c1c266333b85755ad16cd5ce7259436b043f7005cb4e7faf93a5dabe09afafa8731eb8ad9121538cd4959286e38e70194bca

data/Changelog.markdown

@@ -1,3 +1,16 @@
+v0.11.0  (2014-05-24)
+=================================================
+
+* Properly escape HTML in report.
+* Implements hit counters.
+* Output warnings for deprecated features.
+* Development/test
+  - Improve documentation for developers.
+  - Add Rake tasks for documentation. 
+  - Fix a random failing test
+  - Remove command line garbage after tests
+  - Update developer dependencies
+
 v0.10.0  (2014-05-03)
 =================================================
 
@@ -39,7 +52,7 @@ v0.7.1  (2013-07-05)
 v0.7  (2013-06-19)
 =================================================
 
-* Bugfix: single_line_report option is now silent if there is nothing to
+* Bugfix: `single_line_report` option is now silent if there is nothing to
   report
 * Improve report styling (a bit)
 * Default threshold is now 100%
@@ -49,7 +62,7 @@ v0.7  (2013-06-19)
 v0.6  (2011-10-30)
 =================================================
 
-* Added an option 'single_line_report'
+* Added an option `single_line_report`
 
 
 v0.5.1  (2011-08-08)
@@ -68,11 +81,9 @@ v0.5  (2011-03-14)
 v0.4.2  (2011-03-01)
 =================================================
 
-Minor bug fixes 
----------------
-* #14: sometimes text exit on the right from table in html report
-* #13: '<' and '>' are not escaped in hml report
-* #12: no link to web site in html files
+* Fix bug #14 Sometimes text exit on the right from table in html report
+* Fix bug #13 '<' and '>' are not escaped in hml report
+* Fix bug #12 No link to web site in html files
 
 
 v0.4.1  (2011-02-27)
@@ -84,8 +95,8 @@ v0.4.1  (2011-02-27)
 v0.4  (2011-02-26)
 =================================================
 
-* add colors to console output (*nix only)
-* it can exclude unwanted files from the report
+* Add colors to console output (nix only)
+* It can exclude unwanted files from the report
 
 
 v0.3  (2011-02-25)

data/Gemfile

@@ -1,6 +1,3 @@
 source "https://rubygems.org"
 
 gemspec
-
-gem 'rake', '>= 10.1.0'
-gem 'rspec'

data/README.markdown

@@ -19,8 +19,15 @@ Features
 Install
 --------------------------------
 
+In your Gemfile:
+
+    gem coco
+
+Or directly:
+
     gem install coco
 
+
 Usage
 --------------------------------
 Require the coco library at the beginning of your tests:
@@ -174,3 +181,5 @@ Contributors
 [sunaku (Suraj N. Kurapati)](https://github.com/sunaku)
 
 [Daniel Rice](https://github.com/BigNerdRanchDan)
+
+[Gioele](https://github.com/gioele)

data/Rakefile

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 
+require 'bundler/gem_tasks'
 require 'rake/dsl_definition'
 require 'rake'
 require 'rspec/core/rake_task'
@@ -39,14 +40,14 @@ task :metrics do
   Rake::Task['flay'].execute
 end
 
-desc 'Build the gem & install it'
-task :install do
-  sh "gem build coco.gemspec"
-  f = FileList['coco*gem'].to_a
-  sh "gem install #{f.first} --no-rdoc --no-ri"
-end
+namespace :doc do
+  desc 'Generate documentation for developpers'
+  task :create do 
+    exec 'yardoc'
+  end
 
-desc 'Generate yard documentation for developpers'
-task :doc do 
-  exec 'yardoc --title "Coco Documentation" - NEWS COPYING VERSION'
+  desc 'Delete documentation'
+  task :clean do
+    rm_rf 'doc'
+  end
 end

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.11.0

data/lib/coco.rb

@@ -1,16 +1,18 @@
 # -*- encoding: utf-8 -*-
 
-$LOAD_PATH.unshift File.dirname(__FILE__)
-$COCO_PATH = File.expand_path(File.expand_path(File.dirname(__FILE__)) + '/..')
 require 'coco/formatter'
 require 'coco/cover'
 require 'coco/writer'
 require 'coco/helpers'
 require 'coco/configuration'
 require 'coco/lister'
+
 require 'coverage'
 
+# Public: Main namespace of Coco, a code coverage utilily for
+# Ruby from 1.9.3 to 2.1.
 module Coco
+	ROOT = File.expand_path(File.dirname(__FILE__) + '/..').freeze
 end
 
 Coverage.start

data/lib/coco/configuration.rb

@@ -34,6 +34,8 @@ module Coco
         self.merge!(YAML.load_file('.coco.yml'))
       # Deprecated: Support of '.coco' file will be removed in v1.0.
       elsif File.exist?('.coco')
+        warn('Please use `.coco.yml` instead of `.coco`.')
+        warn('Support for `.coco` will be removed in future versions.')
         self.merge!(YAML.load_file('.coco'))
       end
 
@@ -70,16 +72,20 @@ module Coco
       end
     end
 
-    def add_files dir
+    def add_files(dir)
       Helpers.rb_files_from(dir).each {|file| self[:excludes] << file }
     end
 
     def remove_directories
-      self[:excludes].delete_if {|file_or_dir| File.directory?(file_or_dir)}
+      self[:excludes].delete_if {|file_or_dir| File.directory?(file_or_dir) }
     end
 
     def ensure_threeshold_compatibility
-      self[:threshold] = self[:threeshold] unless self[:threeshold].nil?
+      if !self[:threeshold].nil?
+        warn('Please change `threeshold` to `threshold`.')
+        warn('Support for the misspelt `threeshold` configuration key will be removed in future COCO versions.')
+        self[:threshold] = self[:threeshold]
+      end
     end
 
   end

data/lib/coco/cover/coverage_result.rb

@@ -20,7 +20,7 @@ module Coco
     #
     # config      - Hash
     # raw_results - Hash results obtained from Coverage.result.
-    def initialize config, raw_results
+    def initialize(config, raw_results)
       @exclude_files = config[:excludes]
       @threshold = config[:threshold]
       raise ArgumentError if @threshold < 0
@@ -34,7 +34,7 @@ module Coco
     
     def exclude_external_sources
       here = Dir.pwd
-      @all_from_domain = @result.select {|key, value| key.start_with? here}
+      @all_from_domain = @result.select {|key, value| key.start_with?(here) }
     end
     
     def exclude_files_user_dont_want
@@ -45,9 +45,9 @@ module Coco
     end
     
     def exclude_sources_above_threshold 
-      @covered_from_domain = @all_from_domain.select {|key, value| 
+      @covered_from_domain = @all_from_domain.select do |key, value| 
         CoverageStat.coverage_percent(value) < @threshold
-      }
+      end
     end
     
   end

data/lib/coco/cover/coverage_stat.rb

@@ -2,32 +2,39 @@
 
 module Coco
 
-  # Give statistics about an array of lines hit.
+  # Public: Give statistics about an array of lines hit.
   #
   # An "array of lines hit" is an array of integers, possibly nil.
   # Such array is obtain from Coverage.result.
   #
   # Each integer represent the state of a source line:
-  # * nil: source line will never be reached (like comments)
-  # * 0: source line could be reached, but was not
-  # * 1 and above: number of time the source line has been reached
-  class CoverageStat
-    
-    def CoverageStat.remove_nil_from hits
-      hits.select {|elem| not elem.nil?}
-    end
-    
-    def CoverageStat.number_of_covered_lines hits
-      hits.select {|elem| elem > 0}.size
-    end
-    
-    def CoverageStat.coverage_percent hits
-      hits = CoverageStat.remove_nil_from hits
+  # * nil: source line will never be reached (like comments).
+  # * 0: source line could be reached, but was not.
+  # * 1 and above: number of time the source line has been reached.
+  module CoverageStat
+    extend self
+
+    # Public: Compute the percentage of code coverage for a file.
+    # The file is represented by an array of hits.
+    #
+    # hits - Array of Integer.
+    #
+    # Returns a Integer (rounded) percentage.
+    def coverage_percent(hits)
+      hits = hits.compact
       return 0 if hits.empty?
       one_percent = 100.0 / hits.size
-      (CoverageStat.number_of_covered_lines(hits) * one_percent).to_i
+      (number_of_covered_lines(hits) * one_percent).to_i
     end
-    
+
+    # Compute the total of covered lines in a hits array.
+    #
+    # hits - Array of Integer.
+    #
+    # Returns Integer.
+    def number_of_covered_lines(hits)
+      hits.select {|hit| hit > 0 }.size
+    end
+
   end
-  
 end

data/lib/coco/formatter/colored_string.rb

@@ -2,32 +2,39 @@
 
 module Coco
 
-  # Extend String with ANSI colorization.
+  # Public: Build String with ANSI colorization.
   # Do nothing on Windows.
   class ColoredString < String
-    
+
+    # Public: Initialize a new ColoredString object.
+    #
+    # str - A String.
     def initialize(str="")
       super(str)
     end
-    
+
+    # Public: Make a red string.
+    #
+    # Returns String ANSIfied in red.
     def red
       colorize "\033[31m"
     end
-    
+
+    # Public: Make a yellow string.
+    #
+    # Returns String ANSIfied in yellow.
     def yellow
       colorize "\033[33m"
     end
-    
+
     private
-    
-    def colorize color_code
+
+    def colorize(color_code)
       if RUBY_PLATFORM =~ /win32/
         self
       else
         "#{color_code}#{self}\033[0m"
       end
     end
-    
   end
-  
 end

data/lib/coco/formatter/console_formatter.rb

@@ -9,11 +9,7 @@ module Coco
     #
     # Returns percent covered and associated filenames as a String.
     def format(single_line_report = false)
-      if single_line_report
-        single_line_message
-      else
-        @formatted_output.join("\n")
-      end
+      single_line_report ? single_line_message : @formatted_output.join("\n")
     end
 
     # Returns String.
@@ -27,8 +23,8 @@ module Coco
 
     # covered   - Hash
     # uncovered - Array
-    def initialize covered, uncovered
-      super(covered, uncovered)
+    def initialize(covered, uncovered)
+      super
       @formatted_output = []
       compute_percentage
       add_percentage_to_uncovered
@@ -53,7 +49,7 @@ module Coco
     end
 
     def add_percentage_to_uncovered
-      @uncovered.each do |filename| @formatted_output << [0, filename] end
+      @uncovered.each {|filename| @formatted_output << [0, filename] }
     end
 
     def single_line_message

data/lib/coco/formatter/context.rb

@@ -1,32 +1,54 @@
 # -*- encoding: utf-8 -*-
 
 module Coco
-  
+
   # Contextual information for ERB template, representing each covered files.
   class Context
-  
+
+    # Public: Initialize a Context for a covered file shown in the HTML
+    # report.
+    #
     # filename - A String name of the source file.
     # lines    - An Array of lines.
-		def initialize filename, lines
+		def initialize(filename, lines)
 			@filename = filename
       @lines = lines
 		end
 		
+    # Public: Get the object's binding.
+    #
+    # Returns Binding.
 		def get_binding
 			binding
 		end
 	end
-  
+
   # Contextual information for ERB template, representing index.html.
   class IndexContext
-  
-    # @todo doc, inheritance (with Context)
-		def initialize title, covered, uncovered
+
+    # Public: Initialize an IndexContext for the index file in the HTML
+    # report.
+    #
+    # title     - The String title for the report.
+    # covered   - Array of subarrays. Each subarray is:
+    #             [
+    #               Fixnum coverage percentage,
+    #               String formatted filename (HTML ready),
+    #               String real filename
+    #             ]
+    #             FIXME Need a class to handle subarrays.
+    # uncovered - Array of String filenames. The filenames are already
+    #             formatted, ready to be display in an HTML file.
+    #
+		def initialize(title, covered, uncovered)
 			@title = title
       @covered = covered
       @uncovered = uncovered
 		end
 		
+    # Public: Get the object's binding.
+    #
+    # Returns Binding.
 		def get_binding
 			binding
 		end

data/lib/coco/formatter/formatter.rb

@@ -1,22 +1,19 @@
 # -*- encoding: utf-8 -*-
 
 module Coco
-  
+
   # My childs will format coverages information.
-  # Kind of abstract class.
+  # Kind of abstract class, my childs must implements the `format`
+  # method.
   class Formatter
-  
+
     # raw_coverages - The Hash from Coverage.result.
     # uncovered     - An Array list of uncovered files.
-    # @todo I think covered is a better name than raw_coverages
-    def initialize raw_coverages, uncovered
+    # TODO I think covered is a better name than raw_coverages
+    def initialize(raw_coverages, uncovered)
       @raw_coverages = raw_coverages
       @uncovered = uncovered
     end
-    
-    def format
-      "Implement me in child"
-    end
   end
 
 end

data/lib/coco/formatter/html_formatter.rb

@@ -1,39 +1,40 @@
 # -*- encoding: utf-8 -*-
 
+require 'cgi'
 require 'erb'
 
 module Coco
-  
+
   # I format coverages information into html files.
   # @todo document and change name to HtmlFilesFormatter
   class HtmlFormatter < Formatter
-    
-    def initialize raw_coverages
+
+    def initialize(raw_coverages)
       super(raw_coverages, [])
       @formatted_output_files = {}
       @context = nil
-      @template = Template.open File.join($COCO_PATH,'template/file.erb')
+      @template = Template.open File.join(Coco::ROOT, 'template/file.erb')
     end
-    
+
     def format
       @raw_coverages.each do |filename, coverage|
         build_html filename, coverage
       end
       @formatted_output_files
     end
-    
+
     private
-    
-    def build_html filename, coverage
+
+    def build_html(filename, coverage)
       source = File.readlines filename
       lines = []
       source.each_with_index do |line, index|
-        lines << [index+1, line.chomp.gsub(/</, '&lt;').gsub(/>/, '&gt;'), coverage[index]]
+        lines << [index+1, CGI.escapeHTML(line.chomp), coverage[index]]
       end
       @context = Context.new filename, lines
       @formatted_output_files[filename] = @template.result(@context.get_binding)
     end
-    
+
   end
 
 end

data/lib/coco/formatter/html_index_formatter.rb

@@ -3,28 +3,29 @@
 require 'erb'
 
 module Coco
-  
+
   # I format the index.html
   class HtmlIndexFormatter < Formatter
-    
+
     def initialize(raw_coverages, uncovered)
-      super(raw_coverages, uncovered)
+      super
       @context = nil
-      @template = Template.open File.join($COCO_PATH,'template/index.erb')
+      @template = Template.open File.join(Coco::ROOT, 'template/index.erb')
       @lines = []
       build_lines_for_context
     end
-    
+
     def format
-      @context = IndexContext.new(Helpers.index_title, @lines,
-                                  @uncovered.map{|e| emphasize(e)})
+      @context = IndexContext.new(Helpers.index_title,
+                                  @lines,
+                                  @uncovered.map{|e| emphasize(e) })
       @template.result(@context.get_binding)
     end
-    
+
     private
-    
+
     def build_lines_for_context
-      @raw_coverages.each do |filename, coverage| 
+      @raw_coverages.each do |filename, coverage|
         filename = File.expand_path(filename)
         percentage = CoverageStat.coverage_percent(coverage)
         on_disk_filename = Helpers.rb2html(filename)
@@ -32,12 +33,12 @@ module Coco
       end
       @lines.sort!
     end
-    
+
     def emphasize(filename)
       base = File.basename filename
       filename.sub(base, "<b>#{base}</b>")
     end
-    
+
   end
 
 end

data/lib/coco/formatter/template.rb

@@ -9,7 +9,7 @@ module Coco
     # filename - An String ERB template.
     #
     # Returns ERB.
-    def self.open filename
+    def self.open(filename)
       io = IO.readlines(filename, nil)
 			ERB.new(io[0], nil, '><')
     end

data/lib/coco/helpers.rb

@@ -21,7 +21,7 @@ module Coco
       #   #=> '_lib_source.rb.html'
       #
       # Returns String HTML filename.
-      def rb2html name
+      def rb2html(name)
         name.sub(Dir.pwd, '').tr('/\\', '_') + '.html'
       end
 
@@ -30,7 +30,7 @@ module Coco
       # Returns String.
       def index_title
         project_name = File.basename(Dir.pwd)
-        version = File.read(File.join($COCO_PATH, 'VERSION')).strip
+        version = File.read(File.join(Coco::ROOT, 'VERSION')).strip
         "#{project_name} - Code coverage (coco #{version})"
       end
 
@@ -39,8 +39,8 @@ module Coco
       # files - List of filenames as an Array of String.
       #
       # Returns an Array of String.
-      def expand files
-        files.map {|file| File.expand_path file}
+      def expand(files)
+        files.map {|file| File.expand_path(file) }
       end
 
       # Public: Get all ruby files from a directory, including
@@ -49,7 +49,7 @@ module Coco
       # directory - String directory to look into.
       #
       # Returns an Array of String.
-      def rb_files_from directory
+      def rb_files_from(directory)
         rb_files = File.join(directory, "**", "*.rb")
         Dir.glob(rb_files)
       end

data/lib/coco/lister/source_lister.rb

@@ -6,7 +6,7 @@ module Coco
   class SourceLister
   
     # config - Hash.
-    def initialize config
+    def initialize(config)
       @exclude_files = config[:excludes]
       dirs = config[:directories]
       unless dirs.is_a? Array
@@ -26,7 +26,7 @@ module Coco
     # the directories found in configuration.
     def list
       look_for_sources
-      @list.map! {|file| File.expand_path(file)}
+      @list.map! {|file| File.expand_path(file) }
       exclude_files_user_dont_want
       @list
     end
@@ -50,7 +50,7 @@ module Coco
       end
     end
     
-    def exclude_all_from_dir full_path
+    def exclude_all_from_dir(full_path)
       Helpers.rb_files_from(full_path).each do |file|
         @list.delete File.expand_path(file)
       end

data/lib/coco/lister/uncovered_lister.rb

@@ -7,7 +7,7 @@ module Coco
     
     # sources - Array of String list of filenames.
     # covered - Hash raw coverage from the domain.
-    def initialize sources, covered
+    def initialize(sources, covered)
       @source_files = Helpers.expand(sources)
       @covered_files = Helpers.expand(covered.keys)
     end

data/lib/coco/writer/file_writer.rb

@@ -2,12 +2,18 @@
 
 module Coco
   
-  # I write one file.
-  class FileWriter
-    def FileWriter.write filename, content
-      file = File.new(filename, "w")
-      file.write content
-      file.close
+  # Public: I write a single file.
+  module FileWriter
+    extend self
+
+    # Public: Write a file.
+    #
+    # filename - String path+name of the file.
+    # content  - String content to put in the file.
+    #
+    # Returns nothing.
+    def write(filename, content)
+      File.open(filename, 'w') {|file| file.write(content) }
     end
   end
 

data/lib/coco/writer/html_directory.rb

@@ -2,38 +2,61 @@
 
 module Coco
 
-  # I prepare the coverage/ directory for html files.
+  # Public: I prepare the coverage/ directory for html files.
   class HtmlDirectory
-    attr_reader :coverage_dir
-    
+    COVERAGE_DIR = 'coverage'
+
+    # Public: Initialize a new HtmlDirectory object.
     def initialize
-      @coverage_dir = 'coverage'
-      @css_dir = 'coverage/css'
-      @img_dir = 'coverage/img'
-      css = File.join($COCO_PATH, 'template/css')
+      css = File.join(Coco::ROOT, 'template/css')
       @css_files = Dir.glob(css + '/*')
-      img = File.join($COCO_PATH, 'template/img')
+      img = File.join(Coco::ROOT, 'template/img')
       @img_files = Dir.glob(img + '/*')
     end
-    
-    # Delete the coverage/ directory
+
+    # Public: Get the name of the directory where the HTML report is
+    # stored.
+    #
+    # Returns String.
+    def coverage_dir
+      COVERAGE_DIR
+    end
+
+    # Public: Delete the directory where the HTML report is stored.
+    #
+    # Returns nothing.
     def clean
-      FileUtils.remove_dir @coverage_dir if File.exist? @coverage_dir
+      FileUtils.remove_dir(coverage_dir) if File.exist?(coverage_dir)
     end
-    
+
+    # Public: Make all directories needed to store the HTML report, then
+    # copy media files (css, images, etc.).
+    #
+    # Returns nothing.
     def setup
-      FileUtils.makedirs @css_dir
-      FileUtils.makedirs @img_dir
-      FileUtils.cp @css_files, @css_dir
-      FileUtils.cp @img_files, @img_dir
+      FileUtils.makedirs(css_dir)
+      FileUtils.makedirs(image_dir)
+      FileUtils.cp(@css_files, css_dir)
+      FileUtils.cp(@img_files, image_dir)
     end
-    
-    # I list the html files from the coverage directory
+
+    # Public: I list the html files from the directory where the HTML
+    # report is stored.
+    #
+    # Returns nothing.
     def list
-      files = Dir.glob("#{@coverage_dir}/*.html")
-      files.map {|file| File.basename(file)}
+      files = Dir.glob("#{coverage_dir}/*.html")
+      files.map {|file| File.basename(file) }
+    end
+
+    private
+
+    def css_dir
+      "#{COVERAGE_DIR}/css"
     end
-    
-  end
 
+    def image_dir
+      "#{COVERAGE_DIR}/img"
+    end
+  end
 end

data/lib/coco/writer/html_files_writer.rb

@@ -1,16 +1,21 @@
 # -*- encoding: utf-8 -*-
 
 module Coco
-  
-  # I populate the coverage/ directory with files, if any.
+
+  # Public: I populate the coverage/ directory with files, if any.
   class HtmlFilesWriter
-  
+
+    # Public: Initialize a new HtmlFilesWriter.
+    #
     # html_files - Hash, key is filename, value is html content.
-    def initialize html_files
+    def initialize(html_files)
       @html_files = html_files
       @html_dir = HtmlDirectory.new
     end
-    
+
+    # Public: Write HTML files in the right place.
+    #
+    # Returns nothing.
     def write
       @html_dir.clean
       if @html_files.size > 0
@@ -18,16 +23,14 @@ module Coco
         write_each_file
       end
     end
-    
+
     private
-    
+
     def write_each_file
       @html_files.each do |filename, html|
         FileWriter.write File.join(
           @html_dir.coverage_dir, Helpers.rb2html(filename)), html
       end
     end
-    
   end
-
 end

data/lib/coco/writer/html_index_writer.rb

@@ -2,20 +2,24 @@
 
 module Coco
   
-  # I write the index.html
+  # Public: I write the index.html
   class HtmlIndexWriter
   
-    def initialize index
+    # Public: Initialize a new HtmlIndexWriter object.
+    #
+    # index - A String HTML document.
+    def initialize(index)
       @index = index
       @dir = HtmlDirectory.new.coverage_dir
     end
     
+    # Public: Write the index file in the right place.
+    #
+    # Returns nothing.
     def write
       if File.exist?(@dir)
         FileWriter.write File.join(@dir, 'index.html'), @index
       end
     end
-    
   end
-  
 end

data/template/css/coco.css

@@ -29,7 +29,7 @@ h2 {
   font-size: 1.1em;
 }
 
-a { 
+a {
 	color:#446;
   text-decoration: none;
 }
@@ -63,7 +63,15 @@ table td {
 }
 
 table.source td {
-  padding: 0;
+  padding-top: 0;
+  padding-bottom: 0;
+  padding-left: 0;
+}
+
+thead {
+  font-weight: bold;
+  background-color: #eee;
+  text-align: center;
 }
 
 tr.never {
@@ -106,11 +114,35 @@ td.black {
   font-weight: bold;
 }
 
-td:first-child {
+td.percentage {
+  text-align: right;
+  padding-right: 20px;
+}
+
+td.line-source {
+  padding-right: 0;
+}
+
+td.line-num, td.line-hits {
+  width: 10%;
+}
+
+td.line-num {
+  color: #444;
+  text-align: right;
+  padding-right: 5px;
+}
+
+td.line-hits {
   text-align: right;
   padding-right: 20px;
 }
 
+th {
+  padding-bottom: 5px;
+  padding-top: 5px;
+}
+
 pre {
   margin: 6px 0;
 }

data/template/file.erb

@@ -16,18 +16,27 @@
     <p class="date"><%= "#{Time.now}" %></p>
     
     <table class="source">
+
+      <thead>
+        <tr>
+          <th>line num</th>
+          <th>source code</th>
+          <th>
+            <abbr title="Number of time this line has been hit during test.">
+              line hits
+            </abbr>
+          </th>
+        </tr>
+      </thead>
       
       <% @lines.each do |num, text, hit|%>
-      <%   if hit.nil? %>
-        <tr class="never">
-      <%   elsif hit.zero? %>
-        <tr class="miss">
-      <%   elsif hit > 0 %>
-        <tr class="hit" %>
-      <%   end %>
-
-      <%= "<td><pre>#{num} </pre></td><td><pre>#{text}</pre></td>" %>
+        <% classes = { nil => 'never', 0 => 'miss' } %>
+        <% hit_class = classes[hit] || 'hit' %>
 
+        <tr class="<%= hit_class %>">
+          <td class='line-num'><pre><%= num %> </pre></td>
+          <td class='line-source'><pre><%= text %></pre></td>
+          <td class='line-hits'><%= hit %></td>
         </tr>
       <% end%>
       

data/template/index.erb

@@ -19,28 +19,22 @@
     <table class="index">
     
       <% @uncovered.each do |filename| %>
-        <%= "<tr><td class=\"black\">0%</td><td>#{filename}</td></tr>\n" %>
+      <tr><td class="percentage black">0%</td><td><%= filename %></td></tr>
       <% end %>
       
       <% @covered.each do |percentage, filename, href| %>
+        <% level_class = case percentage; when 80..100; 'yellow'; when 70..79; 'orange'; when 69..50; 'pink'; else 'red'; end %>
         <tr>
-      <% if percentage > 80 %>
-        <td class ="yellow">
-      <% elsif percentage > 70 %>
-        <td class="orange">
-      <% elsif percentage > 50 %>
-        <td class="pink">
-      <% else %>
-        <td class="red">
-      <% end %>
-      <%= "#{percentage}%</td><td><a href=\"#{href}\">#{filename}</a></td></tr>\n" %>
+          <td class="percentage <%= level_class %>"><%= percentage %>%</td>
+	  <td><a href="<%= href %>"><%= filename %></a></td>
+        </tr>
       <% end%>
       
     </table>
     
     <p class="license">
     Coco, code coverage for ruby.<br/>
-    Copyright 2011-2013, Xavier Nayrac<br/>
+    Copyright 2011-2014, Xavier Nayrac<br/>
     <br/>
     This program is free software: you can redistribute it and/or modify<br/>
     it under the terms of the GNU General Public License as published by<br/>

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: coco
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Xavier Nayrac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2014-05-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: yard-tomdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: |-
   "Code coverage tool for ruby 1.9.3 to 2.1.
   Use it by "require 'coco'" from rspec or unit/test.
@@ -67,10 +109,8 @@ files:
 - COPYING
 - Changelog.markdown
 - Gemfile
-- Gemfile.lock
 - README.markdown
 - Rakefile
-- TODO
 - VERSION
 - lib/coco.rb
 - lib/coco/configuration.rb

data/Gemfile.lock

@@ -1,43 +0,0 @@
-PATH
-  remote: .
-  specs:
-    coco (0.10.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.4)
-    flay (2.4.0)
-      ruby_parser (~> 3.0)
-      sexp_processor (~> 4.0)
-    rainbow (2.0.0)
-    rake (10.1.1)
-    reek (1.3.7)
-      rainbow
-      ruby2ruby (~> 2.0.8)
-      ruby_parser (~> 3.3)
-      sexp_processor
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    ruby2ruby (2.0.8)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.5.0)
-      sexp_processor (~> 4.1)
-    sexp_processor (4.4.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  coco!
-  flay (~> 2.4)
-  rake (>= 10.1.0)
-  reek (~> 1.3)
-  rspec

data/TODO

@@ -1,33 +0,0 @@
-[x] Release 0.10.0
-    [ ] release gem
-
-[ ] Update website
-
-[ ] Review PRs
-
-[ ] A task to build/install/push a gem
-
-[ ] BUG #22 rails 4.1 / minitest / spring
-    [x] test with rails 4.1 / spring / rspec
-        [x] coco outside dev group
-    [x] test with 4.1 / spring / minitest
-    [ ] retest with a .coco.yml file
-
-[ ] refactor with reek
-
-[ ] en gras: def, class, module
-
-[ ] rakefile task: tomdoc
-
-[ ] exclure spec et test par défaut
-
-[ ] le wiki dit que seul le dossier lib est inspecté par défaut, je pense
-    que c'est en fait toute l'application.
-
-
-Bump Version
-=============
-
-- Update `VERSION` file.
-- `bundle install`
-- Update Changelog.