[ARVADOS] created: 611223d58fcdf5cc6ba434efed2c1ee9234b29a7

[git at public.curoverse.com]

        at  611223d58fcdf5cc6ba434efed2c1ee9234b29a7 (commit)


commit 611223d58fcdf5cc6ba434efed2c1ee9234b29a7
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon May 5 13:30:37 2014 -0400

    Add simplecov-rcov.

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index add8693..bcbe3ef 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -29,7 +29,11 @@ group :test do
   gem 'capybara'
   gem 'poltergeist'
   gem 'headless'
+  # Note: "require: false" here tells bunder not to automatically
+  # 'require' the packages during application startup. Installation is
+  # still mandatory.
   gem 'simplecov', '~> 0.7.1', require: false
+  gem 'simplecov-rcov', require: false
 end
 
 gem 'jquery-rails'
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index ad2655f..8e74832 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -153,6 +153,8 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    simplecov-rcov (0.2.3)
+      simplecov (>= 0.4.1)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -205,6 +207,7 @@ DEPENDENCIES
   sass-rails (~> 3.2.0)
   selenium-webdriver
   simplecov (~> 0.7.1)
+  simplecov-rcov
   sqlite3
   themes_for_rails
   therubyracer
diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index 3ca0a6d..797551e 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -2,6 +2,14 @@ ENV["RAILS_ENV"] = "test"
 unless ENV["NO_COVERAGE_TEST"]
   begin
     require 'simplecov'
+    require 'simplecov-rcov'
+    class SimpleCov::Formatter::MergedFormatter
+      def format(result)
+        SimpleCov::Formatter::HTMLFormatter.new.format(result)
+        SimpleCov::Formatter::RcovFormatter.new.format(result)
+      end
+    end
+    SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
     SimpleCov.start do
       add_filter '/test/'
       add_filter 'initializers/secret_token'
diff --git a/services/api/Gemfile b/services/api/Gemfile
index fc0a38e..b3ec12b 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -6,8 +6,11 @@ gem 'rails', '~> 3.2.0'
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
 
 group :test, :development do
-  gem 'sqlite3'
+  # Note: "require: false" here tells bunder not to automatically
+  # 'require' the packages during application startup. Installation is
+  # still mandatory.
   gem 'simplecov', '~> 0.7.1', require: false
+  gem 'simplecov-rcov', require: false
 end
 
 # This might not be needed in :test and :development, but we load it
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 21af64a..bf778d1 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -179,12 +179,13 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    simplecov-rcov (0.2.3)
+      simplecov (>= 0.4.1)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.9)
     test_after_commit (0.2.3)
     themes_for_rails (0.5.1)
       rails (>= 3.0.0)
@@ -227,7 +228,7 @@ DEPENDENCIES
   rvm-capistrano
   sass-rails (>= 3.2.0)
   simplecov (~> 0.7.1)
-  sqlite3
+  simplecov-rcov
   test_after_commit
   themes_for_rails
   therubyracer
diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb
index d078674..3a54f5c 100644
--- a/services/api/test/test_helper.rb
+++ b/services/api/test/test_helper.rb
@@ -2,6 +2,14 @@ ENV["RAILS_ENV"] = "test"
 unless ENV["NO_COVERAGE_TEST"]
   begin
     require 'simplecov'
+    require 'simplecov-rcov'
+    class SimpleCov::Formatter::MergedFormatter
+      def format(result)
+        SimpleCov::Formatter::HTMLFormatter.new.format(result)
+        SimpleCov::Formatter::RcovFormatter.new.format(result)
+      end
+    end
+    SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
     SimpleCov.start do
       add_filter '/test/'
       add_filter 'initializers/secret_token'

-----------------------------------------------------------------------


hooks/post-receive
--