solutious-rudy 0.9.0 → 0.9.1

data/lib/rudy/cli/status.rb

@@ -0,0 +1,60 @@
+
+
+module Rudy
+  module CLI
+    class Status < Rudy::CLI::CommandBase
+
+      def status
+        process_region @@global.region
+        oregions = Rudy::AWS::VALID_REGIONS - [@@global.region.to_sym]
+        if @option.all
+          oregions.each do |region| 
+            Rudy::AWS::EC2.connect @@global.accesskey, @@global.secretkey, region
+            process_region region
+          end
+        else
+          puts $/, "Other regions: " << oregions.join(', ')
+        end
+      end
+      
+      
+      private 
+      def process_region(region)
+        puts " Region: %s %30s".att(:reverse) % [region, '']
+        puts "  Instances".bright
+        istatus = @option.all ? :any : :running
+        (Rudy::AWS::EC2::Instances.list(istatus) || []).collect do |inst| 
+          puts "    %s (%s): %s; %s; %s" % [inst.awsid, inst.state, inst.dns_public || '[no dns]', inst.size, inst.created]
+        end
+        
+        puts "  Volumes".bright
+        (Rudy::AWS::EC2::Volumes.list || []).collect do |vol|
+          puts "    %s (%s): %sGB; %s" % [vol.awsid, vol.instid || vol.status, vol.size, vol.created]
+        end
+                
+        puts "  Snapshots".bright
+        (Rudy::AWS::EC2::Snapshots.list || []).collect do |snap|
+          puts "    %s: %s; %s" % [snap.awsid, snap.volid, snap.created]
+        end
+        
+        puts "  Addresses".bright
+        (Rudy::AWS::EC2::Addresses.list || []).collect do |o| 
+          puts "    %s (%s)" % [o.ipaddress, o.instid || 'available']
+        end
+        
+        puts "  Groups".bright
+        puts (Rudy::AWS::EC2::Groups.list || []).collect { |o| "    #{o.name}" }
+        
+        puts "  Keypairs".bright
+        puts (Rudy::AWS::EC2::Keypairs.list || []).collect { |o| "    #{o.name}" }
+
+        puts "  Images".bright
+        (Rudy::AWS::EC2::Images.list('self') || []).collect do |o|
+          puts "    %s: %s; %s; %s" % [o.awsid, o.location, o.arch, o.visibility]
+        end
+        puts
+      end
+      
+    end
+  end
+end

data/lib/rudy/config.rb

@@ -44,6 +44,30 @@ module Rudy
       @defaults = Rudy::Config::Defaults.new if @defaults.nil?
     end
     
+    # Looks for a loads configuration files from standard locations. 
+    #     ./.rudy/config
+    #     ~/.rudy/config
+    #
+    #     ~/.rudy/*.rb
+    #     ./Rudyfile
+    #     ./machines.rb, ./routines.rb, ./commands.rb
+    #     ./config/rudy/*.rb
+    #     ./.rudy/*.rb
+    #     /etc/rudy/*.rb
+    #
+    # When multuple files are found, the configuration is NOT OVERRIDDEN,
+    # it's ADDED or APPENDED depending on context. This means you can split 
+    # configuration across as many files as you please. 
+    #
+    # There are five sections: accounts, defaults, machines, commands and routines.
+    # 
+    # By convention, accounts go in ./.rudy/config or ~/.rudy/config 
+    # machines, commands, routines, and defaults configuration go in ./Rudyfile or  
+    # into separate files in ./.rudy or ./config/rudy (machines.rb, commands.rb, ...)
+    #
+    # If +adhoc_path+ is supplied (e.g. rudy -C config/file/path routines), this method
+    # will look for ~/.rudy/config or ./.rudy/config but none of the other default file
+    # locations other than the supplied path. If it's an Array, all paths will be loaded. 
     def look_and_load(adhoc_path=nil)
       cwd = Dir.pwd
       cwd_path = File.join(cwd, '.rudy', 'config')
@@ -52,24 +76,28 @@ module Rudy
       # The "core" config file can have any or all configuration
       # but it should generally only contain the access identifiers
       # and defaults. That's why we only load one of them. 
-      core_config_paths = [adhoc_path, cwd_path, Rudy::CONFIG_FILE]
+      core_config_paths = [cwd_path, Rudy::CONFIG_FILE]
       core_config_paths.each do |path|
         next unless path && File.exists?(path)
         @paths << path
         break
       end
       
-      # self.keys returns the current config types (machines, routines, etc...)
-      typelist = self.keys.collect { |g| "#{g}.rb" }.join(',')
+      if adhoc_path.nil?
+        # self.keys returns the current config types (machines, routines, etc...)
+        typelist = self.keys.collect { |g| "#{g}.rb" }.join(',')
       
-      # Rudy then looks for the rest of the config in these locations
-      @paths += Dir.glob(File.join(Rudy.sysinfo.home, '.rudy', '*.rb')) || []
-      @paths += Dir.glob(File.join(cwd, 'Rudyfile')) || []
-      @paths += Dir.glob(File.join(cwd, 'config', 'rudy', '*.rb')) || []
-      @paths += Dir.glob(File.join(cwd, '.rudy', '*.rb')) || []
-      @paths += Dir.glob(File.join(cwd, "{#{typelist}}")) || []
-      @paths += Dir.glob(File.join('/etc', 'rudy', '*.rb')) || []
-      @paths &&= @paths.uniq
+        # Rudy then looks for the rest of the config in these locations
+        @paths += Dir.glob(File.join(Rudy.sysinfo.home, '.rudy', '*.rb')) || []
+        @paths += Dir.glob(File.join(cwd, 'Rudyfile')) || []
+        @paths += Dir.glob(File.join(cwd, 'config', 'rudy', '*.rb')) || []
+        @paths += Dir.glob(File.join(cwd, '.rudy', '*.rb')) || []
+        @paths += Dir.glob(File.join(cwd, "{#{typelist}}")) || []
+        @paths += Dir.glob(File.join('/etc', 'rudy', '*.rb')) || []
+        @paths &&= @paths.uniq
+      else
+        @paths += [adhoc_path].flatten
+      end
       
       refresh
     end
@@ -88,9 +116,9 @@ module Rudy
           accounts {                           # Account Access Indentifiers
             aws {                              # amazon web services 
               name "Rudy Default"
-              accountnum "012345678912"
-              accesskey "ACCESSACCESS"
-              secretkey "SECRETSECRET"
+              accountnum ""
+              accesskey ""
+              secretkey ""
               pkey "~/path/2/pk-xxxx.pem" 
               cert "~/path/2/cert-xxxx.pem"
             }

data/lib/rudy/exceptions.rb

@@ -48,7 +48,11 @@ module Rudy
     def message; "Machine #{@obj} is not running."; end
   end
   class NoMachines < Rudy::Error;
-    def message; "Specified remote machine(s) not running"; end
+    def message
+      msg = "No machines running "
+      msg << "in #{@obj}" if @obj
+      msg
+    end
   end 
   class MachineGroupNotDefined < Rudy::Error 
     def message; "#{@obj} is not defined in machines config."; end

data/lib/rudy/global.rb

@@ -22,7 +22,7 @@ module Rudy
     field :verbose
     field :format
     field :print_header
-    field :yes
+    field :auto
     field :force
     
     field :accesskey
@@ -57,6 +57,7 @@ module Rudy
     end
     
     def apply_config(config)
+
       return unless config.is_a?(Rudy::Config)
       clear_system_defaults  # temporarily unapply default values
       
@@ -70,9 +71,12 @@ module Rudy
         # WARNING: Don't add bucket either or any machines configuration param 
         # TODO: investigate removing this apply_config method
         %w[region zone environment role position 
-           localhost nocolor quiet yes force parallel].each do |name|
+           localhost nocolor quiet auto force parallel].each do |name|
           curval, defval = self.send(name), config.defaults.send(name)
-          self.send("#{name}=", defval) if curval.nil? && !defval.nil?
+          if curval.nil? && !defval.nil?
+            # Don't use the accessors. These are defaults so no Region  magic. 
+            self.instance_variable_set("@#{name}", defval) 
+          end
         end
       end
       
@@ -85,17 +89,22 @@ module Rudy
       postprocess
     end
     
-    def zone=(z)
-      @zone = z.to_sym
-      @region = @zone.to_s.gsub(/[a-z]$/, '').to_sym
-    end
-    
     def update(ghash={})
       ghash = ghash.marshal_dump if ghash.is_a?(OpenStruct) 
       ghash.each_pair { |n,v| self.send("#{n}=", v) } 
       postprocess
     end
     
+    def zone=(z)
+      @zone = z
+      @region = @zone.to_s.gsub(/[a-z]$/, '').to_sym
+    end
+    
+    def region=(r)
+      @region = r
+      @zone = "#{@region}b".to_sym
+    end
+    
     def to_s(*args)
       super()
     end
@@ -112,7 +121,8 @@ module Rudy
       @position &&= @position.to_s.rjust(2, '0')  
       @format &&= @format.to_sym rescue nil
       @quiet ? Rudy.enable_quiet : Rudy.disable_quiet
-      @yes ? Rudy.enable_yes : Rudy.disable_yes
+      @auto ? Rudy.enable_auto : Rudy.disable_auto
+      
     end
     
     def apply_environment_variables
@@ -125,12 +135,18 @@ module Rudy
     
     # Apply defaults for parameters that must have values
     def apply_system_defaults
-      @region ||= Rudy::DEFAULT_REGION
-      @zone ||= Rudy::DEFAULT_ZONE
+      if    @region.nil? && @zone.nil?
+        @region, @zone = Rudy::DEFAULT_REGION, Rudy::DEFAULT_ZONE
+      elsif @region.nil?
+        @region = @zone.to_s.gsub(/[a-z]$/, '').to_sym
+      elsif @zone.nil?
+        @zone = "#{@region}b".to_sym
+      end
+      
       @environment ||= Rudy::DEFAULT_ENVIRONMENT
       @role ||= Rudy::DEFAULT_ROLE
       @localhost ||= Rudy.sysinfo.hostname || 'localhost'
-      @yes = false if @yes.nil?
+      @auto = false if @auto.nil?
     end
     
     # Unapply defaults for parameters that must have values. 
@@ -143,7 +159,7 @@ module Rudy
       @environment = nil if @environment == Rudy::DEFAULT_ENVIRONMENT
       @role = nil if @role == Rudy::DEFAULT_ROLE
       @localhost = nil if @localhost == (Rudy.sysinfo.hostname || 'localhost')
-      @yes = nil if @yes == false
+      @auto = nil if @auto == false
     end
     
   end

data/lib/rudy/huxtable.rb

@@ -190,7 +190,7 @@ module Rudy
     end
     
     def current_machine_user
-      @@global.user || fetch_machine_param(:user) || Rudy.sysinfo.user
+      @@global.user || fetch_machine_param(:user) || @@config.defaults.user || Rudy.sysinfo.user
     end
     
     def current_machine_bucket
@@ -253,7 +253,7 @@ module Rudy
       raise NoRoutinesConfig unless @@config.routines
       raise NoGlobal unless @@global
       
-      action = action.to_s.tr('-', '_')
+      action = action.to_s.tr('-:', '_')
       
       zon, env, rol = @@global.zone, @@global.environment, @@global.role
       

data/lib/rudy/machines.rb

@@ -38,9 +38,9 @@ module Rudy
     end
     
     # Returns an Array of newly created Rudy::Machine objects
-    def create(size=1)
+    def create(size=nil)
       if Rudy::Huxtable.global.position.nil?
-        size ||= current_machine_count.to_i
+        size ||= current_machine_count.to_i || 1
         group = Array.new(size) do |i|
           m = Rudy::Machine.new(i + 1)
           m.create

data/lib/rudy/metadata/disk.rb

@@ -69,7 +69,7 @@ module Rudy
     end
     
     def to_s(with_titles=true)
-      "%s; %s" % [self.name, self.to_hash.inspect]
+      self.name
     end
     
     def name
@@ -96,6 +96,7 @@ module Rudy
       back = Rudy::Backup.new @position, @path, self.descriptors
       back.create
       back.size, back.fstype = @size, @fstype
+      back.save :replace
       back
     end
     

data/lib/rudy/routines.rb

@@ -97,10 +97,10 @@ module Rudy
     def self.rescue(ret=nil, &bloc_party)
       begin
         ret = bloc_party.call
-      rescue => ex
+      rescue NameError, ArgumentError, RuntimeError => ex
+        STDERR.puts "  #{ex.class}: #{ex.message}".color(:red)
+        STDERR.puts ex.backtrace if Rudy.debug?
         unless Rudy::Huxtable.global.parallel
-          STDERR.puts "  #{ex.class}: #{ex.message}".color(:red)
-          STDERR.puts ex.backtrace if Rudy.debug?
           choice = Annoy.get_user_input('(S)kip  (A)bort: ', nil, 3600) || ''
           if choice.match(/\AS/i)
             # do nothing

data/lib/rudy/routines/base.rb

@@ -38,7 +38,7 @@ module Rudy; module Routines;
       
       # Grab the routines configuration for this routine name
       # e.g. startup, sysupdate, installdeps
-      @routine = fetch_routine_config @name 
+      @routine = fetch_routine_config @name rescue {}
       
       ld "Routine: #{@routine.inspect}"
       
@@ -88,7 +88,7 @@ module Rudy; module Routines;
       # 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
+      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
@@ -199,11 +199,14 @@ module Rudy; module Routines;
       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  (A)bort: ', nil, 3600) || ''
+          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
@@ -218,7 +221,7 @@ module Rudy; module Routines;
       else
         le prefix << "#{ex.class}: #{ex.message}".color(:red)
       end
-      le *ex.backtrace
+      le *ex.backtrace if @@global.verbose > 2
     end
     
   end

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

@@ -13,11 +13,19 @@ module Rudy::Routines::Handlers;
       
     end
     
-    def disks?(routine)
+    def any?(routine)
       (routine.kind_of?(Hash) && routine.disks && 
       routine.disks.kind_of?(Hash) && !routine.disks.empty?) ? true : false
     end
     
+    # Create mount?, create?, umount? etc... methods
+    ACTIONS.each do |action|
+      define_method "#{action}?" do |routine|
+        return false unless any? routine
+        routine.disks.member? action
+      end
+    end
+    
     def paths(routine)
       return nil unless disks?(routine)
       routine.disks.values.collect { |d| d.keys }.flatten
@@ -145,7 +153,9 @@ module Rudy::Routines::Handlers;
       disk.refresh!
       
       raise Rudy::Disks::NotAttached, disk.name if !disk.volume_attached?
-      raise Rudy::Disks::NotMounted, disk.name if !disk.mounted?
+      if @@global.force
+        raise Rudy::Disks::NotMounted, disk.name if !disk.mounted?
+      end
       
       puts "Unmounting #{disk.path}... "
       rbox.umount(disk.path)
@@ -201,7 +211,7 @@ module Rudy::Routines::Handlers;
     end
     
     def restore(rbox, disk)
-      
+
       if disk.exists?
         puts "Disk found: #{disk.name}"
         disk.refresh!       
@@ -212,6 +222,7 @@ module Rudy::Routines::Handlers;
       end
       
       latest_backup = disk.backups.last
+      latest_backup.fstype = 'ext3' if latest_backup.fstype.nil? || latest_backup.fstype.empty?
       disk.size, disk.fstype = latest_backup.size, latest_backup.fstype
       
       puts "Backup found: #{latest_backup.name}"
@@ -222,12 +233,11 @@ module Rudy::Routines::Handlers;
         Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
           disk.volume_available?
         }
-        
+        disk.raw = false
+        disk.save :replace  
       end
-      disk.raw = false
       
       attach rbox, disk unless disk.volume_attached?
-      #format rbox, disk if disk.raw?
       mount rbox, disk unless disk.mounted?
       
       disk.save :replace

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

@@ -21,9 +21,11 @@ module Rudy; module Routines; module Handlers;
     def authorize(name=nil, addresses=nil, ports=nil)
       name ||= current_group_name
       addresses ||= [Rudy::Utils::external_ip_address]
-      ports ||= [[22,22]]
-      li "Authorizing group: #{addresses.inspect} (#{ports.inspect})"
-      Rudy::AWS::EC2::Groups.authorize(name, addresses, ports)
+      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) 
     end
     
     def exists?(name=nil)

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

@@ -8,11 +8,10 @@ module Rudy; module Routines; module Handlers;
     
     def is_running?(rset)
       raise NoMachines if rset.boxes.empty?
-      rset.batch(rset.parallel) do |parallel|
-        msg = "Starting #{self.nickname}..."
-        output = parallel ? nil : Rudy::Huxtable.logger 
-        Rudy::Utils.waiter(3, 120, output, msg, 0) {
-          inst = self.stash.get_instance
+      rset.boxes.each do |rbox|
+        msg = "Waiting for #{rbox.nickname} to boot..."
+        Rudy::Utils.waiter(3, 240, Rudy::Huxtable.logger, msg, 0) {
+          inst = rbox.stash.get_instance
           inst && inst.running?
         }
       end
@@ -25,23 +24,22 @@ module Rudy; module Routines; module Handlers;
     # the machine metadata won't contain the DNS information. Calling it
     # here ensure that the metadata is always up-to-date.
     # Each Rye:Box instance has a Rudy::Machine instance in its stash so
-    # self.stash.update == machine.update
+    # rbox.stash.refresh! == machine.refresh!
     def update_dns(rset)
       raise NoMachines if rset.boxes.empty?
-      rset.batch do 
-        self.stash.refresh! 
-        self.host = self.stash.dns_public
+      rset.boxes.each do |rbox|
+        rbox.stash.refresh! 
+        rbox.host = rbox.stash.dns_public
       end
     end
     
     def is_available?(rset, port=22)
       raise NoMachines if rset.boxes.empty?
-      rset.batch(rset.parallel, port) do |parallel,p|
-        # Windows machines do not have an SSH daemon
-        unless (self.stash.os || '').to_s == 'win32'
-          msg = parallel ? nil : "Waiting for SSH on port #{p}..."
-          Rudy::Utils.waiter(2, 30, STDOUT, msg, 0) {
-            Rudy::Utils.service_available?(self.stash.dns_public, p)
+      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
       end
@@ -50,8 +48,8 @@ module Rudy; module Routines; module Handlers;
     def set_hostname(rset)
       raise NoMachines if rset.boxes.empty?
       original_user = rset.user
+      rset.switch_user 'root' 
       rset.add_key user_keypairpath('root')
-      rset.switch_user 'root'
       # Set the hostname if specified in the machines config. 
       # :rudy -> change to Rudy's machine name
       # :default -> leave the hostname as it is