From 60eead64558b804e9fe6f46695a53036cf81d397 Mon Sep 17 00:00:00 2001
From: Scott Schneider <sschneider@puppetlabs.com>
Date: Wed, 5 Mar 2014 13:19:43 -0800
Subject: [PATCH] Centralize external Gem loading

---
 lib/vmpooler.rb                | 9 +++++++++
 lib/vmpooler/api.rb            | 7 -------
 lib/vmpooler/pool_manager.rb   | 7 -------
 lib/vmpooler/vsphere_helper.rb | 6 ------
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/lib/vmpooler.rb b/lib/vmpooler.rb
index 4e4d901..ef820da 100644
--- a/lib/vmpooler.rb
+++ b/lib/vmpooler.rb
@@ -1,6 +1,15 @@
 require 'rubygems' unless defined?(Gem)
 
 module Vmpooler
+  require 'json'
+  require 'open-uri'
+  require 'rbvmomi'
+  require 'redis'
+  require 'sinatra/base'
+  require 'time'
+  require 'timeout'
+  require 'yaml'
+
   %w( api graphite logger pool_manager vsphere_helper ).each do |lib|
     begin
       require "vmpooler/#{lib}"
diff --git a/lib/vmpooler/api.rb b/lib/vmpooler/api.rb
index 4a84234..c2d6b57 100644
--- a/lib/vmpooler/api.rb
+++ b/lib/vmpooler/api.rb
@@ -1,13 +1,6 @@
 module Vmpooler
   class API
     def initialize
-      require 'sinatra/base'
-
-      require 'json'
-      require 'open-uri'
-      require 'redis'
-      require 'yaml'
-
       # Load the configuration file
       config_file = File.expand_path('vmpooler.yaml')
       $config = YAML.load_file(config_file)
diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index c85ec21..20e25f3 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -1,13 +1,6 @@
 module Vmpooler
   class PoolManager
     def initialize
-      require 'json'
-      require 'rbvmomi'
-      require 'redis'
-      require 'time'
-      require 'timeout'
-      require 'yaml'
-
       # Load the configuration file
       config_file = File.expand_path('vmpooler.yaml')
       $config = YAML.load_file(config_file)
diff --git a/lib/vmpooler/vsphere_helper.rb b/lib/vmpooler/vsphere_helper.rb
index 058e859..402530b 100644
--- a/lib/vmpooler/vsphere_helper.rb
+++ b/lib/vmpooler/vsphere_helper.rb
@@ -3,12 +3,6 @@ require 'rubygems' unless defined?(Gem)
 module Vmpooler
   class VsphereHelper
     def initialize vInfo = {}
-      begin
-        require 'rbvmomi'
-      rescue LoadError
-        raise "Unable to load RbVmomi, please ensure its installed"
-      end
-
       config_file = File.expand_path('vmpooler.yaml')
       vsphere = YAML.load_file(config_file)[:vsphere]