fog 0.2.30 → 0.3.0

data/lib/fog/aws/parsers/{ec2 → compute}/describe_images.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module EC2
+      module Compute
 
         class DescribeImages < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{ec2 → compute}/describe_instances.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module EC2
+      module Compute
 
         class DescribeInstances < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{ec2 → compute}/describe_key_pairs.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module EC2
+      module Compute
 
         class DescribeKeyPairs < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{ec2 → compute}/describe_regions.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module EC2
+      module Compute
 
         class DescribeRegions < Fog::Parsers::Base
 
@@ -27,4 +27,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/aws/parsers/{ec2 → compute}/describe_reserved_instances.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module EC2
+      module Compute
 
         class DescribeReservedInstances < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{ec2 → compute}/describe_security_groups.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module EC2
+      module Compute
 
         class DescribeSecurityGroups < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{ec2 → compute}/describe_snapshots.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module EC2
+      module Compute
 
         class DescribeSnapshots < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{ec2 → compute}/describe_volumes.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module EC2
+      module Compute
 
         class DescribeVolumes < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{ec2 → compute}/detach_volume.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module EC2
+      module Compute
 
         class DetachVolume < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{ec2 → compute}/get_console_output.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module EC2
+      module Compute
 
         class GetConsoleOutput < Fog::Parsers::Base
 
@@ -29,4 +29,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -0,0 +1,20 @@
+module Fog
+  module Parsers
+    module AWS
+      module Compute
+
+        class ImportKeyPair < Fog::Parsers::Base
+
+          def end_element(name)
+            case name
+            when 'keyFingerprint', 'keyName', 'requestId'
+              @response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/{ec2 → compute}/register_image.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module EC2
+      module Compute
 
         class RegisterImage < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{ec2 → compute}/run_instances.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module EC2
+      module Compute
 
         class RunInstances < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{ec2 → compute}/start_stop_instances.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module EC2
+      module Compute
 
         class StartStopInstances < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{ec2 → compute}/terminate_instances.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module EC2
+      module Compute
 
         class TerminateInstances < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{s3 → storage}/access_control_list.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module S3
+      module Storage
 
         class AccessControlList < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{s3 → storage}/copy_object.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module S3
+      module Storage
 
         class CopyObject < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{s3 → storage}/get_bucket.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module S3
+      module Storage
 
         class GetBucket < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_location.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module S3
+      module Storage
 
         class GetBucketLocation < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_logging.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module S3
+      module Storage
 
         class AccessControlList < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_object_versions.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module S3
+      module Storage
 
         class GetBucketObjectVersions < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_versioning.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module S3
+      module Storage
 
         class GetBucketVersioning < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{s3 → storage}/get_request_payment.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module S3
+      module Storage
 
         class GetRequestPayment < Fog::Parsers::Base
 

data/lib/fog/aws/parsers/{s3 → storage}/get_service.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module S3
+      module Storage
 
         class GetService < Fog::Parsers::Base
 

data/lib/fog/aws/requests/{ec2 → compute}/allocate_address.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/allocate_address'
+        require 'fog/aws/parsers/compute/allocate_address'
 
         # Acquire an elastic IP address.
         #
@@ -15,7 +15,7 @@ module Fog
         def allocate_address
           request(
             'Action'  => 'AllocateAddress',
-            :parser   => Fog::Parsers::AWS::EC2::AllocateAddress.new
+            :parser   => Fog::Parsers::AWS::Compute::AllocateAddress.new
           )
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/associate_address.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
         # Associate an elastic IP address with an instance
@@ -20,7 +20,7 @@ module Fog
             'InstanceId'  => instance_id,
             'PublicIp'    => public_ip,
             :idempotent   => true,
-            :parser       => Fog::Parsers::AWS::EC2::Basic.new
+            :parser       => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
 
@@ -45,9 +45,9 @@ module Fog
             }
             response
           elsif !instance
-            raise Fog::AWS::EC2::NotFound.new("The instance ID '#{instance_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
           elsif !address
-            raise Fog::AWS::EC2::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
+            raise Fog::AWS::Compute::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/attach_volume.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/attach_volume'
+        require 'fog/aws/parsers/compute/attach_volume'
 
         # Attach an Amazon EBS volume with a running instance, exposing as specified device
         #
@@ -28,7 +28,7 @@ module Fog
             'InstanceId'  => instance_id,
             'Device'      => device,
             :idempotent   => true,
-            :parser       => Fog::Parsers::AWS::EC2::AttachVolume.new
+            :parser       => Fog::Parsers::AWS::Compute::AttachVolume.new
           )
         end
 
@@ -58,9 +58,9 @@ module Fog
               }.merge!(data)
               response
             elsif !instance
-              raise Fog::AWS::EC2::NotFound.new("The instance ID '#{instance_id}' does not exist.")
+              raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist.")
             elsif !volume
-              raise Fog::AWS::EC2::NotFound.new("The volume '#{volume_id}' does not exist.")
+              raise Fog::AWS::Compute::NotFound.new("The volume '#{volume_id}' does not exist.")
             end
           else
             message = 'MissingParameter => '
@@ -71,7 +71,7 @@ module Fog
             else
               message << 'The request must contain the parameter device'
             end
-            raise Fog::AWS::EC2::Error.new(message)
+            raise Fog::AWS::Compute::Error.new(message)
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/authorize_security_group_ingress.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
         # Add permissions to a security group
@@ -26,7 +26,7 @@ module Fog
           request({
             'Action'    => 'AuthorizeSecurityGroupIngress',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::EC2::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
 
@@ -76,7 +76,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::NotFound.new("The security group '#{options['GroupName']}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The security group '#{options['GroupName']}' does not exist")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/create_image.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/create_image'
+        require 'fog/aws/parsers/compute/create_image'
 
         # Create a bootable EBS volume AMI
         #
@@ -25,7 +25,7 @@ module Fog
             'Name'              => name,
             'Description'       => description,
             'NoReboot'          => no_reboot.to_s,
-            :parser             => Fog::Parsers::AWS::EC2::CreateImage.new
+            :parser             => Fog::Parsers::AWS::Compute::CreateImage.new
           )
         end
       end

data/lib/fog/aws/requests/{ec2 → compute}/create_key_pair.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
-        require 'fog/aws/parsers/ec2/create_key_pair'
+        require 'fog/aws/parsers/compute/create_key_pair'
 
         # Create a new key pair
         #
@@ -21,7 +21,7 @@ module Fog
           request(
             'Action'  => 'CreateKeyPair',
             'KeyName' => key_name,
-            :parser   => Fog::Parsers::AWS::EC2::CreateKeyPair.new
+            :parser   => Fog::Parsers::AWS::Compute::CreateKeyPair.new
           )
         end
 
@@ -44,7 +44,7 @@ module Fog
             }.merge!(data)
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
+            raise Fog::AWS::Compute::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
           end
         end
 

data/lib/fog/aws/requests/{ec2 → compute}/create_security_group.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class Compute
       class Real
 
         # Create a new security group
@@ -19,7 +19,7 @@ module Fog
             'Action'            => 'CreateSecurityGroup',
             'GroupName'         => name,
             'GroupDescription'  => CGI.escape(description),
-            :parser             => Fog::Parsers::AWS::EC2::Basic.new
+            :parser             => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
 
@@ -43,7 +43,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::EC2::Error.new("InvalidGroup.Duplicate => The security group '#{name}' already exists")
+            raise Fog::AWS::Compute::Error.new("InvalidGroup.Duplicate => The security group '#{name}' already exists")
           end
         end