the-maestro 0.4.1 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/README.rdoc +2 -2
  2. data/VERSION +1 -1
  3. data/lib/maestro/cloud.rb +28 -4
  4. data/the-maestro.gemspec +4 -4
  5. metadata +95 -41
data/README.rdoc CHANGED
@@ -25,7 +25,7 @@ JRuby (1.5.2)
25
25
 
26
26
  Add the following gem dependency to your Rails project's <code>Gemfile</code>:
27
27
 
28
- gem 'the-maestro', '0.4.0', :require => 'maestro'
28
+ gem 'the-maestro', '0.4.2', :require => 'maestro'
29
29
 
30
30
  Then run the following to install the Maestro gem:
31
31
 
@@ -44,7 +44,7 @@ Add the following gem dependency to your Rails project's <code>config/environmen
44
44
 
45
45
  Rails::Initializer.run do |config|
46
46
 
47
- config.gem "the-maestro", :lib => "maestro", :version => "0.4.0", :source => "http://gemcutter.org"
47
+ config.gem "the-maestro", :lib => "maestro", :version => "0.4.2", :source => "http://gemcutter.org"
48
48
 
49
49
  end
50
50
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.1
1
+ 0.4.2
data/lib/maestro/cloud.rb CHANGED
@@ -200,8 +200,20 @@ module Maestro
200
200
  channel.request_pty {|ch, success| abort "could not obtain pty" if !success}
201
201
  channel.exec(cmd) do |ch, success|
202
202
  @logger.progress "."
203
- ch.on_data {|ch, data| the_node.logger.info data}
204
- ch.on_extended_data {|ch, data| the_node.logger.error }
203
+ ch.on_data do |ch2, data2|
204
+ begin
205
+ the_node.logger.info data2
206
+ rescue StandardError => err
207
+ the_node.logger.error "Unexpected error logging: #{err.to_s}"
208
+ end
209
+ end
210
+ ch.on_extended_data do |ch2, data2|
211
+ begin
212
+ the_node.logger.error data2
213
+ rescue StandardError => err
214
+ the_node.logger.error "Unexpected error logging: #{err.to_s}"
215
+ end
216
+ end
205
217
  end
206
218
  end
207
219
  end
@@ -274,8 +286,20 @@ module Maestro
274
286
  else
275
287
  node_cmd = cmd + " -j '#{node_json_url(the_node)}'"
276
288
  channel.exec(node_cmd) do |ch, success|
277
- ch.on_data {|ch2, data2| the_node.logger.info data2}
278
- ch.on_extended_data {|ch2, data2| the_node.logger.error data2}
289
+ ch.on_data do |ch2, data2|
290
+ begin
291
+ the_node.logger.info data2
292
+ rescue StandardError => err
293
+ the_node.logger.error "Unexpected error logging: #{err.to_s}"
294
+ end
295
+ end
296
+ ch.on_extended_data do |ch2, data2|
297
+ begin
298
+ the_node.logger.error data2
299
+ rescue StandardError => err
300
+ the_node.logger.error "Unexpected error logging: #{err.to_s}"
301
+ end
302
+ end
279
303
  end
280
304
  end
281
305
  end
data/the-maestro.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{the-maestro}
8
- s.version = "0.4.1"
8
+ s.version = "0.4.2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Brian Ploetz"]
12
- s.date = %q{2010-10-10}
12
+ s.date = %q{2010-10-17}
13
13
  s.description = %q{Maestro is a cloud provisioning, configuration, and management utility for your Ruby and Ruby On Rails applications.}
14
14
  s.extra_rdoc_files = [
15
15
  "LICENSE",
@@ -81,7 +81,7 @@ Gem::Specification.new do |s|
81
81
  s.homepage = %q{http://github.com/bploetz/maestro}
82
82
  s.rdoc_options = ["--charset=UTF-8"]
83
83
  s.require_paths = ["lib"]
84
- s.rubygems_version = %q{1.3.5}
84
+ s.rubygems_version = %q{1.3.7}
85
85
  s.summary = %q{Maestro: Conduct your clouds.}
86
86
  s.test_files = [
87
87
  "test/integration/base_aws.rb",
@@ -117,7 +117,7 @@ Gem::Specification.new do |s|
117
117
  current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
118
118
  s.specification_version = 3
119
119
 
120
- if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
120
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
121
121
  s.add_development_dependency(%q<thoughtbot-shoulda>, ["= 2.10.2"])
122
122
  s.add_runtime_dependency(%q<net-ssh>, ["= 2.0.15"])
123
123
  s.add_runtime_dependency(%q<net-scp>, ["= 1.0.2"])
metadata CHANGED
@@ -1,7 +1,12 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: the-maestro
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ prerelease: false
5
+ segments:
6
+ - 0
7
+ - 4
8
+ - 2
9
+ version: 0.4.2
5
10
  platform: ruby
6
11
  authors:
7
12
  - Brian Ploetz
@@ -9,99 +14,144 @@ autorequire:
9
14
  bindir: bin
10
15
  cert_chain: []
11
16
 
12
- date: 2010-10-10 00:00:00 -04:00
17
+ date: 2010-10-17 00:00:00 -04:00
13
18
  default_executable:
14
19
  dependencies:
15
20
  - !ruby/object:Gem::Dependency
16
21
  name: thoughtbot-shoulda
17
- type: :development
18
- version_requirement:
19
- version_requirements: !ruby/object:Gem::Requirement
22
+ prerelease: false
23
+ requirement: &id001 !ruby/object:Gem::Requirement
24
+ none: false
20
25
  requirements:
21
26
  - - "="
22
27
  - !ruby/object:Gem::Version
28
+ segments:
29
+ - 2
30
+ - 10
31
+ - 2
23
32
  version: 2.10.2
24
- version:
33
+ type: :development
34
+ version_requirements: *id001
25
35
  - !ruby/object:Gem::Dependency
26
36
  name: net-ssh
27
- type: :runtime
28
- version_requirement:
29
- version_requirements: !ruby/object:Gem::Requirement
37
+ prerelease: false
38
+ requirement: &id002 !ruby/object:Gem::Requirement
39
+ none: false
30
40
  requirements:
31
41
  - - "="
32
42
  - !ruby/object:Gem::Version
43
+ segments:
44
+ - 2
45
+ - 0
46
+ - 15
33
47
  version: 2.0.15
34
- version:
48
+ type: :runtime
49
+ version_requirements: *id002
35
50
  - !ruby/object:Gem::Dependency
36
51
  name: net-scp
37
- type: :runtime
38
- version_requirement:
39
- version_requirements: !ruby/object:Gem::Requirement
52
+ prerelease: false
53
+ requirement: &id003 !ruby/object:Gem::Requirement
54
+ none: false
40
55
  requirements:
41
56
  - - "="
42
57
  - !ruby/object:Gem::Version
58
+ segments:
59
+ - 1
60
+ - 0
61
+ - 2
43
62
  version: 1.0.2
44
- version:
63
+ type: :runtime
64
+ version_requirements: *id003
45
65
  - !ruby/object:Gem::Dependency
46
66
  name: net-ssh-multi
47
- type: :runtime
48
- version_requirement:
49
- version_requirements: !ruby/object:Gem::Requirement
67
+ prerelease: false
68
+ requirement: &id004 !ruby/object:Gem::Requirement
69
+ none: false
50
70
  requirements:
51
71
  - - "="
52
72
  - !ruby/object:Gem::Version
73
+ segments:
74
+ - 1
75
+ - 0
76
+ - 1
53
77
  version: 1.0.1
54
- version:
78
+ type: :runtime
79
+ version_requirements: *id004
55
80
  - !ruby/object:Gem::Dependency
56
81
  name: net-ssh-gateway
57
- type: :runtime
58
- version_requirement:
59
- version_requirements: !ruby/object:Gem::Requirement
82
+ prerelease: false
83
+ requirement: &id005 !ruby/object:Gem::Requirement
84
+ none: false
60
85
  requirements:
61
86
  - - "="
62
87
  - !ruby/object:Gem::Version
88
+ segments:
89
+ - 1
90
+ - 0
91
+ - 1
63
92
  version: 1.0.1
64
- version:
93
+ type: :runtime
94
+ version_requirements: *id005
65
95
  - !ruby/object:Gem::Dependency
66
96
  name: archive-tar-minitar
67
- type: :runtime
68
- version_requirement:
69
- version_requirements: !ruby/object:Gem::Requirement
97
+ prerelease: false
98
+ requirement: &id006 !ruby/object:Gem::Requirement
99
+ none: false
70
100
  requirements:
71
101
  - - "="
72
102
  - !ruby/object:Gem::Version
103
+ segments:
104
+ - 0
105
+ - 5
106
+ - 2
73
107
  version: 0.5.2
74
- version:
108
+ type: :runtime
109
+ version_requirements: *id006
75
110
  - !ruby/object:Gem::Dependency
76
111
  name: amazon-ec2
77
- type: :runtime
78
- version_requirement:
79
- version_requirements: !ruby/object:Gem::Requirement
112
+ prerelease: false
113
+ requirement: &id007 !ruby/object:Gem::Requirement
114
+ none: false
80
115
  requirements:
81
116
  - - "="
82
117
  - !ruby/object:Gem::Version
118
+ segments:
119
+ - 0
120
+ - 9
121
+ - 11
83
122
  version: 0.9.11
84
- version:
123
+ type: :runtime
124
+ version_requirements: *id007
85
125
  - !ruby/object:Gem::Dependency
86
126
  name: aws-s3
87
- type: :runtime
88
- version_requirement:
89
- version_requirements: !ruby/object:Gem::Requirement
127
+ prerelease: false
128
+ requirement: &id008 !ruby/object:Gem::Requirement
129
+ none: false
90
130
  requirements:
91
131
  - - "="
92
132
  - !ruby/object:Gem::Version
133
+ segments:
134
+ - 0
135
+ - 6
136
+ - 2
93
137
  version: 0.6.2
94
- version:
138
+ type: :runtime
139
+ version_requirements: *id008
95
140
  - !ruby/object:Gem::Dependency
96
141
  name: log4r
97
- type: :runtime
98
- version_requirement:
99
- version_requirements: !ruby/object:Gem::Requirement
142
+ prerelease: false
143
+ requirement: &id009 !ruby/object:Gem::Requirement
144
+ none: false
100
145
  requirements:
101
146
  - - "="
102
147
  - !ruby/object:Gem::Version
148
+ segments:
149
+ - 1
150
+ - 1
151
+ - 7
103
152
  version: 1.1.7
104
- version:
153
+ type: :runtime
154
+ version_requirements: *id009
105
155
  description: Maestro is a cloud provisioning, configuration, and management utility for your Ruby and Ruby On Rails applications.
106
156
  email:
107
157
  executables: []
@@ -183,21 +233,25 @@ rdoc_options:
183
233
  require_paths:
184
234
  - lib
185
235
  required_ruby_version: !ruby/object:Gem::Requirement
236
+ none: false
186
237
  requirements:
187
238
  - - ">="
188
239
  - !ruby/object:Gem::Version
240
+ segments:
241
+ - 0
189
242
  version: "0"
190
- version:
191
243
  required_rubygems_version: !ruby/object:Gem::Requirement
244
+ none: false
192
245
  requirements:
193
246
  - - ">="
194
247
  - !ruby/object:Gem::Version
248
+ segments:
249
+ - 0
195
250
  version: "0"
196
- version:
197
251
  requirements: []
198
252
 
199
253
  rubyforge_project:
200
- rubygems_version: 1.3.5
254
+ rubygems_version: 1.3.7
201
255
  signing_key:
202
256
  specification_version: 3
203
257
  summary: "Maestro: Conduct your clouds."