diff --git a/Gemfile.lock b/Gemfile.lock index 1c56b2c..4ac7c69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - paypal-express (0.5.4) + paypal-express (0.5.5) activesupport (>= 2.3) attr_required (>= 0.0.5) restclient_with_cert @@ -16,20 +16,15 @@ GEM thread_safe (~> 0.1) tzinfo (~> 0.3.37) atomic (1.1.14) - attr_required (0.0.5) - configatron (2.13.0) - yamler (>= 0.1.0) - cover_me (1.2.0) - configatron - hashie + attr_required (1.0.0) diff-lcs (1.2.5) + docile (1.1.3) fakeweb (1.3.0) - hashie (2.0.5) i18n (0.6.9) - mime-types (2.0) + mime-types (2.1) minitest (4.7.5) - multi_json (1.8.2) - rake (10.1.0) + multi_json (1.8.4) + rake (10.1.1) rest-client (1.6.7) mime-types (>= 1.16) restclient_with_cert (0.0.8) @@ -39,21 +34,25 @@ GEM rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) rspec-core (2.14.7) - rspec-expectations (2.14.4) + rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.4) + rspec-mocks (2.14.5) + simplecov (0.8.2) + docile (~> 1.1.0) + multi_json + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) thread_safe (0.1.3) atomic tzinfo (0.3.38) - yamler (0.1.0) PLATFORMS ruby DEPENDENCIES - cover_me (>= 1.2.0) fakeweb (>= 1.3.0) jruby-openssl (>= 0.7) paypal-express! rake (>= 0.8) rspec (>= 2) + simplecov diff --git a/Rakefile b/Rakefile index 44a32d3..344bbea 100644 --- a/Rakefile +++ b/Rakefile @@ -4,22 +4,16 @@ Bundler::GemHelper.install_tasks require 'rspec/core/rake_task' RSpec::Core::RakeTask.new(:spec) -if RUBY_VERSION >= '1.9' - namespace :cover_me do - desc "Generates and opens code coverage report." - task :report do - require 'cover_me' - CoverMe.complete! - end - end - task :spec do - Rake::Task['cover_me:report'].invoke unless ENV['TRAVIS_RUBY_VERSION'] - end -else - RSpec::Core::RakeTask.new(:rcov) do |spec| - spec.rcov = true - spec.rcov_opts = ['-Ilib -Ispec --exclude spec,gems'] +namespace :coverage do + desc "Open coverage report" + task :report do + require 'simplecov' + `open "#{File.join SimpleCov.coverage_path, 'index.html'}"` end end +task :spec do + Rake::Task[:'coverage:report'].invoke unless ENV['TRAVIS_RUBY_VERSION'] +end + task :default => :spec \ No newline at end of file diff --git a/paypal-express.gemspec b/paypal-express.gemspec index 1455288..06c58d8 100644 --- a/paypal-express.gemspec +++ b/paypal-express.gemspec @@ -17,11 +17,7 @@ Gem::Specification.new do |s| s.add_dependency "restclient_with_cert" s.add_dependency "attr_required", ">= 0.0.5" s.add_development_dependency "rake", ">= 0.8" - if RUBY_VERSION >= '1.9' - s.add_development_dependency "cover_me", ">= 1.2.0" - else - s.add_development_dependency "rcov", ">= 0.9" - end + s.add_development_dependency "simplecov" s.add_development_dependency "rspec", ">= 2" s.add_development_dependency "fakeweb", ">= 1.3.0" end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3063cd1..4391abc 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,7 @@ -if RUBY_VERSION >= '1.9' - require 'cover_me' +require 'simplecov' + +SimpleCov.start do + add_filter 'spec' end require 'paypal'