fog 0.3.31 → 0.3.32

data/lib/fog.rb

@@ -1,80 +1,18 @@
-require 'rubygems'
-require 'base64'
-require 'cgi'
-require 'excon'
-require 'formatador'
-require 'time'
-require 'named-parameters'
-
-__DIR__ = File.dirname(__FILE__)
-
-$LOAD_PATH.unshift __DIR__ unless
-  $LOAD_PATH.include?(__DIR__) ||
-  $LOAD_PATH.include?(File.expand_path(__DIR__))
-
-require 'fog/core'
+require File.join(File.dirname(__FILE__), 'fog', 'core')
 
 module Fog
 
-  @mocking = false
-
   unless const_defined?(:VERSION)
-    VERSION = '0.3.31'
-  end
-
-  module Mock
-    @delay = 1
-    def self.delay
-      @delay
-    end
-
-    def self.delay=(new_delay)
-      raise ArgumentError, "delay must be non-negative" unless new_delay >= 0
-      @delay = new_delay
-    end
-
-    def self.not_implemented
-      raise Fog::Errors::MockNotImplemented.new("Contributions welcome!")
-    end
-
-  end
-
-  def self.bin
-    @bin ||= false
+    VERSION = '0.3.32'
   end
 
-  def self.bin=(new_bin)
-    @bin = new_bin
-  end
-
-  def self.mock!
-    @mocking = true
-  end
-
-  def self.mocking?
-    !!@mocking
-  end
-
-  def self.wait_for(timeout=600, interval=1, &block)
-    duration = 0
-    start = Time.now
-    until yield || duration > timeout
-      sleep(interval)
-      duration = Time.now - start
-    end
-    if duration > timeout
-      false
-    else
-      { :duration => duration }
-    end
-  end
-  
 end
 
 require 'fog/aws'
 require 'fog/bluebox'
 require 'fog/brightbox'
 require 'fog/go_grid'
+require 'fog/google'
 require 'fog/linode'
 require 'fog/local'
 require 'fog/new_servers'
@@ -82,4 +20,5 @@ require 'fog/rackspace'
 require 'fog/slicehost'
 require 'fog/terremark'
 require 'fog/vcloud'
-require 'fog/google'
+require 'fog/zerigo'
+

data/lib/fog/aws.rb

@@ -1,4 +1,6 @@
 require 'nokogiri'
+
+require File.join(File.dirname(__FILE__), 'core')
 require 'fog/core/parser'
 
 module Fog
@@ -9,6 +11,7 @@ module Fog
     service_path 'fog/aws'
     service 'cdn'
     service 'compute'
+    service 'dns'
     service 'ec2'
     service 'elb'
     service 'iam'

data/lib/fog/aws/bin.rb

@@ -7,6 +7,8 @@ class AWS < Fog::Bin
         Fog::AWS::CDN
       when :compute, :ec2
         Fog::AWS::Compute
+      when :dns
+        Fog::AWS::DNS
       when :elb
         Fog::AWS::ELB
       when :iam
@@ -15,7 +17,10 @@ class AWS < Fog::Bin
         Fog::AWS::SimpleDB
       when :eu_storage, :s3, :storage
         Fog::AWS::Storage
-      else 
+      else
+        # @todo Replace most instances of ArgumentError with NotImplementedError
+        # @todo For a list of widely supported Exceptions, see:
+        # => http://www.zenspider.com/Languages/Ruby/QuickRef.html#35
         raise ArgumentError, "Unsupported #{self} service: #{key}"
       end
     end
@@ -46,7 +51,7 @@ class AWS < Fog::Bin
     end
 
     def services
-      [:cdn, :compute, :elb, :iam, :sdb, :storage]
+      [:cdn, :compute, :dns, :elb, :iam, :sdb, :storage]
     end
 
   end

data/lib/fog/aws/cdn.rb

@@ -2,8 +2,8 @@ module Fog
   module AWS
     class CDN < Fog::Service
 
-      requires :aws_access_key_id, :aws_secret_access_key, &inject_parameter_specs
-      recognizes :host, :path, :port, :scheme, :version, :persistent, &inject_parameter_specs
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :host, :path, :port, :scheme, :version, :persistent
 
       model_path 'fog/aws/models/cdn'
 

data/lib/fog/aws/compute.rb

@@ -2,8 +2,8 @@ module Fog
   module AWS
     class Compute < Fog::Service
 
-      requires :aws_access_key_id, :aws_secret_access_key, &inject_parameter_specs
-      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, &inject_parameter_specs
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
 
       model_path 'fog/aws/models/compute'
       model       :address

data/lib/fog/aws/dns.rb

@@ -0,0 +1,101 @@
+module Fog
+  module AWS
+    class DNS < Fog::Service
+
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :host, :path, :port, :scheme, :version, :persistent
+
+      # model_path 'fog/aws/models/dns'
+
+      request_path 'fog/aws/requests/dns'
+      request :create_hosted_zone
+      request :get_hosted_zone
+      request :delete_hosted_zone
+      request :list_hosted_zones
+      request :change_resource_record_sets
+      request :list_resource_record_sets
+      request :get_change
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new do |hash, region|
+            hash[region] = Hash.new do |region_hash, key|
+              region_hash[key] = {
+                :buckets => {}
+              }
+            end
+          end
+        end
+
+        def self.reset_data(keys=data.keys)
+          for key in [*keys]
+            data.delete(key)
+          end
+        end
+
+        def initialize(options={})
+          require 'mime/types'
+          @aws_access_key_id = options[:aws_access_key_id]
+          @data = self.class.data[options[:region]][@aws_access_key_id]
+        end
+
+        def signature(params)
+          "foo"
+        end
+      end
+
+      class Real
+
+        # Initialize connection to Route 53 DNS service
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   dns = Fog::AWS::DNS.new(
+        #     :aws_access_key_id => your_aws_access_key_id,
+        #     :aws_secret_access_key => your_aws_secret_access_key
+        #   )
+        #
+        # ==== Parameters
+        # * options<~Hash> - config arguments for connection.  Defaults to {}.
+        #
+        # ==== Returns
+        # * dns object with connection to aws.
+        def initialize(options={})
+          @aws_access_key_id = options[:aws_access_key_id]
+          @aws_secret_access_key = options[:aws_secret_access_key]
+          @hmac     = Fog::HMAC.new('sha1', @aws_secret_access_key)
+          @host     = options[:host]      || 'route53.amazonaws.com'
+          @path     = options[:path]      || '/'
+          @port     = options[:port]      || 443
+          @scheme   = options[:scheme]    || 'https'
+          @version  = options[:version]  || '2010-10-01'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true)
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        private
+
+        def request(params, &block)
+          params[:headers] ||= {}
+          params[:headers]['Date'] = Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S +0000")
+          params[:headers]['X-Amzn-Authorization'] = "AWS3-HTTPS AWSAccessKeyId=#{@aws_access_key_id},Algorithm=HmacSHA1,Signature=#{signature(params)}"
+          params[:path] = "/#{@version}/#{params[:path]}" 
+          @connection.request(params, &block)
+        end
+
+        def signature(params)
+          string_to_sign = params[:headers]['Date']
+          signed_string = @hmac.sign(string_to_sign)
+          signature = Base64.encode64(signed_string).chomp!
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/elb.rb

@@ -2,8 +2,8 @@ module Fog
   module AWS
     class ELB < Fog::Service
 
-      requires :aws_access_key_id, :aws_secret_access_key, &inject_parameter_specs
-      recognizes :region, :host, :path, :port, :scheme, :persistent, &inject_parameter_specs
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :region, :host, :path, :port, :scheme, :persistent
 
       request_path 'fog/aws/requests/elb'
       request :create_load_balancer

data/lib/fog/aws/iam.rb

@@ -2,8 +2,8 @@ module Fog
   module AWS
     class IAM < Fog::Service
 
-      requires :aws_access_key_id, :aws_secret_access_key, &inject_parameter_specs
-      recognizes :host, :path, :port, :scheme, :persistent, &inject_parameter_specs
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :host, :path, :port, :scheme, :persistent
 
       request_path 'fog/aws/requests/iam'
       request :add_user_to_group

data/lib/fog/aws/models/compute/image.rb

@@ -23,6 +23,7 @@ module Fog
         attribute :root_device_type,      :aliases => 'rootDeviceType'
         attribute :root_device_name,      :aliases => 'rootDeviceName'
         attribute :tags,                  :aliases => 'tagSet'
+        attribute :name
 
         def deregister(delete_snapshot = false)
           connection.deregister_image(id)

data/lib/fog/aws/models/compute/server.rb

@@ -167,7 +167,7 @@ module Fog
               Timeout::timeout(4) do
                 Fog::SSH.new(ip_address, username, credentials).run(commands)
               end
-            rescue Timeout::Error
+            rescue Net::SSH::AuthenticationFailed, Timeout::Error
               retry
             end
           end

data/lib/fog/aws/models/compute/servers.rb

@@ -98,19 +98,7 @@ module Fog
           end
 
           server.save
-          # eventual consistency sometimes means a delay before it appears
-          retries = 3
-          begin
-            server.wait_for { ready? }
-          rescue Fog::Errors::Error => error
-            sleep(1)
-            retries -= 1
-            if retries > 0
-              retry
-            else
-              raise error
-            end
-          end
+          server.wait_for { ready? }
           server.setup(:key_data => [server.private_key])
           server
         end

data/lib/fog/aws/parsers/compute/describe_images.rb

@@ -15,8 +15,6 @@ module Fog
           def start_element(name, attrs = [])
             super
             case name
-            when 'productCodes'
-              @in_product_codes = true
             when 'blockDeviceMapping'
               @in_block_device_mapping = true
             when 'tagSet'
@@ -25,45 +23,49 @@ module Fog
           end
 
           def end_element(name)
-            case name
-            when 'architecture',  'description', 'imageId', 'imageLocation', 'imageOwnerId', 'imageState', 'imageType', 'kernelId', 'platform', 'ramdiskId', 'rootDeviceType','rootDeviceName'
-              @image[name] = @value
-            when 'blockDeviceMapping'
-              @in_block_device_mapping = false
-            when 'deviceName', 'virtualName', 'snapshotId', 'deleteOnTermination'
-              @block_device_mapping[name] = @value
-            when 'isPublic'
-              if @value == 'true'
-                @image[name] = true
-              else
-                @image[name] = false
+            if @in_tag_set
+              case name
+                when 'item'
+                  @image['tagSet'][@tag['key']] = @tag['value']
+                  @tag = {}
+                when 'key', 'value'
+                  @tag[name] = @value
+                when 'tagSet'
+                  @in_tag_set = false
+              end
+            elsif @in_block_device_mapping
+              case name
+                when 'blockDeviceMapping'
+                  @in_block_device_mapping = false
+                when 'deviceName', 'virtualName', 'snapshotId', 'deleteOnTermination'
+                  @block_device_mapping[name] = @value
+                when 'volumeSize'
+                  @block_device_mapping[name] = @value.to_i
+                when 'item'
+                  @image['blockDeviceMapping'] << @block_device_mapping
+                  @block_device_mapping = {}
               end
-            when 'item'
-              if @in_block_device_mapping
-                @image['blockDeviceMapping'] << @block_device_mapping
-                @block_device_mapping = {}
-              elsif @in_tag_set
-                @image['tagSet'][@tag['key']] = @tag['value']
-                @tag = {}
-              elsif !@in_product_codes
+            else
+              case name
+              when 'architecture', 'description', 'imageId', 'imageLocation', 'imageOwnerId', 'imageState', 'imageType', 'kernelId', 'name', 'platform', 'ramdiskId', 'rootDeviceType','rootDeviceName','virtualizationType'
+                @image[name] = @value
+              when 'isPublic'
+                if @value == 'true'
+                  @image[name] = true
+                else
+                  @image[name] = false
+                end
+              when 'item'
                 @response['imagesSet'] << @image
                 @image = { 'blockDeviceMapping' => [], 'productCodes' => [], 'tagSet' => {} }
+              when 'productCode'
+                @image['productCodes'] << @value
+              when 'requestId'
+                @response[name] = @value
               end
-            when 'key', 'value'
-              @tag[name] = @value
-            when 'productCode'
-              @image['productCodes'] << @value
-            when 'productCodes'
-              @in_product_codes = false
-            when 'requestId'
-              @response[name] = @value
-            when 'volumeSize'
-              @block_device_mapping[name] = @value.to_i
             end
           end
-
         end
-
       end
     end
   end

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

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module DNS
+
+        class ChangeResourceRecordSets < Fog::Parsers::Base
+
+          def reset
+            @response = {}
+          end
+          
+          def end_element(name)
+            case name
+            when 'Id'  
+              @response[name] = @value.sub('/change/', '')
+            when 'Status', 'SubmittedAt'
+              @response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+module Fog
+  module Parsers
+    module AWS
+      module DNS
+
+        class CreateHostedZone < Fog::Parsers::Base
+
+          def reset
+            @hosted_zone = {}
+            @change_info = {}
+            @name_servers = []
+            @response = {}
+            @section = :hosted_zone
+          end
+
+          def end_element(name)
+            if @section == :hosted_zone
+              case name
+              when 'Id'
+                @hosted_zone[name]= @value.sub('/hostedzone/', '')
+              when 'Name', 'CallerReference', 'Comment'
+                @hosted_zone[name]= @value
+              when 'HostedZone'
+                @response['HostedZone'] = @hosted_zone
+                @hosted_zone = {}
+                @section = :change_info
+              end
+            elsif @section == :change_info
+              case name
+              when 'Id'
+                @change_info[name]= @value.sub('/change/', '')
+              when 'Status', 'SubmittedAt'
+                @change_info[name] = @value
+              when 'ChangeInfo'
+                @response['ChangeInfo'] = @change_info
+                @change_info = {}
+                @section = :name_servers
+              end
+            elsif @section == :name_servers
+              case name
+              when 'NameServer'
+                @name_servers << @value
+              when 'NameServers'
+                @response['NameServers'] = @name_servers
+                @name_servers = {}
+              end
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end