coverband 0.0.1 → 0.0.2

data/coverband.gemspec

@@ -20,4 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_runtime_dependency "simplecov"
+  spec.add_runtime_dependency "json"
 end

data/lib/coverband/middleware.rb

@@ -0,0 +1,86 @@
+module Coverband
+  class Middleware
+
+    def initialize(app, settings={})
+      @app = app
+      root = settings[:root] || './'
+      @project_directory = File.expand_path(root+'../')
+      @enabled = true
+      @function_set = false
+      @files = {}
+
+      @sample_percentage = settings[:percentage] || 100.0
+      @reporter = settings[:reporter]
+    end
+
+    def call(env)
+      configure_sampling
+      record_coverage
+      results = @app.call(env)
+      report_coverage
+      results
+    end
+
+    private
+
+    def configure_sampling
+      if (rand * 100.0) > @sample_percentage
+        @enabled = false
+      else
+        @enabled = true
+      end
+    end
+
+    def record_coverage
+      if @enabled
+        unless @function_set
+          set_trace_func proc { |event, file, line, id, binding, classname|
+            add_file(file, line)
+          }
+          @function_set = true
+        end
+      else
+        if @function_set
+          set_trace_func(nil)
+          @function_set = false
+        end
+      end
+    end
+    
+    def add_file(file, line)
+      unless !file.match(@project_directory) 
+        if @files.include?(file)
+          @files[file] << line
+          @files[file].uniq!
+        else
+          @files[file] = [line]
+        end
+      end
+    end
+    
+    def report_coverage
+      begin
+        if @enabled
+          if @reporter
+            if @reporter.is_a?(Redis)
+              #"/Users/danmayer/projects/cover_band_server/app.rb"=>[54, 55]
+              @files.each_pair do |key, values|
+                @reporter.sadd "coverband", key.gsub('/','.')
+                @reporter.sadd "coverband#{key.gsub('/','.')}", values
+              end
+              @files = {}
+            end
+          else
+            puts "coverage report: "
+            puts @files.inspect
+          end
+        else
+          puts "coverage disabled" if @reporter
+        end
+      rescue RuntimeError
+        puts "coverage missing" if @reporter
+      end
+    end
+    
+  end
+end

data/lib/coverband/reporter.rb

@@ -0,0 +1,82 @@
+require 'simplecov'
+
+module Coverband
+
+  class Reporter
+
+    def self.baseline
+      require 'coverage'
+      Coverage.start
+      yield
+      @project_directory = File.expand_path(Dir.pwd+'../')
+      results = Coverage.result
+      results = results.reject{|key, val| !key.match(@project_directory)}
+      puts results.inspect
+      
+      File.open('./tmp/coverband_baseline.json', 'w') {|f| f.write(results.to_json) }
+    end
+
+    def self.report(redis, options = {})
+      if options.fetch(:reporter){ 'rcov' }=='rcov'
+        report_rcov(redis, options['existing_coverage'])
+      else
+        redis.smembers('coverband').each{|key| report_line(redis, key) }
+      end
+    end
+
+    private
+
+    def self.report_rcov(redis, existing_coverage)
+      rcov_style_report = {}
+      redis.smembers('coverband').each{|key| rcov_style_report.merge!(line_hash(redis, key)) }
+      rcov_style_report = merge_existing_coverage(rcov_style_report, existing_coverage)
+      puts "report:"
+      puts rcov_style_report.inspect
+      SimpleCov::Result.new(rcov_style_report).format!
+      `open coverage/index.html`
+    end
+
+    def self.merge_existing_coverage(rcov_style_report, existing_coverage)
+      existing_coverage.each_pair do |key, lines|
+        if current_lines = rcov_style_report[key]
+          lines.each_with_index do |line, index|
+            if line.nil? && current_lines[index].to_i==0
+              current_lines[index] = nil
+            else
+              current_lines[index] = current_lines[index] ? (current_lines[index].to_i + line.to_i) : nil
+            end
+          end
+          rcov_style_report[key] = current_lines
+        else
+          rcov_style_report[key] = lines
+        end
+      end
+      rcov_style_report
+    end
+
+    # /Users/danmayer/projects/cover_band_server/views/index/erb: ["0", "2", "3", "6", "65532", "65533"]
+    # /Users/danmayer/projects/cover_band_server/app/rb: ["54", "55"]
+    # /Users/danmayer/projects/cover_band_server/views/layout/erb: ["0", "33", "36", "37", "38", "39", "40", "62", "63", "66", "65532", "65533"]
+    def self.report_line(redis, key)
+      puts "#{key.gsub('.','/')}: #{redis.smembers("coverband#{key}").inspect}"
+    end
+
+    # >> puts  Coverage.result.inspect
+    # {"/Users/danmayer/projects/hearno/script/tester.rb"=>[1, nil, 1, 1, nil, nil, nil]}
+    def self.line_hash(redis, key)
+      filename = key.gsub('.','/').gsub('/rb','.rb').gsub('/erb','.erb')
+
+      lines_hit = redis.smembers("coverband#{key}")
+      count = File.foreach(filename).inject(0) {|c, line| c+1}
+      if filename.match(/\.erb/)
+        line_array = Array.new(count, nil)
+      else
+        line_array = Array.new(count, 0)
+      end
+      line_array.each_with_index{|line,index| line_array[index]=1 if lines_hit.include?((index+1).to_s) }
+      {filename => line_array}
+    end
+
+  end
+
+end

data/lib/coverband/version.rb

@@ -1,3 +1,3 @@
 module Coverband
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/coverband.rb

@@ -1,75 +1,7 @@
 require "coverband/version"
+require "coverband/reporter"
+require "coverband/middleware"
 
 module Coverband
-  class Middleware
-
-    def initialize(app, settings={})
-      @app = app
-      root = settings[:root] || './'
-      @project_directory = File.expand_path(root+'../')
-      @enabled = true
-      @sample_percentage = 100.0
-      @function_set = false
-      @files = {}
-      puts @project_directory
-      puts "*"*40
-    end
-
-    def call(env)
-      configure_sampling
-      record_coverage
-      results = @app.call(env)
-      report_coverage
-      results
-    end
-
-    private
-
-    def configure_sampling
-      if rand > 1.0
-        @enabled = false
-      end
-    end
-
-    def record_coverage
-      if @enabled
-        unless @function_set
-          set_trace_func proc { |event, file, line, id, binding, classname|
-            add_file(file, line)
-          }
-          @function_set = true
-        end
-      else
-        if @function_set
-          set_trace_func(nil)
-          @function_set = false
-        end
-      end
-    end
-    
-    def add_file(file, line)
-      unless !file.match(@project_directory) 
-        if @files.include?(file)
-          @files[file] << line
-          @files[file].uniq!
-        else
-          @files[file] = [line]
-        end
-      end
-    end
-    
-    def report_coverage
-      begin
-        if @enabled
-          puts "coverage report: "
-          puts @files.inspect
-        else
-          puts "coverage disabled"
-        end
-      rescue RuntimeError
-        puts "coverage missing"
-      end
-    end
-    
-  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,6 +43,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rack middleware to help measure production code coverage
 email:
 - dan@mayerdan.com
@@ -58,6 +90,8 @@ files:
 - Rakefile
 - coverband.gemspec
 - lib/coverband.rb
+- lib/coverband/middleware.rb
+- lib/coverband/reporter.rb
 - lib/coverband/version.rb
 homepage: ''
 licenses:
@@ -74,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1504221757513089007
+      hash: -3551265887896435389
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -83,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1504221757513089007
+      hash: -3551265887896435389
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25