fog · phiggins · Jan 10, 2011
diff --git a/lib/fog/providers/aws.rb b/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

diff --git a/lib/fog/providers/bluebox.rb b/lib/fog/providers/bluebox.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 
 module Fog
   module Bluebox

diff --git a/lib/fog/providers/brightbox.rb b/lib/fog/providers/brightbox.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 
 module Fog
   module Brightbox

diff --git a/lib/fog/providers/go_grid.rb b/lib/fog/providers/go_grid.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 
 module Fog
   module GoGrid

diff --git a/lib/fog/providers/google.rb b/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

diff --git a/lib/fog/providers/linode.rb b/lib/fog/providers/linode.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 
 module Fog
   module Linode

diff --git a/lib/fog/providers/local.rb b/lib/fog/providers/local.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 
 module Fog
   module Local

diff --git a/lib/fog/providers/new_servers.rb b/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

diff --git a/lib/fog/providers/rackspace.rb b/lib/fog/providers/rackspace.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core'
 
 module Fog
   module Rackspace

diff --git a/lib/fog/providers/slicehost.rb b/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

diff --git a/lib/fog/providers/zerigo.rb b/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

diff --git a/lib/fog/terremark.rb b/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'

diff --git a/lib/fog/vcloud.rb b/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'

diff --git a/spec/aws/models/compute/address_spec.rb b/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
 

diff --git a/spec/aws/models/compute/addresses_spec.rb b/spec/aws/models/compute/addresses_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe 'F
57AE
og::AWS::Compute::Addresses' do
 

diff --git a/spec/aws/models/compute/key_pair_spec.rb b/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
 

diff --git a/spec/aws/models/compute/key_pairs_spec.rb b/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
 

diff --git a/spec/aws/models/compute/security_group_spec.rb b/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
 

diff --git a/spec/aws/models/compute/security_groups_spec.rb b/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
 

diff --git a/spec/aws/models/compute/server_spec.rb b/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
 

diff --git a/spec/aws/models/compute/snapshot_spec.rb b/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
 

diff --git a/spec/aws/models/compute/snapshots_spec.rb b/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
 

diff --git a/spec/aws/models/compute/volume_spec.rb b/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
 

diff --git a/spec/aws/models/compute/volumes_spec.rb b/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
 

diff --git a/spec/spec_helper.rb b/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!

diff --git a/spec/vcloud/bin_spec.rb b/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 }

diff --git a/spec/vcloud/models/vdc_spec.rb b/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

diff --git a/spec/vcloud/requests/get_network_spec.rb b/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

diff --git a/spec/vcloud/requests/get_organization_spec.rb b/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

diff --git a/spec/vcloud/requests/get_vdc_spec.rb b/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

diff --git a/spec/vcloud/requests/get_versions_spec.rb b/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
 

diff --git a/spec/vcloud/requests/login_spec.rb b/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 }

diff --git a/spec/vcloud/spec_helper.rb b/spec/vcloud/spec_helper.rb
@@ -19,13 +19,12 @@ def its(attribute, &block)
 #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 ]

diff --git a/spec/vcloud/terremark/ecloud/models/backup_internet_service_spec.rb b/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

diff --git a/spec/vcloud/terremark/ecloud/models/backup_internet_services_spec.rb b/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

diff --git a/spec/vcloud/terremark/ecloud/models/internet_service_spec.rb b/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

diff --git a/spec/vcloud/terremark/ecloud/models/internet_services_spec.rb b/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

diff --git a/spec/vcloud/terremark/ecloud/models/ip_spec.rb b/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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

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

@@ -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

@@ -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

@@ -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

@@ -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 }

@@ -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?

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

@@ -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

@@ -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

@@ -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

@@ -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