Merge pull request #159 from edx/clintonb/cleanup

Infrastructure Cleanup (Part 2)

Gemfile

@@ -44,7 +44,7 @@ group :test do
   gem 'rack-test', :require => "rack/test"
   gem 'guard'
   gem 'guard-unicorn'
-  gem 'simplecov', :require => false
+  gem 'codecov', :require => false
   # database_cleaner 1.5.1 which is compatible with Mongoid 5 has not been released
   # to rubygems yet, so pull it from github.
   gem 'database_cleaner', :git =>  'https://github.com/DatabaseCleaner/database_cleaner', :ref => 'b87f00320f8aa0f7e499d183128f05ce29cedc33'

Gemfile.lock

@@ -43,6 +43,10 @@ GEM
     bson (3.2.4)
     bson_ext (1.5.1)
     builder (3.2.2)
+    codecov (0.1.2)
+      json
+      simplecov
+      url
     coderay (1.0.7)
     dalli (2.1.0)
     delayed_job (4.1.1)
@@ -52,6 +56,7 @@ GEM
       mongoid (>= 3.0, < 6)
       mongoid-compatibility
     diff-lcs (1.1.3)
+    docile (1.1.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
     enumerize (0.11.0)
@@ -120,10 +125,11 @@ GEM
     rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.2)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    simplecov (0.11.1)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
@@ -151,6 +157,7 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
+    url (0.3.2)
     will_paginate (3.0.7)
     will_paginate_mongoid (2.0.1)
       mongoid
@@ -164,6 +171,7 @@ DEPENDENCIES
   bson (~> 3.1)
   bson_ext
   bundler
+  codecov
   dalli
   database_cleaner!
   delayed_job
@@ -189,10 +197,12 @@ DEPENDENCIES
   rest-client
   rs_voteable_mongo!
   rspec
-  simplecov
   sinatra
   tire (= 0.6.2)
   tire-contrib
   unicorn
   will_paginate_mongoid (~> 2.0)
   yajl-ruby
+
+BUNDLED WITH
+   1.11.2

README.rst

@@ -2,11 +2,14 @@ Part of `edX code`__.
 
 __ http://code.edx.org/
 
-edX Comments Service/Forums   |Travis|_
-=======================================
+edX Comments Service/Forums   |Travis|_ |Codecov|_
+==================================================
 .. |Travis| image:: https://travis-ci.org/edx/cs_comments_service.svg?branch=master
 .. _Travis: https://travis-ci.org/edx/cs_comments_service
 
+.. |Codecov| image:: http://codecov.io/github/edx/cs_comments_service/coverage.svg?branch=master
+.. _Codecov: http://codecov.io/github/edx/cs_comments_service?branch=master
+
 An independent comment system which supports voting and nested comments. It
 also supports features including instructor endorsement for education-aimed
 discussion platforms.

Rakefile

@@ -6,6 +6,17 @@ Bundler.require
 
 application_yaml = ERB.new(File.read("config/application.yml")).result()
 
+
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
+
+  task :default => :spec
+rescue LoadError
+  # no rspec available
+end
+
 Tire.configure do
   url YAML.load(application_yaml)['elasticsearch_server']
 end

spec/spec_helper.rb

 ENV["SINATRA_ENV"] = "test"
+
 require 'simplecov'
 SimpleCov.start
+if ENV['CI']=='true'
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+end
 
 require File.join(File.dirname(__FILE__), '..', 'app')