skyed 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 252c06eb53f9953de17404e021ee2f3deb44fe4f
-  data.tar.gz: 4e920d1b31974964520910e9f71c07eed3f9a8b6
+  metadata.gz: 0b4c7edec9afbcff17635e187a596fbe520da43b
+  data.tar.gz: 81554b47a088fbabb486b43412f1f18cfe390a6e
 SHA512:
-  metadata.gz: 427e9d0a29fb3f1e77f64f76d0e81f415d96600bfb7b85ccba869744d5a9e101acd149658964d9e0762496088fecf2d7c108cd043250a0f3bd3044c81fe2b346
-  data.tar.gz: 2a305e4db96e5029f28d35c3a64eb1fdceab0fa572ca30c67f1ce1c96b94de71b1bc250f253693f56fa34ef207d12cc8b51a280d37b86fab1a25cb6a9b34ca11
+  metadata.gz: cf6170b754fb52439b847353c2fa6a703a5c33fdb6b1e2d3bb6cb25ee41e161694232d2c38928e2cd0e5e184bcc350dc6221bfe049f3bbdde05707a5e9b1e891
+  data.tar.gz: af4744a0223f3f2af751d3e8c52ec8f096f3f594bb20e8ccfa6681daaab4516caba13bcba40c472bd72609ad85395f9689a0fe62b819a95ea3d75a64077eeaa9

data/lib/skyed.rb

@@ -13,5 +13,5 @@ require 'skyed/settings'
 
 # Skyed is a set of tools for cloud computing
 module Skyed
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

data/lib/skyed/check.rb

@@ -13,24 +13,29 @@ module Skyed
 
       def wait_for_backend_restart(elb_name, instance_name, opts)
         ow = settings(opts)
-        instance = Skyed::AWS::OpsWorks.instance_by_name(
-          instance_name,
-          Skyed::Settings.stack_id,
-          ow)
+        instance_id = instance_by_name(instance_name, ow)
+                      .ec2_instance_id
         elb = login('elb')
+        wait = opts[:wait_interval] || 0
+        timeout = opts[:timeout] || 0
         [true, false].each do |op|
-          wait_for_backend(
-            elb_name, instance.ec2_instance_id, elb, op, opts[:wait_interval])
+          wait_for_backend(elb_name, instance_id, elb, op, wait, timeout)
         end
       end
 
-      def wait_for_backend(elb_name, ec2_instance_id, elb, ok = true, wait = 0)
-        until ok == Skyed::AWS::ELB.instance_ok?(
-          elb_name,
-          ec2_instance_id,
-          elb
-        )
+      def instance_by_name(name, ow)
+        Skyed::AWS::OpsWorks
+          .instance_by_name(name, Skyed::Settings.stack_id, ow)
+      end
+
+      def wait_for_backend(
+        elb_name, instance_id, elb, *other_args)
+        ok, wait, timeout = other_args
+        time = 0
+        until ok == Skyed::AWS::ELB.instance_ok?(elb_name, instance_id, elb) ||
+              time >= timeout
           Kernel.sleep(wait)
+          time += wait
         end
       end
 

data/lib/skyed/commands.rb

@@ -162,6 +162,9 @@ command :check do |cmd|
                          type: String,
                          desc: layer_desc
   desc = 'Time to wait for AWS responses'
+  cmd.flag [:t, :timeout, 'timeout'], default_value: 30,
+                                      type: Integer,
+                                      desc: 'Defines timout for the check'
   cmd.flag [:w, :wait_interval, 'wait-interval'], default_value: 30,
                                                   type: Integer,
                                                   desc: desc

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skyed
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Ignasi Fosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git