fog 0.8.2 → 0.9.0

data/lib/fog/compute/requests/aws/describe_volumes.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/describe_volumes'
@@ -34,11 +34,11 @@ module Fog
             Formatador.display_line("[yellow][WARN] describe_volumes with #{filters.class} param is deprecated, use describe_volumes('volume-id' => []) instead[/] [light_black](#{caller.first})[/]")
             filters = {'volume-id' => [*filters]}
           end
-          params = AWS.indexed_filters(filters)
+          params = Fog::AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeVolumes',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::DescribeVolumes.new
+            :parser     => Fog::Parsers::Compute::AWS::DescribeVolumes.new
           }.merge!(params))
         end
 

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/detach_volume'
@@ -30,7 +30,7 @@ module Fog
             'Action'    => 'DetachVolume',
             'VolumeId'  => volume_id,
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::DetachVolume.new
+            :parser     => Fog::Parsers::Compute::AWS::DetachVolume.new
           }.merge!(options))
         end
 
@@ -50,7 +50,7 @@ module Fog
             }.merge!(data)
             response
           else
-            raise Fog::AWS::Compute::NotFound.new("The volume '#{volume_id}' does not exist.")
+            raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.")
           end
         end
 

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/basic'
@@ -22,7 +22,7 @@ module Fog
             'Action'    => 'DisassociateAddress',
             'PublicIp'  => public_ip,
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::Basic.new
+            :parser     => Fog::Parsers::Compute::AWS::Basic.new
           )
         end
 
@@ -46,7 +46,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::Compute::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
+            raise Fog::Compute::AWS::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
           end
         end
 

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/get_console_output'
@@ -24,7 +24,7 @@ module Fog
             'Action'      => 'GetConsoleOutput',
             'InstanceId'  => instance_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::AWS::Compute::GetConsoleOutput.new
+            :parser       => Fog::Parsers::Compute::AWS::GetConsoleOutput.new
           )
         end
 
@@ -38,13 +38,13 @@ module Fog
             response.status = 200
             response.body = {
               'instanceId'    => instance_id,
-              'output'        => nil,
+              'output'        => (Time.now - instance['launchTime'] >= Fog::Mock.delay) ? nil : Fog::AWS::Mock.console_output,
               'requestId'     => Fog::AWS::Mock.request_id,
               'timestamp'     => Time.now
             }
             response
           else;
-            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
+            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist")
           end
         end
 

data/lib/fog/compute/requests/aws/get_password_data.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/get_password_data'
@@ -26,7 +26,7 @@ module Fog
             'Action'      => 'GetPasswordData',
             'InstanceId'  => instance_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::AWS::Compute::GetPasswordData.new
+            :parser       => Fog::Parsers::Compute::AWS::GetPasswordData.new
           )
         end
 
@@ -46,7 +46,7 @@ module Fog
             }
             response
           else;
-            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
+            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist")
           end
         end
 

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/import_key_pair'
@@ -24,7 +24,7 @@ module Fog
             'Action'  => 'ImportKeyPair',
             'KeyName' => key_name,
             'PublicKeyMaterial' => Base64::encode64(public_key_material),
-            :parser   => Fog::Parsers::AWS::Compute::ImportKeyPair.new
+            :parser   => Fog::Parsers::Compute::AWS::ImportKeyPair.new
           )
         end
 
@@ -46,7 +46,7 @@ module Fog
             }.merge!(data)
             response
           else
-            raise Fog::AWS::Compute::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
+            raise Fog::Compute::AWS::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
           end
         end
 

data/lib/fog/compute/requests/aws/modify_image_attributes.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/basic'
@@ -18,16 +18,16 @@ module Fog
         #
         def modify_image_attributes(image_id, attribute, operation_type, options = {})
           params = {}
-          params.merge!(AWS.indexed_param('UserId', options['UserId']))
-          params.merge!(AWS.indexed_param('UserGroup', options['UserGroup']))
-          params.merge!(AWS.indexed_param('ProductCode', options['ProductCode']))
+          params.merge!(Fog::AWS.indexed_param('UserId', options['UserId']))
+          params.merge!(Fog::AWS.indexed_param('UserGroup', options['UserGroup']))
+          params.merge!(Fog::AWS.indexed_param('ProductCode', options['ProductCode']))
           request({
             'Action'        => 'ModifyImageAttribute',
             'Attribute'     => attribute,
             'ImageId'       => image_id,
             'OperationType' => operation_type,
             :idempotent     => true,
-            :parser         => Fog::Parsers::AWS::Compute::Basic.new
+            :parser         => Fog::Parsers::Compute::AWS::Basic.new
           }.merge!(params))
         end
 

data/lib/fog/compute/requests/aws/modify_snapshot_attribute.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
         
         require 'fog/compute/parsers/aws/basic'
@@ -18,15 +18,15 @@ module Fog
         #
         def modify_snapshot_attribute(snapshot_id, attribute, operation_type, options = {})
           params = {}
-          params.merge!(AWS.indexed_param('UserId', options['UserId']))
-          params.merge!(AWS.indexed_param('UserGroup', options['UserGroup']))
+          params.merge!(Fog::AWS.indexed_param('UserId', options['UserId']))
+          params.merge!(Fog::AWS.indexed_param('UserGroup', options['UserGroup']))
           request({
             'Action'        => 'ModifySnapshotAttribute',
             'Attribute'     => attribute,
             'SnapshotId'    => snapshot_id,
             'OperationType' => operation_type,
             :idempotent     => true,
-            :parser         => Fog::Parsers::AWS::Compute::Basic.new
+            :parser         => Fog::Parsers::Compute::AWS::Basic.new
           }.merge!(params))
         end
 

data/lib/fog/compute/requests/aws/monitor_instances.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
 
       class Real
 
@@ -20,11 +20,11 @@ module Fog
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-MonitorInstances.html]
         def monitor_instances(instance_ids)
-          params = AWS.indexed_param('InstanceId', instance_ids)
+          params = Fog::AWS.indexed_param('InstanceId', instance_ids)
           request({
                           'Action' => 'MonitorInstances',
                           :idempotent => true,
-                          :parser => Fog::Parsers::AWS::Compute::MonitorUnmonitorInstances.new
+                          :parser => Fog::Parsers::Compute::AWS::MonitorUnmonitorInstances.new
                   }.merge!(params))
         end
 
@@ -39,7 +39,7 @@ module Fog
             if instance = self.data[:instances][instance_id]
               instance['monitoring']['state'] = 'enabled'
             else
-              raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_ids}' does not exist")
+              raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_ids}' does not exist")
             end
           end
           instances_set = [*instance_ids].inject([]) { |memo, id| memo << {'instanceId' => id, 'monitoring' => 'enabled'} }

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/basic'
@@ -18,11 +18,11 @@ module Fog
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-RebootInstances.html]
         def reboot_instances(instance_id = [])
-          params = AWS.indexed_param('InstanceId', instance_id)
+          params = Fog::AWS.indexed_param('InstanceId', instance_id)
           request({
             'Action'    => 'RebootInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::Basic.new
+            :parser     => Fog::Parsers::Compute::AWS::Basic.new
           }.merge!(params))
         end
 
@@ -44,7 +44,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::Compute::NotFound.new("The instance ID #{instance_id.inspect} does not exist")
+            raise Fog::Compute::AWS::NotFound.new("The instance ID #{instance_id.inspect} does not exist")
           end
         end
 

data/lib/fog/compute/requests/aws/register_image.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/register_image'
@@ -40,7 +40,7 @@ module Fog
             'Action'      => 'RegisterImage',
             'Name'        => name,
             'Description' => description,
-            :parser       => Fog::Parsers::AWS::Compute::RegisterImage.new
+            :parser       => Fog::Parsers::Compute::AWS::RegisterImage.new
           }
 
           # This determines if we are doing a snapshot or a S3 backed AMI.
@@ -83,7 +83,7 @@ module Fog
             if name.empty?
               message << 'The request must contain the parameter name'
             end
-            raise Fog::AWS::Compute::Error.new(message)
+            raise Fog::Compute::AWS::Error.new(message)
           end
         end
 

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/basic'
@@ -19,7 +19,7 @@ module Fog
             'Action'    => 'ReleaseAddress',
             'PublicIp'  => public_ip,
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::Basic.new
+            :parser     => Fog::Parsers::Compute::AWS::Basic.new
           )
         end
 
@@ -37,7 +37,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::Compute::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
+            raise Fog::Compute::AWS::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
           end
         end
 

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/basic'
@@ -38,7 +38,7 @@ module Fog
             'Action'    => 'RevokeSecurityGroupIngress',
             'GroupName' => group_name,
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::Basic.new
+            :parser     => Fog::Parsers::Compute::AWS::Basic.new
           }.merge!(options))
         end
 
@@ -84,7 +84,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::Compute::NotFound.new("The security group '#{group_name}' does not exist")
+            raise Fog::Compute::AWS::NotFound.new("The security group '#{group_name}' does not exist")
           end
         end
 

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/run_instances'
@@ -90,7 +90,7 @@ module Fog
             end
           end
           if security_groups = options.delete('SecurityGroup')
-            options.merge!(AWS.indexed_param('SecurityGroup', [*security_groups]))
+            options.merge!(Fog::AWS.indexed_param('SecurityGroup', [*security_groups]))
           end
           if options['UserData']
             options['UserData'] = Base64.encode64(options['UserData'])
@@ -104,7 +104,7 @@ module Fog
             'MinCount'  => min_count,
             'MaxCount'  => max_count,
             :idempotent => idempotent,
-            :parser     => Fog::Parsers::AWS::Compute::RunInstances.new
+            :parser     => Fog::Parsers::Compute::AWS::RunInstances.new
           }.merge!(options))
         end
 
@@ -121,7 +121,7 @@ module Fog
           reservation_id = Fog::AWS::Mock.reservation_id
 
           if options['KeyName'] && describe_key_pairs('key-name' => options['KeyName']).body['keySet'].empty?
-            raise Fog::AWS::Compute::NotFound.new("The key pair '#{options['KeyName']}' does not exist")
+            raise Fog::Compute::AWS::NotFound.new("The key pair '#{options['KeyName']}' does not exist")
           end
 
           min_count.times do |i|

data/lib/fog/compute/requests/aws/start_instances.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/start_stop_instances'
@@ -18,11 +18,11 @@ module Fog
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-StartInstances.html]
         def start_instances(instance_id)
-          params = AWS.indexed_param('InstanceId', instance_id)
+          params = Fog::AWS.indexed_param('InstanceId', instance_id)
           request({
             'Action'    => 'StartInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::StartStopInstances.new
+            :parser     => Fog::Parsers::Compute::AWS::StartStopInstances.new
           }.merge!(params))
         end
 

data/lib/fog/compute/requests/aws/stop_instances.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
       class Real
 
         require 'fog/compute/parsers/aws/start_stop_instances'
@@ -18,11 +18,11 @@ module Fog
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-StopInstances.html]
         def stop_instances(instance_id)
-          params = AWS.indexed_param('InstanceId', instance_id)
+          params = Fog::AWS.indexed_param('InstanceId', instance_id)
           request({
             'Action'    => 'StopInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::AWS::Compute::StartStopInstances.new
+            :parser     => Fog::Parsers::Compute::AWS::StartStopInstances.new
           }.merge!(params))
         end