skyed 0.1.13 → 0.1.14

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 252c06eb53f9953de17404e021ee2f3deb44fe4f
4
- data.tar.gz: 4e920d1b31974964520910e9f71c07eed3f9a8b6
3
+ metadata.gz: 0b4c7edec9afbcff17635e187a596fbe520da43b
4
+ data.tar.gz: 81554b47a088fbabb486b43412f1f18cfe390a6e
5
5
  SHA512:
6
- metadata.gz: 427e9d0a29fb3f1e77f64f76d0e81f415d96600bfb7b85ccba869744d5a9e101acd149658964d9e0762496088fecf2d7c108cd043250a0f3bd3044c81fe2b346
7
- data.tar.gz: 2a305e4db96e5029f28d35c3a64eb1fdceab0fa572ca30c67f1ce1c96b94de71b1bc250f253693f56fa34ef207d12cc8b51a280d37b86fab1a25cb6a9b34ca11
6
+ metadata.gz: cf6170b754fb52439b847353c2fa6a703a5c33fdb6b1e2d3bb6cb25ee41e161694232d2c38928e2cd0e5e184bcc350dc6221bfe049f3bbdde05707a5e9b1e891
7
+ data.tar.gz: af4744a0223f3f2af751d3e8c52ec8f096f3f594bb20e8ccfa6681daaab4516caba13bcba40c472bd72609ad85395f9689a0fe62b819a95ea3d75a64077eeaa9
data/lib/skyed.rb CHANGED
@@ -13,5 +13,5 @@ require 'skyed/settings'
13
13
 
14
14
  # Skyed is a set of tools for cloud computing
15
15
  module Skyed
16
- VERSION = '0.1.13'
16
+ VERSION = '0.1.14'
17
17
  end
data/lib/skyed/check.rb CHANGED
@@ -13,24 +13,29 @@ module Skyed
13
13
 
14
14
  def wait_for_backend_restart(elb_name, instance_name, opts)
15
15
  ow = settings(opts)
16
- instance = Skyed::AWS::OpsWorks.instance_by_name(
17
- instance_name,
18
- Skyed::Settings.stack_id,
19
- ow)
16
+ instance_id = instance_by_name(instance_name, ow)
17
+ .ec2_instance_id
20
18
  elb = login('elb')
19
+ wait = opts[:wait_interval] || 0
20
+ timeout = opts[:timeout] || 0
21
21
  [true, false].each do |op|
22
- wait_for_backend(
23
- elb_name, instance.ec2_instance_id, elb, op, opts[:wait_interval])
22
+ wait_for_backend(elb_name, instance_id, elb, op, wait, timeout)
24
23
  end
25
24
  end
26
25
 
27
- def wait_for_backend(elb_name, ec2_instance_id, elb, ok = true, wait = 0)
28
- until ok == Skyed::AWS::ELB.instance_ok?(
29
- elb_name,
30
- ec2_instance_id,
31
- elb
32
- )
26
+ def instance_by_name(name, ow)
27
+ Skyed::AWS::OpsWorks
28
+ .instance_by_name(name, Skyed::Settings.stack_id, ow)
29
+ end
30
+
31
+ def wait_for_backend(
32
+ elb_name, instance_id, elb, *other_args)
33
+ ok, wait, timeout = other_args
34
+ time = 0
35
+ until ok == Skyed::AWS::ELB.instance_ok?(elb_name, instance_id, elb) ||
36
+ time >= timeout
33
37
  Kernel.sleep(wait)
38
+ time += wait
34
39
  end
35
40
  end
36
41
 
@@ -162,6 +162,9 @@ command :check do |cmd|
162
162
  type: String,
163
163
  desc: layer_desc
164
164
  desc = 'Time to wait for AWS responses'
165
+ cmd.flag [:t, :timeout, 'timeout'], default_value: 30,
166
+ type: Integer,
167
+ desc: 'Defines timout for the check'
165
168
  cmd.flag [:w, :wait_interval, 'wait-interval'], default_value: 30,
166
169
  type: Integer,
167
170
  desc: desc
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: skyed
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.13
4
+ version: 0.1.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ignasi Fosch
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-12-15 00:00:00.000000000 Z
11
+ date: 2015-12-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: git