coverband 2.0.0.alpha1 → 2.0.0

data/test/test_helper.rb

@@ -6,6 +6,7 @@ require 'test/unit'
 require 'mocha/setup'
 require 'ostruct'
 require 'json'
+require 'redis'
 
 SimpleCov.start do
   add_filter 'specs/ruby/1.9.1/gems/'
@@ -13,6 +14,8 @@ SimpleCov.start do
   add_filter '/config/'
 end
 
+TEST_COVERAGE_FILE = '/tmp/fake_file.json'
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 Mocha::Configuration.prevent(:stubbing_non_existent_method)
@@ -37,7 +40,7 @@ end
 def fake_redis
   @redis ||= begin
     redis = OpenStruct.new
-    # mocha requires method to exist to mock it 
+    # mocha requires method to exist to mock it
     def redis.smembers(key); end
     def redis.hgetall(key); end
     redis
@@ -63,10 +66,9 @@ end
 
 Coverband.configure do |config|
   config.root              = Dir.pwd
-  config.redis             = Redis.new
-  # config.coverage_baseline = JSON.parse(File.read('./tmp/coverband_baseline.json'))
   config.root_paths        = ['/app/']
   config.ignore            = ['vendor']
   config.percentage        = 100.0
   config.reporter          = 'std_out'
+  config.store             = Coverband::Adapters::RedisStore.new(Redis.new)
 end

data/test/unit/baseline_test.rb

@@ -3,12 +3,10 @@
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class ReporterTest < Test::Unit::TestCase
+
   test 'record baseline' do
     Coverband.configure do |config|
-      config.redis             = nil
-      config.store             = nil
-      config.root              = '/full/remote_app/path'
-      config.coverage_file     = '/tmp/fake_file.json'
+      config.store             = Coverband::Adapters::FileStore.new(TEST_COVERAGE_FILE)
     end
     Coverage.expects(:start).returns(true).at_least_once
     Coverage.expects(:result).returns('fake' => [0, 1]).at_least_once
@@ -29,7 +27,7 @@ class ReporterTest < Test::Unit::TestCase
       config.redis             = nil
       config.store             = nil
       config.root              = '/full/remote_app/path'
-      config.coverage_file     = '/tmp/fake_file.json'
+      config.store             = Coverband::Adapters::FileStore.new(TEST_COVERAGE_FILE)
     end
     File.expects(:exist?).at_least_once.returns(true)
     expected = { 'filename.rb' => [0, nil, 1] }
@@ -44,7 +42,7 @@ class ReporterTest < Test::Unit::TestCase
       config.redis             = nil
       config.store             = nil
       config.root              = '/full/remote_app/path'
-      config.coverage_file     = '/tmp/fake_file.json'
+      config.store             = Coverband::Adapters::FileStore.new(TEST_COVERAGE_FILE)
       config.ignore            = ['ignored_file.rb']
     end
     root = Coverband.configuration.root
@@ -52,7 +50,7 @@ class ReporterTest < Test::Unit::TestCase
     expected_files = [root + '/fakefile.rb']
     assert_equal(expected_files, Coverband::Baseline.exclude_files(files))
   end
-  
+
   test 'convert_coverage_format' do
     results = { 'fake_file.rb' => [1, nil, 0, 2] }
     expected = { 'fake_file.rb' => { 1 => 1, 3 => 0, 4 => 2 } }

data/test/unit/collectors_base_test.rb

@@ -4,6 +4,12 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 require File.expand_path('./dog', File.dirname(__FILE__))
 
 class CollectorsBaseTest < Test::Unit::TestCase
+  def setup
+    Coverband.configure do |config|
+      config.collector         = 'trace'
+    end
+  end
+
   test 'defaults to a redis store' do
     coverband = Coverband::Collectors::Base.instance.reset_instance
     assert_equal Coverband::Adapters::RedisStore, coverband.instance_variable_get('@store').class
@@ -32,7 +38,6 @@ class CollectorsBaseTest < Test::Unit::TestCase
     assert_equal true, coverband.instance_variable_get('@enabled')
     coverband.stop
     assert_equal false, coverband.instance_variable_get('@enabled')
-    assert_equal false, coverband.instance_variable_get('@tracer_set')
   end
 
   test 'allow for sampling with a block and enable when 100 percent sample' do
@@ -71,7 +76,7 @@ class CollectorsBaseTest < Test::Unit::TestCase
     Coverband.configuration.logger.stubs('info')
     store = Coverband::Adapters::RedisStore.new(Redis.new)
     coverband.instance_variable_set('@store', store)
-    store.expects(:save_report).once.with(has_entries(dog_file => { 5 => 5 }))
+    store.expects(:save_report).once.with(has_entries(dog_file => {5 => 5}))
     assert_equal false, coverband.instance_variable_get('@enabled')
     coverband.start
     5.times { Dog.new.bark }
@@ -84,6 +89,7 @@ class CollectorsBaseTest < Test::Unit::TestCase
     coverband = Coverband::Collectors::Base.instance.reset_instance
     coverband.start
     100.times { Dog.new.bark }
+    Coverband::Collectors::Base.instance
     assert_equal 100, coverband.instance_variable_get('@file_line_usage')[dog_file][5]
     coverband.stop
     coverband.save

data/test/unit/collectors_coverage_test.rb

@@ -8,9 +8,9 @@ if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
     attr_accessor :coverband
 
     def setup
-      Thread.current[:coverband_instance] = nil
       Coverband.configure do |config|
         config.collector = 'coverage'
+        config.store     = Coverband::Adapters::RedisStore.new(Redis.new)
       end
       @coverband = Coverband::Collectors::Base.instance.reset_instance
     end

data/test/unit/collectors_trace_test.rb

@@ -4,6 +4,12 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 require File.expand_path('./dog', File.dirname(__FILE__))
 
 class CollectorsTraceTest < Test::Unit::TestCase
+  def setup
+    Coverband.configure do |config|
+      config.collector         = 'trace'
+    end
+  end
+
   test 'defaults to a redis store' do
     coverband = Coverband::Collectors::Base.instance.reset_instance
     assert_equal Coverband::Adapters::RedisStore, coverband.instance_variable_get('@store').class
@@ -82,6 +88,8 @@ class CollectorsTraceTest < Test::Unit::TestCase
   test 'tracer should count line numbers' do
     dog_file = File.expand_path('./dog.rb', File.dirname(__FILE__))
     coverband = Coverband::Collectors::Base.instance.reset_instance
+    store = Coverband::Adapters::RedisStore.new(Redis.new)
+    coverband.instance_variable_set('@store', store)
     coverband.start
     100.times { Dog.new.bark }
     assert_equal 100, coverband.instance_variable_get('@file_line_usage')[dog_file][5]

data/test/unit/configuration_test.rb

@@ -3,10 +3,6 @@
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class BaseTest < Test::Unit::TestCase
-  test 'defaults to line trace point event' do
-    assert_equal Coverband.configuration.trace_point_events, [:line]
-  end
-
   test 'defaults to ignore gems' do
     assert_equal Coverband.configuration.include_gems, false
     coverband = Coverband::Collectors::Base.instance.reset_instance

data/test/unit/middleware_test.rb

@@ -7,6 +7,15 @@ require 'rack'
 class MiddlewareTest < Test::Unit::TestCase
   BASE_KEY = Coverband::Adapters::RedisStore::BASE_KEY
 
+  def setup
+    Coverband.configure do |config|
+      config.redis             = nil
+      config.store             = nil
+      config.collector         = 'trace'
+      config.store             = Coverband::Adapters::RedisStore.new(Redis.new)
+    end
+  end
+
   test 'call app' do
     request = Rack::MockRequest.env_for('/anything.json')
     Coverband::Collectors::Base.instance.reset_instance
@@ -42,26 +51,6 @@ class MiddlewareTest < Test::Unit::TestCase
     assert_equal false, Coverband::Collectors::Base.instance.instance_variable_get('@enabled')
   end
 
-  test 'always unset function when sampling' do
-    request = Rack::MockRequest.env_for('/anything.json')
-    Coverband::Collectors::Base.instance.reset_instance
-    middleware = Coverband::Middleware.new(fake_app)
-    assert_equal false, Coverband::Collectors::Base.instance.instance_variable_get('@tracer_set')
-    Coverband::Collectors::Base.instance.instance_variable_set('@sample_percentage', 100.0)
-    middleware.call(request)
-    assert_equal false, Coverband::Collectors::Base.instance.instance_variable_get('@tracer_set')
-  end
-
-  test 'always unset function when not sampling' do
-    request = Rack::MockRequest.env_for('/anything.json')
-    Coverband::Collectors::Base.instance.reset_instance
-    middleware = Coverband::Middleware.new(fake_app)
-    assert_equal false, Coverband::Collectors::Base.instance.instance_variable_get('@tracer_set')
-    middleware.instance_variable_set('@sample_percentage', 0.0)
-    middleware.call(request)
-    assert_equal false, Coverband::Collectors::Base.instance.instance_variable_get('@tracer_set')
-  end
-
   test 'always record coverage, set trace func, and add_files when sampling' do
     request = Rack::MockRequest.env_for('/anything.json')
     Coverband::Collectors::Base.instance.reset_instance
@@ -93,30 +82,11 @@ class MiddlewareTest < Test::Unit::TestCase
     fake_redis = Redis.new
     redis_store = Coverband::Adapters::RedisStore.new(fake_redis)
     redis_store.clear!
-    Coverband::Collectors::Base.instance.instance_variable_set('@store', redis_store)
-    fake_redis.stubs(:info).returns('redis_version' => 3.0)
-    fake_redis.expects(:sadd).at_least_once
-    fake_redis.expects(:mapped_hmset).at_least_once
-    fake_redis.expects(:mapped_hmset).at_least_once.with("#{BASE_KEY}.#{basic_rack_ruby_file}", '7' => 1)
-    middleware.call(request)
-    assert_equal true, Coverband::Collectors::Base.instance.instance_variable_get('@enabled')
-  end
-
-  test 'report only on calls when configured' do
-    request = Rack::MockRequest.env_for('/anything.json')
-    Coverband.configuration.trace_point_events = [:call]
     Coverband::Collectors::Base.instance.reset_instance
-    middleware = Coverband::Middleware.new(fake_app_with_lines)
-    assert_equal false, Coverband::Collectors::Base.instance.instance_variable_get('@enabled')
-    Coverband::Collectors::Base.instance.instance_variable_set('@sample_percentage', 100.0)
-    fake_redis = Redis.new
-    redis_store = Coverband::Adapters::RedisStore.new(fake_redis)
-    redis_store.clear!
     Coverband::Collectors::Base.instance.instance_variable_set('@store', redis_store)
-    fake_redis.stubs(:info).returns('redis_version' => 3.0)
     fake_redis.expects(:sadd).at_least_once
     fake_redis.expects(:mapped_hmset).at_least_once
-    fake_redis.expects(:mapped_hmset).at_least_once.with("#{BASE_KEY}.#{basic_rack_ruby_file}", '6' => 1)
+    fake_redis.expects(:mapped_hmset).at_least_once.with("#{BASE_KEY}.#{basic_rack_ruby_file}", '7' => 1)
     middleware.call(request)
     assert_equal true, Coverband::Collectors::Base.instance.instance_variable_get('@enabled')
   end

data/test/unit/reports_base_test.rb

@@ -137,4 +137,30 @@ class ReportsBaseTest < Test::Unit::TestCase
 
     assert_equal expects, Coverband::Reporters::Base.merge_existing_coverage(first, second)
   end
+
+  test "#get_current_scov_data_imp doesn't ignore folders with default ignore keys" do
+    @fake_redis = fake_redis
+    store = Coverband::Adapters::RedisStore.new(@fake_redis)
+
+    Coverband.configure do |config|
+      config.redis             = @fake_redis
+      config.reporter          = 'std_out'
+      config.ignore            = %w[vendor .erb$ .slim$]
+      config.root              = '/full/remote_app/path'
+    end
+
+    key = '/a_path/that_has_erb_in/thepath.rb'
+    roots = ['/app/', '/full/remote_app/path/']
+
+    lines_hit = [1, 3, 6]
+    store.stubs(:covered_lines_for_file).returns(lines_hit)
+    # expects to show hit counts on 1,3,6
+    expected = { '/a_path/that_has_erb_in/thepath.rb' => [1, nil, 1, nil, nil, 1] }
+    File.stubs(:exist?).returns(true)
+    File.stubs(:foreach).returns(['line 1', 'line2', 'line3', 'line4', 'line5', 'line6'])
+
+    # assert_equal expected, Coverband::Reporters::Base.line_hash(store, key, roots)
+    store.expects(:covered_files).returns([key])
+    assert_equal expected, Coverband::Reporters::Base.get_current_scov_data_imp(store, roots)
+  end
 end

data/test/unit/s3_report_writer_test.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 require 'aws-sdk'
 

data/test/unit/s3_web_test.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require File.expand_path('../test_helper', File.dirname(__FILE__))
+require 'aws-sdk'
 require File.expand_path('../../lib/coverband/s3_web', File.dirname(__FILE__))
 require 'rack/test'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha1
+  version: 2.0.0
 platform: ruby
 authors:
 - Dan Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,13 +151,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -165,33 +165,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.1
 description: Rack middleware to help measure production code usage (LOC runtime usage)
 email:
 - dan@mayerdan.com
@@ -210,7 +210,9 @@ files:
 - coverband.gemspec
 - docs/coverband_details.png
 - docs/coverband_index.png
+- docs/coverband_install.gif
 - lib/coverband.rb
+- lib/coverband/adapters/base.rb
 - lib/coverband/adapters/file_store.rb
 - lib/coverband/adapters/memory_cache_store.rb
 - lib/coverband/adapters/redis_store.rb
@@ -262,12 +264,12 @@ 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.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Rack middleware to help measure production code usage (LOC runtime usage)