solutious-rudy 0.9.1 → 0.9.2

data/lib/rudy/metadata/machine.rb

@@ -77,16 +77,55 @@ module Rudy
     
     def postprocess
       @position &&= @position.to_s.rjust(2, '0')
+      @os &&= @os.to_sym
     end
     
     def to_s(*args)
-      self.name
+      [self.name.bright, self.instid, self.dns_public].join '; '
     end
     
+    def rbox
+      r = Rudy::Routines::Handlers::RyeTools.create_box self
+    end
+    
+    def disks
+      Rudy::Disks.list
+    end
+    
+    
     def get_instance
       Rudy::AWS::EC2::Instances.get @instid
     end
     
+    def get_console
+      raise "Instance not running" unless instance_running?
+      raw = Rudy::AWS::EC2::Instances.console @instid
+      console = Base64.decode64(raw)
+      # The linux console can include ANSI escape codes for color, 
+      # clear screen etc... We strip them out to get rid of the 
+      # clear specifically. Otherwise the display is messed!
+      console &&= console.noansi if console.respond_to? :noansi
+      console
+    end
+    
+    def get_password
+      unless windows?
+        raise "Password support is Windows only (this is #{@os})" 
+      end
+      console = get_console
+      
+      raise "Console output not yet available. Please wait." if console.nil?
+      
+      unless console.match(/<Password>(.+)<\/Password>/m)  
+        # /m, match multiple lines
+        raise "Password not yet available. Is this a custom AMI?"
+      end  
+      
+      encrtypted_text = ($1 || '').strip
+      k = Rye::Key.from_file root_keypairpath
+      k.decrypt encrtypted_text
+    end
+    
     def create
       raise "#{name} is already running" if instance_running?
       
@@ -103,6 +142,10 @@ module Rudy
       
       Rudy::Huxtable.ld "OPTS: #{opts.inspect}"
       
+      #@dns_public = @dns_private = nil
+      #inst = Rudy::AWS::EC2::Instances.list(:running).first
+      #@instid = inst.awsid
+      
       Rudy::AWS::EC2::Instances.create(opts) do |inst|
         @instid = inst.awsid
         @created = @started = Time.now
@@ -125,6 +168,7 @@ module Rudy
           STDERR.puts ex.backtrace if Rudy.debug?
         end
       end
+      
       self.save
       self
     end
@@ -138,9 +182,15 @@ module Rudy
       Rudy::AWS::EC2::Instances.restart(@instid) if instance_running?
     end
     
+    def attached_volumes
+      volumes = []
+      return volumes if @instid.nil?
+      Rudy::AWS::EC2::Volumes.list_by_instance( @instid) || []
+    end
+    
     def refresh!(metadata=true)
       ## Updating the metadata isn't necessary
-      ##super if metadata # update metadata
+      super() if metadata # update metadata
       @instance = get_instance
       if @instance.is_a?(Rudy::AWS::EC2::Instance)
         @dns_public, @dns_private = @instance.dns_public, @instance.dns_private
@@ -161,6 +211,20 @@ module Rudy
       d
     end
     
+    def default_fstype
+      windows? ? Rudy::DEFAULT_WINDOWS_FS : Rudy::DEFAULT_LINUX_FS
+    end
+    
+    def default_device
+      windows? ? Rudy::DEFAULT_WINDOWS_DEVICE : Rudy::DEFAULT_LINUX_DEVICE
+    end
+    
+    
+    def os?(v); @os.to_s == v.to_s; end
+    def windows?; os? 'windows'; end
+    def linux?; os? 'linux'; end
+    def solaris?; os? 'solaris'; end
+    
     def dns_public?;  !@dns_public.nil? && !@dns_public.empty?;   end
     def dns_private?; !@dns_private.nil? && !@dns_private.empty?; end
     

data/lib/rudy/routines.rb

@@ -95,9 +95,10 @@ module Rudy
     end
     
     def self.rescue(ret=nil, &bloc_party)
+
       begin
         ret = bloc_party.call
-      rescue NameError, ArgumentError, RuntimeError => ex
+      rescue NameError, ArgumentError, RuntimeError, Errno::ECONNREFUSED => ex
         STDERR.puts "  #{ex.class}: #{ex.message}".color(:red)
         STDERR.puts ex.backtrace if Rudy.debug?
         unless Rudy::Huxtable.global.parallel

data/lib/rudy/routines/base.rb

@@ -49,7 +49,10 @@ module Rudy; module Routines;
       end
       
       # Share one Rye::Box instance for localhost across all routines
-      @@lbox = create_rye_box @@global.localhost unless defined?(@@lbox)
+      unless defined?(@@lbox)
+        host, opts = @@global.localhost, { :user => Rudy.sysinfo.user }
+        @@lbox = Rudy::Routines::Handlers::RyeTools.create_box host, opts
+      end
       
       disable_run if @@global.testrun
       
@@ -68,162 +71,6 @@ module Rudy; module Routines;
     def raise_early_exceptions; raise "Please override"; end
     def execute; raise "Please override"; end
     
-    # Create an instance of Rye::Box for +hostname+. +opts+ is
-    # an optional Hash of options. See Rye::Box.initialize
-    #
-    # This method should be used throughout the Rudy::Routines 
-    # namespace rather than creating instances manually b/c it 
-    # applies some fancy pants defaults like command hooks.
-    def create_rye_box(hostname, opts={})
-      ld [:hostname, hostname, opts, caller[0]]
-      opts = {
-        :info => (@@global.verbose >= 3),  # rudy -vvv 
-        :debug => false,
-        :user => Rudy.sysinfo.user
-      }.merge opts
-      
-      box = Rye::Box.new hostname, opts
-      
-    
-      # 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. 
-      if @@global.verbose > 0 && !@@global.parallel
-        # This block gets called for every command method call.
-        box.pre_command_hook do |cmd, user, host, nickname|
-          print_command user, nickname, cmd
-        end
-      end
-    
-      if @@global.verbose > 1
-        # And this one gets called after each command method call.
-        box.post_command_hook do |ret|
-          print_response ret
-        end
-      end
-      
-      box.exception_hook(Rye::CommandError, &rbox_exception_handler)
-      box.exception_hook(Exception, &rbox_exception_handler)
-      
-      ## It'd better for unknown commands to be handled elsewhere
-      ## because it doesn't make sense to retry a method that doesn't exist
-      ##box.exception_hook(Rye::CommandNotFound, &rbox_exception_handler)
-    
-      box
-    end
-    
-
-    
-    # Create an instance of Rye::Set from a list of +hostnames+.
-    # +hostnames+ can contain hostnames or Rudy::Machine objects.
-    # +opts+ is an optional Hash of options. See Rye::Box.initialize
-    #
-    # NOTE: Windows machines are skipped and not added to the set. 
-    def create_rye_set(hostnames, opts={})
-      hostnames ||= []
-      
-      opts = {
-        :user => (current_machine_user).to_s,
-        :parallel => @@global.parallel
-      }.merge(opts)
-      set = Rye::Set.new current_machine_group, opts 
-      
-      opts.delete(:parallel)   # Not used by Rye::Box.new
-      
-      hostnames.each do |m| 
-        # This is a short-circuit for Windows instances. We don't support
-        # disks for windows yet and there's no SSH so routines are out of
-        # the picture too. 
-        next if (m.os || '').to_s == 'win32'
-          
-        if m.is_a?(Rudy::Machine)
-          m.refresh! if m.dns_public.nil? || m.dns_public.empty?
-          if m.dns_public.nil? || m.dns_public.empty?
-            ld "Cannot find public DNS for #{m.name} (continuing...)"
-            ##next
-          end
-          ld [:dns_public, m.dns_public, m.instid]
-          rbox = create_rye_box(m.dns_public, opts) 
-          rbox.stash = m   # Store the machine instance in the stash
-          rbox.nickname = m.name
-        else
-          # Otherwise we assume it's a hostname
-          rbox = create_rye_box(m)
-        end
-        rbox.add_key user_keypairpath(opts[:user])
-        set.add_box rbox
-      end
-      
-      ld "Machines Set: %s" % [set.empty? ? '[empty]' : set.inspect]
-      
-      set
-    end
-    
-    
-
-    
-    # Returns a formatted string for printing command info
-    def print_command(user, host, cmd)
-      #return if @@global.parallel
-      cmd ||= ""
-      cmd, user = cmd.to_s, user.to_s
-      prompt = user == "root" ? "#" : "$"
-      li ("%s@%s%s %s" % [user, host, prompt, cmd.bright])
-    end
-    
-    def print_response(rap)
-      # Non zero exit codes raise exceptions so  
-      # the erorrs have already been handled. 
-      return if rap.exit_code != 0
-      
-      if @@global.parallel
-        cmd, user = cmd.to_s, user.to_s
-        prompt = user == "root" ? "#" : "$"
-        li "%s@%s%s %s%s%s" % [rap.box.user, rap.box.nickname, prompt, rap.cmd.bright, $/, rap.stdout.inspect]
-        unless rap.stderr.empty?
-          le "#{rap.box.nickname}: " << rap.stderr.join("#{rap.box.nickname}: ")
-        end
-      else
-        li '  ' << rap.stdout.join("#{$/}  ") if !rap.stdout.empty?
-        colour = rap.exit_code != 0 ? :red : :normal
-        unless rap.stderr.empty?
-          le ("  STDERR  " << '-'*38).color(colour).bright
-          le "  " << rap.stderr.join("#{$/}    ").color(colour)
-        end
-      end
-    end
-    
-  private 
-    
-    def rbox_exception_handler
-      Proc.new do |ex, cmd, user, host, nickname|
-        print_exception(user, host, cmd, nickname, ex)
-        unless @@global.parallel
-          choice = Annoy.get_user_input('(S)kip  (R)etry  (F)orce  (A)bort: ', nil, 3600) || ''
-          if choice.match(/\AS/i)
-            :skip
-          elsif choice.match(/\AR/i)
-            :retry   # Tells Rye::Box#run_command to retry
-          elsif choice.match(/\AF/i)
-            @@global.force = true
-            :retry
-          else
-            exit 12
-          end
-        end
-      end
-    end
-    
-    def print_exception(user, host, cmd, nickname, ex)
-      prefix = @@global.parallel ? "#{nickname}: #{cmd}: " : ""
-      if ex.is_a?(Rye::CommandError)
-        le prefix << ex.message.color(:red)
-      else
-        le prefix << "#{ex.class}: #{ex.message}".color(:red)
-      end
-      le *ex.backtrace if @@global.verbose > 2
-    end
-    
   end
   
 end; end;

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

@@ -12,11 +12,14 @@ module Rudy; module Routines; module Handlers;
        print_response(ret)
      rescue IOError => ex
        STDERR.puts "  Connection Error (#{ex.message})".color(:red)
-       choice = Annoy.get_user_input('(S)kip  (A)bort: ', nil, 3600) || ''
+       choice = Annoy.get_user_input('(S)kip  (R)etry  (F)orce  (A)bort: ', nil, 3600) || ''
         if choice.match(/\AS/i)
           return
-        #elsif choice.match(/\AR/i)
-        #  retry
+        elsif choice.match(/\AR/i)
+          retry
+        elsif choice.match(/\AF/i)
+          @@global.force = true
+          retry
         else
           exit 12
         end

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