Vagrant is now a good ruby gem citizen and no longer modifies the include path.

bin/vagrant-box

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
+require File.expand_path('vagrant', libdir)
-require 'vagrant'
 
 GitStyleBinary.command do
   short_desc "manage boxes"

bin/vagrant-down

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
+require File.expand_path('vagrant', libdir)
-require 'vagrant'
 
 GitStyleBinary.command do
   short_desc "destroys the vagrant environment"

bin/vagrant-halt

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
+require File.expand_path('vagrant', libdir)
-require 'vagrant'
 
 GitStyleBinary.command do
   short_desc "forcibly halts the vagrant environment"

bin/vagrant-init

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
+require File.expand_path('vagrant', libdir)
-require 'vagrant'
 
 GitStyleBinary.command do
   short_desc "initializes directory for vagrant use"

bin/vagrant-package

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
+require File.expand_path('vagrant', libdir)
-require 'vagrant'
 
 GitStyleBinary.command do
   short_desc "package the current vagrant environment"

bin/vagrant-reload

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
+require File.expand_path('vagrant', libdir)
-require 'vagrant'
 
 GitStyleBinary.command do
   short_desc "reload the vagrant environment"

bin/vagrant-resume

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
+require File.expand_path('vagrant', libdir)
-require 'vagrant'
 
 GitStyleBinary.command do
   short_desc "resumes the vagrant environment"

bin/vagrant-ssh

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
+require File.expand_path('vagrant', libdir)
-require 'vagrant'
 
 GitStyleBinary.command do
   short_desc "opens an SSH connection into the VM"

bin/vagrant-suspend

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
+require File.expand_path('vagrant', libdir)
-require 'vagrant'
 
 GitStyleBinary.command do
   short_desc "suspends the vagrant environment"

bin/vagrant-up

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
+require File.expand_path('vagrant', libdir)
-require 'vagrant'
 
 GitStyleBinary.command do
   short_desc "create the vagrant environment"

lib/vagrant.rb

@@ -1,5 +1,4 @@
 libdir = File.dirname(__FILE__)
-$:.unshift(libdir)
 PROJECT_ROOT = File.join(libdir, '..') unless defined?(PROJECT_ROOT)
 
 # The libs which must be loaded prior to the rest