[WIP] Test the upgrade

.travis.yml

@@ -1,12 +1,33 @@
 language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-script: "appraisal rake"
-gemfile:
-  - Gemfile
-  - gemfiles/latest_stable.gemfile
-  - gemfiles/oldest_current.gemfile
-  - gemfiles/previous_release.gemfile
-
+before_install:
+  - rvm @global do gem uninstall bundler --all --force --executables
+  - gem uninstall bundler --all --force --executables
+  - gem install bundler -v "$BUNDLER_VERSION"
+bundler_args: --without development
+matrix:
+  include:
+    - gemfile: Gemfile
+      rvm: 2.1.1 # Just to make sure we're ready...
+      env:
+        BUNDLER_VERSION='>= 1.5.2, < 1.8.0'
+    - gemfile: Gemfile
+      rvm: 2.0.0
+      env:
+        BUNDLER_VERSION='>= 1.5.2, < 1.8.0'
+    - gemfile: gemfiles/vagrant_1.7.gemfile
+      rvm: 2.0.0
+      env:
+        BUNDLER_VERSION='>= 1.5.2, < 1.8.0'
+    - gemfile: gemfiles/vagrant_1.6.gemfile
+      rvm: 2.0.0
+      env:
+        BUNDLER_VERSION='>= 1.5.2, < 1.7.0'
+    - gemfile: gemfiles/vagrant_1.5.gemfile
+      rvm: 2.0.0
+      env:
+        BUNDLER_VERSION='= 1.5.2'
+    # The oldest Vagrant/Ruby/Bundler we support
+    - gemfile: gemfiles/vagrant_1.5.0.gemfile
+      rvm: 2.0.0
+      env:
+        BUNDLER_VERSION='= 1.5.2'

Appraisals

@@ -1,14 +1,36 @@
-appraise "latest-stable" do
-  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.4.2'
+# Note: You may need to use bundler 1.5.2 to run `appraisal install`
+appraise "vagrant-1.7" do
+  group :plugins do
+    gem 'bundler', '>= 1.5.2', '< 1.8.0'
+    gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.7.1'
+  end
 end
 
-# Oldest (current release)
-appraise "oldest-current" do
-  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.4.0'
+appraise "vagrant-1.6" do
+  gem 'bundler', '>= 1.5.2', '< 1.7.0'
+  group :plugins do
+    gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.6.5'
+  end
 end
 
-# Latest patch (previous release)
-appraise "previous-release" do
-  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.3.5'
+appraise "vagrant-1.5" do
+  gem 'bundler', '= 1.5.2'
+  group :plugins do
+    gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.5.4'
+  end
+end
+
+# Oldest supported
+appraise "vagrant-1.5.0" do
+  gem 'bundler', '= 1.5.2'
+  group :plugins do
+    gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.5.4'
+  end
+end
+
+appraise "windows-wip" do
+  group :plugins do
+    gem "vagrant", :git => 'https://github.com/maxlinc/vagrant', :branch => 'winrm-1.3'
+  end
 end
 

Gemfile

@@ -1,19 +1,18 @@
 source 'https://rubygems.org'
 
-
-group :plugins do
-  gemspec
-  gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant'
+# This group will not be installed on Travis
+group :development do
+  gem 'pry'
+  # My branch contains a fix for https://github.com/thoughtbot/appraisal/issues/76
+  gem 'appraisal', '~> 1.0', git: 'https://github.com/maxlinc/appraisal', branch: 'gemspec_in_group'
 end
 
-gem "appraisal", "1.0.0.beta2"
-
-group :development do
-  # We depend on Vagrant for development, but we don't add it as a
-  # gem dependency because we expect to be installed within the
-  # Vagrant environment itself using `vagrant plugin`.
+group :test do
   gem 'coveralls', require: false
-  gem 'pry'
 end
 
-
+group :plugins do
+  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", :branch => 'master'
+  gemspec
+end
+