bosh_cli_plugin_micro 1.2411.0 → 1.2416.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/lib/bosh/cli/commands/micro.rb +2 -2
  2. data/lib/bosh/deployer/deployer_renderer.rb +19 -14
  3. data/lib/bosh/deployer/version.rb +1 -1
  4. metadata +24 -24
data/lib/bosh/cli/commands/micro.rb CHANGED
@@ -171,7 +171,7 @@ module Bosh::Cli::Command
171
171
  stemcell_archive = Bosh::Stemcell::Archive.new(stemcell)
172
172
  end
173
173
 
174
- renderer = Bosh::Deployer::DeployerRenderer.new
174
+ renderer = Bosh::Deployer::DeployerRenderer.new(Bosh::Cli::TaskTracking::EventLogRenderer.new)
175
175
  renderer.start
176
176
  deployer.renderer = renderer
177
177
 
@@ -208,7 +208,7 @@ module Bosh::Cli::Command
208
208
  return
209
209
  end
210
210
 
211
- renderer = Bosh::Deployer::DeployerRenderer.new
211
+ renderer = Bosh::Deployer::DeployerRenderer.new(Bosh::Cli::TaskTracking::EventLogRenderer.new)
212
212
  renderer.start
213
213
  deployer.renderer = renderer
214
214
 
data/lib/bosh/deployer/deployer_renderer.rb CHANGED
@@ -1,17 +1,16 @@
1
1
  module Bosh::Deployer
2
- class DeployerRenderer < Bosh::Cli::TaskTracking::EventLogRenderer
3
- attr_accessor :stage, :total, :index
2
+ class DeployerRenderer
3
+ DEFAULT_POLL_INTERVAL = 0.1
4
4
 
5
- DEFAULT_POLL_INTERVAL = 1
6
-
7
- def interval_poll
8
- Bosh::Cli::Config.poll_interval || DEFAULT_POLL_INTERVAL
5
+ def initialize(event_log_renderer)
6
+ @event_log_renderer = event_log_renderer
7
+ @index = 0
9
8
  end
10
9
 
11
10
  def start
12
11
  @thread = Thread.new do
13
12
  loop do
14
- refresh
13
+ @event_log_renderer.refresh
15
14
  sleep(interval_poll)
16
15
  end
17
16
  end
@@ -19,7 +18,7 @@ module Bosh::Deployer
19
18
 
20
19
  def finish(state)
21
20
  @thread.kill
22
- super(state)
21
+ @event_log_renderer.finish(state)
23
22
  end
24
23
 
25
24
  def enter_stage(stage, total)
@@ -28,10 +27,6 @@ module Bosh::Deployer
28
27
  @index = 0
29
28
  end
30
29
 
31
- def parse_event(event)
32
- event
33
- end
34
-
35
30
  def update(state, task)
36
31
  event = {
37
32
  'time' => Time.now,
@@ -41,12 +36,22 @@ module Bosh::Deployer
41
36
  'index' => @index + 1,
42
37
  'total' => @total,
43
38
  'state' => state.to_s,
44
- 'progress' => state == :finished ? 100 : 0
39
+ 'progress' => state == :finished ? 100 : 0,
45
40
  }
46
41
 
47
- add_event(event)
42
+ @event_log_renderer.add_output(JSON.generate(event))
48
43
 
49
44
  @index += 1 if state == :finished
50
45
  end
46
+
47
+ def duration
48
+ @event_log_renderer.duration
49
+ end
50
+
51
+ private
52
+
53
+ def interval_poll
54
+ Bosh::Cli::Config.poll_interval || DEFAULT_POLL_INTERVAL
55
+ end
51
56
  end
52
57
  end
data/lib/bosh/deployer/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Deployer
3
- VERSION = '1.2411.0'
3
+ VERSION = '1.2416.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh_cli_plugin_micro
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2411.0
4
+ version: 1.2416.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-04-16 00:00:00.000000000 Z
12
+ date: 2014-04-17 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sqlite3
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - ~>
36
36
  - !ruby/object:Gem::Version
37
- version: 1.2411.0
37
+ version: 1.2416.0
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
42
42
  requirements:
43
43
  - - ~>
44
44
  - !ruby/object:Gem::Version
45
- version: 1.2411.0
45
+ version: 1.2416.0
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: bosh-stemcell
48
48
  requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
50
50
  requirements:
51
51
  - - ~>
52
52
  - !ruby/object:Gem::Version
53
- version: 1.2411.0
53
+ version: 1.2416.0
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
58
58
  requirements:
59
59
  - - ~>
60
60
  - !ruby/object:Gem::Version
61
- version: 1.2411.0
61
+ version: 1.2416.0
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: bosh-registry
64
64
  requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
66
66
  requirements:
67
67
  - - ~>
68
68
  - !ruby/object:Gem::Version
69
- version: 1.2411.0
69
+ version: 1.2416.0
70
70
  type: :runtime
71
71
  prerelease: false
72
72
  version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
74
74
  requirements:
75
75
  - - ~>
76
76
  - !ruby/object:Gem::Version
77
- version: 1.2411.0
77
+ version: 1.2416.0
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: agent_client
80
80
  requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
82
82
  requirements:
83
83
  - - ~>
84
84
  - !ruby/object:Gem::Version
85
- version: 1.2411.0
85
+ version: 1.2416.0
86
86
  type: :runtime
87
87
  prerelease: false
88
88
  version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
90
90
  requirements:
91
91
  - - ~>
92
92
  - !ruby/object:Gem::Version
93
- version: 1.2411.0
93
+ version: 1.2416.0
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: bosh_cpi
96
96
  requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
98
98
  requirements:
99
99
  - - ~>
100
100
  - !ruby/object:Gem::Version
101
- version: 1.2411.0
101
+ version: 1.2416.0
102
102
  type: :runtime
103
103
  prerelease: false
104
104
  version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
106
106
  requirements:
107
107
  - - ~>
108
108
  - !ruby/object:Gem::Version
109
- version: 1.2411.0
109
+ version: 1.2416.0
110
110
  - !ruby/object:Gem::Dependency
111
111
  name: bosh_aws_cpi
112
112
  requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
114
114
  requirements:
115
115
  - - ~>
116
116
  - !ruby/object:Gem::Version
117
- version: 1.2411.0
117
+ version: 1.2416.0
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
122
122
  requirements:
123
123
  - - ~>
124
124
  - !ruby/object:Gem::Version
125
- version: 1.2411.0
125
+ version: 1.2416.0
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: bosh_openstack_cpi
128
128
  requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
130
130
  requirements:
131
131
  - - ~>
132
132
  - !ruby/object:Gem::Version
133
- version: 1.2411.0
133
+ version: 1.2416.0
134
134
  type: :runtime
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
138
138
  requirements:
139
139
  - - ~>
140
140
  - !ruby/object:Gem::Version
141
- version: 1.2411.0
141
+ version: 1.2416.0
142
142
  - !ruby/object:Gem::Dependency
143
143
  name: bosh_vcloud_cpi
144
144
  requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
162
162
  requirements:
163
163
  - - ~>
164
164
  - !ruby/object:Gem::Version
165
- version: 1.2411.0
165
+ version: 1.2416.0
166
166
  type: :runtime
167
167
  prerelease: false
168
168
  version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
170
170
  requirements:
171
171
  - - ~>
172
172
  - !ruby/object:Gem::Version
173
- version: 1.2411.0
173
+ version: 1.2416.0
174
174
  - !ruby/object:Gem::Dependency
175
175
  name: bosh-director-core
176
176
  requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
178
178
  requirements:
179
179
  - - ~>
180
180
  - !ruby/object:Gem::Version
181
- version: 1.2411.0
181
+ version: 1.2416.0
182
182
  type: :runtime
183
183
  prerelease: false
184
184
  version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
186
186
  requirements:
187
187
  - - ~>
188
188
  - !ruby/object:Gem::Version
189
- version: 1.2411.0
189
+ version: 1.2416.0
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: blobstore_client
192
192
  requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
194
194
  requirements:
195
195
  - - ~>
196
196
  - !ruby/object:Gem::Version
197
- version: 1.2411.0
197
+ version: 1.2416.0
198
198
  type: :runtime
199
199
  prerelease: false
200
200
  version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
202
202
  requirements:
203
203
  - - ~>
204
204
  - !ruby/object:Gem::Version
205
- version: 1.2411.0
205
+ version: 1.2416.0
206
206
  - !ruby/object:Gem::Dependency
207
207
  name: rspec
208
208
  requirement: !ruby/object:Gem::Requirement
@@ -237,7 +237,7 @@ dependencies:
237
237
  version: '0'
238
238
  description: ! 'BOSH CLI plugin for Micro BOSH deployment
239
239
 
240
- a126f7'
240
+ 7ca225'
241
241
  email: support@cloudfoundry.com
242
242
  executables: []
243
243
  extensions: []
@@ -294,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
294
294
  version: '0'
295
295
  segments:
296
296
  - 0
297
- hash: 2116467383396972478
297
+ hash: -3774776269693316751
298
298
  requirements: []
299
299
  rubyforge_project:
300
300
  rubygems_version: 1.8.23