instant_ec2 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba694d8dac452161e3b7590663a7963e75973c2
-  data.tar.gz: 9e2a2d0a1425121b5e4860a09c91ba591357c505
+  metadata.gz: 42cfc79bfd329aa789ce68b9d7b955699c9eebfb
+  data.tar.gz: d9af3f8b46f88b3b95f149fa48ac3bb337b6c2da
 SHA512:
-  metadata.gz: be8616f736600d6bec62c8942e973d8ea10fe8fe5656961242648083e3948d885ce26c4c1bd082337a05b7010ec5e1c10dd001274fde90d42c77dad6e986b997
-  data.tar.gz: 27ba6067ad63729a31bc4e78b9bf81440581a2c81d729ecc720fca8f29088737af206f57956ed806059b0c54fe9e0706c1711104944d5399a5f30490ea23b1ea
+  metadata.gz: 1b2b7d7edeaf36e7378a0215bd999fa7ee97227765f4f2c822a927decb164a6e6dc6fd1783d05d46b71d3420548ed417f6ee4d0765bd96304ed52ec8b7ca54e0
+  data.tar.gz: d9526ba7df9a67fe8873c9c520c557c041fd3b70bcd56f6f3d7db39b7d492c591ed3dc046e37be737d9c6ace8ae873e66e88d50242b47be5c45ed6db4fd2f379

data/lib/instant_ec2.rb

@@ -17,7 +17,7 @@ class EC2Instance < Hash
   def start(duration: nil)
 
     @c.start_instance self[:instance_id]       
-    Thread.new{ sleep duration * 60; self.stop} if duration
+    Thread.new{ sleep duration.to_i * 60; self.stop} if duration
 
   end
   
@@ -38,18 +38,24 @@ class InstantEC2
                                credentials: Aws::Credentials.new(*credentials))
 
     r = @ec2.describe_instances.reservations
-    image_ids = r.map{|x| x[:instances][0][:image_id] }
-    image_names = @ec2.describe_images(image_ids: image_ids).images.\
-                                                             map{|x| x.name }
-    instance_ids = r.map{|x| x.instances[0].instance_id}
+    
+    ids = @ec2.describe_instances[:reservations].inject({}) do |r, item| 
+      x = item.instances[0]
+      r.merge(x.image_id => x.instance_id)
+    end
+
+    rows = @ec2.describe_images(image_ids: ids.keys)[:images].\
+                                                 map{|x| [x.name, x.image_id] }
 
-    @images = image_names.zip(instance_ids).inject([]) do |r, x|
+    @images = rows.inject([]) do |r, x|
 
-      name, id = x
-      r << EC2Instance.new({image_name: name, instance_id: id}, self)
+      name, image_id = x
+      
+      r << EC2Instance.new({image_name: name, \
+                                         instance_id: ids[image_id]}, self)
       
     end
-    
+
     @hooks = {
       running: ->(ip){ 
         puts "%s: the instance is now accessible from %s" % [Time.now, ip]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instant_ec2
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - James Robertson