Gemfile in vagrant-pe_build-0.8.8 vs Gemfile in vagrant-pe_build-0.9.0

@@ -1,19 +1,28 @@
 source 'https://rubygems.org'
+ruby '2.0.0' # Required by Vagrant 1.4 and newer.
 
-gemspec
+ENV['TEST_VAGRANT_VERSION'] ||= 'v1.6.3'
 
+# Wrapping gemspec in the :plugins group causes Vagrant 1.5 and newer to
+# automagically load this plugin during acceptance tests.
+group :plugins do
+  gemspec
+end
+
 group :doc do
   gem 'yard', '~> 0.8.7'
   gem 'redcarpet'
 end
 
-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`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.4.0'
-end
+group :test do
+  if ENV['TEST_VAGRANT_VERSION'] == 'HEAD'
+    gem 'vagrant', :github => 'mitchellh/vagrant', :branch => 'master'
+  else
+    gem 'vagrant', :github => 'mitchellh/vagrant', :tag => ENV['TEST_VAGRANT_VERSION']
+  end
 
-if File.exists? "#{__FILE__}.local"
-  eval(File.read("#{__FILE__}.local"), binding)
+  # Pinned on 05/05/2014. Compatible with Vagrant 1.5.x and 1.6.x.
+  gem 'vagrant-spec', :github => 'mitchellh/vagrant-spec', :ref => 'aae28ee'
 end
+
+eval_gemfile "#{__FILE__}.local" if File.exists? "#{__FILE__}.local"