rudy 0.9.4 → 0.9.5

data/CHANGES.txt

@@ -1,6 +1,12 @@
 RUDY, CHANGES 
 
 
+#### 0.9.5 (2009-09-01) ###########################
+
+* FIXED: Unknown method error, 'li' 
+* ADDED: Better error handling for disk routines
+
+
 #### 0.9.4 (2009-08-28) ###########################
 
 * FIXED: NoMachines exception when running various dependency scenarios

data/lib/rudy.rb

@@ -42,7 +42,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 9.freeze
-      TINY  = 4.freeze
+      TINY  = 5.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end

data/lib/rudy/cli/base.rb

@@ -46,10 +46,10 @@ module Rudy::CLI
         exit 1
       end
 
-      if @@global.environment =~ /^prod/ && Rudy.debug?
-        li Rudy::Utils.banner("PRODUCTION ACCESS IS DISABLED IN DEBUG MODE")
-        exit 1
-      end
+      #if @@global.environment =~ /^prod/ && Rudy.debug?
+      #  li Rudy::Utils.banner("PRODUCTION ACCESS IS DISABLED IN DEBUG MODE")
+      #  exit 1
+      #end
 
       if @@global.verbose >= 4    # -vvvv
         format = @@global.format == :json ? :json : :yaml

data/lib/rudy/config.rb

@@ -106,12 +106,12 @@ module Rudy
     def self.init_config_dir
       
       unless File.exists?(Rudy::CONFIG_DIR)
-        li "Creating #{Rudy::CONFIG_DIR}"
+        puts "Creating #{Rudy::CONFIG_DIR}"
         Dir.mkdir(Rudy::CONFIG_DIR, 0700)
       end
 
       unless File.exists?(Rudy::CONFIG_FILE)
-        li "Creating #{Rudy::CONFIG_FILE}"
+        puts "Creating #{Rudy::CONFIG_FILE}"
         rudy_config = Rudy::Utils.without_indent %Q`
           accounts {                           # Account Access Indentifiers
             aws {                              # amazon web services 

data/lib/rudy/routines.rb

@@ -110,7 +110,7 @@ module Rudy
           end
          end
       rescue Interrupt
-        li "Aborting..."
+        Rudy::Huxtable.li "Aborting..."
         exit 12
       end
       ret

data/lib/rudy/routines/handlers/disks.rb

@@ -88,22 +88,25 @@ module Rudy::Routines::Handlers;
       
       disk.index = index  # Needed for windows
       
-      unless @@global.force
-        raise Rudy::Disks::AlreadyAttached, disk.name if disk.volume_attached?
-      end
-      
-      unless disk.volume_exists?
-        msg = "Creating volume... "
-        disk.create
-        Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
-          disk.volume_available?
-        }
-      end
+      Rudy::Routines.rescue {
+        unless disk.volume_exists?
+          msg = "Creating volume... "
+          disk.create
+          Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
+            disk.volume_available?
+          }
+        end
+      }
       
-      attach rbox, disk, index unless disk.volume_attached?
-      format rbox, disk, index if disk.raw?
-      mount rbox, disk, index unless disk.mounted?
-
+      Rudy::Routines.rescue {
+        attach rbox, disk, index unless disk.volume_attached?
+      }
+      Rudy::Routines.rescue {
+        format rbox, disk, index if disk.raw?
+      }
+      Rudy::Routines.rescue {
+        mount rbox, disk, index unless disk.mounted?
+      }
       disk.save :replace
     end
     
@@ -121,23 +124,27 @@ module Rudy::Routines::Handlers;
       umount rbox, disk, index if disk.mounted?
       raise Rudy::Disks::InUse, disk.name if disk.mounted?
       
-      msg = "Detaching #{disk.volid}..."
-      disk.volume_detach 
-      Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
-        disk.volume_available? 
+      Rudy::Routines.rescue {
+        msg = "Detaching #{disk.volid}..."
+        disk.volume_detach 
+        Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
+          disk.volume_available? 
+        }
       }
-
+      
     end
     
     def attach(rbox, disk, index)
       
-      unless disk.volume_exists?
-        msg = "Creating volume... "
-        disk.create
-        Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
-          disk.volume_available?
-        }
-      end
+      Rudy::Routines.rescue {
+        unless disk.volume_exists?
+          msg = "Creating volume... "
+          disk.create
+          Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
+            disk.volume_available?
+          }
+        end
+      }
       
       raise Rudy::Metadata::UnknownObject, disk.name unless disk.exists?
       disk.refresh!
@@ -153,12 +160,13 @@ module Rudy::Routines::Handlers;
         disk.save :replace
       end
       
-      msg = "Attaching #{disk.volid} to #{rbox.stash.instid}... "
-      disk.volume_attach(rbox.stash.instid)
-      Rudy::Utils.waiter(3, 30, STDOUT, msg) { 
-        disk.volume_attached?
+      Rudy::Routines.rescue {
+        msg = "Attaching #{disk.volid} to #{rbox.stash.instid}... "
+        disk.volume_attach(rbox.stash.instid)
+        Rudy::Utils.waiter(3, 30, STDOUT, msg) { 
+          disk.volume_attached?
+        }
       }
-
     end
     
     def mount(rbox, disk, index)
@@ -181,7 +189,6 @@ module Rudy::Routines::Handlers;
       
       li "Mounting at #{disk.path}... "
       
-      
       rbox.mkdir(:p, disk.path)
       rbox.mount(:t, disk.fstype, disk.device, disk.path) 
       disk.mounted = true
@@ -257,8 +264,10 @@ module Rudy::Routines::Handlers;
         raise Rudy::Disks::InUse, disk.name if disk.volume_attached?
       end
       
-      li "Destroying #{disk.name}"
-      disk.destroy
+      Rudy::Routines.rescue {
+        li "Destroying #{disk.name}"
+        disk.destroy
+      }
     end
     
     def archive(rbox, disk, index)
@@ -267,8 +276,10 @@ module Rudy::Routines::Handlers;
       
       raise Rudy::Disks::NotAttached, disk.name if !disk.volume_attached?
       
-      back = disk.archive
-      li "Created backup: #{back.name}"
+      Rudy::Routines.rescue {
+        li "Creating backup: #{back.name}"
+        back = disk.archive
+      }
     end
     
     def restore(rbox, disk, index)
@@ -292,15 +303,17 @@ module Rudy::Routines::Handlers;
       
       li "Backup found: #{latest_backup.name}"
       
-      unless disk.volume_exists?
-        msg = "Creating volume... "
-        disk.create latest_backup.size, latest_backup.zone, latest_backup.snapid
-        Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
-          disk.volume_available?
-        }
-        disk.raw = false
-        disk.save :replace  
-      end
+      Rudy::Routines.rescue {
+        unless disk.volume_exists?
+          msg = "Creating volume... "
+          disk.create latest_backup.size, latest_backup.zone, latest_backup.snapid
+          Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
+            disk.volume_available?
+          }
+          disk.raw = false
+          disk.save :replace  
+        end
+      }
       
       attach rbox, disk, index unless disk.volume_attached?
       mount rbox, disk, index unless disk.mounted?

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.9.4"
+	s.version = "0.9.5"
 	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-28 00:00:00 -04:00
+date: 2009-09-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency