fog 0.0.70 → 0.0.71

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 70
+:patch: 71
 :build: 

data/fog.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.70"
+  s.version = "0.0.71"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]

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

@@ -75,8 +75,10 @@ module Fog
             case instance['instanceState']['name']
             when 'pending'
               if Time.now - instance['launchTime'] > Fog::Mock::DELAY
-                instance['dnsName']       = Fog::AWS::Mock.ip_address
-                instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
+                instance['dnsName']           = "ec2-#{Fog::AWS::Mock.ip_address.gsub('.','-')}.compute-1.amazonaws.com"
+                instance['privateIpAddress']  = Fog::AWS::Mock.ip_address
+                instance['privateDnsName']    = "ip-#{instance['privateDnsName'].gsub('.','-')}.ec2.internal"
+                instance['instanceState']     = { 'code' => 16, 'name' => 'running' }
               end
             when 'rebooting'
               instance['instanceState'] = { 'code' => 16, 'name' => 'running' }

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

@@ -122,6 +122,7 @@ module Fog
               'ownerId'             => @owner_id,
               'placement'           => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone },
               'privateDnsName'      => '',
+              'privateIpAddress'    => '',
               'productCodes'        => [],
               'ramdiskId'           => options['RamdiskId'] || Fog::AWS::Mock.ramdisk_id,
               'reason'              => '',

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

@@ -38,14 +38,14 @@ module Fog
           response = Excon::Response.new
           instance_id = [*instance_id]
           if (@data[:instances].keys & instance_id).length == instance_id.length
-            for instance_id in instance_id
-              response.body = {
-                'requestId'     => Fog::AWS::Mock.request_id,
-                'instancesSet'  => []
-              }
-              instance = @data[:instances][instance_id]
-              @data[:deleted_at][instance_id] = Time.now
-              response.status = 200
+            response.body = {
+              'requestId'     => Fog::AWS::Mock.request_id,
+              'instancesSet'  => []
+            }
+            response.status = 200
+            for id in instance_id
+              instance = @data[:instances][id]
+              @data[:deleted_at][id] = Time.now
               # TODO: the codes are mostly educated guessing, not certainty
               code = case instance['state']
               when 'pending'
@@ -61,22 +61,22 @@ module Fog
               end
               state = { 'name' => 'shutting-down', 'code' => 32}
               response.body['instancesSet'] << {
-                'instanceId'    => instance_id,
+                'instanceId'    => id,
                 'previousState' => instance['instanceState'],
                 'currentState'  => state
               }
               instance['instanceState'] = state
+            end
 
-              describe_addresses.body['addressesSet'].each do |address|
-                if address['instanceId'] == instance_id
-                  disassociate_address(address['publicIp'])
-                end
+            describe_addresses.body['addressesSet'].each do |address|
+              if instance_id.include?(address['instanceId'])
+                disassociate_address(address['publicIp'])
               end
+            end
 
-              describe_volumes.body['volumeSet'].each do |volume|
-                if volume['attachmentSet'].first && volume['attachmentSet'].first['instanceId'] == instance_id
-                  detach_volume(volume['volumeId'])
-                end
+            describe_volumes.body['volumeSet'].each do |volume|
+              if volume['attachmentSet'].first && instance_id.include?(volume['attachmentSet'].first['instanceId'])
+                detach_volume(volume['volumeId'])
               end
             end
           else

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 70
-  version: 0.0.70
+  - 71
+  version: 0.0.71
 platform: ruby
 authors: 
 - geemus (Wesley Beary)