RubyGems - fog - Versions diffs - 0.8.2 → 0.9.0 - Mend

fog 0.8.2 → 0.9.0

Files changed (913) hide show

data/lib/fog/compute/parsers/aws/allocate_address.rb CHANGED

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

data/lib/fog/compute/parsers/aws/attach_volume.rb CHANGED

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

data/lib/fog/compute/parsers/aws/basic.rb CHANGED

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

data/lib/fog/compute/parsers/aws/create_image.rb CHANGED

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

data/lib/fog/compute/parsers/aws/create_key_pair.rb CHANGED

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

data/lib/fog/compute/parsers/aws/create_snapshot.rb CHANGED

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

data/lib/fog/compute/parsers/aws/create_volume.rb CHANGED

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

data/lib/fog/compute/parsers/aws/deregister_image.rb CHANGED

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

data/lib/fog/compute/parsers/aws/describe_addresses.rb CHANGED

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

data/lib/fog/compute/parsers/aws/describe_availability_zones.rb CHANGED

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

data/lib/fog/compute/parsers/aws/describe_images.rb CHANGED

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

data/lib/fog/compute/parsers/aws/describe_instances.rb CHANGED

@@ -1,12 +1,14 @@
 module Fog
   module Parsers
-    module AWS
-      module Compute
+    module Compute
+      module AWS
         class DescribeInstances < Fog::Parsers::Base
           def reset
             @block_device_mapping = {}
+            @context = []
+            @contexts = ['blockDeviceMapping', 'groupSet', 'instancesSet', 'instanceState', 'productCodes', 'stateReason', 'tagSet']
             @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [], 'stateReason' => {}, 'tagSet' => {} }
             @reservation = { 'groupSet' => [], 'instancesSet' => [] }
             @response = { 'reservationSet' => [] }
@@ -15,19 +17,8 @@ module Fog
           def start_element(name, attrs = [])
             super
-            case name
-            when 'blockDeviceMapping'
-              @in_block_device_mapping = true
-            when'groupSet', 'productCodes'
-              @in_subset = true
-            when 'instancesSet'
-              @in_instances_set = true
-            when 'instanceState'
-              @in_instance_state = true
-            when 'stateReason'
-              @in_state_reason = true
-            when 'tagSet'
-              @in_tag_set = true
+            if @contexts.include?(name)
+              @context.push(name)
             end
           end
@@ -44,41 +35,28 @@ module Fog
               @instance[name] = value
             when 'attachTime'
               @block_device_mapping[name] = Time.parse(value)
-            when 'blockDeviceMapping'
-              @in_block_device_mapping = false
+            when *@contexts
+              @context.pop
             when 'code'
-              if @in_instance_state
-                @instance['instanceState'][name] = value.to_i
-              elsif @in_state_reason
-                @instance['stateReason'][name] = value.to_i
-              end
+              @instance[@context.last][name] = value.to_i
             when 'deleteOnTermination'
-              if value == 'true'
-                @block_device_mapping[name] = true
-              else
-                @block_device_mapping[name] = false
-              end
+              @block_device_mapping[name] = (value == 'true')
             when 'deviceName', 'status', 'volumeId'
               @block_device_mapping[name] = value
-            when 'groupId'
+            when 'groupName'
               @reservation['groupSet'] << value
-            when 'groupSet', 'productCodes'
-              @in_subset = false
-            when 'instancesSet'
-              @in_instances_set = false
-            when 'instanceState'
-              @in_instance_state = false
             when 'item'
-              if @in_block_device_mapping
+              case @context.last
+              when 'blockDeviceMapping'
                 @instance['blockDeviceMapping'] << @block_device_mapping
                 @block_device_mapping = {}
-              elsif @in_tag_set
-                @instance['tagSet'][@tag['key']] = @tag['value']
-                @tag = {}
-              elsif @in_instances_set
+              when 'instancesSet'
                 @reservation['instancesSet'] << @instance
                 @instance = { 'blockDeviceMapping' => [], 'instanceState' => {}, 'monitoring' => {}, 'placement' => {}, 'productCodes' => [], 'stateReason' => {}, 'tagSet' => {} }
-              elsif !@in_subset
+              when 'tagSet'
+                @instance['tagSet'][@tag['key']] = @tag['value']
+                @tag = {}
+              when nil
                 @response['reservationSet'] << @reservation
                 @reservation = { 'groupSet' => [], 'instancesSet' => [] }
               end
@@ -87,11 +65,7 @@ module Fog
             when 'launchTime'
               @instance[name] = Time.parse(value)
             when 'name'
-              if @in_instance_state
-                @instance['instanceState'][name] = value
-              elsif @in_state_reason
-                @instance['stateReason'][name] = value
-              end
+              @instance[@context.last][name] = value
             when 'ownerId', 'reservationId'
               @reservation[name] = value
             when 'requestId'
@@ -99,15 +73,7 @@ module Fog
             when 'productCode'
               @instance['productCodes'] << value
             when 'state'
-              if value == 'true'
-                @instance['monitoring'][name] = true
-              else
-                @instance['monitoring'][name] = false
-              end
-            when 'stateReason'
-              @in_state_reason = false
-            when 'tagSet'
-              @in_tag_set = false
+              @instance['monitoring'][name] = (value == 'true')
             end
           end

data/lib/fog/compute/parsers/aws/describe_key_pairs.rb CHANGED

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

data/lib/fog/compute/parsers/aws/describe_regions.rb CHANGED

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

data/lib/fog/compute/parsers/aws/describe_reserved_instances.rb CHANGED

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

data/lib/fog/compute/parsers/aws/describe_reserved_instances_offerings.rb CHANGED

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

data/lib/fog/compute/parsers/aws/describe_security_groups.rb CHANGED

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

data/lib/fog/compute/parsers/aws/describe_snapshots.rb CHANGED

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

data/lib/fog/compute/parsers/aws/describe_tags.rb CHANGED

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

data/lib/fog/compute/parsers/aws/describe_volumes.rb CHANGED

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

data/lib/fog/compute/parsers/aws/detach_volume.rb CHANGED

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

data/lib/fog/compute/parsers/aws/get_console_output.rb CHANGED

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

data/lib/fog/compute/parsers/aws/get_password_data.rb CHANGED

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

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

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

data/lib/fog/compute/parsers/aws/monitor_unmonitor_instances.rb CHANGED

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

data/lib/fog/compute/parsers/aws/register_image.rb CHANGED

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

data/lib/fog/compute/parsers/aws/run_instances.rb CHANGED

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

data/lib/fog/compute/parsers/aws/start_stop_instances.rb CHANGED

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

data/lib/fog/compute/parsers/aws/terminate_instances.rb CHANGED

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

data/lib/fog/compute/parsers/slicehost/create_slice.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Slicehost
-      module Compute
+    module Compute
+      module Slicehost
         class CreateSlice < Fog::Parsers::Base

data/lib/fog/compute/parsers/slicehost/get_backups.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Slicehost
-      module Compute
+    module Compute
+      module Slicehost
         class GetBackups < Fog::Parsers::Base