fog 0.0.42 → 0.0.43

data/lib/fog/aws/ec2.rb

@@ -19,94 +19,80 @@ module Fog
         end
       end
 
-      def self.reload
-        load "fog/aws/models/ec2/address.rb"
-        load "fog/aws/models/ec2/addresses.rb"
-        load "fog/aws/models/ec2/flavor.rb"
-        load "fog/aws/models/ec2/flavors.rb"
-        load "fog/aws/models/ec2/image.rb"
-        load "fog/aws/models/ec2/images.rb"
-        load "fog/aws/models/ec2/key_pair.rb"
-        load "fog/aws/models/ec2/key_pairs.rb"
-        load "fog/aws/models/ec2/security_group.rb"
-        load "fog/aws/models/ec2/security_groups.rb"
-        load "fog/aws/models/ec2/server.rb"
-        load "fog/aws/models/ec2/servers.rb"
-        load "fog/aws/models/ec2/snapshot.rb"
-        load "fog/aws/models/ec2/snapshots.rb"
-        load "fog/aws/models/ec2/volume.rb"
-        load "fog/aws/models/ec2/volumes.rb"
-
-        load "fog/aws/parsers/ec2/allocate_address.rb"
-        load "fog/aws/parsers/ec2/attach_volume.rb"
-        load "fog/aws/parsers/ec2/basic.rb"
-        load "fog/aws/parsers/ec2/create_key_pair.rb"
-        load "fog/aws/parsers/ec2/create_snapshot.rb"
-        load "fog/aws/parsers/ec2/create_volume.rb"
-        load "fog/aws/parsers/ec2/describe_addresses.rb"
-        load "fog/aws/parsers/ec2/describe_availability_zones.rb"
-        load "fog/aws/parsers/ec2/describe_images.rb"
-        load "fog/aws/parsers/ec2/describe_instances.rb"
-        load "fog/aws/parsers/ec2/describe_key_pairs.rb"
-        load "fog/aws/parsers/ec2/describe_regions.rb"
-        load "fog/aws/parsers/ec2/describe_security_groups.rb"
-        load "fog/aws/parsers/ec2/describe_snapshots.rb"
-        load "fog/aws/parsers/ec2/describe_volumes.rb"
-        load "fog/aws/parsers/ec2/detach_volume.rb"
-        load "fog/aws/parsers/ec2/get_console_output.rb"
-        load "fog/aws/parsers/ec2/run_instances.rb"
-        load "fog/aws/parsers/ec2/terminate_instances.rb"
-
-        load "fog/aws/requests/ec2/allocate_address.rb"
-        load "fog/aws/requests/ec2/associate_address.rb"
-        load "fog/aws/requests/ec2/attach_volume.rb"
-        load "fog/aws/requests/ec2/authorize_security_group_ingress.rb"
-        # TODO: require "fog/aws/requests/ec2/bundle_instance.rb"
-        # TODO: require "fog/aws/requests/ec2/cancel_bundle_task.rb"
-        # TODO: require "fog/aws/requests/ec2/confirm_product_instance.rb"
-        load "fog/aws/requests/ec2/create_key_pair.rb"
-        load "fog/aws/requests/ec2/create_security_group.rb"
-        load "fog/aws/requests/ec2/create_snapshot.rb"
-        load "fog/aws/requests/ec2/create_volume.rb"
-        load "fog/aws/requests/ec2/delete_key_pair.rb"
-        load "fog/aws/requests/ec2/delete_security_group.rb"
-        load "fog/aws/requests/ec2/delete_snapshot.rb"
-        load "fog/aws/requests/ec2/delete_volume.rb"
-        # TODO: require "fog/aws/requests/ec2/deregister_image.rb"
-        load "fog/aws/requests/ec2/describe_addresses.rb"
-        load "fog/aws/requests/ec2/describe_availability_zones.rb"
-        # TODO: require "fog/aws/requests/ec2/describe_bundle_tasks.rb"
-        # TODO: require "fog/aws/requests/ec2/describe_image_attribute.rb"
-        load "fog/aws/requests/ec2/describe_images.rb"
-        load "fog/aws/requests/ec2/describe_instances.rb"
-        load "fog/aws/requests/ec2/describe_key_pairs.rb"
-        load "fog/aws/requests/ec2/describe_regions.rb"
-        # TODO: require "fog/aws/requests/ec2/describe_reserved_instances.rb"
-        # TODO: require "fog/aws/requests/ec2/describe_reserved_instances_offerings.rb"
-        load "fog/aws/requests/ec2/describe_security_groups.rb"
-        load "fog/aws/requests/ec2/describe_snapshots.rb"
-        load "fog/aws/requests/ec2/describe_volumes.rb"
-        load "fog/aws/requests/ec2/detach_volume.rb"
-        load "fog/aws/requests/ec2/disassociate_address.rb"
-        load "fog/aws/requests/ec2/get_console_output.rb"
-        # TODO: require "fog/aws/requests/ec2/modify_image_attribute.rb"
-        # TODO: require "fog/aws/requests/ec2/modify_snapshot_attribute.rb"
-        # TODO: require "fog/aws/requests/ec2/monitor_instances.rb"
-        # TODO: require "fog/aws/requests/ec2/purchase_reserved_instances_offering.rb"
-        load "fog/aws/requests/ec2/reboot_instances.rb"
-        # TODO: require "fog/aws/requests/ec2/register_image.rb"
-        load "fog/aws/requests/ec2/release_address.rb"
-        # TODO: require "fog/aws/requests/ec2/reset_image_attributes.rb"
-        # TODO: require "fog/aws/requests/ec2/reset_snapshot_attributes.rb"
-        load "fog/aws/requests/ec2/revoke_security_group_ingress.rb"
-        load "fog/aws/requests/ec2/run_instances.rb"
-        load "fog/aws/requests/ec2/terminate_instances.rb"
-        # TODO: require "fog/aws/requests/ec2/unmonitor_instances.rb"
+      def self.dependencies
+        [
+          "fog/aws/models/ec2/address.rb",
+          "fog/aws/models/ec2/addresses.rb",
+          "fog/aws/models/ec2/flavor.rb",
+          "fog/aws/models/ec2/flavors.rb",
+          "fog/aws/models/ec2/image.rb",
+          "fog/aws/models/ec2/images.rb",
+          "fog/aws/models/ec2/key_pair.rb",
+          "fog/aws/models/ec2/key_pairs.rb",
+          "fog/aws/models/ec2/security_group.rb",
+          "fog/aws/models/ec2/security_groups.rb",
+          "fog/aws/models/ec2/server.rb",
+          "fog/aws/models/ec2/servers.rb",
+          "fog/aws/models/ec2/snapshot.rb",
+          "fog/aws/models/ec2/snapshots.rb",
+          "fog/aws/models/ec2/volume.rb",
+          "fog/aws/models/ec2/volumes.rb",
+          "fog/aws/parsers/ec2/allocate_address.rb",
+          "fog/aws/parsers/ec2/attach_volume.rb",
+          "fog/aws/parsers/ec2/basic.rb",
+          "fog/aws/parsers/ec2/create_key_pair.rb",
+          "fog/aws/parsers/ec2/create_snapshot.rb",
+          "fog/aws/parsers/ec2/create_volume.rb",
+          "fog/aws/parsers/ec2/describe_addresses.rb",
+          "fog/aws/parsers/ec2/describe_availability_zones.rb",
+          "fog/aws/parsers/ec2/describe_images.rb",
+          "fog/aws/parsers/ec2/describe_instances.rb",
+          "fog/aws/parsers/ec2/describe_key_pairs.rb",
+          "fog/aws/parsers/ec2/describe_regions.rb",
+          "fog/aws/parsers/ec2/describe_security_groups.rb",
+          "fog/aws/parsers/ec2/describe_snapshots.rb",
+          "fog/aws/parsers/ec2/describe_volumes.rb",
+          "fog/aws/parsers/ec2/detach_volume.rb",
+          "fog/aws/parsers/ec2/get_console_output.rb",
+          "fog/aws/parsers/ec2/run_instances.rb",
+          "fog/aws/parsers/ec2/terminate_instances.rb",
+          "fog/aws/requests/ec2/allocate_address.rb",
+          "fog/aws/requests/ec2/associate_address.rb",
+          "fog/aws/requests/ec2/attach_volume.rb",
+          "fog/aws/requests/ec2/authorize_security_group_ingress.rb",
+          "fog/aws/requests/ec2/create_key_pair.rb",
+          "fog/aws/requests/ec2/create_security_group.rb",
+          "fog/aws/requests/ec2/create_snapshot.rb",
+          "fog/aws/requests/ec2/create_volume.rb",
+          "fog/aws/requests/ec2/delete_key_pair.rb",
+          "fog/aws/requests/ec2/delete_security_group.rb",
+          "fog/aws/requests/ec2/delete_snapshot.rb",
+          "fog/aws/requests/ec2/delete_volume.rb",
+          "fog/aws/requests/ec2/describe_addresses.rb",
+          "fog/aws/requests/ec2/describe_availability_zones.rb",
+          "fog/aws/requests/ec2/describe_images.rb",
+          "fog/aws/requests/ec2/describe_instances.rb",
+          "fog/aws/requests/ec2/describe_key_pairs.rb",
+          "fog/aws/requests/ec2/describe_regions.rb",
+          "fog/aws/requests/ec2/describe_security_groups.rb",
+          "fog/aws/requests/ec2/describe_snapshots.rb",
+          "fog/aws/requests/ec2/describe_volumes.rb",
+          "fog/aws/requests/ec2/detach_volume.rb",
+          "fog/aws/requests/ec2/disassociate_address.rb",
+          "fog/aws/requests/ec2/get_console_output.rb",
+          "fog/aws/requests/ec2/reboot_instances.rb",
+          "fog/aws/requests/ec2/release_address.rb",
+          "fog/aws/requests/ec2/revoke_security_group_ingress.rb",
+          "fog/aws/requests/ec2/run_instances.rb",
+          "fog/aws/requests/ec2/terminate_instances.rb"
+        ]
+      end
 
+      def self.reload
+        self.dependencies.each {|dependency| load(dependency)}
         if Fog.mocking?
           reset_data
         end
-
       end
 
       # Initialize connection to EC2
@@ -123,6 +109,7 @@ module Fog
       #
       # ==== Parameters
       # * options<~Hash> - config arguments for connection.  Defaults to {}.
+      #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1']
       #
       # ==== Returns
       # * EC2 object with connection to aws.
@@ -134,7 +121,16 @@ module Fog
           raise ArgumentError.new('aws_secret_access_key is required to access ec2')
         end
         @hmac       = HMAC::SHA256.new(@aws_secret_access_key)
-        @host       = options[:host]      || 'ec2.amazonaws.com'
+        @host = options[:host] || case options[:region]
+        when 'eu-west-1'
+          'ec2.eu-west-1.amazonaws.com'
+        when 'us-east-1'
+          'ec2.us-east-1.amazonaws.com'
+        when 'us-west-1'
+          'ec2.us-west-1.amazonaws.com'
+        else
+          'ec2.amazonaws.com'
+        end
         @port       = options[:port]      || 443
         @scheme     = options[:scheme]    || 'https'
       end
@@ -178,4 +174,4 @@ module Fog
   end
 end
 
-Fog::AWS::EC2.reload
+Fog::AWS::EC2.dependencies.each {|dependency| require(dependency)}

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

@@ -41,24 +41,28 @@ else
 
         # TODO: handle the GroupName/Source/Source case
         def authorize_security_group_ingress(options = {})
-          response = Excon::Response.new
-          group = Fog::AWS::EC2.data[:security_groups][options['GroupName']]
+          if options['GroupName'] && options['SourceSecurityGroupName'] && options['SourceSecurityGroupOwnerId']
+            raise MockNotImplemented.new("Contributions welcome!")
+          else
+            response = Excon::Response.new
+            group = Fog::AWS::EC2.data[:security_groups][options['GroupName']]
 
-          group['ipPermissions'] ||= []
-          group['ipPermissions'] << {
-            'groups'      => [],
-            'fromPort'    => options['FromPort'],
-            'ipRanges'    => [{ 'cidrIp' => options['CidrIp'] }],
-            'ipProtocol'  => options['IpProtocol'],
-            'toPort'      => options['ToPort']
-          }
+            group['ipPermissions'] ||= []
+            group['ipPermissions'] << {
+              'groups'      => [],
+              'fromPort'    => options['FromPort'],
+              'ipRanges'    => [{ 'cidrIp' => options['CidrIp'] }],
+              'ipProtocol'  => options['IpProtocol'],
+              'toPort'      => options['ToPort']
+            }
 
-          response.status = 200
-          response.body = {
-            'requestId' => Fog::AWS::Mock.request_id,
-            'return'    => true
-          }
-          response
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'return'    => true
+            }
+            response
+          end
         end
 
       end

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

@@ -41,24 +41,28 @@ else
 
         # TODO: handle the GroupName/Source/Source case
         def revoke_security_group_ingress(options = {})
-          response = Excon::Response.new
-          group = Fog::AWS::EC2.data[:security_groups][options['GroupName']]
+          if options['GroupName'] && options['SourceSecurityGroupName'] && options['SourceSecurityGroupOwnerId']
+            raise MockNotImplemented.new("Contributions welcome!")
+          else
+            response = Excon::Response.new
+            group = Fog::AWS::EC2.data[:security_groups][options['GroupName']]
 
-          ingress = group['ipPermissions'].select {|permission|
-            permission['fromPort']    == options['FromPort'] &&
-            permission['ipProtocol']  == options['IpProtocol'] &&
-            permission['toPort']      == options['ToPort'] &&
-            permission['ipRanges'].first['cidrIp'] == options['CidrIp']
-          }.first
+            ingress = group['ipPermissions'].select {|permission|
+              permission['fromPort']    == options['FromPort'] &&
+              permission['ipProtocol']  == options['IpProtocol'] &&
+              permission['toPort']      == options['ToPort'] &&
+              permission['ipRanges'].first['cidrIp'] == options['CidrIp']
+            }.first
 
-          group['ipPermissions'].delete(ingress)
+            group['ipPermissions'].delete(ingress)
 
-          response.status = 200
-          response.body = {
-            'requestId' => Fog::AWS::Mock.request_id,
-            'return'    => true
-          }
-          response
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'return'    => true
+            }
+            response
+          end
         end
 
       end

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

@@ -114,6 +114,10 @@ else
           response
         end
 
+        def get_object_url(bucket_name, object_name, expires)
+          raise MockNotImplemented.new("Contributions welcome!")
+        end
+
       end
     end
   end

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

@@ -1,29 +1,47 @@
-module Fog
-  module AWS
-    class SimpleDB
-
-      # Select item data from SimpleDB
-      #
-      # ==== Parameters
-      # * select_expression<~String> - Expression to query domain with.
-      # * next_token<~String> - Offset token to start list, defaults to nil.
-      #
-      # ==== Returns
-      # * response<~Excon::Response>:
-      #   * body<~Hash>:
-      #     * 'BoxUsage'<~Float>
-      #     * 'RequestId'<~String>
-      #     * 'Items'<~Hash> - list of attribute name/values for the items formatted as 
-      #       { 'item_name' => { 'attribute_name' => ['attribute_value'] }}
-      #     * 'NextToken'<~String> - offset to start with if there are are more domains to list
-      def select(select_expression, next_token = nil)
-        request({
-          'Action' => 'Select',
-          'NextToken' => next_token,
-          'SelectExpression' => select_expression
-        }, Fog::Parsers::AWS::SimpleDB::Select.new(@nil_string))
+unless Fog.mocking?
+
+  module Fog
+    module AWS
+      class SimpleDB
+
+        # Select item data from SimpleDB
+        #
+        # ==== Parameters
+        # * select_expression<~String> - Expression to query domain with.
+        # * next_token<~String> - Offset token to start list, defaults to nil.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'BoxUsage'<~Float>
+        #     * 'RequestId'<~String>
+        #     * 'Items'<~Hash> - list of attribute name/values for the items formatted as 
+        #       { 'item_name' => { 'attribute_name' => ['attribute_value'] }}
+        #     * 'NextToken'<~String> - offset to start with if there are are more domains to list
+        def select(select_expression, next_token = nil)
+          request({
+            'Action' => 'Select',
+            'NextToken' => next_token,
+            'SelectExpression' => select_expression
+          }, Fog::Parsers::AWS::SimpleDB::Select.new(@nil_string))
+        end
+
       end
+    end
+  end
 
+else
+
+  module Fog
+    module AWS
+      class SimpleDB
+
+        def select(select_expression, next_token = nil)
+          raise MockNotImplemented.new("Contributions welcome!")
+        end
+
+      end
     end
   end
+
 end

data/lib/fog/aws/s3.rb

@@ -11,31 +11,34 @@ module Fog
         end
       end
 
-      def self.reload
-        load "fog/aws/models/s3/directory.rb"
-        load "fog/aws/models/s3/directories.rb"
-        load "fog/aws/models/s3/file.rb"
-        load "fog/aws/models/s3/files.rb"
-
-        load "fog/aws/parsers/s3/copy_object.rb"
-        load "fog/aws/parsers/s3/get_bucket.rb"
-        load "fog/aws/parsers/s3/get_bucket_location.rb"
-        load "fog/aws/parsers/s3/get_request_payment.rb"
-        load "fog/aws/parsers/s3/get_service.rb"
-
-        load "fog/aws/requests/s3/copy_object.rb"
-        load "fog/aws/requests/s3/delete_bucket.rb"
-        load "fog/aws/requests/s3/delete_object.rb"
-        load "fog/aws/requests/s3/get_bucket.rb"
-        load "fog/aws/requests/s3/get_bucket_location.rb"
-        load "fog/aws/requests/s3/get_object.rb"
-        load "fog/aws/requests/s3/get_request_payment.rb"
-        load "fog/aws/requests/s3/get_service.rb"
-        load "fog/aws/requests/s3/head_object.rb"
-        load "fog/aws/requests/s3/put_bucket.rb"
-        load "fog/aws/requests/s3/put_object.rb"
-        load "fog/aws/requests/s3/put_request_payment.rb"
+      def self.dependencies
+        [
+          "fog/aws/models/s3/directory.rb",
+          "fog/aws/models/s3/directories.rb",
+          "fog/aws/models/s3/file.rb",
+          "fog/aws/models/s3/files.rb",
+          "fog/aws/parsers/s3/copy_object.rb",
+          "fog/aws/parsers/s3/get_bucket.rb",
+          "fog/aws/parsers/s3/get_bucket_location.rb",
+          "fog/aws/parsers/s3/get_request_payment.rb",
+          "fog/aws/parsers/s3/get_service.rb",
+          "fog/aws/requests/s3/copy_object.rb",
+          "fog/aws/requests/s3/delete_bucket.rb",
+          "fog/aws/requests/s3/delete_object.rb",
+          "fog/aws/requests/s3/get_bucket.rb",
+          "fog/aws/requests/s3/get_bucket_location.rb",
+          "fog/aws/requests/s3/get_object.rb",
+          "fog/aws/requests/s3/get_request_payment.rb",
+          "fog/aws/requests/s3/get_service.rb",
+          "fog/aws/requests/s3/head_object.rb",
+          "fog/aws/requests/s3/put_bucket.rb",
+          "fog/aws/requests/s3/put_object.rb",
+          "fog/aws/requests/s3/put_request_payment.rb"
+        ]
+      end
 
+      def self.reload
+        self.dependencies.each {|dependency| load(dependency)}
         if Fog.mocking?
           reset_data
         end
@@ -164,4 +167,4 @@ DATA
   end
 end
 
-Fog::AWS::S3.reload
+Fog::AWS::S3.dependencies.each {|dependency| require(dependency)}

data/lib/fog/aws/simpledb.rb

@@ -11,23 +11,27 @@ module Fog
         end
       end
 
-      def self.reload
-        load "fog/aws/parsers/simpledb/basic.rb"
-        load "fog/aws/parsers/simpledb/domain_metadata.rb"
-        load "fog/aws/parsers/simpledb/get_attributes.rb"
-        load "fog/aws/parsers/simpledb/list_domains.rb"
-        load "fog/aws/parsers/simpledb/select.rb"
-
-        load "fog/aws/requests/simpledb/batch_put_attributes.rb"
-        load "fog/aws/requests/simpledb/create_domain.rb"
-        load "fog/aws/requests/simpledb/delete_attributes.rb"
-        load "fog/aws/requests/simpledb/delete_domain.rb"
-        load "fog/aws/requests/simpledb/domain_metadata.rb"
-        load "fog/aws/requests/simpledb/get_attributes.rb"
-        load "fog/aws/requests/simpledb/list_domains.rb"
-        load "fog/aws/requests/simpledb/put_attributes.rb"
-        load "fog/aws/requests/simpledb/select.rb"
+      def self.dependencies
+        [
+          "fog/aws/parsers/simpledb/basic.rb",
+          "fog/aws/parsers/simpledb/domain_metadata.rb",
+          "fog/aws/parsers/simpledb/get_attributes.rb",
+          "fog/aws/parsers/simpledb/list_domains.rb",
+          "fog/aws/parsers/simpledb/select.rb",
+          "fog/aws/requests/simpledb/batch_put_attributes.rb",
+          "fog/aws/requests/simpledb/create_domain.rb",
+          "fog/aws/requests/simpledb/delete_attributes.rb",
+          "fog/aws/requests/simpledb/delete_domain.rb",
+          "fog/aws/requests/simpledb/domain_metadata.rb",
+          "fog/aws/requests/simpledb/get_attributes.rb",
+          "fog/aws/requests/simpledb/list_domains.rb",
+          "fog/aws/requests/simpledb/put_attributes.rb",
+          "fog/aws/requests/simpledb/select.rb"
+        ]
+      end
 
+      def self.reload
+        self.dependencies.each {|dependency| load(dependency)}
         if Fog.mocking?
           reset_data
         end
@@ -152,4 +156,4 @@ module Fog
   end
 end
 
-Fog::AWS::SimpleDB.reload
+Fog::AWS::SimpleDB.dependencies.each {|dependency| require(dependency)}