marathon_deploy 0.1.53 → 0.1.54

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/marathon_deploy/deployment.rb +8 -3
  3. data/lib/marathon_deploy/version.rb +1 -1
  4. metadata +26 -27
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b13ef45b8bba9c71cf8f52ed306bd57a5ff382ab
4
- data.tar.gz: 1fe370e82cdf987d63b578f4542fe7710d0a1e36
3
+ metadata.gz: 56aa5c81bad40c47bf112ff8cec36f859d3706ce
4
+ data.tar.gz: 6063decec7f1a13cf98b82916e9c7f993b9fd29b
5
5
  SHA512:
6
- metadata.gz: c0ef1e1e78f5c5a672337b76dbbdd34a69f68008592ce9ee398b926ac9611800004cfe71bce179564d5a09eb74927c541a879dd7fed670126ff09616ab0dd079
7
- data.tar.gz: 2359d7d49fe6e403fd220ac1cb0b83da78a071faa54bf00c0fc389417b706f26f7bc95c1cd8da92273653170a3e65c86cf02612bd2f851dddcf05d31918bec38
6
+ metadata.gz: 39e4852f16ef71a5311870e2ffe903c9121cfd3a9ad5151bc804f0d50cada69db26cf4e111f7bb67135d1a78fb7beaa720e5a646fe7334c1a3ba79a646945c77
7
+ data.tar.gz: 93d9544b1726289a8f33e3fb58e6e98bc450668f668e7f6892bff3371d6248d354ded440a407f747c0206a022be49e66f477cd1f407702a6f804a029b7939d9a
data/lib/marathon_deploy/deployment.rb CHANGED
@@ -171,7 +171,7 @@ module MarathonDeploy
171
171
  ####### PRIVATE METHODS ##########
172
172
  private
173
173
 
174
- # returns an array of taskIds which are alive
174
+ # returns an array of taskIds or instanceIds (from marathon 1.4.x) which are alive
175
175
  def get_alive(value)
176
176
  raise ArgumentError, "value must be boolean true or false" unless (!!value == value)
177
177
  if (health_checks_defined?)
@@ -190,8 +190,13 @@ module MarathonDeploy
190
190
  check_results = get_healthcheck_results.flatten
191
191
  check_results.each do |task|
192
192
  next if task.nil?
193
- tasks[task[:taskId].to_s] ||= []
194
- tasks[task[:taskId].to_s] << task[:alive]
193
+ if not task[:instanceId].nil?
194
+ id = task[:instanceId].to_s
195
+ else
196
+ id = task[:taskId].to_s
197
+ end
198
+ tasks[id] ||= []
199
+ tasks[id] << task[:alive]
195
200
  end
196
201
 
197
202
  tasks.each do |k,v|
data/lib/marathon_deploy/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MarathonDeploy
2
- VERSION = "0.1.53"
2
+ VERSION = "0.1.54"
3
3
  end
metadata CHANGED
@@ -1,131 +1,131 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: marathon_deploy
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.53
4
+ version: 0.1.54
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Colby
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-02-03 00:00:00.000000000 Z
11
+ date: 2017-04-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: logger
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - '>='
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - '>='
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: json
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - '>='
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ">="
38
+ - - '>='
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: deep_merge
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ~>
46
46
  - !ruby/object:Gem::Version
47
47
  version: '1.0'
48
- - - ">="
48
+ - - '>='
49
49
  - !ruby/object:Gem::Version
50
50
  version: 1.0.1
51
51
  type: :runtime
52
52
  prerelease: false
53
53
  version_requirements: !ruby/object:Gem::Requirement
54
54
  requirements:
55
- - - "~>"
55
+ - - ~>
56
56
  - !ruby/object:Gem::Version
57
57
  version: '1.0'
58
- - - ">="
58
+ - - '>='
59
59
  - !ruby/object:Gem::Version
60
60
  version: 1.0.1
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: bundler
63
63
  requirement: !ruby/object:Gem::Requirement
64
64
  requirements:
65
- - - "~>"
65
+ - - ~>
66
66
  - !ruby/object:Gem::Version
67
67
  version: 1.11.2
68
68
  type: :development
69
69
  prerelease: false
70
70
  version_requirements: !ruby/object:Gem::Requirement
71
71
  requirements:
72
- - - "~>"
72
+ - - ~>
73
73
  - !ruby/object:Gem::Version
74
74
  version: 1.11.2
75
75
  - !ruby/object:Gem::Dependency
76
76
  name: rake
77
77
  requirement: !ruby/object:Gem::Requirement
78
78
  requirements:
79
- - - "~>"
79
+ - - ~>
80
80
  - !ruby/object:Gem::Version
81
81
  version: '10.0'
82
82
  type: :development
83
83
  prerelease: false
84
84
  version_requirements: !ruby/object:Gem::Requirement
85
85
  requirements:
86
- - - "~>"
86
+ - - ~>
87
87
  - !ruby/object:Gem::Version
88
88
  version: '10.0'
89
89
  - !ruby/object:Gem::Dependency
90
90
  name: minitest
91
91
  requirement: !ruby/object:Gem::Requirement
92
92
  requirements:
93
- - - "~>"
93
+ - - ~>
94
94
  - !ruby/object:Gem::Version
95
95
  version: '5.7'
96
96
  type: :development
97
97
  prerelease: false
98
98
  version_requirements: !ruby/object:Gem::Requirement
99
99
  requirements:
100
- - - "~>"
100
+ - - ~>
101
101
  - !ruby/object:Gem::Version
102
102
  version: '5.7'
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: yard
105
105
  requirement: !ruby/object:Gem::Requirement
106
106
  requirements:
107
- - - ">="
107
+ - - '>='
108
108
  - !ruby/object:Gem::Version
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
112
  version_requirements: !ruby/object:Gem::Requirement
113
113
  requirements:
114
- - - ">="
114
+ - - '>='
115
115
  - !ruby/object:Gem::Version
116
116
  version: '0'
117
117
  - !ruby/object:Gem::Dependency
118
118
  name: travis
119
119
  requirement: !ruby/object:Gem::Requirement
120
120
  requirements:
121
- - - ">="
121
+ - - '>='
122
122
  - !ruby/object:Gem::Version
123
123
  version: '0'
124
124
  type: :development
125
125
  prerelease: false
126
126
  version_requirements: !ruby/object:Gem::Requirement
127
127
  requirements:
128
- - - ">="
128
+ - - '>='
129
129
  - !ruby/object:Gem::Version
130
130
  version: '0'
131
131
  description: Pushes a yaml or json file to the Marathon API.
@@ -138,9 +138,9 @@ executables:
138
138
  extensions: []
139
139
  extra_rdoc_files: []
140
140
  files:
141
- - ".gitignore"
142
- - ".ruby-version"
143
- - ".travis.yml"
141
+ - .gitignore
142
+ - .ruby-version
143
+ - .travis.yml
144
144
  - Gemfile
145
145
  - LICENSE.txt
146
146
  - NOTES
@@ -228,17 +228,17 @@ require_paths:
228
228
  - lib
229
229
  required_ruby_version: !ruby/object:Gem::Requirement
230
230
  requirements:
231
- - - ">="
231
+ - - '>='
232
232
  - !ruby/object:Gem::Version
233
233
  version: '0'
234
234
  required_rubygems_version: !ruby/object:Gem::Requirement
235
235
  requirements:
236
- - - ">="
236
+ - - '>='
237
237
  - !ruby/object:Gem::Version
238
238
  version: '0'
239
239
  requirements: []
240
240
  rubyforge_project:
241
- rubygems_version: 2.4.6
241
+ rubygems_version: 2.0.14
242
242
  signing_key:
243
243
  specification_version: 4
244
244
  summary: Mesos/Marathon deployment tool.
@@ -252,4 +252,3 @@ test_files:
252
252
  - test/fixtures/macros.yml
253
253
  - test/macro_test.rb
254
254
  - test/test_helper.rb
255
- has_rdoc: