rudy 0.9.4 → 0.9.5

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,6 +1,12 @@
1
1
  RUDY, CHANGES
2
2
 
3
3
 
4
+ #### 0.9.5 (2009-09-01) ###########################
5
+
6
+ * FIXED: Unknown method error, 'li'
7
+ * ADDED: Better error handling for disk routines
8
+
9
+
4
10
  #### 0.9.4 (2009-08-28) ###########################
5
11
 
6
12
  * FIXED: NoMachines exception when running various dependency scenarios
@@ -42,7 +42,7 @@ module Rudy
42
42
  unless defined?(MAJOR)
43
43
  MAJOR = 0.freeze
44
44
  MINOR = 9.freeze
45
- TINY = 4.freeze
45
+ TINY = 5.freeze
46
46
  end
47
47
  def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
48
48
  def self.to_f; self.to_s.to_f; end
@@ -46,10 +46,10 @@ module Rudy::CLI
46
46
  exit 1
47
47
  end
48
48
 
49
- if @@global.environment =~ /^prod/ && Rudy.debug?
50
- li Rudy::Utils.banner("PRODUCTION ACCESS IS DISABLED IN DEBUG MODE")
51
- exit 1
52
- end
49
+ #if @@global.environment =~ /^prod/ && Rudy.debug?
50
+ # li Rudy::Utils.banner("PRODUCTION ACCESS IS DISABLED IN DEBUG MODE")
51
+ # exit 1
52
+ #end
53
53
 
54
54
  if @@global.verbose >= 4 # -vvvv
55
55
  format = @@global.format == :json ? :json : :yaml
@@ -106,12 +106,12 @@ module Rudy
106
106
  def self.init_config_dir
107
107
 
108
108
  unless File.exists?(Rudy::CONFIG_DIR)
109
- li "Creating #{Rudy::CONFIG_DIR}"
109
+ puts "Creating #{Rudy::CONFIG_DIR}"
110
110
  Dir.mkdir(Rudy::CONFIG_DIR, 0700)
111
111
  end
112
112
 
113
113
  unless File.exists?(Rudy::CONFIG_FILE)
114
- li "Creating #{Rudy::CONFIG_FILE}"
114
+ puts "Creating #{Rudy::CONFIG_FILE}"
115
115
  rudy_config = Rudy::Utils.without_indent %Q`
116
116
  accounts { # Account Access Indentifiers
117
117
  aws { # amazon web services
@@ -110,7 +110,7 @@ module Rudy
110
110
  end
111
111
  end
112
112
  rescue Interrupt
113
- li "Aborting..."
113
+ Rudy::Huxtable.li "Aborting..."
114
114
  exit 12
115
115
  end
116
116
  ret
@@ -88,22 +88,25 @@ module Rudy::Routines::Handlers;
88
88
 
89
89
  disk.index = index # Needed for windows
90
90
 
91
- unless @@global.force
92
- raise Rudy::Disks::AlreadyAttached, disk.name if disk.volume_attached?
93
- end
94
-
95
- unless disk.volume_exists?
96
- msg = "Creating volume... "
97
- disk.create
98
- Rudy::Utils.waiter(2, 60, STDOUT, msg) {
99
- disk.volume_available?
100
- }
101
- end
91
+ Rudy::Routines.rescue {
92
+ unless disk.volume_exists?
93
+ msg = "Creating volume... "
94
+ disk.create
95
+ Rudy::Utils.waiter(2, 60, STDOUT, msg) {
96
+ disk.volume_available?
97
+ }
98
+ end
99
+ }
102
100
 
103
- attach rbox, disk, index unless disk.volume_attached?
104
- format rbox, disk, index if disk.raw?
105
- mount rbox, disk, index unless disk.mounted?
106
-
101
+ Rudy::Routines.rescue {
102
+ attach rbox, disk, index unless disk.volume_attached?
103
+ }
104
+ Rudy::Routines.rescue {
105
+ format rbox, disk, index if disk.raw?
106
+ }
107
+ Rudy::Routines.rescue {
108
+ mount rbox, disk, index unless disk.mounted?
109
+ }
107
110
  disk.save :replace
108
111
  end
109
112
 
@@ -121,23 +124,27 @@ module Rudy::Routines::Handlers;
121
124
  umount rbox, disk, index if disk.mounted?
122
125
  raise Rudy::Disks::InUse, disk.name if disk.mounted?
123
126
 
124
- msg = "Detaching #{disk.volid}..."
125
- disk.volume_detach
126
- Rudy::Utils.waiter(2, 60, STDOUT, msg) {
127
- disk.volume_available?
127
+ Rudy::Routines.rescue {
128
+ msg = "Detaching #{disk.volid}..."
129
+ disk.volume_detach
130
+ Rudy::Utils.waiter(2, 60, STDOUT, msg) {
131
+ disk.volume_available?
132
+ }
128
133
  }
129
-
134
+
130
135
  end
131
136
 
132
137
  def attach(rbox, disk, index)
133
138
 
134
- unless disk.volume_exists?
135
- msg = "Creating volume... "
136
- disk.create
137
- Rudy::Utils.waiter(2, 60, STDOUT, msg) {
138
- disk.volume_available?
139
- }
140
- end
139
+ Rudy::Routines.rescue {
140
+ unless disk.volume_exists?
141
+ msg = "Creating volume... "
142
+ disk.create
143
+ Rudy::Utils.waiter(2, 60, STDOUT, msg) {
144
+ disk.volume_available?
145
+ }
146
+ end
147
+ }
141
148
 
142
149
  raise Rudy::Metadata::UnknownObject, disk.name unless disk.exists?
143
150
  disk.refresh!
@@ -153,12 +160,13 @@ module Rudy::Routines::Handlers;
153
160
  disk.save :replace
154
161
  end
155
162
 
156
- msg = "Attaching #{disk.volid} to #{rbox.stash.instid}... "
157
- disk.volume_attach(rbox.stash.instid)
158
- Rudy::Utils.waiter(3, 30, STDOUT, msg) {
159
- disk.volume_attached?
163
+ Rudy::Routines.rescue {
164
+ msg = "Attaching #{disk.volid} to #{rbox.stash.instid}... "
165
+ disk.volume_attach(rbox.stash.instid)
166
+ Rudy::Utils.waiter(3, 30, STDOUT, msg) {
167
+ disk.volume_attached?
168
+ }
160
169
  }
161
-
162
170
  end
163
171
 
164
172
  def mount(rbox, disk, index)
@@ -181,7 +189,6 @@ module Rudy::Routines::Handlers;
181
189
 
182
190
  li "Mounting at #{disk.path}... "
183
191
 
184
-
185
192
  rbox.mkdir(:p, disk.path)
186
193
  rbox.mount(:t, disk.fstype, disk.device, disk.path)
187
194
  disk.mounted = true
@@ -257,8 +264,10 @@ module Rudy::Routines::Handlers;
257
264
  raise Rudy::Disks::InUse, disk.name if disk.volume_attached?
258
265
  end
259
266
 
260
- li "Destroying #{disk.name}"
261
- disk.destroy
267
+ Rudy::Routines.rescue {
268
+ li "Destroying #{disk.name}"
269
+ disk.destroy
270
+ }
262
271
  end
263
272
 
264
273
  def archive(rbox, disk, index)
@@ -267,8 +276,10 @@ module Rudy::Routines::Handlers;
267
276
 
268
277
  raise Rudy::Disks::NotAttached, disk.name if !disk.volume_attached?
269
278
 
270
- back = disk.archive
271
- li "Created backup: #{back.name}"
279
+ Rudy::Routines.rescue {
280
+ li "Creating backup: #{back.name}"
281
+ back = disk.archive
282
+ }
272
283
  end
273
284
 
274
285
  def restore(rbox, disk, index)
@@ -292,15 +303,17 @@ module Rudy::Routines::Handlers;
292
303
 
293
304
  li "Backup found: #{latest_backup.name}"
294
305
 
295
- unless disk.volume_exists?
296
- msg = "Creating volume... "
297
- disk.create latest_backup.size, latest_backup.zone, latest_backup.snapid
298
- Rudy::Utils.waiter(2, 60, STDOUT, msg) {
299
- disk.volume_available?
300
- }
301
- disk.raw = false
302
- disk.save :replace
303
- end
306
+ Rudy::Routines.rescue {
307
+ unless disk.volume_exists?
308
+ msg = "Creating volume... "
309
+ disk.create latest_backup.size, latest_backup.zone, latest_backup.snapid
310
+ Rudy::Utils.waiter(2, 60, STDOUT, msg) {
311
+ disk.volume_available?
312
+ }
313
+ disk.raw = false
314
+ disk.save :replace
315
+ end
316
+ }
304
317
 
305
318
  attach rbox, disk, index unless disk.volume_attached?
306
319
  mount rbox, disk, index unless disk.mounted?
@@ -1,7 +1,7 @@
1
1
  @spec = Gem::Specification.new do |s|
2
2
  s.name = "rudy"
3
3
  s.rubyforge_project = 'rudy'
4
- s.version = "0.9.4"
4
+ s.version = "0.9.5"
5
5
  s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
6
6
  s.description = s.summary
7
7
  s.author = "Delano Mandelbaum"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rudy
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.4
4
+ version: 0.9.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-08-28 00:00:00 -04:00
12
+ date: 2009-09-01 00:00:00 -04:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency