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

Push branch 'release-1.2' to master and make tests run #16

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
bundler_args: --without yard guard metrics benchmarks
branches:
only:
- /^release-.*$/
script: "bundle exec rake spec"
rvm:
- ree
- 1.8.7
- 1.9.2
- 1.9.3
- 2.0.0
- ruby-head
- jruby-18mode
- jruby-19mode
- jruby-head
- ree
- rbx-18mode
- rbx-19mode
env:
- "GIT_BRANCH=release-1.2"
notifications:
irc: "irc.freenode.org#datamapper"
email:
- [email protected]
matrix:
allow_failures:
- rvm: rbx-18mode
- rvm: rbx-19mode
33 changes: 10 additions & 23 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
require 'pathname'

source :rubygems
source 'https://rubygems.org'

gemspec

SOURCE = ENV.fetch('SOURCE', :git).to_sym
REPO_POSTFIX = SOURCE == :path ? '' : '.git'
DATAMAPPER = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
DM_VERSION = '~> 1.3.0.beta'
DO_VERSION = '~> 0.10.6'
DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
DO_VERSION = '~> 0.10.15'
DM_DO_ADAPTERS = %w[sqlite postgres mysql oracle sqlserver]
GIT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')

gem 'dm-core', DM_VERSION,
SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}",
:branch => CURRENT_BRANCH
gem 'dm-core', DM_VERSION, github: 'datamapper/dm-core', branch: GIT_BRANCH

platforms :mri_18 do
group :quality do
Expand All @@ -27,13 +22,12 @@ platforms :mri_18 do
end

group :datamapper do

adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[in_memory]

if (do_adapters = DM_DO_ADAPTERS & adapters).any?
do_options = {}
do_options[:git] = "#{DATAMAPPER}/do#{REPO_POSTFIX}" if ENV['DO_GIT'] == 'true'
do_options[:github] = 'datamapper/do' if ENV['DO_GIT'] == 'true'

gem 'data_objects', DO_VERSION, do_options.dup

Expand All @@ -42,24 +36,17 @@ group :datamapper do
gem "do_#{adapter}", DO_VERSION, do_options.dup
end

gem 'dm-do-adapter', DM_VERSION,
SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}",
:branch => CURRENT_BRANCH
gem 'dm-do-adapter', DM_VERSION, github: 'datamapper/dm-do-adapter', branch: GIT_BRANCH
end

adapters.each do |adapter|
gem "dm-#{adapter}-adapter", DM_VERSION,
SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}",
:branch => CURRENT_BRANCH
gem "dm-#{adapter}-adapter", DM_VERSION, github: "datamapper/dm-#{adapter}-adapter", branch: GIT_BRANCH
end

plugins = ENV['PLUGINS'] || ENV['PLUGIN']
plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq

plugins.each do |plugin|
gem plugin, DM_VERSION,
SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}",
:branch => CURRENT_BRANCH
gem plugin, DM_VERSION, github: "datamapper/#{plugin}", branch: GIT_BRANCH
end

end
1 change: 0 additions & 1 deletion spec/isolated/require_after_setup_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'backports'
require 'spec'

require 'isolated/require_spec'
Expand Down
1 change: 0 additions & 1 deletion spec/isolated/require_before_setup_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'backports'
require 'spec'

require 'isolated/require_spec'
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.

2 changes: 0 additions & 2 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'backports'

require 'dm-core/spec/setup'
require 'dm-core/spec/lib/spec_helper'
require 'dm-core/spec/lib/adapter_helpers'
Expand Down
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