fog 0.0.29 → 0.0.30

data/lib/fog/aws/requests/ec2/detach_volume.rb

@@ -14,7 +14,7 @@ unless Fog.mocking?
         #   * 'InstanceId'<~String> - Id of instance to associate volume with
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'attachTime'<~Time> - Time of attachment was initiated at
         #     * 'device'<~String> - Device as it is exposed to the instance
@@ -50,7 +50,7 @@ else
             }.merge!(data)
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/disassociate_address.rb

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * public_ip<~String> - Public ip to assign to instance
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
@@ -43,7 +43,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/get_console_output.rb

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * instance_id<~String> - Id of instance to get console output from
         #
         # ==== Returns
-        # # * response<~Fog::AWS::Response>:
+        # # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'instanceId'<~String> - Id of instance
         #     * 'output'<~String> - Console output
@@ -45,7 +45,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/reboot_instances.rb

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * instance_id<~Array> - Ids of instances to reboot
         #
         # ==== Returns
-        # # * response<~Fog::AWS::Response>:
+        # # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
@@ -45,7 +45,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/release_address.rb

@@ -7,7 +7,7 @@ unless Fog.mocking?
         # Release an elastic IP address.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
@@ -38,7 +38,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

data/lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb

@@ -19,7 +19,7 @@ unless Fog.mocking?
         #   * 'ToPort' - End of port range (or -1 for ICMP wildcard)
         #
         # === Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?

data/lib/fog/aws/requests/ec2/run_instances.rb

@@ -35,7 +35,7 @@ unless Fog.mocking?
         #   * 'VirtualName'<~String> - ?
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'groupSet'<~Array>: groups the instances are members in
         #       * 'groupName'<~String> - Name of group
@@ -115,7 +115,7 @@ else
               'ramdiskId'       => options['RamdiskId'] || Fog::AWS::Mock.ramdisk_id,
               'reason'          => '',
               'reservationId'   => reservation_id,
-              'state'           => 'pending'
+              'instanceState'   => 'pending'
             }
             Fog::AWS::EC2.data[:instances][instance_id] = data
             instances_set << data.reject{|key,value| !['amiLaunchIndex', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'privateDnsName', 'productCodes', 'ramdiskId', 'reason'].include?(key)}

data/lib/fog/aws/requests/ec2/terminate_instances.rb

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * instance_id<~Array> - Ids of instances to terminates
         #
         # ==== Returns
-        # # * response<~Fog::AWS::Response>:
+        # # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'instancesSet'<~Array>:
@@ -72,7 +72,7 @@ else
             end
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

data/lib/fog/aws/requests/s3/copy_object.rb

@@ -19,7 +19,7 @@ unless Fog.mocking?
         #   * 'x-amz-copy_source-if-unmodified-since'<~Time> - Copies object it it has not been modified since this time
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'ETag'<~String> - etag of new object
         #     * 'LastModified'<~Time> - date object was last modified
@@ -66,7 +66,7 @@ else
             }
           else
             response.status = 404
-            raise(Fog::Errors.status_error(200, 404, response))
+            raise(Excon::Errors.status_error(200, 404, response))
           end
 
           response

data/lib/fog/aws/requests/s3/delete_bucket.rb

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * bucket_name<~String> - name of bucket to delete
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * status<~Integer> - 204
         def delete_bucket(bucket_name)
           request({
@@ -35,10 +35,10 @@ else
           response = Fog::Response.new
           if Fog::AWS::S3.data[:buckets][bucket_name].nil?
             response.status = 404
-            raise(Fog::Errors.status_error(204, 404, response))
+            raise(Excon::Errors.status_error(204, 404, response))
           elsif Fog::AWS::S3.data[:buckets][bucket_name] && !Fog::AWS::S3.data[:buckets][bucket_name][:objects].empty?
             response.status = 409
-            raise(Fog::Errors.status_error(204, 409, response))
+            raise(Excon::Errors.status_error(204, 409, response))
           else
             Fog::AWS::S3.data[:buckets].delete(bucket_name)
             response.status = 204

data/lib/fog/aws/requests/s3/delete_object.rb

@@ -11,7 +11,7 @@ unless Fog.mocking?
         # * object_name<~String> - Name of object to delete
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * status<~Integer> - 204
         def delete_object(bucket_name, object_name)
           request({
@@ -40,7 +40,7 @@ else
             bucket[:objects].delete(object_name)
           else
             response.status = 404
-            raise(Fog::Errors.status_error(204, 404, response))
+            raise(Excon::Errors.status_error(204, 404, response))
           end
           response
         end

data/lib/fog/aws/requests/s3/get_bucket.rb

@@ -17,7 +17,7 @@ unless Fog.mocking?
         #     value and the first occurence of delimiter to be rolled up
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'Delimeter'<~String> - Delimiter specified for query
         #     * 'Marker'<~String> - Marker specified for query
@@ -94,7 +94,7 @@ else
             end
           else
             response.status = 404
-            raise(Fog::Errors.status_error(200, 404, response))
+            raise(Excon::Errors.status_error(200, 404, response))
           end
           response
         end

data/lib/fog/aws/requests/s3/get_bucket_location.rb

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * bucket_name<~String> - name of bucket to get location constraint for
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'LocationConstraint'<~String> - Location constraint of the bucket
         def get_bucket_location(bucket_name)
@@ -41,7 +41,7 @@ else
             response.body = {'LocationConstraint' => bucket['LocationConstraint'] }
           else
             response.status = 404
-            raise(Fog::Errors.status_error(200, 404, response))
+            raise(Excon::Errors.status_error(200, 404, response))
           end
           response
         end

data/lib/fog/aws/requests/s3/get_object.rb

@@ -16,7 +16,7 @@ unless Fog.mocking?
         #   * 'If-Unmodified-Since'<~Time> - Returns object only if it has not been modified since this time, otherwise returns 412 (Precodition Failed).
         #   * 'Range'<~String> - Range of object to download
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~String> - Contents of object
         #   * headers<~Hash>:
         #     * 'Content-Length'<~String> - Size of object contents
@@ -108,7 +108,7 @@ else
             end
           else
             response.status = 404
-            raise(Fog::Errors.status_error(200, 404, response))
+            raise(Excon::Errors.status_error(200, 404, response))
           end
           response
         end

data/lib/fog/aws/requests/s3/get_request_payment.rb

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * bucket_name<~String> - name of bucket to get payer for
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'Payer'<~String> - Specifies who pays for download and requests
         def get_request_payment(bucket_name)
@@ -41,7 +41,7 @@ else
             response.body = { 'Payer' => bucket['Payer'] }
           else
             response.status = 404
-            raise(Fog::Errors.status_error(200, 404, response))
+            raise(Excon::Errors.status_error(200, 404, response))
           end
           response
         end

data/lib/fog/aws/requests/s3/get_service.rb

@@ -7,7 +7,7 @@ unless Fog.mocking?
         # List information about S3 buckets for authorized user
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'Buckets'<~Hash>:
         #       * 'Name'<~String> - Name of bucket

data/lib/fog/aws/requests/s3/head_object.rb

@@ -17,7 +17,7 @@ unless Fog.mocking?
         #   * 'Range'<~String> - Range of object to download
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~String> - Contents of object
         #   * headers<~Hash>:
         #     * 'Content-Length'<~String> - Size of object contents

data/lib/fog/aws/requests/s3/put_bucket.rb

@@ -12,7 +12,7 @@ unless Fog.mocking?
         #   * :location_constraint<~Symbol> - sets the location for the bucket
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * status<~Integer> - 200
         def put_bucket(bucket_name, options = {})
           if options['LocationConstraint']

data/lib/fog/aws/requests/s3/put_object.rb

@@ -21,7 +21,7 @@ unless Fog.mocking?
         #   * "x-amz-meta-#{name}" - Headers to be returned with object, note total size of request without body must be less than 8 KB.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * headers<~Hash>:
         #     * 'ETag'<~String> - etag of new object
         def put_object(bucket_name, object_name, data, options = {})
@@ -64,7 +64,7 @@ else
             bucket[:objects][object_name]['Content-Type'] = data[:headers]['Content-Type']
           else
             response.status = 404
-            raise(Fog::Errors.status_error(200, 404, response))
+            raise(Excon::Errors.status_error(200, 404, response))
           end
           response
         end

data/lib/fog/aws/requests/s3/put_request_payment.rb

@@ -43,7 +43,7 @@ else
             bucket['Payer'] = payer
           else
             response.status = 404
-            raise(Fog::Errors.status_error(200, 404, response))
+            raise(Excon::Errors.status_error(200, 404, response))
           end
           response
         end

data/lib/fog/aws/requests/simpledb/batch_put_attributes.rb

@@ -17,7 +17,7 @@ unless Fog.mocking?
         #   not valid.  Each name and value can be up to 1024 bytes long.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'BoxUsage'
         #     * 'RequestId'
@@ -59,7 +59,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

data/lib/fog/aws/requests/simpledb/create_domain.rb

@@ -11,7 +11,7 @@ unless Fog.mocking?
         # following characters: a-z, A-Z, 0-9, '_', '-' and '.'.
         # 
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'BoxUsage'
         #     * 'RequestId'

data/lib/fog/aws/requests/simpledb/delete_attributes.rb

@@ -19,7 +19,7 @@ unless Fog.mocking?
         #   bytes long.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'BoxUsage'
         #     * 'RequestId'
@@ -60,7 +60,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

data/lib/fog/aws/requests/simpledb/delete_domain.rb

@@ -11,7 +11,7 @@ unless Fog.mocking?
         # following characters: a-z, A-Z, 0-9, '_', '-' and '.'.
         # 
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'BoxUsage'
         #     * 'RequestId'

data/lib/fog/aws/requests/simpledb/domain_metadata.rb

@@ -11,7 +11,7 @@ unless Fog.mocking?
         # following characters: a-z, A-Z, 0-9, '_', '-' and '.'.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'AttributeNameCount' - number of unique attribute names in domain
         #     * 'AttributeNamesSizeBytes' - total size of unique attribute names, in bytes
@@ -68,7 +68,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

data/lib/fog/aws/requests/simpledb/get_attributes.rb

@@ -19,7 +19,7 @@ unless Fog.mocking?
         #   bytes long.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'Attributes' - list of attribute name/values for the item
         #     * 'BoxUsage'
@@ -63,7 +63,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

data/lib/fog/aws/requests/simpledb/list_domains.rb

@@ -13,7 +13,7 @@ unless Fog.mocking?
         #   * 'NextToken'<~String> - Offset token to start listing, defaults to nil
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'BoxUsage'
         #     * 'Domains' - array of domain names.

data/lib/fog/aws/requests/simpledb/put_attributes.rb

@@ -18,7 +18,7 @@ unless Fog.mocking?
         #   be up to 1024 bytes long.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'BoxUsage'
         #     * 'RequestId'

data/lib/fog/aws/requests/simpledb/select.rb

@@ -9,7 +9,7 @@ module Fog
       # * next_token<~String> - Offset token to start list, defaults to nil.
       #
       # ==== Returns
-      # * response<~Fog::AWS::Response>:
+      # * response<~Excon::Response>:
       #   * body<~Hash>:
       #     * 'BoxUsage'<~Float>
       #     * 'RequestId'<~String>