Fix a bunch of paths.

lib/fog/providers/aws.rb

@@ -1,6 +1,6 @@
 require 'nokogiri'
 
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 require 'fog/core/parser'
 
 module Fog

lib/fog/providers/bluebox.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 
 module Fog
   module Bluebox

lib/fog/providers/brightbox.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 
 module Fog
   module Brightbox

lib/fog/providers/go_grid.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 
 module Fog
   module GoGrid

lib/fog/providers/google.rb

@@ -1,6 +1,6 @@
 require 'nokogiri'
 
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 require 'fog/core/parser'
 
 module Fog

lib/fog/providers/linode.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 
 module Fog
   module Linode

lib/fog/providers/local.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 
 module Fog
   module Local

lib/fog/providers/new_servers.rb

@@ -1,6 +1,6 @@
 require 'nokogiri'
 
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 require 'fog/core/parser'
 
 module Fog

lib/fog/providers/rackspace.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 
 module Fog
   module Rackspace

lib/fog/providers/slicehost.rb

@@ -1,6 +1,6 @@
 require 'nokogiri'
 
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 require 'fog/core/parser'
 
 module Fog

lib/fog/providers/zerigo.rb

@@ -1,6 +1,6 @@
 require 'nokogiri'
 
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 require 'fog/core/parser'
 
 module Fog

lib/fog/terremark.rb

@@ -1,6 +1,6 @@
 require 'nokogiri'
 
-require File.join(File.dirname(__FILE__), 'core')
+require 'fog/core'
 require 'fog/core/parser'
 
 require 'fog/terremark/shared'

lib/fog/vcloud.rb

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

spec/aws/models/compute/address_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe 'Fog::AWS::Compute::Address' do
 

spec/aws/models/compute/addresses_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe 'Fog::AWS::Compute::Addresses' do
 

spec/aws/models/compute/key_pair_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe 'Fog::AWS::Compute::KeyPair' do
 

spec/aws/models/compute/key_pairs_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe 'Fog::AWS::Compute::KeyPairs' do
 

spec/aws/models/compute/security_group_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe 'Fog::AWS::Compute::SecurityGroup' do
 

spec/aws/models/compute/security_groups_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe 'Fog::AWS::Compute::SecurityGroups' do
 

spec/aws/models/compute/server_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe 'Fog::AWS::Compute::Server' do
 

spec/aws/models/compute/snapshot_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe 'Fog::AWS::Compute::Snapshot' do
 

spec/aws/models/compute/snapshots_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe 'Fog::AWS::Compute::Snapshots' do
 

spec/aws/models/compute/volume_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe 'Fog::AWS::Compute::Volume' do
 

spec/aws/models/compute/volumes_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe 'Fog::AWS::Compute::Volumes' do
 

spec/spec_helper.rb

@@ -1,8 +1,8 @@
 require 'spec'
 require 'open-uri'
 require 'fog'
-require 'fog/core/bin'
-require 'fog/vcloud/bin'
+require 'fog/bin'
+require 'fog/bin/vcloud'
 
 if ENV["FOG_MOCK"] == "true"
   Fog.mock!

spec/vcloud/bin_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'vcloud/spec_helper'
 
 describe Vcloud do
   it { should be_initialized }

spec/vcloud/models/vdc_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Vdc", :type => :mock_vcloud_model do

spec/vcloud/requests/get_network_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_vcloud_request do

spec/vcloud/requests/get_organization_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_vcloud_request do

spec/vcloud/requests/get_vdc_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 #
 # WARNING: INCOMPLETE

spec/vcloud/requests/get_versions_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 shared_examples_for "real or mock get_versions requests" do
 

spec/vcloud/requests/login_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 shared_examples_for "real or mock login requests" do
   subject { @vcloud }

spec/vcloud/spec_helper.rb

@@ -19,13 +19,12 @@ end
 #Initialize this to a known seed
 srand 1234
 
-current_directory = File.dirname(__FILE__)
-require "#{current_directory}/../../lib/fog"
-require "#{current_directory}/../../lib/fog/core/bin"
+require 'fog'
+require 'fog/bin'
 
 Fog.mock! if ENV['FOG_MOCK']
 
-require "#{current_directory}/../../lib/fog/vcloud/bin"
+require 'fog/bin/vcloud'
 
 def arrayify(item)
   item.is_a?(Array) ? item : [ item ]

spec/vcloud/terremark/ecloud/models/backup_internet_service_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::BackupInternetService", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/models/backup_internet_services_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::InternetServices", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/models/internet_service_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::InternetService", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/models/internet_services_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::InternetServices", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/models/ip_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Ip", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/models/ips_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Ips", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/models/network_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Network", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/models/networks_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Networks", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/models/node_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Node", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/models/nodes_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::InternetServices", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/models/public_ip_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::PublicIp", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/models/public_ips_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::PublicIps", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/models/server_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Vdc", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/models/vdc_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Vdc", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/models/vdcs_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','..','..','spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud::Terremark::Ecloud::Vdcs", :type => :mock_tmrk_ecloud_model do

spec/vcloud/terremark/ecloud/requests/add_backup_internet_service_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/add_internet_service_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/add_node_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   #FIXME: with rspec2

spec/vcloud/terremark/ecloud/requests/configure_internet_service_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/configure_network_ip_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/configure_node_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/configure_vapp_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 shared_examples_for "a successful configure vapp" do
   specify { after_vapp_data.should == new_vapp_data }

spec/vcloud/terremark/ecloud/requests/delete_internet_service_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 #FIXME: Make this more sane with rspec2
 if Fog.mocking?

spec/vcloud/terremark/ecloud/requests/delete_node_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   #FIXME: with rspec2

spec/vcloud/terremark/ecloud/requests/delete_vapp_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 shared_examples_for "a failed vapp deletion" do
   it "should not change the mock data" do

spec/vcloud/terremark/ecloud/requests/get_catalog_item_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/get_catalog_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/get_customization_options_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/get_internet_services_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   shared_examples_for "a basic internet service" do

spec/vcloud/terremark/ecloud/requests/get_network_ip_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/get_network_ips_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/get_network_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/get_node_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/get_nodes_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/get_public_ip_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/get_public_ips_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/get_vapp_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/instantiate_vapp_template_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/login_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/power_off_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_tmrk_ecloud_request do

spec/vcloud/terremark/ecloud/requests/power_on_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_tmrk_ecloud_request do

spec/vcloud/vcloud_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'vcloud/spec_helper'
 
 if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_vcloud_request do

tests/helper.rb

@@ -1,5 +1,7 @@
-require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
-require 'fog/core/bin'
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), %w[ .. lib fog]))
+
+require 'fog'
+require 'fog/bin'
 
 # Use so you can run in mock mode from the command line
 #