From 56657a8f65a89dddf275132a8d430e677a50207d Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Thu, 14 Jun 2012 15:04:30 +0200 Subject: [PATCH 1/4] Require 'spec', it is included in the .gemspec and requires manual require. --- spec/spec_helper.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6f1dd6867..900caa382 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,8 +1,7 @@ -spec_dir = File.expand_path("..", __FILE__) -lib_dir = File.expand_path("../lib", spec_dir) - -$LOAD_PATH.unshift(lib_dir) +$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__)) $LOAD_PATH.uniq! +require 'rspec' + RSpec.configure do |config| end From 6c5267359a374c6fd66702a0eea44d24becf604d Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Thu, 14 Jun 2012 15:05:21 +0200 Subject: [PATCH 2/4] Ruby 1.8 doesn't seem to like one --exclude --- tasks/spec.rake | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tasks/spec.rake b/tasks/spec.rake index 858c874f2..32849baad 100644 --- a/tasks/spec.rake +++ b/tasks/spec.rake @@ -29,14 +29,8 @@ namespace :spec do t.rcov = false end t.rcov_opts = %w( - --exclude lib/google/api_client/environment.rb, - lib/compat, - spec, - .rvm/gems, - 1.8/gems, - 1.9/gems, - .rvm, - /Library/Ruby + --exclude gems/ + --exclude spec/ ) end From c656b1aaeb1f696dce4cafa37b18e0f3da0ea6f7 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Thu, 14 Jun 2012 15:05:40 +0200 Subject: [PATCH 3/4] Drop RCov::VerifyTask task (see GH-2) --- tasks/spec.rake | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tasks/spec.rake b/tasks/spec.rake index 32849baad..ccae0ac21 100644 --- a/tasks/spec.rake +++ b/tasks/spec.rake @@ -34,15 +34,6 @@ namespace :spec do ) end - if RCOV_ENABLED - RCov::VerifyTask.new(:verify) do |t| - t.threshold = 65.0 - t.index_html = 'coverage/index.html' - end - - task :verify => :rcov - end - namespace :rcov do desc 'Browse the code coverage report.' task :browse => 'spec:rcov' do From 4656b73ff91824bf9d9b515559fe869546ae4d5b Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Thu, 14 Jun 2012 20:49:53 +0200 Subject: [PATCH 4/4] Restore exclusion for compact and environment as requested in 6c5267359a374c6fd66702a0eea44d24becf604d --- tasks/spec.rake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasks/spec.rake b/tasks/spec.rake index ccae0ac21..7e58adfbd 100644 --- a/tasks/spec.rake +++ b/tasks/spec.rake @@ -31,6 +31,8 @@ namespace :spec do t.rcov_opts = %w( --exclude gems/ --exclude spec/ + --exclude lib/google/api_client/environment.rb + --exclude lib/compat ) end