fog 0.7.2 → 0.8.0

data/lib/fog/core/credentials.rb

@@ -36,7 +36,7 @@ module Fog
     @credentials  ||= begin
       if credentials_path && File.exists?(credentials_path)
         credentials = self.symbolize_credentials(YAML.load_file(credentials_path))
-        (credentials && credentials[credential]) or raise LoadError.new(missing_credentials)
+        (credentials && credentials[credential]) || Fog::Errors.missing_credentials
       else
         {}
       end
@@ -53,55 +53,4 @@ module Fog
     end
   end
 
-private
-
-  # @return [String] The error message that will be raised, if credentials cannot be found
-  def self.missing_credentials
-    <<-YML
-Missing Credentials
-
-To run as '#{credential}', add the following to your resource config file: #{credentials_path}
-An alternate file may be used by placing its path in the FOG_RC environment variable
-
-#######################################################
-# Fog Credentials File
-#
-# Key-value pairs should look like:
-# :aws_access_key_id:                 022QF06E7MXBSAMPLE
-:#{credential}:
-  :aws_access_key_id:
-  :aws_secret_access_key:
-  :bluebox_api_key:
-  :bluebox_customer_id:
-  :brightbox_client_id:
-  :brightbox_secret:
-  :go_grid_api_key:
-  :go_grid_shared_secret:
-  :google_storage_access_key_id:
-  :google_storage_secret_access_key:
-  :linode_api_key:
-  :local_root:
-  :new_servers_password:
-  :new_servers_username:
-  :public_key_path:
-  :private_key_path:
-  :rackspace_api_key:
-  :rackspace_username:
-  :rackspace_servicenet:
-  :rackspace_cdn_ssl:
-  :slicehost_password:
-  :terremark_username:
-  :terremark_password:
-  :voxel_api_key:
-  :voxel_api_secret:
-  :zerigo_email:
-  :zerigo_token:
-  :dnsimple_email:
-  :dnsimple_password:
-#
-# End of Fog Credentials File
-#######################################################
-
-YML
-  end
 end

data/lib/fog/core/errors.rb

@@ -16,5 +16,58 @@ module Fog
 
     class NotFound < Fog::Errors::Error; end
 
+    # @return [String] The error message that will be raised, if credentials cannot be found
+    def self.missing_credentials
+      missing_credentials_message = <<-YML
+Missing Credentials
+
+To run as '#{Fog.credential}', add the following to your resource config file: #{Fog.credentials_path}
+An alternate file may be used by placing its path in the FOG_RC environment variable
+
+#######################################################
+# Fog Credentials File
+#
+# Key-value pairs should look like:
+# :aws_access_key_id:                 022QF06E7MXBSAMPLE
+:#{Fog.credential}:
+  :aws_access_key_id:
+  :aws_secret_access_key:
+  :bluebox_api_key:
+  :bluebox_customer_id:
+  :brightbox_client_id:
+  :brightbox_secret:
+  :go_grid_api_key:
+  :go_grid_shared_secret:
+  :google_storage_access_key_id:
+  :google_storage_secret_access_key:
+  :linode_api_key:
+  :local_root:
+  :new_servers_password:
+  :new_servers_username:
+  :public_key_path:
+  :private_key_path:
+  :rackspace_api_key:
+  :rackspace_username:
+  :rackspace_servicenet:
+  :rackspace_cdn_ssl:
+  :slicehost_password:
+  :stormondemand_username:
+  :stormondemand_password:
+  :terremark_username:
+  :terremark_password:
+  :voxel_api_key:
+  :voxel_api_secret:
+  :zerigo_email:
+  :zerigo_token:
+  :dnsimple_email:
+  :dnsimple_password:
+#
+# End of Fog Credentials File
+#######################################################
+
+    YML
+    raise(LoadError.new(missing_credentials_message))
+  end
+
   end
 end

data/lib/fog/core/model.rb

@@ -25,11 +25,16 @@ module Fog
 
     def reload
       requires :identity
-      if data = collection.get(identity)
-        new_attributes = data.attributes
-        merge_attributes(new_attributes)
-        self
+
+      return unless data = begin
+        collection.get(identity)
+      rescue Excon::Errors::SocketError
+        nil
       end
+
+      new_attributes = data.attributes
+      merge_attributes(new_attributes)
+      self
     end
 
     def to_json
@@ -39,8 +44,8 @@ module Fog
 
     def wait_for(timeout=600, interval=1, &block)
       reload
+      retries = 3
       Fog.wait_for(timeout, interval) do
-        retries = 3
         if reload
           retries = 3
         elsif retries > 0

data/lib/fog/core/parser.rb

@@ -10,20 +10,25 @@ module Fog
         reset
       end
 
+      def attr_value(name, attrs)
+        (entry = attrs.detect {|a, v| a == name }) && entry.last
+      end
+
       def reset
         @response = {}
       end
 
       def characters(string)
-        @value = string
+        @value ||= ''
+        @value << string
       end
 
       def start_element(name, attrs = [])
         @value = nil
       end
 
-      def attr_value(name, attrs)
-        (entry = attrs.detect {|a, v| a == name }) && entry.last
+      def value
+        @value && @value.dup
       end
 
     end

data/lib/fog/dns/models/aws/records.rb

@@ -33,7 +33,7 @@ module Fog
         def get(record_id)
           data = connection.get_change(record_id).body
           new(data)
-        rescue Excon::Errors::BadRequest
+        rescue Excon::Errors::Forbidden
           nil
         end
 

data/lib/fog/dns/models/aws/zones.rb

@@ -22,7 +22,7 @@ module Fog
         def get(zone_id)
           data = connection.get_hosted_zone(zone_id).body
           new(data)
-        rescue Excon::Errors::BadRequest
+        rescue Excon::Errors::Forbidden
           nil
         end
 

data/lib/fog/dns/parsers/aws/change_resource_record_sets.rb

@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'Id'  
-              @response[name] = @value.sub('/change/', '')
+              @response[name] = value.sub('/change/', '')
             when 'Status', 'SubmittedAt'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/dns/parsers/aws/create_hosted_zone.rb

@@ -17,9 +17,9 @@ module Fog
             if @section == :hosted_zone
               case name
               when 'Id'
-                @hosted_zone[name] = @value.sub('/hostedzone/', '')
+                @hosted_zone[name] = value.sub('/hostedzone/', '')
               when 'Name', 'CallerReference', 'Comment'
-                @hosted_zone[name]= @value
+                @hosted_zone[name]= value
               when 'HostedZone'
                 @response['HostedZone'] = @hosted_zone
                 @hosted_zone = {}
@@ -28,9 +28,9 @@ module Fog
             elsif @section == :change_info
               case name
               when 'Id'
-                @change_info[name]= @value.sub('/change/', '')
+                @change_info[name]= value.sub('/change/', '')
               when 'Status', 'SubmittedAt'
-                @change_info[name] = @value
+                @change_info[name] = value
               when 'ChangeInfo'
                 @response['ChangeInfo'] = @change_info
                 @change_info = {}
@@ -39,7 +39,7 @@ module Fog
             elsif @section == :name_servers
               case name
               when 'NameServer'
-                @name_servers << @value
+                @name_servers << value
               when 'NameServers'
                 @response['NameServers'] = @name_servers
                 @name_servers = {}

data/lib/fog/dns/parsers/aws/delete_hosted_zone.rb

@@ -13,7 +13,7 @@ module Fog
           def end_element(name)
             case name
             when 'Id', 'Status', 'SubmittedAt'
-              @response['ChangeInfo'][name] = @value
+              @response['ChangeInfo'][name] = value
             end
           end
 

data/lib/fog/dns/parsers/aws/get_change.rb

@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'Id'
-              @response[name] = @value.sub('/change/', '')
+              @response[name] = value.sub('/change/', '')
             when 'Status', 'SubmittedAt'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/dns/parsers/aws/get_hosted_zone.rb

@@ -16,9 +16,9 @@ module Fog
             if @section == :hosted_zone
               case name
               when 'Id'
-                @hosted_zone[name]= @value.sub('/hostedzone/', '')
+                @hosted_zone[name]= value.sub('/hostedzone/', '')
               when 'Name', 'CallerReference', 'Comment'
-                @hosted_zone[name]= @value
+                @hosted_zone[name]= value
               when 'HostedZone'
                 @response['HostedZone'] = @hosted_zone
                 @hosted_zone = {}
@@ -27,7 +27,7 @@ module Fog
             elsif @section == :name_servers
               case name
               when 'NameServer'
-                @name_servers << @value
+                @name_servers << value
               when 'NameServers'
                 @response['NameServers'] = @name_servers
                 @name_servers = {}

data/lib/fog/dns/parsers/aws/list_hosted_zones.rb

@@ -14,18 +14,18 @@ module Fog
           def end_element(name)
             case name
             when 'Id'
-              @zone[name] = @value.sub('/hostedzone/', '')
+              @zone[name] = value.sub('/hostedzone/', '')
             when 'Name', 'CallerReference', 'Comment'
-              @zone[name] = @value
+              @zone[name] = value
             when 'HostedZone'
               @hosted_zones << @zone
               @zone = {}
             when 'HostedZones'
               @response['HostedZones'] = @hosted_zones
             when 'MaxItems'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'IsTruncated', 'Marker', 'NextMarker'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/dns/parsers/aws/list_resource_record_sets.rb

@@ -18,9 +18,9 @@ module Fog
             if @section == :resource_record_set
               case name
               when 'Name', 'Type', 'TTL'
-                @resource_record_set[name] = @value
+                @resource_record_set[name] = value
               when 'Value'
-                @resource_record_set['ResourceRecords'] << @value
+                @resource_record_set['ResourceRecords'] << value
               when 'ResourceRecordSet'
                 @response['ResourceRecordSets'] << @resource_record_set
                 @resource_record_set = {}
@@ -31,9 +31,9 @@ module Fog
             elsif @section == :main
                 case name
                 when 'MaxItems'
-                  @response[name]= @value.to_i
+                  @response[name]= value.to_i
                 when 'IsTruncated', 'NextRecordName', 'NextRecordType'
-                  @response[name]= @value
+                  @response[name]= value
                 end
             end
           end

data/lib/fog/dns/parsers/bluebox/create_record.rb

@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'serial', 'ttl', 'retry', 'refresh', 'minimum', 'record-count', 'expires'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'name', 'id'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/dns/parsers/bluebox/create_zone.rb

@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'serial', 'ttl', 'retry', 'refresh', 'minimum', 'record-count', 'expires'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'name', 'id'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/dns/parsers/bluebox/get_record.rb

@@ -10,7 +10,7 @@ module Fog
           end
 
           def end_element(name)
-            @response[name] = @value
+            @response[name] = value
           end
 
         end

data/lib/fog/dns/parsers/bluebox/get_records.rb

@@ -16,7 +16,7 @@ module Fog
               @response['records'] << @record
               @record = {}
             else
-              @record[name] = @value
+              @record[name] = value
             end
           end
         end

data/lib/fog/dns/parsers/bluebox/get_zone.rb

@@ -11,9 +11,9 @@ module Fog
           def end_element(name)
             case name
             when 'serial', 'ttl', 'retry', 'expires', 'record-count', 'refresh', 'minimum'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'name', 'id'
-              @response[name] = @value
+              @response[name] = value
             end
           end
         end

data/lib/fog/dns/parsers/bluebox/get_zones.rb

@@ -13,9 +13,9 @@ module Fog
           def end_element(name)
             case name
             when 'serial', 'ttl', 'retry', 'expires', 'record-count', 'refresh', 'minimum'
-              @zone[name] = @value.to_i
+              @zone[name] = value.to_i
             when 'name', 'id'
-              @zone[name] = @value
+              @zone[name] = value
             when 'record'
               @response['zones'] << @zone
               @zone = {}

data/lib/fog/dns/parsers/slicehost/create_record.rb

@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'zone-id', 'ttl', 'id'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'record-type', 'name', 'data', 'active', 'aux'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/dns/parsers/slicehost/create_zone.rb

@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'ttl', 'id'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'origin', 'active'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/dns/parsers/slicehost/get_record.rb

@@ -12,9 +12,9 @@ module Fog
           def end_element(name)
             case name
             when 'zone-id', 'ttl'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'record-type', 'name', 'data', 'active', 'aux'
-              @response[name] = @value
+              @response[name] = value
             end
           end