From 240f43b98a3c17f05082b0a846f0610a310eb801 Mon Sep 17 00:00:00 2001
From: geemus <geemus@gmail.com>
Date: Fri, 29 Oct 2010 15:25:14 -0700
Subject: [PATCH] pushing nokogiri dependency toward leaves as well

---
 lib/fog.rb             | 1 -
 lib/fog/aws.rb         | 3 +++
 lib/fog/core.rb        | 2 +-
 lib/fog/google.rb      | 3 +++
 lib/fog/new_servers.rb | 3 +++
 lib/fog/slicehost.rb   | 3 +++
 lib/fog/terremark.rb   | 3 +++
 lib/fog/vcloud.rb      | 3 +++
 8 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/lib/fog.rb b/lib/fog.rb
index afa72e069..cf861784e 100644
--- a/lib/fog.rb
+++ b/lib/fog.rb
@@ -3,7 +3,6 @@ require 'base64'
 require 'cgi'
 require 'excon'
 require 'formatador'
-require 'nokogiri'
 require 'time'
 
 __DIR__ = File.dirname(__FILE__)
diff --git a/lib/fog/aws.rb b/lib/fog/aws.rb
index 8b46c1a78..34a31ff8f 100644
--- a/lib/fog/aws.rb
+++ b/lib/fog/aws.rb
@@ -1,3 +1,6 @@
+require 'nokogiri'
+require 'fog/core/parser'
+
 module Fog
   module AWS
 
diff --git a/lib/fog/core.rb b/lib/fog/core.rb
index 87416eb89..773bab8e9 100644
--- a/lib/fog/core.rb
+++ b/lib/fog/core.rb
@@ -5,7 +5,7 @@ require 'fog/core/deprecation'
 require 'fog/core/errors'
 require 'fog/core/hmac'
 require 'fog/core/model'
-require 'fog/core/parser'
+# require 'fog/core/parser'
 require 'fog/core/provider'
 require 'fog/core/service'
 require 'fog/core/ssh'
\ No newline at end of file
diff --git a/lib/fog/google.rb b/lib/fog/google.rb
index 12e03f7d3..588d8145f 100644
--- a/lib/fog/google.rb
+++ b/lib/fog/google.rb
@@ -1,3 +1,6 @@
+require 'nokogiri'
+require 'fog/core/parser'
+
 module Fog
   module Google
 
diff --git a/lib/fog/new_servers.rb b/lib/fog/new_servers.rb
index b5734b4c4..96feb966c 100644
--- a/lib/fog/new_servers.rb
+++ b/lib/fog/new_servers.rb
@@ -1,3 +1,6 @@
+require 'nokogiri'
+require 'fog/core/parser'
+
 module Fog
   module NewServers
 
diff --git a/lib/fog/slicehost.rb b/lib/fog/slicehost.rb
index 26eb78097..ecccf3be9 100644
--- a/lib/fog/slicehost.rb
+++ b/lib/fog/slicehost.rb
@@ -1,3 +1,6 @@
+require 'nokogiri'
+require 'fog/core/parser'
+
 module Fog
   module Slicehost
 
diff --git a/lib/fog/terremark.rb b/lib/fog/terremark.rb
index ec499febd..000e74c6f 100644
--- a/lib/fog/terremark.rb
+++ b/lib/fog/terremark.rb
@@ -1,3 +1,6 @@
+require 'nokogiri'
+require 'fog/core/parser'
+
 require 'fog/terremark/shared'
 require 'fog/terremark/parser'
 require 'fog/terremark/ecloud'
diff --git a/lib/fog/vcloud.rb b/lib/fog/vcloud.rb
index 7e5bc4b1e..a156afbd9 100644
--- a/lib/fog/vcloud.rb
+++ b/lib/fog/vcloud.rb
@@ -1,3 +1,6 @@
+require 'nokogiri'
+require 'fog/core/parser'
+
 require 'builder'
 require 'fog/vcloud/model'
 require 'fog/vcloud/collection'