Merge 1ec1973 into 002a0af

hirocaster · Aug 10, 2013 · 5686f7a · 5686f7a
2 parents 002a0af + 1ec1973
commit 5686f7a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
@@ -0,0 +1,2 @@
+service_name: travis
+repo_token: Qc0g2mwHwjEgLQY3jH3dZghlx0pqnEU2n
diff --git a/Gemfile b/Gemfile
@@ -57,6 +57,7 @@ group :test do
   gem 'simplecov', :require => false if RUBY_VERSION >= '1.9'
   gem 'factory_girl', '2.6.1'
   gem 'database_cleaner', '0.7.1'
+  gem 'coveralls', require: false
 end
 
 group :mysql do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -44,10 +44,17 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
+    colorize (0.5.8)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
+    coveralls (0.5.8)
+      colorize
+      json
+      rest-client
+      simplecov (>= 0.7)
+      thor
     database_cleaner (0.7.1)
     diff-lcs (1.1.3)
     dm-aggregates (1.2.0)
@@ -102,6 +109,7 @@ GEM
     json (1.5.5)
     kramdown (1.0.2)
     libv8 (3.11.8.17)
+    mime-types (1.23)
     multi_json (1.0.4)
     nokogiri (1.5.9)
     padrino-core (0.11.2)
@@ -124,6 +132,8 @@ GEM
     rake (10.0.4)
     redcarpet (2.3.0)
     ref (1.0.5)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     ripl (0.7.0)
       bond (~> 0.4.2)
     ripl-multi_line (0.3.1)
@@ -197,6 +207,7 @@ DEPENDENCIES
   coderay (= 1.0.5)
   coffee-script
   compass
+  coveralls
   data_objects!
   database_cleaner (= 0.7.1)
   dm-aggregates (= 1.2.0)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 if RUBY_VERSION >= '1.9'
 
   require 'simplecov'