coverband 0.1.0.preRC9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcd25d6b360168b39561e19c131ee97507457c71
-  data.tar.gz: 8bd10e92ee92bfb3439943d036d02fe56f3815a9
+  metadata.gz: 577f3ba7a0b16748ac4ea09192da659ec70a2e9a
+  data.tar.gz: 2a56294e904a385080a97970830c23652f6323d0
 SHA512:
-  metadata.gz: 3455ef1c7fe8aaf469ded5d2880a4ec941e83c044221de9381387126cb6990848101fcc14e8e06423b49793ad7d8914e3a4e3f4a78b0bd482d40323c6223a0c1
-  data.tar.gz: 67f4dd4ce118865ee944d11cb36fbb46aa59bfd0bebedc33121c0613364a1e2d8ad19ff001e88dadd16255c102bae59ca4e57c76b610fde7fdfdcb6cc71b230d
+  metadata.gz: 3feecaf7cf2c268f03a23090f341b0102654ad546c2df8f5a47b6d0f7a807a67af70d6e357d8f4134b848b272afb7ee725d905728a501ade5acda02b18a2daa7
+  data.tar.gz: 9af8b91ba39ea2759cb59c97b8fd52f8fa803ec46566c49ac6bdcdfb3bc576b366c3379538531214bcb548f862238b96710238ba9115c0b418427a7240b535a8

data/coverband.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "mocha", "~> 0.14.0"
-  spec.add_development_dependency "shoulda"
   spec.add_development_dependency "rack"
   spec.add_runtime_dependency "simplecov"
   spec.add_runtime_dependency "json"

data/lib/coverband/base.rb

@@ -126,10 +126,6 @@ module Coverband
       end
     end
 
-    def add_from_tracepoint(trace_point)
-      add_file(trace_point.path, trace_point.lineno)
-    end
-
     def add_file(file, line)
       if !file.match(/(\/gems\/|internal\:prelude)/) && file.match(@project_directory) && !@ignore_patterns.any?{|pattern| file.match(/#{pattern}/) } 
         add_file_without_checks(file, line)

data/lib/coverband/reporter.rb

@@ -63,6 +63,27 @@ module Coverband
       fixed_report
     end
 
+    # [0,0,1,0,1]
+    # [nil,0,1,0,0]
+    # merge to
+    # [0,0,1,0,1]
+    def self.merge_arrays(first, second)
+      merged = []
+      longest = if first.length > second.length 
+        first
+      else
+        second
+      end
+     longest.each_with_index do |line, index|
+              if first[index] || second[index]
+                merged[index] = (first[index].to_i + second[index].to_i >= 1 ? 1 : 0)
+              else
+                merged[index] = nil
+              end
+            end
+     merged
+    end
+
     def self.report_scov(redis, existing_coverage, roots, open_report)
       scov_style_report = {}
       redis.smembers('coverband').each do |key|
@@ -73,7 +94,8 @@ module Coverband
                                      line_key = line_data.keys.first
                                      previous_line_hash = scov_style_report[line_key]
                                      if previous_line_hash
-                                       line_data[line_key] = line_data[line_key].merge(previous_line_hash)
+                       
+                                       line_data[line_key] = merge_arrays(line_data[line_key], previous_line_hash)
                                      end
                                      scov_style_report.merge!(line_data)
                                    end

data/lib/coverband/version.rb

@@ -1,3 +1,3 @@
 module Coverband
-  VERSION = "0.1.0.preRC9"
+  VERSION = "1.0.0"
 end

data/test/test_helper.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'simplecov'
 require 'test/unit'
-require 'shoulda'
 require 'mocha/setup'
 require 'ostruct'
 require 'json'
@@ -16,6 +15,19 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 Mocha::Configuration.prevent(:stubbing_non_existent_method)
 
+def test(name, &block)
+  test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+  defined = instance_method(test_name) rescue false
+  raise "#{test_name} is already defined in #{self}" if defined
+  if block_given?
+    define_method(test_name, &block)
+  else
+    define_method(test_name) do
+      flunk "No implementation provided for #{name}"
+    end
+  end
+end
+
 require 'coverband'
 
 unless File.exist?('./tmp/coverband_baseline.json')

data/test/unit/base_test.rb

@@ -2,15 +2,20 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class BaseTest < Test::Unit::TestCase
 
-  should "start should enable coverage" do
+  test "start should enable coverage" do
     coverband = Coverband::Base.instance.reset_instance
     assert_equal false, coverband.instance_variable_get("@enabled")
     coverband.expects(:record_coverage).once
     coverband.start
     assert_equal true, coverband.instance_variable_get("@enabled")
   end
+
+  test "extended should default to false" do
+    coverband = Coverband::Base.instance.reset_instance
+    assert_equal false, coverband.extended?
+  end
   
-  should "stop should disable coverage" do
+  test "stop should disable coverage" do
     coverband = Coverband::Base.instance.reset_instance
     assert_equal false, coverband.instance_variable_get("@enabled")
     coverband.expects(:record_coverage).once
@@ -21,7 +26,7 @@ class BaseTest < Test::Unit::TestCase
     assert_equal false, coverband.instance_variable_get("@tracer_set")
   end
   
-  should "allow for sampling with a block and enable when 100 percent sample" do
+  test "allow for sampling with a block and enable when 100 percent sample" do
     logger = Logger.new(STDOUT)
     coverband = Coverband::Base.instance.reset_instance
     coverband.instance_variable_set("@sample_percentage", 100.0)
@@ -34,7 +39,7 @@ class BaseTest < Test::Unit::TestCase
     assert_equal true, coverband.instance_variable_get("@enabled")
   end
   
-  should "allow reporting with start stop save" do
+  test "allow reporting with start stop save" do
     logger = Logger.new(STDOUT)
     coverband = Coverband::Base.instance.reset_instance
     coverband.instance_variable_set("@sample_percentage", 100.0)
@@ -49,7 +54,7 @@ class BaseTest < Test::Unit::TestCase
     coverband.save
   end
   
-  should "allow reporting to redis start stop save" do
+  test "allow reporting to redis start stop save" do
     coverband = Coverband::Base.instance.reset_instance
     coverband.instance_variable_set("@sample_percentage", 100.0)
     coverband.instance_variable_set("@verbose", true)

data/test/unit/middleware_test.rb

@@ -3,7 +3,7 @@ require 'rack'
 
 class MiddlewareTest < Test::Unit::TestCase
   
-  should "call app" do
+  test "call app" do
     request = Rack::MockRequest.env_for("/anything.json")
     Coverband::Base.instance.reset_instance
     middleware = Coverband::Middleware.new(fake_app)
@@ -11,14 +11,14 @@ class MiddlewareTest < Test::Unit::TestCase
     assert_equal "/anything.json", results.last
   end
 
-  should 'pass all rack lint checks' do
+  test 'pass all rack lint checks' do
     Coverband::Base.instance.reset_instance
     app = Rack::Lint.new(Coverband::Middleware.new(fake_app))
     env = Rack::MockRequest.env_for('/hello')
     app.call(env)
   end
 
-  should 'always be enabled with sample percentage of 100' do
+  test 'always be enabled with sample percentage of 100' do
     request = Rack::MockRequest.env_for("/anything.json")
     Coverband::Base.instance.reset_instance
     middleware = Coverband::Middleware.new(fake_app)
@@ -28,7 +28,7 @@ class MiddlewareTest < Test::Unit::TestCase
     assert_equal true, Coverband::Base.instance.instance_variable_get("@enabled")
   end
 
-  should 'never be enabled with sample percentage of 0' do
+  test 'never be enabled with sample percentage of 0' do
     request = Rack::MockRequest.env_for("/anything.json")
     Coverband::Base.instance.reset_instance
     middleware = Coverband::Middleware.new(fake_app)
@@ -38,7 +38,7 @@ class MiddlewareTest < Test::Unit::TestCase
     assert_equal false, Coverband::Base.instance.instance_variable_get("@enabled")
   end
 
-  should 'always unset function when sampling' do
+  test 'always unset function when sampling' do
     request = Rack::MockRequest.env_for("/anything.json")
     Coverband::Base.instance.reset_instance
     middleware = Coverband::Middleware.new(fake_app)
@@ -48,7 +48,7 @@ class MiddlewareTest < Test::Unit::TestCase
     assert_equal false, Coverband::Base.instance.instance_variable_get("@tracer_set")
   end
 
-  should 'always unset function when not sampling' do
+  test 'always unset function when not sampling' do
     request = Rack::MockRequest.env_for("/anything.json")
     Coverband::Base.instance.reset_instance
     middleware = Coverband::Middleware.new(fake_app)
@@ -58,7 +58,7 @@ class MiddlewareTest < Test::Unit::TestCase
     assert_equal false, Coverband::Base.instance.instance_variable_get("@tracer_set")
   end
 
-  should 'always record coverage, set trace func, and add_files when sampling' do
+  test 'always record coverage, set trace func, and add_files when sampling' do
     request = Rack::MockRequest.env_for("/anything.json")
     Coverband::Base.instance.reset_instance
     middleware = Coverband::Middleware.new(fake_app)
@@ -69,7 +69,7 @@ class MiddlewareTest < Test::Unit::TestCase
     assert_equal true, Coverband::Base.instance.instance_variable_get("@enabled")
   end
 
-  should 'always report coverage when sampling' do
+  test 'always report coverage when sampling' do
     request = Rack::MockRequest.env_for("/anything.json")
     Coverband::Base.instance.reset_instance
 

data/test/unit/redis_store_test.rb

@@ -1,8 +1,20 @@
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
-class RedisStoreTest < Test::Unit::TestCase
-  context '#store_report' do
-    setup do
+class RedisTest < Test::Unit::TestCase
+
+  private
+
+  def test_data
+    {
+      "/Users/danmayer/projects/cover_band_server/app.rb"=>[54, 55],
+      "/Users/danmayer/projects/cover_band_server/server.rb"=>[5]
+    }
+  end
+end
+
+class RedisStoreTestV3 < RedisTest
+
+    def setup
       @redis = Redis.current.tap { |redis|
         redis.stubs(:sadd).with(anything, anything)
         redis.stubs(:info).returns({'redis_version' => 3.0})
@@ -11,7 +23,7 @@ class RedisStoreTest < Test::Unit::TestCase
       @store = Coverband::RedisStore.new(@redis)
     end
 
-    should "it stores the files into coverband" do
+    test "it stores the files into coverband" do
       @redis.expects(:sadd).with('coverband', [
         '/Users/danmayer/projects/cover_band_server/app.rb',
         '/Users/danmayer/projects/cover_band_server/server.rb'
@@ -20,7 +32,7 @@ class RedisStoreTest < Test::Unit::TestCase
       @store.store_report(test_data)
     end
 
-    should "it stores the file lines of the file app.rb" do
+    test "it stores the file lines of the file app.rb" do
       @redis.expects(:sadd).with(
         'coverband./Users/danmayer/projects/cover_band_server/app.rb',
         [54, 55]
@@ -29,7 +41,7 @@ class RedisStoreTest < Test::Unit::TestCase
       @store.store_report(test_data)
     end
 
-    should "it stores the file lines of the file server.rb" do
+    test "it stores the file lines of the file server.rb" do
       @redis.expects(:sadd).with(
         'coverband./Users/danmayer/projects/cover_band_server/server.rb',
         [5]
@@ -38,46 +50,42 @@ class RedisStoreTest < Test::Unit::TestCase
       @store.store_report(test_data)
     end
 
-    context 'when the redis server version is too old' do
-      setup do
-        @redis.stubs(:info).returns("redis_version"=>"2.2.3")
-      end
+end
 
-      should "it store the files with separate calls into coverband" do
-        @redis.expects(:sadd).with('coverband', '/Users/danmayer/projects/cover_band_server/app.rb')
-        @redis.expects(:sadd).with('coverband', '/Users/danmayer/projects/cover_band_server/server.rb')
+class RedisStoreTestV223 < RedisTest
 
-        @store.store_report(test_data)
-      end
+    def setup
+      @redis = Redis.current.tap { |redis|
+        redis.stubs(:sadd).with(anything, anything)
+        redis.stubs(:info).returns({'redis_version' => "2.2.3"})
+      }
+
+      @store = Coverband::RedisStore.new(@redis)
     end
 
-    context 'when the redis gem version is too old' do
-      setup do
-        @gem_version = Redis::VERSION
-        Redis.send(:remove_const, :VERSION)
-        Redis::VERSION = '2.2.2'
-      end
+    test "it store the files with separate calls into coverband" do
+      @redis.expects(:sadd).with('coverband', '/Users/danmayer/projects/cover_band_server/app.rb')
+      @redis.expects(:sadd).with('coverband', '/Users/danmayer/projects/cover_band_server/server.rb')
 
-      teardown do
-        Redis.send(:remove_const, :VERSION)
-        Redis::VERSION = @gem_version
-      end
+      @store.store_report(test_data)
+    end
+end
 
-      should "it store the files with separate calls into coverband" do
-        @redis.expects(:sadd).with('coverband', '/Users/danmayer/projects/cover_band_server/app.rb')
-        @redis.expects(:sadd).with('coverband', '/Users/danmayer/projects/cover_band_server/server.rb')
+class RedisStoreTestV222 < RedisTest
 
-        @store.store_report(test_data)
-      end
+    def setup
+      @redis = Redis.current.tap { |redis|
+        redis.stubs(:sadd).with(anything, anything)
+        redis.stubs(:info).returns({'redis_version' => "2.2.2"})
+      }
+
+      @store = Coverband::RedisStore.new(@redis)
     end
-  end
 
-  private
+    test "it store the files with separate calls into coverband" do
+      @redis.expects(:sadd).with('coverband', '/Users/danmayer/projects/cover_band_server/app.rb')
+      @redis.expects(:sadd).with('coverband', '/Users/danmayer/projects/cover_band_server/server.rb')
 
-  def test_data
-    {
-      "/Users/danmayer/projects/cover_band_server/app.rb"=>[54, 55],
-      "/Users/danmayer/projects/cover_band_server/server.rb"=>[5]
-    }
-  end
+      @store.store_report(test_data)
+    end
 end

data/test/unit/reporter_test.rb

@@ -2,7 +2,7 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class ReporterTest < Test::Unit::TestCase
 
-  should "record baseline" do
+  test "record baseline" do
     Coverage.expects(:start).at_least_once
     Coverage.expects(:result).returns({'fake' => [0,1]}).at_least_once
     File.expects(:open).once
@@ -14,7 +14,7 @@ class ReporterTest < Test::Unit::TestCase
     }
   end
 
-  should "report data" do
+  test "report data" do
     Coverband.configure do |config|
       config.redis             = fake_redis
       config.reporter          = 'std_out'
@@ -44,7 +44,7 @@ class ReporterTest < Test::Unit::TestCase
   # shows that it has become a disaster of self methods relying on side effects.
   # Fix to standard class and methods.
   ####
-  should "fix filename from a key with a swappable path" do
+  test "filename_from_key fix filename from a key with a swappable path" do
     Coverband.configure do |config|
       config.redis             = fake_redis
       config.reporter          = 'std_out'
@@ -52,19 +52,43 @@ class ReporterTest < Test::Unit::TestCase
     end
 
     key = "/app/is/a/path.rb"
-    #the code takes config.root expands and adds a '/'
+    #the code takes config.root expands and adds a '/' for the final path in roots
     roots = ["/app/", '/full/remote_app/path/']
 
     assert_equal "/full/remote_app/path/is/a/path.rb", Coverband::Reporter.filename_from_key(key, roots)
   end
 
-  ####
-  # TODO
-  # attempting to write some tests around this reporter
-  # shows that it has become a disaster of self methods relying on side effects.
-  # Fix to standard class and methods.
-  ####
-  should "leave filename from a key with a local path" do
+  test "filename_from_key fix filename a changing deploy path with double quotes" do
+    Coverband.configure do |config|
+      config.redis             = fake_redis
+      config.reporter          = 'std_out'
+      config.root              = '/full/remote_app/path'
+    end
+
+    key = "/box/apps/app_name/releases/20140725203539/app/models/user.rb"
+    # the code takes config.root expands and adds a '/' for the final path in roots
+    # note to get regex to work for changing deploy directories it must be double escaped in double quotes or use single qoutes
+    roots = ["/box/apps/app_name/releases/\\d+/", '/full/remote_app/path/']
+
+    assert_equal "/full/remote_app/path/app/models/user.rb", Coverband::Reporter.filename_from_key(key, roots)
+  end
+
+  test "filename_from_key fix filename a changing deploy path with single quotes" do
+    Coverband.configure do |config|
+      config.redis             = fake_redis
+      config.reporter          = 'std_out'
+      config.root              = '/full/remote_app/path'
+    end
+
+    key = "/box/apps/app_name/releases/20140725203539/app/models/user.rb"
+    # the code takes config.root expands and adds a '/' for the final path in roots
+    # note to get regex to work for changing deploy directories it must be double escaped in double quotes or use single qoutes
+    roots = ['/box/apps/app_name/releases/\d+/', '/full/remote_app/path/']
+
+    assert_equal "/full/remote_app/path/app/models/user.rb", Coverband::Reporter.filename_from_key(key, roots)
+  end
+
+  test "filename_from_key leave filename from a key with a local path" do
     Coverband.configure do |config|
       config.redis             = fake_redis
       config.reporter          = 'std_out'
@@ -72,12 +96,72 @@ class ReporterTest < Test::Unit::TestCase
     end
 
     key = "/full/remote_app/path/is/a/path.rb"
-    #the code takes config.root expands and adds a '/'
+    #the code takes config.root expands and adds a '/' for the final path in roots
     roots = ["/app/", '/full/remote_app/path/']
 
     assert_equal "/full/remote_app/path/is/a/path.rb", Coverband::Reporter.filename_from_key(key, roots)
   end
 
+  test "line_hash gets correct hash entry for a line key" do
+    Coverband.configure do |config|
+      config.redis             = fake_redis
+      config.reporter          = 'std_out'
+      config.root              = '/full/remote_app/path'
+    end
+
+    key = "/full/remote_app/path/is/a/path.rb"
+    #the code takes config.root expands and adds a '/'
+    roots = ["/app/", '/full/remote_app/path/']
+
+    current_redis = fake_redis
+    lines_hit = ['1','3','6']
+    current_redis.stubs(:smembers).returns(lines_hit)
+    #expects to show hit counts on 1,3,6
+    expected = {"/full/remote_app/path/is/a/path.rb" => [1,0,1,0,0,1]}
+    File.stubs(:exists?).returns(true)
+    File.stubs(:foreach).returns(['line 1','line2','line3','line4','line5','line6'])
+    
+    assert_equal expected, Coverband::Reporter.line_hash(current_redis, key, roots)
+  end
+
+  test "line_hash adjusts relative paths" do
+    Coverband.configure do |config|
+      config.redis             = fake_redis
+      config.reporter          = 'std_out'
+      config.root              = '/full/remote_app/path'
+    end
+
+    key = "./is/a/path.rb"
+    #the code takes config.root expands and adds a '/'
+    roots = ["/app/", '/full/remote_app/path/']
+
+    current_redis = fake_redis
+    lines_hit = ['1','3','6']
+    current_redis.stubs(:smembers).returns(lines_hit)
+    #expects to show hit counts on 1,3,6
+    expected = {"/full/remote_app/path/is/a/path.rb" => [1,0,1,0,0,1]}
+    File.stubs(:exists?).returns(true)
+    File.stubs(:foreach).returns(['line 1','line2','line3','line4','line5','line6'])
+    
+    assert_equal expected, Coverband::Reporter.line_hash(current_redis, key, roots)
+  end
+
+  test "#merge_arrays basic merge preserves order and counts" do
+    first = [0,0,1,0,1]
+    second = [nil,0,1,0,0]
+    expects = [0,0,1,0,1]
+
+    assert_equal expects, Coverband::Reporter.merge_arrays(first, second)
+  end
+
+  test "#merge_arrays basic merge preserves order and counts different lenths" do
+    first = [0,0,1,0,1]
+    second = [nil,0,1,0,0,0,0,1]
+    expects = [0,0,1,0,1,0,0,1]
+
+    assert_equal expects, Coverband::Reporter.merge_arrays(first, second)
+  end
+
   private
 
   def fake_redis

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 0.1.0.preRC9
+  version: 1.0.0
 platform: ruby
 authors:
 - Dan Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.0
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -167,9 +153,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2