From b26327f20a46e8a4d0dcba6e1c99c0a36d679cb3 Mon Sep 17 00:00:00 2001
From: "maul.esel" <maul.esel@go4more.de>
Date: Sat, 14 Sep 2013 15:28:41 +0200
Subject: [PATCH] simplify conditions for coverage reports

---
 .travis.yml             | 1 -
 Gemfile                 | 6 +-----
 Rakefile                | 2 +-
 features/support/env.rb | 2 +-
 jekyll.gemspec          | 1 +
 test/helper.rb          | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 15a8b56f..7e970a6d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: ruby
 before_install:
   - gem install bundler
-env: COVERAGE=true
 rvm:
   - 2.0.0
   - 1.9.3
diff --git a/Gemfile b/Gemfile
index 8675f1e7..d9266971 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,2 @@
 source 'https://rubygems.org'
-gemspec
-
-if RUBY_VERSION > '1.9'
-  gem 'coveralls', :require => false
-end
\ No newline at end of file
+gemspec
\ No newline at end of file
diff --git a/Rakefile b/Rakefile
index dec33c44..e649989c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -84,7 +84,7 @@ end
 #
 #############################################################################
 
-if RUBY_VERSION > '1.9' && ENV["COVERAGE"] == "true" && ENV["TRAVIS"] == "true"
+if RUBY_VERSION > '1.9' && ENV["TRAVIS"] == "true"
   require 'coveralls/rake/task'
   Coveralls::RakeTask.new
 
diff --git a/features/support/env.rb b/features/support/env.rb
index 7a77cd0e..5c7db508 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -1,4 +1,4 @@
-if RUBY_VERSION > '1.9' && ENV["COVERAGE"] == "true"
+if RUBY_VERSION > '1.9'
   require 'coveralls'
   Coveralls.wear_merged!
 end
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 25a83d53..d05cbf15 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('launchy', "~> 2.1.2")
   s.add_development_dependency('simplecov', "~> 0.7")
   s.add_development_dependency('simplecov-gem-adapter', "~> 1.0.1")
+  s.add_development_dependency('coveralls', "~> 0.6.9")
   s.add_development_dependency('activesupport', '~> 3.2.13')
 
   # = MANIFEST =
diff --git a/test/helper.rb b/test/helper.rb
index b54bf01f..5eb41938 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,4 +1,4 @@
-if RUBY_VERSION > '1.9' && ENV["COVERAGE"] == "true"
+if RUBY_VERSION > '1.9'
   require 'simplecov'
   require 'simplecov-gem-adapter'
   SimpleCov.start('gem')