solutious-rudy 0.9.3 → 0.9.4

data/lib/rudy/cli/metadata.rb

@@ -23,7 +23,7 @@ module Rudy
         end
         
         objlist.each_pair do |k,o|
-          puts "#{k}: " << o.inspect
+          li "#{k}: " << o.inspect
         end
       end
       
@@ -38,7 +38,7 @@ module Rudy
         unless @@global.quiet
           msg = "NOTE: This will delete only the metadata and "
           msg << "not the EC2 object (volume, instance, etc...)"
-          puts msg
+          li msg
         end
         
         execute_check(:medium)

data/lib/rudy/cli/networks.rb

@@ -7,10 +7,19 @@ module Rudy
       def networks
         name = current_group_name
         Rudy::AWS::EC2::Groups.list(name).each do |group|
-          puts @@global.verbose > 0 ? group.inspect : group.dump(@@global.format)
+          li @@global.verbose > 0 ? group.inspect : group.dump(@@global.format)
         end
       end
       
+      def create_networks
+        Rudy::Routines::Handlers::Group.create rescue nil
+        networks
+      end
+      
+      def destroy_networks
+        Rudy::Routines::Handlers::Group.destroy rescue nil
+      end
+      
       def update_networks
         Rudy::Routines::Handlers::Group.authorize rescue nil
         networks
@@ -20,11 +29,11 @@ module Rudy
         ea = Rudy::Utils::external_ip_address || '' 
         ia = Rudy::Utils::internal_ip_address || ''
         if @global.quiet
-          puts ia unless @option.external && !@option.internal
-          puts ea unless @option.internal && !@option.external
+          li ia unless @option.external && !@option.internal
+          li ea unless @option.internal && !@option.external
         else
-          puts "%10s: %s" % ['Internal', ia] unless @option.external && !@option.internal
-          puts "%10s: %s" % ['External', ea] unless @option.internal && !@option.external
+          li "%10s: %s" % ['Internal', ia] unless @option.external && !@option.internal
+          li "%10s: %s" % ['External', ea] unless @option.internal && !@option.external
         end
         @global.quiet = true  # don't print elapsed time
       end
@@ -60,12 +69,12 @@ module Rudy
         opts = check_options
         if (@option.group || @option.owner)
           g = [opts[:owner], opts[:group]].join(':')
-          puts "#{action.to_s.capitalize} access to #{group.bright} from #{g.bright}"
+          li "#{action.to_s.capitalize} access to #{group.bright} from #{g.bright}"
         else
           print "#{action.to_s.capitalize} access to #{group.bright}"
-           puts " from #{opts[:addresses].join(', ').bright}"
+           li " from #{opts[:addresses].join(', ').bright}"
           print "on #{opts[:protocols].join(', ').bright} "
-           puts "ports: #{opts[:ports].map { |p| "#{p.join(' to ').bright}" }.join(', ')}"
+           li "ports: #{opts[:ports].map { |p| "#{p.join(' to ').bright}" }.join(', ')}"
         end
         execute_check(:medium)
         execute_action { 

data/lib/rudy/cli/routines.rb

@@ -24,7 +24,7 @@ module Rudy; module CLI;
       
       outform = @@global.format == :json ? :to_json : :to_yaml
       
-      puts routine.to_hash.send(outform)
+      li routine.to_hash.send(outform)
     end
     
     def startup_valid?
@@ -34,7 +34,7 @@ module Rudy; module CLI;
     end
     def startup
       machines = @rr.execute || []
-      puts $/, "The following machines are now available:" unless machines.empty?
+      li $/, "The following machines are now available:" unless machines.empty?
       print_stobjects machines, :noverbose
     end
     
@@ -45,7 +45,7 @@ module Rudy; module CLI;
     end
     def reboot
       machines = @rr.execute
-      puts $/, "The following machines have been restarted:"
+      li $/, "The following machines have been restarted:"
       print_stobjects machines, :noverbose
     end
     
@@ -71,8 +71,8 @@ module Rudy; module CLI;
             
       machines = @rr.execute
       
-      if @global.verbose > 1 && !machines.empty?
-        puts $/, "The following machines were processed:"
+      if !@@global.quiet && !machines.empty?
+        li $/, "The following machines were processed:"
         print_stobjects machines, :noverbose
       end
       
@@ -86,11 +86,11 @@ module Rudy; module CLI;
     def shutdown
       routine = fetch_routine_config(:shutdown) rescue {}
       
-      puts "All machines in #{current_machine_group} will be shutdown".bright
+      li "All machines in #{current_machine_group} will be shutdown".bright
       if routine && routine.disks
         if routine.disks.destroy
-          puts "The following filesystems will be destroyed:".bright
-          puts routine.disks.destroy.keys.join($/).bright
+          li "The following filesystems will be destroyed:".bright
+          li routine.disks.destroy.keys.join($/).bright
         end
       end
       
@@ -98,9 +98,9 @@ module Rudy; module CLI;
       
       machines = @rr.execute
       
-      puts $/, "The following instances have been destroyed:"
+      li $/, "The following instances have been destroyed:"
       machines.each do |machine|
-        puts '%s %s ' % [machine.name.bright, machine.instid]
+        li '%s %s ' % [machine.name.bright, machine.instid]
       end
       
     end

data/lib/rudy/config.rb

@@ -106,12 +106,12 @@ module Rudy
     def self.init_config_dir
       
       unless File.exists?(Rudy::CONFIG_DIR)
-        puts "Creating #{Rudy::CONFIG_DIR}"
+        li "Creating #{Rudy::CONFIG_DIR}"
         Dir.mkdir(Rudy::CONFIG_DIR, 0700)
       end
 
       unless File.exists?(Rudy::CONFIG_FILE)
-        puts "Creating #{Rudy::CONFIG_FILE}"
+        li "Creating #{Rudy::CONFIG_FILE}"
         rudy_config = Rudy::Utils.without_indent %Q`
           accounts {                           # Account Access Indentifiers
             aws {                              # amazon web services 

data/lib/rudy/config/objects.rb

@@ -112,7 +112,7 @@ class Rudy::Config
         # We can allow existing commands to be overridden but we
         # print a message to STDERR so the user knows what's up.
         if Rye::Cmd.can?(cmd)
-          STDERR.puts "Redefining #{cmd}" if Rudy::Huxtable.global.verbose > 2
+          Rudy::Huxtable.le "Redefining #{cmd}" if Rudy::Huxtable.global.verbose > 2
         end
         
         if args.last.is_a?(Proc)

data/lib/rudy/huxtable.rb

@@ -38,7 +38,10 @@ module Rudy
     end
 
     def self.update_global(ghash); @@global.update(ghash); end
-    def self.update_logger(logger);   @@logger = logger; end
+    def self.update_logger(logger)
+      return if logger.nil?
+      @@logger = logger 
+    end
     
     def self.reset_config; @@config = Rudy::Config.new; end
     def self.reset_global; @@global = Rudy::Global.new; end
@@ -59,14 +62,17 @@ module Rudy
     
     # Puts +msg+ to +@@logger+
     def self.li(*msg); msg.each { |m| @@logger.puts m } if !@@global.quiet; end
-    # Puts +msg+ to +@@logger+ if +Rudy.debug?+ returns true
-    def self.ld(*msg); msg.each { |m| @@logger.puts "D: #{m}" } if Rudy.debug?; end
     # Puts +msg+ to +@@logger+ with "ERROR: " prepended
-    def self.le(*msg); msg.each { |m| @@logger.puts "  #{m}" }; end
+    def self.le(*msg); @@logger.puts "  " << msg.join("#{$/}  "); end
+    # Puts +msg+ to +@@logger+ if +Rudy.debug?+ returns true
+    def self.ld(*msg)
+      return unless Rudy.debug?
+      @@logger.puts "D:  " << msg.join("#{$/}D:  ")
+    end
     
     def li(*msg); Rudy::Huxtable.li *msg; end
-    def ld(*msg); Rudy::Huxtable.ld *msg; end
     def le(*msg); Rudy::Huxtable.le *msg; end
+    def ld(*msg); Rudy::Huxtable.ld *msg; end
     
     def config_dirname
       raise "No config paths defined" unless @@config.is_a?(Rudy::Config) && @@config.paths.is_a?(Array)

data/lib/rudy/machines.rb

@@ -44,13 +44,16 @@ module Rudy
         group = Array.new(size) do |i|
           m = Rudy::Machine.new(i + 1)
           m.create
+          li "Created: #{m.to_s}"
           m
         end
       else
         m = Rudy::Machine.new(Rudy::Huxtable.global.position)
         m.create
-        [m]
+        li "Created: #{m.to_s}"
+        group = [m]
       end
+      group
     end
     
     def restart

data/lib/rudy/metadata/machine.rb

@@ -126,6 +126,16 @@ module Rudy
       k.decrypt encrtypted_text
     end
     
+    def create_mock
+      refresh!
+      @dns_public = @dns_private = nil
+      inst = Rudy::AWS::EC2::Instances.list(:running).first
+      @instid = inst.awsid
+      self.save :replace
+      sleep 1
+      self
+    end
+    
     def create
       raise "#{name} is already running" if instance_running?
       
@@ -140,11 +150,7 @@ module Rudy
         :machine_data => self.generate_machine_data.to_yaml
       }
       
-      Rudy::Huxtable.ld "OPTS: #{opts.inspect}"
-      
-      #@dns_public = @dns_private = nil
-      #inst = Rudy::AWS::EC2::Instances.list(:running).first
-      #@instid = inst.awsid
+      ld "OPTS: #{opts.inspect}"
       
       Rudy::AWS::EC2::Instances.create(opts) do |inst|
         @instid = inst.awsid
@@ -157,19 +163,22 @@ module Rudy
           if @address
             # Make sure the address is associated to the current account
             if Rudy::AWS::EC2::Addresses.exists?(@address)
-              puts "Associating #{@address} to #{@instid}"
+              li "Associating #{@address} to #{@instid}"
               Rudy::AWS::EC2::Addresses.associate(@address, @instid)
             else
-              STDERR.puts "Unknown address: #{@address}"
+              le "Unknown address: #{@address}"
             end
           end
         rescue => ex
-          STDERR.puts "Error: #{ex.message}"
-          STDERR.puts ex.backtrace if Rudy.debug?
+          le "Error: #{ex.message}"
+          le ex.backtrace if Rudy.debug?
         end
       end
       
       self.save
+      
+      sleep 1 # Eventual consistency in SimpleDB
+      
       self
     end
     

data/lib/rudy/routines.rb

@@ -87,7 +87,7 @@ module Rudy
     def self.runner(routine, rset, lbox, argv=nil)
       routine.each_pair do |name,definition| 
         handler = Rudy::Routines.get_handler name
-        Rudy::Huxtable.ld "  executing handler: #{name}"
+        Rudy::Huxtable.li "  #{name}:".bright
         self.rescue {
           handler.execute(name, definition, rset, lbox, argv)
         }
@@ -99,8 +99,8 @@ module Rudy
       begin
         ret = bloc_party.call
       rescue NameError, ArgumentError, RuntimeError, Errno::ECONNREFUSED => ex
-        STDERR.puts "  #{ex.class}: #{ex.message}".color(:red)
-        STDERR.puts ex.backtrace if Rudy.debug?
+        Rudy::Huxtable.le "#{ex.class}: #{ex.message}".color(:red)
+        Rudy::Huxtable.le ex.backtrace if Rudy.debug?
         unless Rudy::Huxtable.global.parallel
           choice = Annoy.get_user_input('(S)kip  (A)bort: ', nil, 3600) || ''
           if choice.match(/\AS/i)
@@ -110,7 +110,7 @@ module Rudy
           end
          end
       rescue Interrupt
-        puts "Aborting..."
+        li "Aborting..."
         exit 12
       end
       ret

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

@@ -8,10 +8,10 @@ module Rudy; module Routines; module Handlers;
      begin
        ret = command.call if command
        return unless ret.is_a?(Rye::Rap)
-       puts '  ' << ret.stdout.join("#{$/}  ") if !ret.stdout.empty?
+       li '  ' << ret.stdout.join("#{$/}  ") if !ret.stdout.empty?
        print_response(ret)
      rescue IOError => ex
-       STDERR.puts "  Connection Error (#{ex.message})".color(:red)
+       le "  Connection Error (#{ex.message})".color(:red)
        choice = Annoy.get_user_input('(S)kip  (R)etry  (F)orce  (A)bort: ', nil, 3600) || ''
         if choice.match(/\AS/i)
           return
@@ -38,11 +38,11 @@ module Rudy; module Routines; module Handlers;
       colour = rap.exit_code != 0 ? :red : :normal
       [:stderr].each do |sumpin|
         next if rap.send(sumpin).empty?
-        STDERR.puts
-        STDERR.puts(("  #{sumpin.to_s.upcase}  " << '-'*38).color(colour).bright)
-        STDERR.puts "  " << rap.send(sumpin).join("#{$/}  ").color(colour)
+        le
+        le(("  #{sumpin.to_s.upcase}  " << '-'*38).color(colour).bright)
+        le "  " << rap.send(sumpin).join("#{$/}  ").color(colour)
       end
-      STDERR.puts "  Exit code: #{rap.exit_code}".color(colour) if rap.exit_code != 0
+      le "  Exit code: #{rap.exit_code}".color(colour) if rap.exit_code != 0
     end
   
   end

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

@@ -82,7 +82,7 @@ module Rudy::Routines::Handlers;
     
     def create(rbox, disk, index)
       if disk.exists?
-        puts "Disk found: #{disk.name}"
+        li "Disk found: #{disk.name}"
         disk.refresh!          
       end
       
@@ -179,7 +179,7 @@ module Rudy::Routines::Handlers;
         raise Rudy::Disks::AlreadyMounted, disk.name if disk.mounted?
       end
       
-      puts "Mounting at #{disk.path}... "
+      li "Mounting at #{disk.path}... "
       
       
       rbox.mkdir(:p, disk.path)
@@ -201,7 +201,7 @@ module Rudy::Routines::Handlers;
         raise Rudy::Disks::NotMounted, disk.name if !disk.mounted?
       end
       
-      puts "Unmounting #{disk.path}... "
+      li "Unmounting #{disk.path}... "
       
       unless rbox.nil? || rbox.stash.windows?
         rbox.umount(disk.path)
@@ -232,11 +232,11 @@ module Rudy::Routines::Handlers;
       
       print "Creating #{disk.fstype} filesystem for #{disk.path}... "
       if rbox.stash.windows?
-        puts "(index: #{index})"
+        li "(index: #{index})"
         windows_diskpart_partition rbox, disk, index
         disk.mounted = true
       else
-        puts $/
+        li $/
         rbox.rudy_mkfs(:t, disk.fstype, :F, disk.device)
       end
       
@@ -257,7 +257,7 @@ module Rudy::Routines::Handlers;
         raise Rudy::Disks::InUse, disk.name if disk.volume_attached?
       end
       
-      puts "Destroying #{disk.name}"
+      li "Destroying #{disk.name}"
       disk.destroy
     end
     
@@ -268,13 +268,13 @@ module Rudy::Routines::Handlers;
       raise Rudy::Disks::NotAttached, disk.name if !disk.volume_attached?
       
       back = disk.archive
-      puts "Created backup: #{back.name}"
+      li "Created backup: #{back.name}"
     end
     
     def restore(rbox, disk, index)
 
       if disk.exists?
-        puts "Disk found: #{disk.name}"
+        li "Disk found: #{disk.name}"
         disk.refresh!       
       end
       
@@ -290,7 +290,7 @@ module Rudy::Routines::Handlers;
       
       disk.size, disk.fstype = latest_backup.size, latest_backup.fstype
       
-      puts "Backup found: #{latest_backup.name}"
+      li "Backup found: #{latest_backup.name}"
       
       unless disk.volume_exists?
         msg = "Creating volume... "

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

@@ -70,7 +70,7 @@ module Rudy; module Routines; module Handlers;
       end
       
       ports.each do |port|
-        #li "Authorizing port #{port} access for: #{addresses.join(', ')}"
+        li "#{action} port #{port} access for: #{addresses.join(', ')}"
         Rudy::AWS::EC2::Groups.send(action, name, addresses, [[port, port]]) rescue nil
       end
     end

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

@@ -13,7 +13,7 @@ module Rudy::Routines::Handlers;
      def create_box(hostname, opts={})
        ld [:hostname, hostname, opts, caller[0]]
        opts = {
-         :info => (@@global.verbose >= 3),  # rudy -vvv
+         :info => (@@global.verbose >= 2),  # rudy -vv
          :debug => false,
          :user => current_machine_user, 
          :ostype => current_machine_os || :unix,
@@ -35,14 +35,14 @@ module Rudy::Routines::Handlers;
        # 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
+       if !@@global.parallel && !@@global.quiet
          # 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
+       if @@global.verbose > 0 && !@@global.quiet
          # And this one gets called after each command method call.
          box.post_command_hook do |ret|
            print_response ret
@@ -68,7 +68,9 @@ module Rudy::Routines::Handlers;
      # NOTE: Windows machines are skipped and not added to the set. 
      def create_set(hostnames, opts={})
        hostnames ||= []
-
+       
+       ld "Creating set from:", hostnames.inspect
+       
        opts = {
          :user => (current_machine_user).to_s,
          :parallel => @@global.parallel
@@ -164,7 +166,7 @@ module Rudy::Routines::Handlers;
      else
        le prefix << "#{ex.class}: #{ex.message}".color(:red)
      end
-     le *ex.backtrace if @@global.verbose > 2
+     le ex.backtrace if @@global.verbose > 1
    end