rudy 0.9.1 → 0.9.2

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

@@ -5,10 +5,16 @@ module Rudy::Routines::Handlers;
     extend self
     
     ACTIONS = [:create, :destroy, :archive, :mount, :restore,
-               :attach, :detach, :mount, :umount].freeze
+               :attach, :detach, :mount, :umount, :fstype].freeze
     
     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, 'diskpart')
+    
     def raise_early_exceptions(type, batch, rset, lbox, argv=nil)
       
     end
@@ -34,43 +40,54 @@ module Rudy::Routines::Handlers;
     
     def execute(type, routine, rset, lbox, argv=nil)
       original_user = rset.user
-      rset.add_key user_keypairpath('root')
-      rset.switch_user 'root'
-      
-      # 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_mkfs, 'mkfs')
+      rset.add_key user_keypairpath(current_machine_user)
+      rset.switch_user current_machine_user
       
       routine.each_pair do |action, disks|
         unless respond_to?(action.to_sym)  
-          Rudy::Huxtable.le %Q(DiskHelper: unknown action "#{action}")
+          Rudy::Huxtable.le %Q(DiskHandler: unknown action "#{action}")
           next
         end
         # A quick hack to take advantage of the threading in Rye::Set.
         # The action method does not run in the context of a Rye::Box
         # object so we need to send rset as an argument. 
         rset.batch do
+          # Windows EC2 instances have 2 disks by default (C: and D:)
+          volumes = self.stash.attached_volumes
           disks.each_pair do |path, props|
             # self contains the current instance of Rye::Box. 
             disk = Rudy::Disk.new(self.stash.position, path, props)
-            Rudy::Routines::Handlers::Disks.send(action, self, disk)
+            disk.refresh! if disk.exists?  # We need the volume ID if available
+            # don't include the current disk in the count. 
+            volumes.reject! { |v| v.awsid == disk.volid } if disk.volid && disk.volume_attached?
+            disk_index = volumes.size + 2
+            Rudy::Routines::Handlers::Disks.send(action, self, disk, disk_index)
           end
         end
 
       end
       
-      Rye::Cmd.remove_command(:rudy_mkfs)
-      
       rset.switch_user original_user
     end
     
+    def fstype(rbox, disk, index)
+      
+      raise Rudy::Metadata::UnknownObject, disk.name unless disk.exists?
+      disk.refresh!
+      
+      #p rbox.rudy_blkid :s, 'TYPE', :o, 'value', disk.device
+      
+    end
+    
     
-    def create(rbox, disk)
+    def create(rbox, disk, index)
       if disk.exists?
         puts "Disk found: #{disk.name}"
         disk.refresh!          
       end
       
+      disk.index = index  # Needed for windows
+      
       unless @@global.force
         raise Rudy::Disks::AlreadyAttached, disk.name if disk.volume_attached?
       end
@@ -83,25 +100,27 @@ module Rudy::Routines::Handlers;
         }
       end
       
-      attach rbox, disk unless disk.volume_attached?
-      format rbox, disk if disk.raw?
-      mount rbox, disk unless disk.mounted?
+      attach rbox, disk, index unless disk.volume_attached?
+      format rbox, disk, index if disk.raw?
+      mount rbox, disk, index unless disk.mounted?
 
       disk.save :replace
     end
     
     
     
-    def detach(rbox, disk)
+    def detach(rbox, disk, index)
       
       raise Rudy::Metadata::UnknownObject, disk.name unless disk.exists?
       disk.refresh!
       
-      raise Rudy::Disks::NotAttached, disk.name if !disk.volume_attached?
+      unless @@global.force
+        raise Rudy::Disks::NotAttached, disk.name unless disk.volume_attached?
+      end
       
-      umount rbox, disk if disk.mounted?
+      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) { 
@@ -110,25 +129,48 @@ module Rudy::Routines::Handlers;
 
     end
     
-    def attach(rbox, disk)
+    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
       
       raise Rudy::Metadata::UnknownObject, disk.name unless disk.exists?
       disk.refresh!
       
-      raise Rudy::Disks::AlreadyAttached, disk.name if disk.volume_attached?
+      unless @@global.force
+        raise Rudy::Disks::AlreadyAttached, disk.name if disk.volume_attached?
+      end
+      
+      devices = rbox.stash.attached_volumes.collect { |v| v.device }
+      if devices.member? disk.device
+        li "Device ID #{disk.device} is taken. Using #{devices.sort.last.succ}"
+        disk.device = devices.sort.last.succ 
+        disk.save :replace
+      end
       
       msg = "Attaching #{disk.volid} to #{rbox.stash.instid}... "
       disk.volume_attach(rbox.stash.instid)
-      Rudy::Utils.waiter(2, 10, STDOUT, msg) { 
+      Rudy::Utils.waiter(3, 30, STDOUT, msg) { 
         disk.volume_attached?
       }
 
     end
     
-    def mount(rbox, disk)
+    def mount(rbox, disk, index)
       
       raise Rudy::Metadata::UnknownObject, disk.name unless disk.exists?
       disk.refresh!
+      
+      if rbox.stash.windows?
+        Rudy::Huxtable.li "Skipping for Windows"
+        return 
+      end
+      
       attach rbox, disk unless disk.volume_attached?
       
       unless @@global.force
@@ -137,35 +179,42 @@ module Rudy::Routines::Handlers;
         raise Rudy::Disks::AlreadyMounted, disk.name if disk.mounted?
       end
       
-      rbox.mkdir(:p, disk.path)
-      
       puts "Mounting at #{disk.path}... "
-  
+      
+      
+      rbox.mkdir(:p, disk.path)
       rbox.mount(:t, disk.fstype, disk.device, disk.path) 
       disk.mounted = true
       disk.save :replace
       sleep 1
+
     end
     
     
-    def umount(rbox, disk)
+    def umount(rbox, disk, index)
+      
       raise Rudy::Metadata::UnknownObject, disk.name unless disk.exists?
       disk.refresh!
       
-      raise Rudy::Disks::NotAttached, disk.name if !disk.volume_attached?
-      if @@global.force
+      unless @@global.force
+        raise Rudy::Disks::NotAttached, disk.name if !disk.volume_attached?
         raise Rudy::Disks::NotMounted, disk.name if !disk.mounted?
       end
       
       puts "Unmounting #{disk.path}... "
-      rbox.umount(disk.path)
+      
+      unless rbox.nil? || rbox.stash.windows?
+        rbox.umount(disk.path)
+      end
+      
       disk.mounted = false
       disk.save :replace
       sleep 2
+      
     end
     alias_method :unmount, :umount
     
-    def format(rbox, disk)
+    def format(rbox, disk, index)
       raise Rudy::Metadata::UnknownObject, disk.name unless disk.exists?
       disk.refresh!
       
@@ -177,20 +226,32 @@ module Rudy::Routines::Handlers;
         raise Rudy::Disks::AlreadyFormatted, disk.name if !disk.raw?
       end
       
-      disk.fstype = 'ext3' if disk.fstype.nil? || disk.fstype.empty?
+      if disk.fstype.nil? || disk.fstype.empty?
+        disk.fstype = rbox.stash.default_fstype
+      end
+      
+      print "Creating #{disk.fstype} filesystem for #{disk.path}... "
+      if rbox.stash.windows?
+        puts "(index: #{index})"
+        windows_diskpart_partition rbox, disk, index
+        disk.mounted = true
+      else
+        puts $/
+        rbox.rudy_mkfs(:t, disk.fstype, :F, disk.device)
+      end
       
-      puts "Creating #{disk.fstype} filesystem for #{disk.device}... "
-      rbox.rudy_mkfs(:t, disk.fstype, :F, disk.device)
       disk.raw = false
       disk.save :replace
+      sleep 1
+      disk
     end
     
-    def destroy(rbox, disk)
+    def destroy(rbox, disk, index)
       raise Rudy::Metadata::UnknownObject, disk.name unless disk.exists?
       disk.refresh!
         
-      umount rbox, disk if disk.mounted?
-      detach rbox, disk if disk.volume_attached?
+      umount rbox,disk,index if disk.mounted? && !rbox.nil? && !rbox.stash.windows?
+      detach rbox,disk,index if disk.volume_attached?
       
       unless @@global.force
         raise Rudy::Disks::InUse, disk.name if disk.volume_attached?
@@ -200,7 +261,7 @@ module Rudy::Routines::Handlers;
       disk.destroy
     end
     
-    def archive(rbox, disk)
+    def archive(rbox, disk, index)
       raise Rudy::Metadata::UnknownObject, disk.name unless disk.exists?
       disk.refresh!
       
@@ -210,7 +271,7 @@ module Rudy::Routines::Handlers;
       puts "Created backup: #{back.name}"
     end
     
-    def restore(rbox, disk)
+    def restore(rbox, disk, index)
 
       if disk.exists?
         puts "Disk found: #{disk.name}"
@@ -222,7 +283,11 @@ module Rudy::Routines::Handlers;
       end
       
       latest_backup = disk.backups.last
-      latest_backup.fstype = 'ext3' if latest_backup.fstype.nil? || latest_backup.fstype.empty?
+      
+      if latest_backup.fstype.nil? || latest_backup.fstype.empty?
+        latest_backup.fstype = rbox.stash.default_fstype
+      end
+      
       disk.size, disk.fstype = latest_backup.size, latest_backup.fstype
       
       puts "Backup found: #{latest_backup.name}"
@@ -237,13 +302,33 @@ module Rudy::Routines::Handlers;
         disk.save :replace  
       end
       
-      attach rbox, disk unless disk.volume_attached?
-      mount rbox, disk unless disk.mounted?
+      attach rbox, disk, index unless disk.volume_attached?
+      mount rbox, disk, index unless disk.mounted?
       
       disk.save :replace
 
     end
     
+  private
+    
+    # See:
+    # * http://social.technet.microsoft.com/Forums/en-US/winserversetup/thread/2cfbaae1-6e33-4197-bb71-63434a34eb3c
+    # * http://technet.microsoft.com/en-us/library/cc766465(WS.10).aspx
+    def windows_diskpart_partition(rbox, disk, disk_num)
+      rbox.quietly { rudy_rm :f, 'diskpart-script' }
+      rbox.file_append 'diskpart-script', %Q{
+      select disk #{disk_num}
+      clean
+      create partition primary
+      select partition 1
+      active
+      assign letter=#{disk.path.tr(':/', '')}
+      exit}
+      rbox.rudy_diskpart '/s', 'diskpart-script'
+      rbox.quietly { rudy_rm :f, 'diskpart-script' }
+      rbox.rudy_format disk.path, '/V:RUDY', "/FS:#{disk.fstype}", '/Q', '/Y'
+    end
+
     
   end
 end

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

@@ -4,13 +4,24 @@ module Rudy; module Routines; module Handlers;
     include Rudy::Routines::Handlers::Base
     extend self
     
-    ##Rudy::Routines.add_handler :machines, self
+    Rudy::Routines.add_handler :network, self
     
     
-    def raise_early_exceptions(name=nil)
+    def raise_early_exceptions(type, batch, rset, lbox, argv=nil)
       
     end
     
+    def execute(type, routine, rset, lbox, argv=nil)
+      routine.each_pair do |action, definition|
+        unless respond_to?(action.to_sym)  
+          Rudy::Huxtable.le %Q(GroupHandler: unknown action "#{action}")
+          next
+        end
+        Rudy::Huxtable.ld %Q(GroupHandler: "#{action}")
+        Rudy::Routines::Handlers::Group.send(action, definition)
+      end
+    end
+    
     def create(name=nil)
       name ||= current_group_name
       return if exists? name
@@ -18,14 +29,12 @@ module Rudy; module Routines; module Handlers;
       Rudy::AWS::EC2::Groups.create name
     end
     
-    def authorize(name=nil, addresses=nil, ports=nil)
-      name ||= current_group_name
-      addresses ||= [Rudy::Utils::external_ip_address]
-      if ports.nil?
-        ports = current_machine_os.to_s == 'win32' ? [[3389,3389]] : [[22,22]]
-      end
-      li "Authorizing ports #{ports.inspect} access for: #{addresses.join(', ')}"
-      Rudy::AWS::EC2::Groups.authorize(name, addresses, ports) 
+    def authorize(ports=nil, addresses=nil, name=nil)      
+      modify(:authorize, ports, addresses, name)
+    end
+    
+    def revoke(ports=nil, addresses=nil, name=nil)      
+      modify(:revoke, ports, addresses, name)
     end
     
     def exists?(name=nil)
@@ -40,5 +49,31 @@ module Rudy; module Routines; module Handlers;
       Rudy::AWS::EC2::Groups.destroy name
     end
     
+    def get(name=nil)
+      name ||= current_group_name
+      Rudy::AWS::EC2::Groups.get name
+    end
+    
+    def list
+      Rudy::AWS::EC2::Groups.list
+    end
+    
+  private 
+    def modify(action, ports=nil, addresses=nil, name=nil)
+      name ||= current_group_name
+      addresses ||= [Rudy::Utils::external_ip_address]
+      
+      if ports.nil?
+        ports = current_machine_os.to_s == 'windows' ? [3389,22] : [22]
+      else
+        ports = [ports].flatten.compact
+      end
+      
+      ports.each do |port|
+        #li "Authorizing port #{port} access for: #{addresses.join(', ')}"
+        Rudy::AWS::EC2::Groups.send(action, name, addresses, [[port, port]]) rescue nil
+      end
+    end
+    
   end
 end; end; end

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

@@ -10,7 +10,9 @@ module Rudy; module Routines; module Handlers;
       raise NoMachines if rset.boxes.empty?
       rset.boxes.each do |rbox|
         msg = "Waiting for #{rbox.nickname} to boot..."
-        Rudy::Utils.waiter(3, 240, Rudy::Huxtable.logger, msg, 0) {
+        multi = rbox.stash.windows? ? 6 : 3
+        interval, max = 1*multi, 80*multi
+        Rudy::Utils.waiter(interval, max, Rudy::Huxtable.logger, msg, 0) {
           inst = rbox.stash.get_instance
           inst && inst.running?
         }
@@ -36,17 +38,19 @@ module Rudy; module Routines; module Handlers;
     def is_available?(rset, port=22)
       raise NoMachines if rset.boxes.empty?
       rset.boxes.each do |rbox|
-        unless (rbox.stash.os || '').to_s == 'win32' # No SSH daemon in windows
-          msg = "Waiting for SSH (#{port}) on #{rbox.nickname} ..."
-          Rudy::Utils.waiter(2, 60, STDOUT, msg, 0) {
-            Rudy::Utils.service_available?(rbox.stash.dns_public, port)
-          }
-        end
+        msg = "Waiting for port #{port} on #{rbox.nickname} ..."
+        port = 3389 if rbox.stash.windows?
+        multi = rbox.stash.windows? ? 3 : 2
+        interval, max = 1*multi, 30*multi
+        Rudy::Utils.waiter(interval, max, STDOUT, msg, 0) {
+          Rudy::Utils.service_available?(rbox.stash.dns_public, port)
+        }
       end
     end
     
     def set_hostname(rset)
       raise NoMachines if rset.boxes.empty?
+      
       original_user = rset.user
       rset.switch_user 'root' 
       rset.add_key user_keypairpath('root')
@@ -58,9 +62,11 @@ module Rudy; module Routines; module Handlers;
       # run so we may want to make this an explicit action.
       type = current_machine_hostname || :rudy
       rset.batch(type) do |hn|
-        if hn != :default
-          hn = self.stash.name if hn == :rudy
-          self.quietly { hostname(hn) }
+        unless self.stash.os == :windows
+          if hn != :default
+            hn = self.stash.name if hn == :rudy
+            self.quietly { hostname(hn) }
+          end
         end
       end
       rset.switch_user original_user