rudy 0.9.1 → 0.9.2

data/lib/rudy/config/objects.rb

@@ -177,7 +177,6 @@ class Rudy::Config
     chill :xremote                   
         
     forced_hash :network
-    chill :network
        
     # Startup, Shutdown, Reboot routines
     forced_hash :before_local

data/lib/rudy/disks.rb

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

data/lib/rudy/global.rb

@@ -70,7 +70,7 @@ module Rudy
         # value from the defaults config. 
         # WARNING: Don't add bucket either or any machines configuration param 
         # TODO: investigate removing this apply_config method
-        %w[region zone environment role position 
+        %w[region zone environment role position bucket
            localhost nocolor quiet auto force parallel].each do |name|
           curval, defval = self.send(name), config.defaults.send(name)
           if curval.nil? && !defval.nil?

data/lib/rudy/huxtable.rb

@@ -177,8 +177,8 @@ module Rudy
     end
     
     def current_machine_address(position='01')
-      raise NoConfig unless @@config
-      raise NoMachinesConfig unless @@config.machines
+      #raise NoConfig unless @@config
+      #raise NoMachinesConfig unless @@config.machines
       raise "Position cannot be nil" if position.nil?
       addresses = [fetch_machine_param(:addresses)].flatten.compact
       addresses[position.to_i-1]
@@ -275,7 +275,7 @@ module Rudy
         end
         disks.each_pair do |path, props|
           unless disk_defs.has_key?(path)
-            li "#{path} is not defined. Check your #{action} machines config.".color(:red)
+            li "#{path} is not defined. Check your machines config.".color(:red)
             routine.disks[raction].delete(path) 
             next
           end
@@ -288,6 +288,12 @@ module Rudy
       routine
     end
     
+    def self.generate_rudy_command(name, *args)
+      cmd = "rudy "
+      cmd << "-C " << @@global.config.join(' -C ') if @@global.config 
+      "#{cmd} #{name} " << args.join(' ')
+    end
+    
     # Is +action+ a valid routine for the current machine group?
     def valid_routine?(action)
       !fetch_routine_config(action).nil?

data/lib/rudy/machines.rb

@@ -55,7 +55,7 @@ module Rudy
     
     def restart
       group = list 
-      raise MachineGroupNotRunning, current_group_name if group.nil?
+      raise MachineGroupNotRunning, current_machine_group if group.nil?
       group.each do |inst|
         inst.restart
       end

data/lib/rudy/metadata.rb

@@ -106,11 +106,14 @@ module Rudy
       criteria
     end
     
+    
+    # These methods are common to all plural metadata classes:
+    # Rudy::Machines, Rudy::Disks, Rudy::Backups, etc...
+    # 
     module ClassMethods
       extend self
       extend Rudy::Huxtable
       
-      # TODO: MOVE TO Rudy:Disks etc...
       def list(fields={}, less=[], &block)
         fields = Rudy::Metadata.build_criteria self::RTYPE, fields, less
         records_raw, records = Rudy::Metadata.select(fields), []

data/lib/rudy/metadata/backup.rb

@@ -67,8 +67,8 @@ module Rudy
       @second = @created.sec.to_s.rjust(2, '0')
     end
     
-    def to_s(with_titles=true)
-      "%s; %s" % [self.name, self.to_hash.inspect]
+    def to_s(*args)
+      [self.name.bright, self.snapid, self.volid, self.size, self.fstype].join '; '
     end
     
     def name

data/lib/rudy/metadata/disk.rb

@@ -16,6 +16,9 @@ module Rudy
     field :size
     field :fstype
     
+    field :name    # Windows, used for label
+    field :index   # Windows, used for diskpart
+    
     #field :backups => Array
     
     # Is the associated volume formatted? One of: true, false
@@ -45,7 +48,7 @@ module Rudy
       
       opts = {
         :size => 1,
-        :device => '/dev/sdh'
+        :device => current_machine_os.to_s == 'windows' ? DEFAULT_WINDOWS_DEVICE : DEFAULT_LINUX_DEVICE
       }.merge opts
       
       super Rudy::Disks::RTYPE, opts  # Rudy::Metadata#initialize
@@ -68,8 +71,8 @@ module Rudy
       @mounted = (@mounted == "true") unless @mounted.is_a?(TrueClass)
     end
     
-    def to_s(with_titles=true)
-      self.name
+    def to_s(*args)
+      [self.name.bright, self.volid, self.size, self.fstype].join '; '
     end
     
     def name
@@ -83,7 +86,7 @@ module Rudy
     end
     
     def create(size=nil, zone=nil, snapshot=nil)
-      raise DuplicateRecord, self.name if exists?
+      raise DuplicateRecord, self.name if exists? && !@@global.force
       vol = Rudy::AWS::EC2::Volumes.create(size || @size, zone || @zone, snapshot) 
       #vol = Rudy::AWS::EC2::Volumes.list(:available).first   # debugging
       @volid, @raw = vol.awsid, true

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