From f75e7126bac6f41dcefa94d28aca2d4554ee274e Mon Sep 17 00:00:00 2001 From: Piotr Solnica Date: Fri, 27 Mar 2015 22:08:53 +0100 Subject: [PATCH] Fix spec setup and update Gemfile --- Gemfile | 12 +++--------- spec/rcov.opts | 6 ------ spec/spec.opts | 4 ---- tasks/spec.rake | 3 ++- 4 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 spec/rcov.opts delete mode 100644 spec/spec.opts diff --git a/Gemfile b/Gemfile index c5d75ca..99561ef 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,11 @@ require 'pathname' -source :rubygems +source 'https://rubygems.org' gemspec +gem 'backports' + SOURCE = ENV.fetch('SOURCE', :git).to_sym REPO_POSTFIX = SOURCE == :path ? '' : '.git' DATAMAPPER = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper' @@ -16,20 +18,12 @@ gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}", :branch => CURRENT_BRANCH -group :development do - - gem 'rake', '~> 0.9.2' - gem 'rspec', '~> 1.3.2' - -end - platforms :mri_18 do group :quality do gem 'rcov', '~> 0.9.10' gem 'yard', '~> 0.7.2' gem 'yardstick', '~> 0.4' - end end diff --git a/spec/rcov.opts b/spec/rcov.opts deleted file mode 100644 index bd1c450..0000000 --- a/spec/rcov.opts +++ /dev/null @@ -1,6 +0,0 @@ ---exclude "spec,^/" ---sort coverage ---callsites ---xrefs ---profile ---text-summary diff --git a/spec/spec.opts b/spec/spec.opts deleted file mode 100644 index 90be10b..0000000 --- a/spec/spec.opts +++ /dev/null @@ -1,4 +0,0 @@ ---colour ---loadby random ---format profile ---backtrace diff --git a/tasks/spec.rake b/tasks/spec.rake index 652b946..ba2b743 100644 --- a/tasks/spec.rake +++ b/tasks/spec.rake @@ -1,7 +1,8 @@ spec_defaults = lambda do |spec| spec.pattern = 'spec/**/*_spec.rb' spec.libs << 'lib' << 'spec' - spec.spec_opts << '--options' << 'spec/spec.opts' + spec.spec_opts << '--loadby random' + spec.spec_opts << '-c' if RUBY_VERSION < '2.2' end begin