Merge pull request #12 from rspec/travis_builds

Run travis build against RSpec 2-99-maintenance and master branches

Author: JonRowe

.travis.yml

@@ -2,16 +2,15 @@ language: ruby
 script: "script/test_all"
 bundler_args: "--standalone --binstubs --without documentation"
 rvm:
-  - 1.8.7
-  - 1.9.2
+  - 2.1.0
+  - 2.0.0
   - 1.9.3
+  - 1.9.2
+  - 1.8.7
   - ree
-  - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-  - 2.0.0
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
-    - rvm: rbx-18mode
+  - jruby-18mode
+  - rbx
+env:
+  - BRANCH=master
+  - BRANCH=2-99-maintenance

Gemfile

@@ -2,17 +2,25 @@ source 'https://rubygems.org'
 
 gemspec
 
-%w[rspec rspec-core rspec-expectations rspec-mocks rspec-support].each do |lib|
+%w[rspec rspec-core rspec-expectations rspec-mocks].each do |lib|
   library_path = File.expand_path("../../#{lib}", __FILE__)
   if File.exist?(library_path)
     gem lib, :path => library_path
   else
-    gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => "2-99-maintenance" unless lib == 'rspec-support'
+    gem lib, :git    => "git://github.com/rspec/#{lib}.git",
+             :branch => ENV.fetch('BRANCH',"master")
   end
 end
 
+# only the master branche is supported on rspec-support
+gem "rspec-support", :git => "git://github.com/rspec/rspec-support.git"
+
 gem "cucumber", "~> 1.1.9"
 gem "aruba",    "~> 0.5"
 gem "rake",     "~> 10.0.0"
 
+platform :rbx do
+  gem 'rubysl'
+end
+
 eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')