Permalink
Browse files

Merge branch 'stage'

  • Loading branch information...
2 parents e4128e4 + 09b2d85 commit 1abb954b5a712f4319699ae9fefdad4cd5e7e949 @moonhouse moonhouse committed Mar 20, 2012
Showing with 42 additions and 4 deletions.
  1. +3 −0 .gitignore
  2. +7 −0 .simplecov
  3. +7 −4 Gemfile
  4. +13 −0 Gemfile.lock
  5. +6 −0 Rakefile
  6. +5 −0 ci.sh
  7. +1 −0 spec/spec_helper.rb
View
3 .gitignore
@@ -23,3 +23,6 @@ doc
# jeweler generated
pkg
+
+#ci_reporter
+spec/reports/
View
7 .simplecov
@@ -0,0 +1,7 @@
+require 'simplecov'
+require 'simplecov-rcov'
+SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+if ENV["COVERAGE"]
+ SimpleCov.start
+end
+
View
11 Gemfile
@@ -8,10 +8,13 @@ gem "rmagick", "~> 2.13", :require => false
gem "newrelic_rpm"
group :development, :test do
- gem "heroku"
- gem "shotgun"
- gem "rspec"
- gem "rack-test", :require => "rack/test"
gem "awesome_print"
+ gem "ci_reporter", :require => false
+ gem "heroku"
gem "jeweler"
+ gem "rack-test", :require => "rack/test"
+ gem "rspec"
+ gem "shotgun"
+ gem 'simplecov', :require => false
+ gem 'simplecov-rcov', :require => false
end
View
13 Gemfile.lock
@@ -3,6 +3,9 @@ GEM
specs:
addressable (2.2.7)
awesome_print (0.3.2)
+ builder (3.0.0)
+ ci_reporter (1.7.0)
+ builder (>= 2.1.2)
diff-lcs (1.1.3)
git (1.2.5)
heroku (2.21.3)
@@ -17,6 +20,7 @@ GEM
launchy (2.0.5)
addressable (~> 2.2.6)
mime-types (1.17.2)
+ multi_json (1.1.0)
netrc (0.7.1)
newrelic_rpm (3.3.2.1)
rack (1.4.1)
@@ -37,12 +41,19 @@ GEM
rubyzip (0.9.6.1)
shotgun (0.9)
rack (>= 1.0)
+ simplecov (0.6.1)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.5.3)
+ simplecov-html (0.5.3)
+ simplecov-rcov (0.2.3)
+ simplecov (>= 0.4.1)
PLATFORMS
ruby
DEPENDENCIES
awesome_print
+ ci_reporter
heroku
jeweler
mime-types
@@ -54,3 +65,5 @@ DEPENDENCIES
rmagick (~> 2.13)
rspec
shotgun
+ simplecov
+ simplecov-rcov
View
6 Rakefile
@@ -1,4 +1,10 @@
require 'bundler'
+begin
+ require 'ci/reporter/rake/rspec' # use this if you're using RSpec
+rescue LoadError
+ puts "could not load ci_reporter rspec task"
+end
+
Bundler.require :test
desc "Run all specs"
View
5 ci.sh
@@ -0,0 +1,5 @@
+#!/bin/bash --login
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # This loads RVM
+source .rvmrc
+bundle install
+COVERAGE=on bundle exec rake ci:setup:rspec spec
View
1 spec/spec_helper.rb
@@ -1,3 +1,4 @@
+require 'simplecov'
ENV["RACK_ENV"] = "test"
Bundler.require :test

0 comments on commit 1abb954

Please sign in to comment.