Merge ea9f82f into 0fd7c7f

mezis · May 19, 2013 · 86c31f1 · 86c31f1
2 parents 0fd7c7f + ea9f82f
commit 86c31f1
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,6 @@ push_*.dat
 
 # Script turds
 nohup.out
+
+# Coveralls output
+/coverage
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.0.0-p0
+2.0.0-p195
diff --git a/Gemfile b/Gemfile
@@ -124,6 +124,9 @@ group :development do
   gem 'rb-fchange',              require:false
   gem 'terminal-notifier-guard', require:false
 
+  # measure test coverage
+  gem 'coveralls',               require:false
+
   # heroku interaction
   gem 'taps',                    require:false
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -57,6 +57,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.2)
+    colorize (0.5.8)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -65,6 +66,12 @@ GEM
       compass (>= 0.12.2, < 0.14)
     configatron (2.10.0)
       yamler (>= 0.1.0)
+    coveralls (0.6.7)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
     css_parser (1.3.4)
       addressable
     cucumber (1.3.1)
@@ -287,6 +294,10 @@ GEM
       uuidtools
     sequel (3.20.0)
     sexp_processor (4.2.1)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     sinatra (1.0)
       rack (>= 1.0)
     slop (3.4.4)
@@ -342,6 +353,7 @@ DEPENDENCIES
   coffee-rails
   compass-rails
   configatron
+  coveralls
   cucumber-rails
   dalli
   database_cleaner

diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/mezis/appfab.png?branch=master)](https://travis-ci.org/mezis/appfab)
 [![Code Climate](https://codeclimate.com/github/mezis/appfab.png)](https://codeclimate.com/github/mezis/appfab)
 [![Dependency Status](https://gemnasium.com/mezis/appfab.png)](https://gemnasium.com/mezis/appfab)
+[![Coverage Status](https://coveralls.io/repos/mezis/appfab/badge.png)](https://coveralls.io/r/mezis/appfab)
 
 ## Kanban, one level up: agility at the product level.
 

diff --git a/config/database.yml b/config/database.yml
@@ -9,6 +9,7 @@ development: &local
 # Do not set this db to the same as development or production.
 test: &test
   <<: *local
+  database: appfab_test
   socket: /Volumes/MySQLRAMDisk/mysql.sock
 
 cucumber:

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -7,6 +7,9 @@
 
 require 'database_cleaner'
 require 'timecop'
+require 'coveralls'
+
+Coveralls.wear!
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.