coco 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 370bbcc5a7090bd6ad4ce42f2b7a339a6cc7f4c9
-  data.tar.gz: 588bd8101244a9802da80a2bc42641f3c180ea61
+  metadata.gz: 3030feb597e938253dfae399455180d66a35f093
+  data.tar.gz: a0a298d7731658d6aff3c0493304bc7111caa4a8
 SHA512:
-  metadata.gz: 325a23f885d4c9342aad6f3006244952c74566f79463167f6027f32529d1ca0e405005de0b83896e5c60b2b3d9cbe6037ace7958cdd879449cde0552084ad845
-  data.tar.gz: e6aa3b9764732984c806d196c6eccae802590da1fc05bc6ea483aec4f10c5b41addebfcc19fe8a6c0e32801a53f9c26fce912739dd41252b2be98b9460d484cd
+  metadata.gz: 44de807fa160bf1e72e5e48dfa78464faf3f5d6bea1298f4b0afa2ccb28c0e22e5d31408c30c195655cbabb212bd5f60b9533bfc9a0f50b92f93c1a1f2153d20
+  data.tar.gz: 3a1b568bb6d43580078b59d23abe583da54d06972b8f9aa81c69ed8f30232db811633b69e00145e223904463254a74baf2257cb5fd8daf102c33384e187d29dc

data/Changelog.markdown

@@ -1,3 +1,17 @@
+v0.13.0  (2015-07-03)
+=================================================
+
+* Drop support for Ruby 1.9.3.
+* Remove base path in index file of the HTML report for greater
+  readability.
+* Exclude spec and test folders by default from the coverage. It was
+  weird to sometimes see test files reported.
+* Improve the theme.
+* In HTML report, highlight each lines of code, not only the green ones.
+* Ligthen the first part of the path in the index file of the HTML
+  report for greater readability.
+
+
 v0.12.0  (2014-08-09)
 =================================================
 

data/Gemfile.lock

@@ -1,38 +1,58 @@
 PATH
   remote: .
   specs:
-    coco (0.12.0)
+    coco (0.13.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    abstract_type (0.0.7)
+    adamantium (0.2.0)
+      ice_nine (~> 0.11.0)
+      memoizable (~> 0.4.0)
+    ast (2.0.0)
+    concord (0.1.5)
+      adamantium (~> 0.2.0)
+      equalizer (~> 0.0.9)
     diff-lcs (1.2.5)
-    flay (2.4.0)
+    equalizer (0.0.11)
+    flay (2.6.1)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
+    ice_nine (0.11.1)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
+    parser (2.2.2.6)
+      ast (>= 1.1, < 3.0)
+    procto (0.0.2)
     rainbow (2.0.0)
-    rake (10.3.2)
-    reek (1.3.7)
-      rainbow
-      ruby2ruby (~> 2.0.8)
-      ruby_parser (~> 3.3)
-      sexp_processor
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
+    rake (10.4.2)
+    reek (3.0.0)
+      parser (~> 2.2.2.5)
+      rainbow (~> 2.0)
+      unparser (~> 0.2.2)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    ruby2ruby (2.0.8)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.6.1)
+    rspec-mocks (2.99.4)
+    ruby_parser (3.7.0)
       sexp_processor (~> 4.1)
-    sexp_processor (4.4.3)
+    sexp_processor (4.6.0)
+    thread_safe (0.3.5)
     tomparse (0.4.2)
-    yard (0.8.7.3)
+    unparser (0.2.4)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.2.5)
+      equalizer (~> 0.0.9)
+      parser (~> 2.2.2)
+      procto (~> 0.0.2)
+    yard (0.8.7.6)
     yard-tomdoc (0.7.1)
       tomparse (>= 0.4.0)
       yard
@@ -45,6 +65,6 @@ DEPENDENCIES
   coco!
   flay (~> 2.4)
   rake (~> 10.1)
-  reek (~> 1.3)
+  reek (~> 3.0)
   rspec (~> 2.14)
   yard-tomdoc (~> 0.7)

data/README.markdown

@@ -1,7 +1,10 @@
 coco [![Build Status](https://travis-ci.org/lkdjiin/coco.png)](https://travis-ci.org/lkdjiin/coco) [![Gem Version](https://badge.fury.io/rb/coco.png)](http://badge.fury.io/rb/coco) [![Inline docs](http://inch-ci.org/github/lkdjiin/coco.png)](http://inch-ci.org/github/lkdjiin/coco) [![Dependency Status](https://gemnasium.com/lkdjiin/coco.svg)](https://gemnasium.com/lkdjiin/coco)
 ==============================
 
-Code coverage tool for ruby 1.9.3, 2.0 and 2.1.
+— *«If it's well-covered it doesn't mean it's well-tested!»* —
+
+Code coverage tool for ruby 2.0, 2.1 and 2.2.
+=======
 
 Features
 --------------------------------
@@ -11,7 +14,6 @@ Features
 * Display names of uncovered files on console
 * _Simple_ html report _only_ for uncovered files
 * Report sources that have no tests
-* UTF-8 compliant
 * Configurable via a simple yaml file
 * Colorized console output (nix only)
 
@@ -27,6 +29,7 @@ Or directly:
 
     gem install coco
 
+*NOTE: If you're using a Gemfile, don't `:require => false`*
 
 Usage
 --------------------------------
@@ -161,7 +164,7 @@ Now, when running tests, you will see something like the following:
 Dependencies
 --------------------------------
 
-ruby >= 1.9.3
+ruby >= 2.0
 
 
 Contributing

data/Rakefile

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require 'bundler/gem_tasks'
 require 'rake/dsl_definition'
 require 'rake'

data/VERSION

@@ -1 +1 @@
-0.12.0
+0.13.0

data/lib/coco.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require 'coco/formatter'
 require 'coco/cover'
 require 'coco/writer'

data/lib/coco/configuration.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require 'yaml'
 
 module Coco
@@ -26,7 +24,7 @@ module Coco
     def initialize
       self[:threshold] = 100
       self[:directories] = ['lib']
-      self[:excludes] = []
+      self[:excludes] = ['spec', 'test']
       self[:single_line_report] = false
       self[:always_run] = true
       self[:show_link_in_terminal] = false

data/lib/coco/cover.rb

@@ -1,4 +1,2 @@
-# -*- encoding: utf-8 -*-
-
 require 'coco/cover/coverage_stat'
 require 'coco/cover/coverage_result'

data/lib/coco/cover/coverage_result.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module Coco
 
   # Compute results of interest from the big results information (from

data/lib/coco/cover/coverage_stat.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module Coco
 
   # Public: Give statistics about an array of lines hit.

data/lib/coco/formatter/colored_string.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module Coco
 
   # Public: Build String with ANSI colorization.

data/lib/coco/formatter/console_formatter.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module Coco
 
   # I format coverages data for console output.

data/lib/coco/formatter/context.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module Coco
 
   # Contextual information for ERB template, representing each covered files.

data/lib/coco/formatter/formatter.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module Coco
 
   # My childs will format coverages information.

data/lib/coco/formatter/html_formatter.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require 'cgi'
 require 'erb'
 
@@ -13,12 +11,12 @@ module Coco
       super(raw_coverages, [])
       @formatted_output_files = {}
       @context = nil
-      @template = Template.open File.join(Coco::ROOT, '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
+        build_html(filename, coverage)
       end
       @formatted_output_files
     end
@@ -26,15 +24,18 @@ module Coco
     private
 
     def build_html(filename, coverage)
-      source = File.readlines filename
       lines = []
-      source.each_with_index do |line, index|
+      source(filename).each_with_index do |line, index|
         lines << [index+1, CGI.escapeHTML(line.chomp), coverage[index]]
       end
-      @context = Context.new filename, lines
+      @context = Context.new(Helpers.name_for_html(filename), lines)
       @formatted_output_files[filename] = @template.result(@context.get_binding)
     end
 
+    def source(filename)
+      File.readlines(filename)
+    end
+
   end
 
 end

data/lib/coco/formatter/html_index_formatter.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require 'erb'
 
 module Coco
@@ -10,15 +8,16 @@ module Coco
     def initialize(raw_coverages, uncovered)
       super
       @context = nil
-      @template = Template.open File.join(Coco::ROOT, '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 {|filename| Helpers.name_for_html(filename) })
       @template.result(@context.get_binding)
     end
 
@@ -26,19 +25,15 @@ module Coco
 
     def build_lines_for_context
       @raw_coverages.each do |filename, coverage|
-        filename = File.expand_path(filename)
-        percentage = CoverageStat.coverage_percent(coverage)
-        on_disk_filename = Helpers.rb2html(filename)
-        @lines << [percentage, emphasize(filename), on_disk_filename]
+        @lines << [
+          CoverageStat.coverage_percent(coverage),
+          Helpers.name_for_html(filename),
+          Helpers.rb2html(filename)
+        ]
       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

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require 'erb'
 
 module Coco

data/lib/coco/helpers.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module Coco
 
   # Public: Collection of application's helpers methods.
@@ -9,6 +7,27 @@ module Coco
   module Helpers
     class << self
 
+      # Public: Get a String (ruby) source filename ready to be
+      # displayed in the index file.
+      #
+      # name - String full path filename (normaly full path but, who
+      #        knows? may be relative path).
+      #
+      # Examples
+      #
+      #   name = '/home/user/my_project/lib/source.rb'
+      #   Helpers.name_for_html(name)
+      #   #=> 'lib/<b>source.rb</b>'
+      #
+      # Returns the formatted String.
+      def name_for_html(name)
+        name = File.expand_path(name)
+        name = name.sub(Dir.pwd, '')
+        name = name.sub(/^\//, '')
+        base = File.basename(name)
+        name.sub(base, "<b>#{base}</b>")
+      end
+
       # Public: Get html filename (from a ruby filename) suitable for
       # the coverage directory.
       #
@@ -22,7 +41,10 @@ module Coco
       #
       # Returns String HTML filename.
       def rb2html(name)
-        name.sub(Dir.pwd, '').tr('/\\', '_') + '.html'
+        name = name.sub(Dir.pwd, '')
+        name = name.sub(/^\//, '')
+        name = name.tr('/\\', '_')
+        name + '.html'
       end
 
       # Public: Get page title for the index.html file.

data/lib/coco/lister.rb

@@ -1,4 +1,2 @@
-# -*- encoding: utf-8 -*-
-
 require 'coco/lister/source_lister'
 require 'coco/lister/uncovered_lister'

data/lib/coco/lister/source_lister.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module Coco
 
   # I retrieve the .rb files from a list of directories.

data/lib/coco/lister/uncovered_lister.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module Coco
 
   # I retrieve the list of uncovered (0%) .rb files.

data/lib/coco/writer.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require 'coco/writer/file_writer'
 require 'coco/writer/html_directory'
 require 'coco/writer/html_files_writer'

data/lib/coco/writer/file_writer.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module Coco
   
   # Public: I write a single file.

data/lib/coco/writer/html_directory.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module Coco
 
   # Public: I prepare the coverage/ directory for html files.

data/lib/coco/writer/html_files_writer.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module Coco
 
   # Public: I populate the coverage/ directory with files, if any.

data/lib/coco/writer/html_index_writer.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 module Coco
   
   # Public: I write the index.html

data/template/css/coco.css

@@ -14,8 +14,8 @@ table.index td {
 }
 
 html {
-  background-color: #fff;
-  color: #222;
+  background-color: #F5F5F5;
+  color: #505050;
 }
 
 body {
@@ -24,13 +24,13 @@ body {
 
 h2 {
   padding: 10px;
-  background-color: #7658F8;
-  color: #fff;
+  background-color: #6A9FB5;
+  color: #F5F5F5;
   font-size: 1.1em;
 }
 
 a {
-	color:#446;
+  color: #505050;
   text-decoration: none;
 }
 
@@ -43,10 +43,10 @@ p.menu a {
 }
 
 p.license {
-  color: #888;
+  color: #B0B0B0;
   margin-top: 20px;
   padding-top: 5px;
-  border-top: 1px solid #888;
+  border-top: 1px solid #D0D0D0;
   font-size: 80%;
 }
 
@@ -70,52 +70,57 @@ table.source td {
 
 thead {
   font-weight: bold;
-  background-color: #eee;
+  background-color: #E0E0E0;
   text-align: center;
 }
 
+td,
+td a {
+  color: #B0B0B0;
+}
+
+td b,
+td a b {
+  color: #505050;
+}
+
 tr.never {
-  background-color: #eee;
+  background-color: #F5F5F5;
 }
 
 tr.hit {
-  background-color: #5BD999;
+  background-color: #90A959;
 }
 
 tr.hit:hover {
-  background-color: #8BF9C9;
+  background-color: #C4E679;
 }
 
 tr.miss {
-   background-color: #E6567A;
-}
-
-td.yellow, td.orange, td.pink, td.red, td.black {
-  width: 45px;
-  color: #fff;
+   background-color: #AC4142;
 }
 
-td.yellow {
-  background-color: #EAC14D;
+tr.miss:hover {
+  background-color: #E65758;
 }
 
-td.orange {
-  background-color: #CB70D7;
+td.yellow, td.red, td.black {
+  width: 45px;
 }
 
-td.pink {
-  background-color: #CB70D7;
+td.yellow {
+  background-color: #F4BF75;
+  color: #303030;
 }
 
 td.red {
-  background-color: #E6567A;
-  font-weight: bold;
+  background-color: #AC4142;
+  color: #F5F5F5;
 }
 
 td.black {
-  background-color: #222;
-  color: #fff;
-  font-weight: bold;
+  background-color: #505050;
+  color: #F5F5F5;
 }
 
 td.percentage {
@@ -123,22 +128,27 @@ td.percentage {
   padding-right: 20px;
 }
 
+td.line-num,
+td.line-hits,
 td.line-source {
-  padding-right: 0;
+  color: #202020;
 }
 
-td.line-num, td.line-hits {
+td.line-num,
+td.line-hits {
   width: 10%;
+  text-align: right;
+}
+
+td.line-source {
+  padding-right: 0;
 }
 
 td.line-num {
-  color: #444;
-  text-align: right;
   padding-right: 5px;
 }
 
 td.line-hits {
-  text-align: right;
   padding-right: 20px;
 }
 
@@ -150,3 +160,5 @@ th {
 pre {
   margin: 6px 0;
 }
+
+

data/template/index.erb

@@ -23,7 +23,7 @@
       <% 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 %>
+        <% level_class = case percentage; when 80..100; 'yellow'; else 'red'; end %>
         <tr>
           <td class="percentage <%= level_class %>"><%= percentage %>%</td>
 	  <td><a href="<%= href %>"><%= filename %></a></td>
@@ -34,7 +34,7 @@
     
     <p class="license">
     Coco, code coverage for ruby.<br/>
-    Copyright 2011-2014, Xavier Nayrac<br/>
+    Copyright 2011-<%= Time.now.year %>, 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coco
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Xavier Nayrac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-09 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: flay
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 description: |-
-  "Code coverage tool for ruby 1.9.3 to 2.1.
+  "Code coverage tool for ruby 2.0 to 2.2.
   Use it by "require 'coco'" from rspec or unit/test.
   It display names of uncovered files on console.
   It builds simple html report.
@@ -152,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -160,9 +160,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Code coverage tool for ruby 1.9.3 to 2.1
+summary: Code coverage tool for ruby 2.0 to 2.2
 test_files: []
 has_rdoc: