From 700938b668e1b67d023fb7d708df89aef493d655 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 7 Mar 2012 22:15:45 -0800
Subject: [PATCH] Load rubygems in environment.rb [GH-781]

---
 CHANGELOG.md               | 5 +++++
 lib/vagrant/environment.rb | 1 +
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf211f555..c4cd4d9cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.0.1 (unreleased)
+
+  - Add missing `rubygems` require in `environment.rb` to avoid
+    possible load errors. [GH-781]
+
 ## 1.0.0 (March 6, 2012)
 
   - `vagrant gem` should now be used to install Vagrant plugins that are
diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb
index c7ed90a17..ce4b97f2e 100644
--- a/lib/vagrant/environment.rb
+++ b/lib/vagrant/environment.rb
@@ -2,6 +2,7 @@ require 'pathname'
 require 'fileutils'
 
 require 'log4r'
+require 'rubygems'  # This is needed for plugin loading below.
 
 require 'vagrant/util/file_mode'
 require 'vagrant/util/platform'