Skip to content
This repository has been archived by the owner on Apr 17, 2018. It is now read-only.

Commit

Permalink
Fix spec setup and update Gemfile
Browse files Browse the repository at this point in the history
  • Loading branch information
solnic committed Mar 27, 2015
1 parent c0b7842 commit f75e712
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 20 deletions.
12 changes: 3 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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

Expand Down
6 changes: 0 additions & 6 deletions spec/rcov.opts

This file was deleted.

4 changes: 0 additions & 4 deletions spec/spec.opts

This file was deleted.

3 changes: 2 additions & 1 deletion tasks/spec.rake
Original file line number Diff line number Diff line change
@@ -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
Expand Down

1 comment on commit f75e712

@dkubb
Copy link
Member

@dkubb dkubb commented on f75e712 Mar 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@solnic I traced the spec failures for sqlite on jruby and found I could fix them locally with this change: datamapper/do#81

Please sign in to comment.