instant_ec2 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42cfc79bfd329aa789ce68b9d7b955699c9eebfb
-  data.tar.gz: d9af3f8b46f88b3b95f149fa48ac3bb337b6c2da
+  metadata.gz: df4c6b926f369e4b1cb6cdbad52818d61781ce71
+  data.tar.gz: 41a8663e649b6fe159814f5b0891cd1f8e2fd1c0
 SHA512:
-  metadata.gz: 1b2b7d7edeaf36e7378a0215bd999fa7ee97227765f4f2c822a927decb164a6e6dc6fd1783d05d46b71d3420548ed417f6ee4d0765bd96304ed52ec8b7ca54e0
-  data.tar.gz: d9526ba7df9a67fe8873c9c520c557c041fd3b70bcd56f6f3d7db39b7d492c591ed3dc046e37be737d9c6ace8ae873e66e88d50242b47be5c45ed6db4fd2f379
+  metadata.gz: f2a029b6746f3e63e7b48cde244ce7b122ce96a9accf89904278da34b53fc7f808842125173342d189872008d7d6d689254a12770eb1cc983426db2f907391e4
+  data.tar.gz: dbbb8484a8ccc37817376d48fae13ea261b7f0828bd93254c8f7e227505c810dffbd22b54648e1a152fe483ded1931c4aefa4850a19cf158bcbe211448b03259

data/lib/instant_ec2.rb

@@ -16,8 +16,19 @@ class EC2Instance < Hash
 
   def start(duration: nil)
 
-    @c.start_instance self[:instance_id]       
-    Thread.new{ sleep duration.to_i * 60; self.stop} if duration
+    @c.start_instance self[:instance_id]
+    
+    if duration then
+      
+      seconds = duration.to_i * 60
+      
+      if @c.async then
+        Thread.new{ sleep seconds; self.stop} 
+      else
+        sleep seconds
+        self.stop
+      end
+    end
 
   end
   
@@ -30,9 +41,11 @@ end
 
 class InstantEC2
 
-  attr_reader :images
+  attr_reader :images, :async
 
-  def initialize(credentials: [], region: 'us-east-1')
+  def initialize(credentials: [], region: 'us-east-1', async: true)
+    
+    @async = async
 
     @ec2 = Aws::EC2::Client.new(region: region, 
                                credentials: Aws::Credentials.new(*credentials))
@@ -57,6 +70,9 @@ class InstantEC2
     end
 
     @hooks = {
+      pending: ->(){ 
+        puts "%s: the instance is now pending" % [Time.now]
+      },
       running: ->(ip){ 
         puts "%s: the instance is now accessible from %s" % [Time.now, ip]
       },
@@ -68,11 +84,19 @@ class InstantEC2
   def find_image(s)
     @images.find {|x| x[:image_name][/#{s}/i]}
   end
+  
+  def find_pending()
+
+    r = @ec2.describe_instances.reservations.detect do |x|
+      x.instances[0].state.name == 'pending'
+    end
+
+  end  
 
   def find_running()
 
     r = @ec2.describe_instances.reservations.detect do |x|
-      x.instances[0].state.name != 'stopped'
+      x.instances[0].state.name == 'running'
     end
 
   end
@@ -81,10 +105,18 @@ class InstantEC2
     r = self.find_running
     r.instances[0].public_ip_address if r
   end
+
+  def on_pending(&blk)
+    @hooks[:pending]= blk
+  end  
   
   def on_running(&blk)
     @hooks[:running] = blk
   end    
+                                                 
+  def on_stopped(&blk)
+    @hooks[:stopped] = blk
+  end                                                   
   
   def running?
     self.ip ? true : false
@@ -100,7 +132,7 @@ class InstantEC2
 
   def start_instance(id)
     @ec2.start_instances instance_ids: [id]
-    Thread.new { trigger_on_start() }
+    @async ? Thread.new { trigger_on_start() } : trigger_on_start()
   end
   
   def stop()
@@ -120,16 +152,13 @@ class InstantEC2
   
   def stop_instance(id)
     @ec2.stop_instances instance_ids: [id]
-    trigger_on_stopping()    
+    @async ? Thread.new { trigger_on_stopping() } : trigger_on_stopping()
   end
 
   def stopped?()
     self.ip.nil?
   end
   
-  def on_stopped(&blk)
-    @hooks[:stopped] = blk
-  end  
   
   private
   
@@ -137,7 +166,23 @@ class InstantEC2
     
     # timeout after 60 seconds
     t1 = Time.now
-    sleep 1; ip = self.ip until ip or Time.now > t1 + 60
+    sleep 10
+    sleep 2; pending = self.find_pending() until pending or Time.now > t1 + 60
+    
+    if pending then
+      @hooks[:pending].call()
+      trigger_on_running()
+    else
+      puts 'on_running timedout'
+    end
+    
+  end
+                                                 
+  def trigger_on_running()
+    
+    # timeout after 30 seconds
+    t1 = Time.now
+    sleep 1; ip = self.ip until ip or Time.now > t1 + 30
     
     if ip then 
       @hooks[:running].call(ip)
@@ -145,13 +190,14 @@ class InstantEC2
       puts 'on_running timedout'
     end
     
-  end
+  end                                                 
   
   def trigger_on_stopping()
     
     # timeout after 30 seconds
     t1 = Time.now
-    sleep 1; ip = self.ip until ip.nil? or Time.now > t1 + 30
+    sleep 7
+    sleep 2; ip = self.ip until ip.nil? or Time.now > t1 + 30
     
     if ip.nil? then 
       @hooks[:stopping].call()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instant_ec2
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   I2p/gjcBfDCdq3/4DlrprfJdiPD30+XqKCWbt0NOod/6Ky8nvmilmfrciMvsgp+g
   bO5j5Um4EdA15w==
   -----END CERTIFICATE-----
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk