Merge pull request #55 from pikesley/try-provides

Try provides
pikesley · Jan 26, 2014 · be84458 · be84458
2 parents fbd4e81 + fd12450
commit be84458
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -41,14 +41,14 @@ GEM
     curb (0.8.5)
     daemons (1.1.9)
     diff-lcs (1.2.5)
-    docile (1.1.1)
+    docile (1.1.2)
     eventmachine (1.0.3)
     extlib (0.9.16)
     ffi (1.9.3)
     formatador (0.2.4)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    guard (2.2.5)
+    guard (2.3.0)
       formatador (>= 0.2.4)
       listen (~> 2.1)
       lumberjack (~> 1.0)
@@ -57,10 +57,10 @@ GEM
     guard-cucumber (1.4.1)
       cucumber (>= 1.2.0)
       guard (>= 1.1.0)
-    guard-rspec (4.2.3)
+    guard-rspec (4.2.4)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
-    haml (4.0.4)
+    haml (4.0.5)
       tilt
     highline (1.6.20)
     i18n (0.6.9)
@@ -72,10 +72,10 @@ GEM
       rb-inotify (>= 0.9)
     lumberjack (1.0.4)
     method_source (0.8.2)
-    mime-types (2.0)
+    mime-types (2.1)
     mini_portile (0.5.2)
     minitest (4.7.5)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     multi_test (0.0.3)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
@@ -84,10 +84,10 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
-    rack-google-analytics (0.14.0)
+    rack-google-analytics (1.0.0)
       actionpack
       activesupport
-    rack-protection (1.5.1)
+    rack-protection (1.5.2)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![Build Status](http://b.adge.me/travis/pikesley/uncle-clive.svg)](https://travis-ci.org/pikesley/uncle-clive)
 [![Coverage Status](http://b.adge.me/coveralls/pikesley/uncle-clive.svg)](https://coveralls.io/r/pikesley/uncle-clive?branch=master)
-[![Dependency Status](https://gemnasium.com/pikesley/uncle-clive.png)](https://gemnasium.com/pikesley/uncle-clive)
-[![Code Climate](https://codeclimate.com/github/pikesley/uncle-clive.png)](https://codeclimate.com/github/pikesley/uncle-clive)
+[![Dependency Status](http://b.adge.me/gemnasium/pikesley/uncle-clive.svg)](https://gemnasium.com/pikesley/uncle-clive)
+[![Code Climate](http://b.adge.me/codeclimate/github/pikesley/uncle-clive.svg)](https://codeclimate.com/github/pikesley/uncle-clive)
 [![License](http://b.adge.me/:license-mit-green.svg)](http://pikesley.mit-license.org/)
 [![Things Cleaned](http://b.adge.me/:things%20cleaned-all-green.svg)](http://hyperboleandahalf.blogspot.co.uk/2010/06/this-is-why-ill-never-be-adult.html)
 [![Badge Status](http://b.adge.me/:badges-7/7-green.svg)](http://www.youtube.com/watch?v=s7rHCYtbZRo)

diff --git a/Rakefile b/Rakefile
@@ -1,10 +1,12 @@
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
+require 'coveralls/rake/task'
 
+Coveralls::RakeTask.new
 RSpec::Core::RakeTask.new
 Cucumber::Rake::Task.new
 
-task :default => [:spec, :cucumber]
+task :default => [:spec, :cucumber, 'coveralls:push']
 
 task :run do
   ruby 'lib/uncle_clive.rb'

diff --git a/features/support/env.rb b/features/support/env.rb
@@ -9,7 +9,7 @@
 require 'rspec'
 
 require 'coveralls'
-Coveralls.wear!
+Coveralls.wear_merged!
 
 Capybara.app = Spectrum
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -7,7 +7,7 @@
 require 'uncle_clive/decorators/fourifier'
 
 require 'coveralls'
-Coveralls.wear!
+Coveralls.wear_merged!
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.