fog 1.10.0 → 1.10.1

data/lib/fog/aws/cloud_formation.rb

@@ -106,7 +106,7 @@ module Fog
               :parser     => parser
             })
           rescue Excon::Errors::HTTPStatusError => error
-            if match = error.message.match(/<Code>(.*)<\/Code><Message>(.*)<\/Message>/)
+            if match = error.message.match(/(?:.*<Code>(.*)<\/Code>)(?:.*<Message>(.*)<\/Message>)/m)
               raise case match[1].split('.').last
               when 'NotFound'
                 Fog::AWS::Compute::NotFound.slurp(error, match[2])

data/lib/fog/aws/compute.rb

@@ -391,7 +391,7 @@ module Fog
               :parser     => parser
             })
         rescue Excon::Errors::HTTPStatusError => error
-          if match = error.message.match(/<Code>(.*)<\/Code><Message>(.*)<\/Message>/)
+          if match = error.message.match(/(?:.*<Code>(.*)<\/Code>)(?:.*<Message>(.*)<\/Message>)/m)
             raise case match[1].split('.').last
                   when 'NotFound', 'Unknown'
                     Fog::Compute::AWS::NotFound.slurp(error, match[2])

data/lib/fog/aws/elasticache.rb

@@ -104,7 +104,7 @@ module Fog
               :parser     => parser
             })
           rescue Excon::Errors::HTTPStatusError => error
-            if match = error.message.match(/<Code>(.*)<\/Code>/m)
+            if match = error.message.match(/(?:.*<Code>(.*)<\/Code>?)/m)
               case match[1]
               when 'CacheSecurityGroupNotFound', 'CacheParameterGroupNotFound',
                 'CacheClusterNotFound'

data/lib/fog/aws/elb.rb

@@ -191,7 +191,7 @@ module Fog
             :parser     => parser
           })
         rescue Excon::Errors::HTTPStatusError => error
-          if match = error.message.match(/<Code>(.*)<\/Code>(?:.*<Message>(.*)<\/Message>)?/m)
+          if match = error.message.match(/(?:.*<Code>(.*)<\/Code>)(?:.*<Message>(.*)<\/Message>)/m)
             case match[1]
             when 'CertificateNotFound'
               raise Fog::AWS::IAM::NotFound.slurp(error, match[2])

data/lib/fog/aws/iam.rb

@@ -205,7 +205,7 @@ module Fog
             :parser     => parser
           })
         rescue Excon::Errors::HTTPStatusError => error
-          if match = error.message.match(/<Code>(.*)<\/Code>(?:.*<Message>(.*)<\/Message>)?/m)
+          if match = error.message.match(/(?:.*<Code>(.*)<\/Code>)(?:.*<Message>(.*)<\/Message>)/m)
             case match[1]
             when 'CertificateNotFound', 'NoSuchEntity'
               raise Fog::AWS::IAM::NotFound.slurp(error, match[2])

data/lib/fog/aws/models/beanstalk/environment.rb

@@ -47,8 +47,12 @@ module Fog
 
         # Returns the load balancer object associated with the environment.
         def load_balancer(elb_connection = Fog::AWS[:elb])
-          requires :resources
-          elb_connection.load_balancers.get(resources['LoadBalancer']['LoadBalancerName'])
+
+          if resources.nil?
+            elb_connection.load_balancers.get(live_resources['LoadBalancers'].first['Name'])
+          else
+            elb_connection.load_balancers.get(resources['LoadBalancer']['LoadBalancerName'])
+          end
         end
 
         # Return events related to this version

data/lib/fog/aws/models/cdn/distributions.rb

@@ -23,7 +23,8 @@ module Fog
           service.get_distribution_list(options)
         end
 
-        alias :each_distribution_this_page :each
+        alias_method :each_distribution_this_page, :each
+        alias_method :each, :each_distribution
 
       end
 

data/lib/fog/aws/models/cdn/distributions_helper.rb

@@ -5,6 +5,7 @@ module Fog
     class AWS
 
       module DistributionsHelper
+        
         def all(options = {})
           merge_attributes(options)
           data = list_distributions(options).body
@@ -24,7 +25,7 @@ module Fog
           nil
         end
 
-        def each
+        def each_distribution
           if !block_given?
             self
           else

data/lib/fog/aws/models/cdn/streaming_distributions.rb

@@ -23,7 +23,8 @@ module Fog
           service.get_streaming_distribution_list(options)
         end
 
-        alias :each_distribution_this_page :each
+        alias_method :each_distribution_this_page, :each
+        alias_method :each, :each_distribution
 
       end
 

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

@@ -202,7 +202,7 @@ module Fog
           end
 
           # wait for aws to be ready
-          wait_for { sshable? }
+          wait_for { sshable?(credentials) }
 
           Fog::SSH.new(public_ip_address, username, credentials).run(commands)
         end

data/lib/fog/aws/models/storage/directory.rb

@@ -43,7 +43,7 @@ module Fog
           if INVALID_LOCATIONS.include?(new_location)
             raise ArgumentError, "location must not include any of #{INVALID_LOCATIONS.join(', ')}. See http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUT.html"
           else
-            merge_attributes(:location => new_location)
+            @location = new_location
           end
         end
 

data/lib/fog/aws/models/storage/file.rb

@@ -223,7 +223,7 @@ module Fog
         # 
         #     required attributes: key
         # 
-        # @param expires [String] number of seconds before url expires
+        # @param expires [String] number of seconds (since 1970-01-01 00:00) before url expires
         # @param options [Hash]
         # @return [String] url
         # 

data/lib/fog/aws/parsers/beanstalk/describe_environment_resources.rb

@@ -16,6 +16,17 @@ module Fog
             tag 'Id', :string
             tag 'LaunchConfigurations', :object, :list
             tag 'LoadBalancers', :object, :list
+            tag 'Resources', :object, :list
+            tag 'Description', :string
+            tag 'LogicalResourceId', :string
+            tag 'PhysicalResourceId', :string
+            tag 'Type', :string
+            tag 'Properties', :object, :list
+            tag 'RuntimeSources', :object, :list
+            tag 'Parameter', :string
+            tag 'Versions', :object, :list
+            tag 'ApplicationName', :string
+            tag 'VersionLabel', :string
             tag 'Triggers', :object, :list
           end
 

data/lib/fog/aws/rds.rb

@@ -206,7 +206,7 @@ module Fog
               :parser     => parser
             })
           rescue Excon::Errors::HTTPStatusError => error
-            if match = error.message.match(/<Code>(.*)<\/Code>[\s\\\w]+<Message>(.*)<\/Message>/m)
+            if match = error.message.match(/(?:.*<Code>(.*)<\/Code>)(?:.*<Message>(.*)<\/Message>)/m)
               case match[1].split('.').last
               when 'DBInstanceNotFound', 'DBParameterGroupNotFound', 'DBSnapshotNotFound', 'DBSecurityGroupNotFound'
                 raise Fog::AWS::RDS::NotFound.slurp(error, match[2])

data/lib/fog/aws/requests/cdn/delete_distribution.rb

@@ -3,15 +3,13 @@ module Fog
     class AWS
       class Real
 
-        # Delete a distribution from CloudFront
+        # Delete a distribution from CloudFront.
         #
-        # ==== Parameters
-        # * distribution_id<~String> - Id of distribution to delete
-        # * etag<~String> - etag of that distribution from earlier get or put
+        # @param distribution_id [String] Id of distribution to delete.
+        # @param etag [String] etag of that distribution from earlier get or put
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/DeleteDistribution.html
-
+        # @see http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/DeleteDistribution.html
+        
         def delete_distribution(distribution_id, etag)
           request({
             :expects    => 204,

data/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb

@@ -3,15 +3,13 @@ module Fog
     class AWS
       class Real
 
-        # Delete a streaming distribution from CloudFront
+        # Delete a streaming distribution from CloudFront.
         #
-        # ==== Parameters
-        # * distribution_id<~String> - Id of distribution to delete
-        # * etag<~String> - etag of that distribution from earlier get or put
+        # @param distribution_id [String] Id of distribution to delete.
+        # @parma etag [String] Etag of that distribution from earlier get or put
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/DeleteStreamingDistribution.html
-
+        # @see http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/DeleteStreamingDistribution.html
+        
         def delete_streaming_distribution(distribution_id, etag)
           request({
             :expects    => 204,

data/lib/fog/aws/requests/cdn/get_distribution.rb

@@ -5,42 +5,39 @@ module Fog
 
         require 'fog/aws/parsers/cdn/distribution'
 
-        # Get information about a distribution from CloudFront
+        # Get information about a distribution from CloudFront.
         #
-        # ==== Parameters
-        # * distribution_id<~String> - id of distribution
+        # @param distribution_id [String] Id of distribution.
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'S3Origin'<~Hash>:
-        #       * 'DNSName'<~String> - origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'
-        #       * 'OriginAccessIdentity'<~String> - Optional: Used when serving private content
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * S3Origin [Hash]:
+        #       * DNSName [String] - Origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'.
+        #       * OriginAccessIdentity [String] - Optional: Used when serving private content.
         #     or
-        #     * 'CustomOrigin'<~Hash>:
-        #       * 'DNSName'<~String> - origin to associate with distribution, ie 'www.example.com'
-        #       * 'HTTPPort'<~Integer> - HTTP port of origin, in [80, 443] or (1024...65535)
-        #       * 'HTTPSPort'<~Integer> - HTTPS port of origin, in [80, 443] or (1024...65535)
-        #       * 'OriginProtocolPolicy'<~String> - Policy on using http vs https, in ['http-only', 'match-viewer']
+        #     * CustomOrigin [Hash]:
+        #       * DNSName [String] - Origin to associate with distribution, ie 'www.example.com'.
+        #       * HTTPPort [Integer] - HTTP port of origin, in [80, 443] or (1024...65535).
+        #       * HTTPSPort [Integer] - HTTPS port of origin, in [80, 443] or (1024...65535).
+        #       * OriginProtocolPolicy [String] - Policy on using http vs https, in ['http-only', 'match-viewer'].
         #
-        #     * 'Id'<~String> - Id of distribution
-        #     * 'LastModifiedTime'<~String> - Timestamp of last modification of distribution
-        #     * 'Status'<~String> - Status of distribution
-        #     * 'DistributionConfig'<~Array>:
-        #       * 'CallerReference'<~String> - Used to prevent replay, defaults to Time.now.to_i.to_s
-        #       * 'CNAME'<~Array> - array of associated cnames
-        #       * 'Comment'<~String> - comment associated with distribution
-        #       * 'Enabled'<~Boolean> - whether or not distribution is enabled
-        #       * 'InProgressInvalidationBatches'<~Integer> - number of invalidation batches in progress
-        #       * 'Logging'<~Hash>:
-        #         * 'Bucket'<~String> - bucket logs are stored in
-        #         * 'Prefix'<~String> - prefix logs are stored with
-        #       * 'Origin'<~String> - s3 origin bucket
-        #       * 'TrustedSigners'<~Array> - trusted signers
+        #     * Id [String] Id of distribution.
+        #     * LastModifiedTime [String] - Timestamp of last modification of distribution.
+        #     * Status [String] - Status of distribution.
+        #     * DistributionConfig [Array]:
+        #       * CallerReference [String] - Used to prevent replay, defaults to Time.now.to_i.to_s.
+        #       * CNAME [Array] - Array of associated cnames.
+        #       * Comment [String] - Comment associated with distribution.
+        #       * Enabled [Boolean] - Whether or not distribution is enabled.
+        #       * InProgressInvalidationBatches [Integer] - Number of invalidation batches in progress.
+        #       * Logging [Hash]:
+        #         * Bucket [String] - Bucket logs are stored in.
+        #         * Prefix [String] - Prefix logs are stored with.
+        #       * Origin [String] - S3 origin bucket.
+        #       * TrustedSigners [Array] - Trusted signers.
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/GetDistribution.html
-
+        # @see http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/GetDistribution.html
+        
         def get_distribution(distribution_id)
           request({
             :expects    => 200,

data/lib/fog/aws/requests/cdn/get_distribution_list.rb

@@ -5,43 +5,39 @@ module Fog
 
         require 'fog/aws/parsers/cdn/get_distribution_list'
 
-        # List information about distributions in CloudFront
+        # List information about distributions in CloudFront.
         #
-        # ==== Parameters
-        # * options<~Hash> - config arguments for list.  Defaults to {}.
-        #   * 'Marker'<~String> - limits object keys to only those that appear
-        #     lexicographically after its value.
-        #   * 'MaxItems'<~Integer> - limits number of object keys returned
+        # @param options [Hash] Config arguments for list.
+         # @option options Marker [String] Limits object keys to only those that appear lexicographically after its value.
+        # @option options MaxItems [Integer] Limits number of object keys returned.
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'IsTruncated'<~Boolean> - Whether or not the listing is truncated
-        #     * 'Marker'<~String> - Marker specified for query
-        #     * 'MaxItems'<~Integer> - Maximum number of keys specified for query
-        #     * 'NextMarker'<~String> - Marker to specify for next page (id of last result of current page)
-        #     * 'DistributionSummary'<~Array>:
-        #       * 'S3Origin'<~Hash>:
-        #         * 'DNSName'<~String> - origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'
-        #         * 'OriginAccessIdentity'<~String> - Optional: Used when serving private content
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * IsTruncated [Boolean] - Whether or not the listing is truncated.
+        #     * Marker [String] Marker specified for query.
+        #     * MaxItems [Integer] - Maximum number of keys specified for query.
+        #     * NextMarker [String] - Marker to specify for next page (id of last result of current page).
+        #     * DistributionSummary [Array]:
+        #       * S3Origin [Hash]:
+        #         * DNSName [String] - Origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'.
+        #         * OriginAccessIdentity [String] - Optional: Used when serving private content.
         #       or
-        #       * 'CustomOrigin'<~Hash>:
-        #         * 'DNSName'<~String> - origin to associate with distribution, ie 'www.example.com'
-        #         * 'HTTPPort'<~Integer> - HTTP port of origin, in [80, 443] or (1024...65535)
-        #         * 'HTTPSPort'<~Integer> - HTTPS port of origin, in [80, 443] or (1024...65535)
-        #       * 'OriginProtocolPolicy'<~String> - Policy on using http vs https, in ['http-only', 'match-viewer']
-        #       * 'Comment'<~String> - comment associated with distribution
-        #       * 'CNAME'<~Array> - array of associated cnames
-        #       * 'Enabled'<~Boolean> - whether or not distribution is enabled
-        #       * 'Id'<~String> - Id of distribution
-        #       * 'LastModifiedTime'<~String> - Timestamp of last modification of distribution
-        #       * 'Origin'<~String> - s3 origin bucket
-        #       * 'Status'<~String> - Status of distribution
-        #       * 'TrustedSigners'<~Array> - trusted signers
+        #       * CustomOrigin [Hash]:
+        #         * DNSName [String] - Origin to associate with distribution, ie 'www.example.com'.
+        #         * HTTPPort [Integer] - HTTP port of origin, in [80, 443] or (1024...65535).
+        #         * HTTPSPort [Integer] - HTTPS port of origin, in [80, 443] or (1024...65535).
+        #       * OriginProtocolPolicy [String] - Policy on using http vs https, in ['http-only', 'match-viewer'].
+        #       * Comment [String] - Comment associated with distribution.
+        #       * CNAME [Array] - Array of associated cnames.
+        #       * Enabled [Boolean] - Whether or not distribution is enabled.
+        #       * Id [String] - Id of distribution.
+        #       * LastModifiedTime [String] - Timestamp of last modification of distribution.
+        #       * Origin [String] - S3 origin bucket.
+        #       * Status [String] - Status of distribution.
+        #       * TrustedSigners [Array] - Trusted signers.
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/ListDistributions.html
-
+        # @see http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/ListDistributions.html
+        # 
         def get_distribution_list(options = {})
           request({
             :expects    => 200,

data/lib/fog/aws/requests/cdn/get_invalidation.rb

@@ -5,19 +5,21 @@ module Fog
 
         require 'fog/aws/parsers/cdn/get_invalidation'
 
-        # ==== Parameters
-        #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'Id'<~String> - Invalidation id
-        #     * 'Status'<~String>
-        #     * 'CreateTime'<~String>
-        #     * 'InvalidationBatch'<~Array>:
-        #       * 'Path'<~String>
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonCloudFront/2010-11-01/APIReference/GetInvalidation.html
-
+        # Get invalidation.
+        # 
+        # @param distribution_id [String] Distribution id.
+        # @param invalidation_id [String] Invalidation id.
+        #   
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * Id [String] - Invalidation id.
+        #     * Status [String]
+        #     * CreateTime [String]
+        #     * InvalidationBatch [Array]:
+        #       * Path [String]
+        # 
+        # @see http://docs.amazonwebservices.com/AmazonCloudFront/2010-11-01/APIReference/GetInvalidation.html
+        
         def get_invalidation(distribution_id, invalidation_id)
           request({
             :expects    => 200,

data/lib/fog/aws/requests/cdn/get_invalidation_list.rb

@@ -5,25 +5,23 @@ module Fog
 
         require 'fog/aws/parsers/cdn/get_invalidation_list'
 
-        # ==== Parameters
-        # * options<~Hash> - config arguments for list.  Defaults to {}.
-        #   * 'Marker'<~String> - limits object keys to only those that appear
-        #     lexicographically after its value.
-        #   * 'MaxItems'<~Integer> - limits number of object keys returned
+        # Get invalidation list.
+        # 
+        # @param options [Hash] Config arguments for list.
+        # @option options Marker [String] Limits object keys to only those that appear lexicographically after its value.
+        # @option options MaxItems [Integer] Limits number of object keys returned.
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'IsTruncated'<~Boolean> - Whether or not the listing is truncated
-        #     * 'Marker'<~String> - Marker specified for query
-        #     * 'MaxItems'<~Integer> - Maximum number of keys specified for query
-        #     * 'NextMarker'<~String> - Marker to specify for next page (id of last result of current page)
-        #     * 'InvalidationSummary'<~Array>:
-        #       * 'Id'<~String>:
-        #       * 'Status'<~String>:
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * IsTruncated [Boolean] - Whether or not the listing is truncated.
+        #     * Marker [String] - Marker specified for query.
+        #     * MaxItems [Integer] - Maximum number of keys specified for query.
+        #     * NextMarker [String] - Marker to specify for next page (id of last result of current page).
+        #     * InvalidationSummary [Array]:
+        #       * Id [String]
+        #       * Status [String]
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/ListInvalidation.html
+        # @see http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/ListInvalidation.html
         
         def get_invalidation_list(distribution_id, options = {})
           request({

data/lib/fog/aws/requests/cdn/get_streaming_distribution.rb

@@ -5,35 +5,32 @@ module Fog
 
         require 'fog/aws/parsers/cdn/streaming_distribution'
 
-        # Get information about a streaming distribution from CloudFront
+        # Get information about a streaming distribution from CloudFront.
         #
-        # ==== Parameters
-        # * distribution_id<~String> - id of distribution
+        # @param distribution_id [String] Id of distribution.
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'S3Origin'<~Hash>:
-        #       * 'DNSName'<~String> - origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'
-        #       * 'OriginAccessIdentity'<~String> - Optional: Used when serving private content
-        #     * 'Id'<~String> - Id of distribution
-        #     * 'LastModifiedTime'<~String> - Timestamp of last modification of distribution
-        #     * 'Status'<~String> - Status of distribution
-        #     * 'StreamingDistributionConfig'<~Array>:
-        #       * 'CallerReference'<~String> - Used to prevent replay, defaults to Time.now.to_i.to_s
-        #       * 'CNAME'<~Array> - array of associated cnames
-        #       * 'Comment'<~String> - comment associated with distribution
-        #       * 'Enabled'<~Boolean> - whether or not distribution is enabled
-        #       * 'InProgressInvalidationBatches'<~Integer> - number of invalidation batches in progress
-        #       * 'Logging'<~Hash>:
-        #         * 'Bucket'<~String> - bucket logs are stored in
-        #         * 'Prefix'<~String> - prefix logs are stored with
-        #       * 'Origin'<~String> - s3 origin bucket
-        #       * 'TrustedSigners'<~Array> - trusted signers
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * S3Origin [Hash]:
+        #       * DNSName [String] - Origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'.
+        #       * OriginAccessIdentity [String] - Optional: Used when serving private content.
+        #     * Id [String] - Id of distribution.
+        #     * LastModifiedTime [String] - Timestamp of last modification of distribution.
+        #     * Status [String] - Status of distribution.
+        #     * StreamingDistributionConfig [Array]:
+        #       * CallerReference [String] - Used to prevent replay, defaults to Time.now.to_i.to_s.
+        #       * CNAME [Array] - Array of associated cnames.
+        #       * Comment [String] - Comment associated with distribution.
+        #       * Enabled [Boolean] - Whether or not distribution is enabled.
+        #       * InProgressInvalidationBatches [Integer] - Number of invalidation batches in progress.
+        #       * Logging [Hash]:
+        #         * Bucket [String] - Bucket logs are stored in.
+        #         * Prefix [String] - Prefix logs are stored with.
+        #       * Origin [String] - S3 origin bucket.
+        #       * TrustedSigners [Array] - Trusted signers.
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/GetStreamingDistribution.html
-
+        # @see http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/GetStreamingDistribution.html
+        
         def get_streaming_distribution(distribution_id)
           request({
             :expects    => 200,