fog 0.3.31 → 0.3.32

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

@@ -0,0 +1,51 @@
+module Fog
+  module AWS
+    class DNS
+      class Real
+
+        require 'fog/aws/parsers/dns/get_hosted_zone'
+
+        # retrieve information about a hosted zone
+        #
+        # ==== Parameters
+        # * zone_id<~String> - The ID of the hosted zone
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'HostedZone'<~Hash>:
+        #       * 'Id'<~String> - 
+        #       * 'Name'<~String> - 
+        #       * 'CallerReference'<~String>
+        #       * 'Comment'<~String> - 
+        #     * 'NameServers'<~Array>
+        #       * 'NameServer'<~String>
+        #   * status<~Integer> - 201 when successful
+        def get_hosted_zone(zone_id)
+
+          # AWS methods return zone_ids that looks like '/hostedzone/id'.  Let the caller either use 
+          # that form or just the actual id (which is what this request needs)
+          zone_id = zone_id.sub('/hostedzone/', '')
+
+          request({
+            :expects    => 200,
+            :parser     => Fog::Parsers::AWS::DNS::GetHostedZone.new,
+            :method     => 'GET',
+            :path       => "hostedzone/#{zone_id}"
+          })
+
+        end
+
+      end
+
+      class Mock
+
+        def get_hosted_zone(zone_id)
+          Fog::Mock.not_implemented
+        end
+
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,63 @@
+module Fog
+  module AWS
+    class DNS
+      class Real
+
+        require 'fog/aws/parsers/dns/list_hosted_zones'
+
+        # Describe all or specified instances
+        #
+        # ==== Parameters
+        # * options<~Hash>
+        #   * marker<~String> - Indicates where to begin in your list of hosted zones. 
+        #   * max_items<~Integer> - The maximum number of hosted zones to be included in the response body
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'HostedZones'<~Array>:
+        #       * 'HostedZone'<~Hash>:
+        #         * 'Id'<~String> - 
+        #         * 'Name'<~String> - 
+        #         * 'CallerReference'<~String>
+        #         * 'Comment'<~String> - 
+        #     * 'Marker'<~String> - 
+        #     * 'MaxItems'<~Integer> - 
+        #     * 'IsTruncated'<~String> - 
+        #     * 'NextMarket'<~String>
+        #   * status<~Integer> - 200 when successful
+        def list_hosted_zones(options = {})
+
+          parameters = {}
+          options.each { |option, value|
+            case option
+            when :marker
+              parameters[option] = value
+            when :max_items
+              parameters[:maxitems] = value
+            end
+          }
+          
+          request({
+            :query      => parameters,
+            :parser     => Fog::Parsers::AWS::DNS::ListHostedZones.new,
+            :expects    => 200,
+            :method     => 'GET',
+            :path       => "hostedzone"
+          })
+
+        end
+
+      end
+
+
+      class Mock
+
+        def list_hosted_zones(options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+module Fog
+  module AWS
+    class DNS
+      class Real
+
+        require 'fog/aws/parsers/dns/list_resource_record_sets'
+
+        # list your resource record sets
+        #
+        # ==== Parameters
+        # * zone_id<~String> - 
+        # * options<~Hash>
+        #   * type<~String> - 
+        #   * name<~String> -
+        #   * max_items<~Integer> - 
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResourceRecordSet'<~Array>:
+        #       * 'Name'<~String> - 
+        #       * 'Type'<~String> - 
+        #       * 'TTL'<~Integer> - 
+        #       * 'ResourceRecords'<~Array>
+        #         * 'Value'<~String> - 
+        #     * 'IsTruncated'<~String> - 
+        #     * 'MaxItems'<~String> - 
+        #     * 'NextRecordName'<~String>
+        #     * 'NexRecordType'<~String>
+        #   * status<~Integer> - 201 when successful
+        def list_resource_record_sets(zone_id, options = {})
+
+          # AWS methods return zone_ids that looks like '/hostedzone/id'.  Let the caller either use 
+          # that form or just the actual id (which is what this request needs)
+          zone_id = zone_id.sub('/hostedzone/', '')
+
+          parameters = {}
+          options.each { |option, value|
+            case option
+            when :type, :name
+              parameters[option]= "#{value}"
+            when :max_items
+              parameters['maxitems']= "#{value}"
+            end
+          }
+          
+          request({
+            :query => parameters,
+            :parser     => Fog::Parsers::AWS::DNS::ListResourceRecordSets.new,
+            :expects    => 200,
+            :method     => 'GET',
+            :path       => "hostedzone/#{zone_id}/rrset"
+          })
+
+        end
+
+      end
+
+      class Mock
+
+        def list_resource_record_sets(zone_id, options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/storage/get_object_url.rb

@@ -28,7 +28,7 @@ module Fog
             :headers  => {},
             :host     => @host,
             :method   => 'GET',
-            :path     => [bucket_name, CGI.escape(object_name)].join('/')
+            :path     => "#{bucket_name}/#{object_name}"
           }, expires)
         end
 
@@ -47,7 +47,7 @@ module Fog
             :headers  => {},
             :host     => @host,
             :method   => 'GET',
-            :path     => [bucket_name, CGI.escape(object_name)].join('/')
+            :path     => "#{bucket_name}/#{object_name}"
           }, expires)
         end
 

data/lib/fog/aws/requests/storage/put_object_url.rb

@@ -28,7 +28,7 @@ module Fog
             :headers  => {},
             :host     => @host,
             :method   => 'PUT',
-            :path     => [bucket_name, CGI.escape(object_name)].join('/')
+            :path     => "#{bucket_name}/#{object_name}"
           }, expires)
         end
 
@@ -47,7 +47,7 @@ module Fog
             :headers  => {},
             :host     => @host,
             :method   => 'PUT',
-            :path     => [bucket_name, CGI.escape(object_name)].join('/')
+            :path     => "#{bucket_name}/#{object_name}"
           }, expires)
         end
 

data/lib/fog/aws/requests/storage/sync_clock.rb

@@ -0,0 +1,28 @@
+module Fog
+  module AWS
+    class Storage
+      class Real
+
+        # Sync clock against S3 to avoid skew errors
+        #
+        def sync_clock
+          response = begin
+            get_service
+          rescue => error
+            error.response
+          end
+          Fog::Time.now = Time.parse(response.headers['Date'])
+        end
+
+      end # Real
+
+      class Mock # :nodoc:all
+
+        def sync_clock
+          true
+        end
+
+      end # Mock
+    end # Storage
+  end # AWS
+end # Fog

data/lib/fog/aws/simpledb.rb

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

data/lib/fog/aws/storage.rb

@@ -2,8 +2,8 @@ module Fog
   module AWS
     class Storage < 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/storage'
       collection  :directories
@@ -42,6 +42,7 @@ module Fog
       request :put_object_acl
       request :put_object_url
       request :put_request_payment
+      request :sync_clock
       request :upload_part
 
       module Utils
@@ -81,7 +82,8 @@ module Fog
           query << "Signature=#{CGI.escape(signature(params))}"
           query << "Expires=#{params[:headers]['Date']}"
           bucket = params[:host].split('.').first
-          "https://#{@host}/#{params[:path]}?#{query.join('&')}"
+          path = CGI.escape(params[:path]).gsub('%2F', '/')
+          "https://#{@host}/#{path}?#{query.join('&')}"
         end
 
       end

data/lib/fog/bluebox.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), 'core')
+
 module Fog
   module Bluebox
 

data/lib/fog/bluebox/compute.rb

@@ -2,8 +2,8 @@ module Fog
   module Bluebox
     class Compute < Fog::Service
 
-      requires :bluebox_api_key, :bluebox_customer_id, &inject_parameter_specs
-      recognizes :bluebox_host, :bluebox_port, :bluebox_scheme, :persistent, &inject_parameter_specs
+      requires :bluebox_api_key, :bluebox_customer_id
+      recognizes :bluebox_host, :bluebox_port, :bluebox_scheme, :persistent
 
       model_path 'fog/bluebox/models/compute'
       model       :flavor

data/lib/fog/brightbox.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), 'core')
+
 module Fog
   module Brightbox
     extend Fog::Provider

data/lib/fog/brightbox/compute.rb

@@ -4,8 +4,8 @@ module Fog
 
       API_URL = "https://api.gb1.brightbox.com/"
 
-      requires :brightbox_client_id, :brightbox_secret, &inject_parameter_specs
-      recognizes :brightbox_auth_url, :brightbox_api_url, &inject_parameter_specs
+      requires :brightbox_client_id, :brightbox_secret
+      recognizes :brightbox_auth_url, :brightbox_api_url
 
       model_path 'fog/brightbox/models/compute'
       model :account # Singular resource, no collection

data/lib/fog/core.rb

@@ -1,13 +1,33 @@
+__LIB_DIR__ = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+$LOAD_PATH.unshift __LIB_DIR__ unless
+  $LOAD_PATH.include?(__LIB_DIR__) ||
+  $LOAD_PATH.include?(File.expand_path(__LIB_DIR__))
+
+# external core dependencies
+require 'rubygems'
+require 'base64'
+require 'cgi'
+require 'excon'
+require 'formatador'
+require 'time'
+require 'timeout'
+
+# internal core dependencies
 require 'fog/core/attributes'
 require 'fog/core/collection'
 require 'fog/core/compute'
 require 'fog/core/connection'
+require 'fog/core/credentials'
 require 'fog/core/deprecation'
 require 'fog/core/errors'
 require 'fog/core/hmac'
 require 'fog/core/model'
+require 'fog/core/mock'
 # require 'fog/core/parser'
 require 'fog/core/provider'
 require 'fog/core/service'
 require 'fog/core/ssh'
-require 'fog/core/storage'
+require 'fog/core/storage'
+require 'fog/core/time'
+require 'fog/core/wait_for'

data/lib/fog/core/bin.rb

@@ -15,7 +15,8 @@ module Fog
         ::NewServers,
         ::Rackspace,
         ::Slicehost,
-        ::Terremark
+        ::Terremark,
+        ::Zerigo
       ].select {|provider| provider.available?}
     end
 
@@ -83,3 +84,4 @@ require 'fog/rackspace/bin'
 require 'fog/slicehost/bin'
 require 'fog/terremark/bin'
 require 'fog/vcloud/bin'
+require 'fog/zerigo/bin'

data/lib/fog/core/compute.rb

@@ -2,6 +2,7 @@ module Fog
   class Compute
 
     def self.new(attributes)
+      attributes = attributes.dup # prevent delete from having side effects
       case provider = attributes.delete(:provider)
       when 'AWS'
         require 'fog/aws'

data/lib/fog/core/credentials.rb

@@ -1,61 +1,83 @@
 require 'yaml'
+
 module Fog
-  class << self
+  require 'fog/core/deprecation'
+  extend Fog::Deprecation
+  self_deprecate(:config_path, :credentials_path)
 
-    def credential=(new_credential)
-      @credential = new_credential
-      @credentials = nil
-    end
+  # Assign a new credential to use from configuration file
+  #   @param [String, Symbol] new_credential name of new credential to use
+  #   @ return [String, Symbol] name of the new credential
+  def self.credential=(new_credential)
+    @credential = new_credential
+  end
 
-    def credential
-      @credential || :default
-    end
+  # @return [String, Symbol] The credential to use in Fog
+  def self.credential
+    @credential ||= :default
+  end
+
+  # @return [String] The path for configuration_file
+  def self.credentials_path
+    @credential_path ||= File.expand_path(ENV["FOG_RC"] || '~/.fog')
+  end
+
+  # @return [String] The new path for credentials file
+  def self.credentials_path=(new_credentials_path)
+    @credential_path = new_credentials_path
+  end
 
-    def config_path
-      ENV["FOG_RC"] || '~/.fog'
+  # @return [Hash] The credentials pulled from the configuration file
+  # @raise [LoadError] Configuration unavailable in configuration file
+  def self.credentials
+    @credentials  ||= begin
+      credentials = YAML.load_file(credentials_path)
+      (credentials && credentials[credential]) or raise LoadError.new missing_credentials
     end
+  end
+
+private
+
+  # @return [String] The error message that will be raised, if credentials cannot be found
+  def self.missing_credentials
+    <<-YML
+Missing Credentials
 
-    def credentials
-      @credentials ||= begin
-        path = File.expand_path(config_path)
-        credentials = if File.exists?(path)
-          File.open(path) do |file|
-            YAML.load(file.read)
-          end
-        else
-          nil
-        end
-        unless credentials && credentials[credential]
-          print("\n  To run as '#{credential}', add the following to #{config_path}\n")
-          yml = <<-YML
+To run as '#{credential}', add the following to your resource config file: #{config_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:                INTENTIONALLY_LEFT_BLANK
-  :aws_secret_access_key:            INTENTIONALLY_LEFT_BLANK
-  :bluebox_api_key:                  INTENTIONALLY_LEFT_BLANK
-  :bluebox_customer_id:              INTENTIONALLY_LEFT_BLANK
-  :brightbox_client_id:              INTENTIONALLY_LEFT_BLANK
-  :brightbox_secret:                 INTENTIONALLY_LEFT_BLANK
-  :go_grid_api_key:                  INTENTIONALLY_LEFT_BLANK
-  :go_grid_shared_secret:            INTENTIONALLY_LEFT_BLANK
-  :google_storage_access_key_id:     INTENTIONALLY_LEFT_BLANK
-  :google_storage_secret_access_key: INTENTIONALLY_LEFT_BLANK
-  :local_root:                       INTENTIONALLY_LEFT_BLANK
-  :new_servers_password:             INTENTIONALLY_LEFT_BLANK
-  :new_servers_username:             INTENTIONALLY_LEFT_BLANK
-  :public_key_path:                  INTENTIONALLY_LEFT_BLANK
-  :private_key_path:                 INTENTIONALLY_LEFT_BLANK
-  :rackspace_api_key:                INTENTIONALLY_LEFT_BLANK
-  :rackspace_username:               INTENTIONALLY_LEFT_BLANK
-  :slicehost_password:               INTENTIONALLY_LEFT_BLANK
-  :terremark_username:               INTENTIONALLY_LEFT_BLANK
-  :terremark_password:               INTENTIONALLY_LEFT_BLANK
-YML
-          print("\n#{yml}\n")
-          raise(ArgumentError.new("Missing Credentials"))
-        end
-        credentials[credential]
-      end
-    end
+  :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:
+  :local_root:
+  :new_servers_password:
+  :new_servers_username:
+  :public_key_path:
+  :private_key_path:
+  :rackspace_api_key:
+  :rackspace_username:
+  :slicehost_password:
+  :terremark_username:
+  :terremark_password:
+  :zerigo_email:
+  :zerigo_token:
+#
+# End of Fog Credentials File
+#######################################################
 
+YML
   end
 end