Re-added create and destroy actions for "rudy disks"

CHANGES.txt

@@ -20,6 +20,8 @@ RUDY, CHANGES
 * ADDED: "rudy keypairs"
 * ADDED: "rudy networks --authorize"
 * ADDED: "rudy networks --revoke"
+* ADDED: "rudy disks --create"
+* ADDED: "rudy disks --destroy"
 * ADDED: Support for attaching and formating disks in Windows. 
 
 

lib/rudy/cli/disks.rb

@@ -61,22 +61,53 @@ def disks_wash
       end
 
       def disks_create_valid?
+        @mlist = Rudy::Machines.list
+        raise "No machines" if @mlist.nil?
+
         raise "No path provided" unless @argv.first
+        if Rudy::Disks.exists? @argv.first
+          raise "Disk exists" if Rudy::Disks.get(@argv.first).volume_attached?
+        end
         raise "No size provided" unless @option.size
 
-        @mlist = Rudy::Machines.list
-        raise "No machines" if @mlist.nil?
         true
       end
 
 
       def disks_create
         @mlist.each do |m|  
-          p Rudy::Routines::Handlers::RyeTools.create_box m
+          puts machine_separator m.name, m.instid
+          rbox = Rudy::Routines::Handlers::RyeTools.create_box m
+          rbox.stash = m
+          disk = Rudy::Disk.new m.position, @argv.first
+          disk.device = @option.device if @option.device
+          disk.size = @option.size if @option.size
+          li "Creating disk: #{disk.name}"
+          Rudy::Routines::Handlers::Disks.create rbox, disk, 0
         end
       end
 
 
+      def disks_destroy_valid?
+        @mlist = Rudy::Machines.list
+        raise "No machines" if @mlist.nil?
+
+        raise "No path provided" unless @argv.first
+        raise "Disk does not exist" unless Rudy::Disks.exists? @argv.first
+
+        true
+      end
+
+      def disks_destroy
+        @mlist.each do |m|  
+          puts machine_separator m.name, m.instid
+          rbox = Rudy::Routines::Handlers::RyeTools.create_box m
+          rbox.stash = m
+          disk = Rudy::Disk.new m.position, @argv.first
+          li "Destroying disk: #{disk.name}"
+          Rudy::Routines::Handlers::Disks.destroy rbox, disk, 0
+        end
+      end
     end
   end
 end

lib/rudy/disks.rb

@@ -21,5 +21,9 @@ def from_hash(h)
       Rudy::Disk.from_hash h
     end
 
+    def exists?(path)
+      !get(path).nil?
+    end
+
   end
 end

lib/rudy/metadata/machine.rb

@@ -85,7 +85,7 @@ def to_s(*args)
     end
 
     def rbox
-      r = Rye::Box.new self.name, 
+      r = Rudy::Routines::Handlers::RyeTools.create_box self
     end
 
 

lib/rudy/routines/handlers/disks.rb

@@ -9,6 +9,12 @@ module Disks
 
     Rudy::Routines.add_handler :disks, self
 
+    Rye::Cmd.add_command(:rudy_rm, 'rm')
+    Rye::Cmd.add_command(:rudy_mkfs, 'mkfs')
+    Rye::Cmd.add_command(:rudy_blkid, 'blkid')
+    Rye::Cmd.add_command(:rudy_format, 'C:/windows/system32/format.com')
+    Rye::Cmd.add_command(:rudy_diskpart, 'C:/windows/system32/diskpart.exe')
+
     def raise_early_exceptions(type, batch, rset, lbox, argv=nil)
 
     end
@@ -37,14 +43,6 @@ def execute(type, routine, rset, lbox, argv=nil)
       rset.add_key user_keypairpath(current_machine_user)
       rset.switch_user current_machine_user
 
-      # We need to add mkfs since it's not enabled by default. 
-      # We prepend the command with rudy_ so we can delete it. 
-      Rye::Cmd.add_command(:rudy_rm, 'rm')
-      Rye::Cmd.add_command(:rudy_mkfs, 'mkfs')
-      Rye::Cmd.add_command(:rudy_blkid, 'blkid')
-      Rye::Cmd.add_command(:rudy_format, 'C:/windows/system32/format.com')
-      Rye::Cmd.add_command(:rudy_diskpart, 'C:/windows/system32/diskpart.exe')
-
       routine.each_pair do |action, disks|
         unless respond_to?(action.to_sym)  
           Rudy::Huxtable.le %Q(DiskHelper: unknown action "#{action}")
@@ -66,12 +64,6 @@ def execute(type, routine, rset, lbox, argv=nil)
 
       end
 
-      Rye::Cmd.remove_command(:rudy_rm)
-      Rye::Cmd.remove_command(:rudy_mkfs)
-      Rye::Cmd.remove_command(:rudy_blkid)
-      Rye::Cmd.remove_command(:rudy_format)
-      Rye::Cmd.remove_command(:rudy_diskpart)
-
       rset.switch_user original_user
     end
 

lib/rudy/routines/handlers/rye.rb

@@ -15,16 +15,21 @@ def create_box(hostname, opts={})
        opts = {
          :info => (@@global.verbose >= 3),  # rudy -vvv
          :debug => false,
-         :user => Rudy.sysinfo.user, 
+         :user => :root, 
          :ostype => current_machine_os || :unix,
          :impltype => :linux
        }.merge opts
 
-       hostname = hostname.name if hostname.kind_of? Rudy::Machine
+       nickname = hostname
+       if hostname.kind_of? Rudy::Machine
+         hostname, nickname = hostname.dns_public, hostname.name
+       end
 
        box = ::Rye::Box.new hostname, opts
-
-
+       box.nickname = nickname
+
+       box.add_key user_keypairpath(opts[:user])
+
        # We define hooks so we can still print each command and its output
        # when running the command blocks. NOTE: We only print this in
        # verbosity mode.