[core] cleanup/fixes for dependencies

lib/fog/aws.rb

@@ -1,3 +1,5 @@
+require 'nokogiri'
+
 require File.join(File.dirname(__FILE__), 'core')
 require 'fog/core/parser'
 

lib/fog/core.rb

@@ -1,4 +1,4 @@
-__LIB_DIR__ = File.join(File.dirname(__FILE__), '..')
+__LIB_DIR__ = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
 $LOAD_PATH.unshift __LIB_DIR__ unless
   $LOAD_PATH.include?(__LIB_DIR__) ||
@@ -10,8 +10,8 @@ require 'base64'
 require 'cgi'
 require 'excon'
 require 'formatador'
-require 'nokogiri'
 require 'time'
+require 'timeout'
 require 'named-parameters'
 
 # internal core dependencies

lib/fog/google.rb

@@ -1,3 +1,5 @@
+require 'nokogiri'
+
 require File.join(File.dirname(__FILE__), 'core')
 require 'fog/core/parser'
 

lib/fog/new_servers.rb

@@ -1,3 +1,5 @@
+require 'nokogiri'
+
 require File.join(File.dirname(__FILE__), 'core')
 require 'fog/core/parser'
 

lib/fog/slicehost.rb

@@ -1,3 +1,5 @@
+require 'nokogiri'
+
 require File.join(File.dirname(__FILE__), 'core')
 require 'fog/core/parser'
 

lib/fog/terremark.rb

@@ -1,3 +1,5 @@
+require 'nokogiri'
+
 require File.join(File.dirname(__FILE__), 'core')
 require 'fog/core/parser'
 

lib/fog/vcloud.rb

@@ -1,3 +1,5 @@
+require 'nokogiri'
+
 require File.join(File.dirname(__FILE__), 'core')
 require 'fog/core/parser'
 

lib/fog/zerigo.rb

@@ -1,3 +1,5 @@
+require 'nokogiri'
+
 require File.join(File.dirname(__FILE__), 'core')
 require 'fog/core/parser'