solutious-rudy 0.9.0 → 0.9.1

data/lib/rudy/cli/base.rb

@@ -30,10 +30,16 @@ module Rudy::CLI
         STDERR.puts ex.backtrace if @@global.verbose > 0
         exit 81
       end
-
+      
       @@global.nocolor ? String.disable_color : String.enable_color
-      @@global.yes ? Annoy.enable_skip : Annoy.disable_skip
-
+      @@global.auto ? Annoy.enable_skip : Annoy.disable_skip
+      
+      # ANSI codes look like garbage in DOS
+      if Rudy.sysinfo.os.to_s == 'win32'
+        String.disable_color 
+        raise Rudy::Error, 'Ruby 1.9 is not supported (yet)' if Rudy.sysinfo.ruby == [1,9,1]
+      end
+      
       unless @@global.accesskey && @@global.secretkey
         STDERR.puts "No AWS credentials. Check your configs!"
         STDERR.puts "Try: rudy init"
@@ -51,7 +57,7 @@ module Rudy::CLI
         gcopy.secretkey = "[HIDDEN]"
         puts "# GLOBALS: ", gcopy.dump(format)
       end
-
+      
       Rudy::Metadata.connect @@global.accesskey, @@global.secretkey, @@global.region
       Rudy::AWS::EC2.connect @@global.accesskey, @@global.secretkey, @@global.region
     end

data/lib/rudy/cli/config.rb

@@ -21,7 +21,7 @@ module Rudy
       #
       # It will return the most specific configuration available. If the 
       # attribute isn'e found it will check each parent for the same attribute. 
-      # i.e. if [prod][app][ami] is not available, it will check [prod][ami]
+      # e.g. if [prod][app][ami] is not available, it will check [prod][ami]
       # and then [ami]. 
       #
       #     # Display all configuration
@@ -61,7 +61,11 @@ module Rudy
           types.each do |conftype|
             puts "# #{conftype.to_s.upcase}"
             next unless @@config[conftype]  # Nothing to output
-            @@config[conftype][:aws][:secretkey] = '[hidden]' if conftype == :accounts
+            if conftype == :accounts
+              skey = @@config[conftype][:aws][:secretkey]
+              @@config[conftype][:aws][:secretkey] = hide_secret_key(skey)
+            end
+            
             puts @@config[conftype].to_hash.send(outform)
           end
         end
@@ -76,10 +80,16 @@ module Rudy
         end
         gtmp = @@global.clone
         gtmp.format = "yaml" if gtmp.format == :s || gtmp.format == :string
-        gtmp.accesskey = gtmp.secretkey = "[not displayed]"
+        gtmp.secretkey = hide_secret_key(gtmp.secretkey)
         puts gtmp.dump(gtmp.format)
       end
       
+      private
+      def hide_secret_key(skey)
+        skey = skey.to_s
+        "%s%s%s" % [skey[0], '.'*18, skey[-1]]
+      end
+      
     end
   end
 end

data/lib/rudy/cli/disks.rb

@@ -25,7 +25,7 @@ module Rudy
           seen << d.name
           puts @@global.verbose > 0 ? d.inspect : d.dump(@@global.format)
           if @option.backups
-            d.list_backups.each_with_index do |b, index|
+            d.backups.each_with_index do |b, index|
               puts '  %s' % b.name
               ##break if @option.all.nil? && index >= 2 # display only 3, unless all
             end

data/lib/rudy/cli/execbase.rb

@@ -34,10 +34,13 @@ module Rudy::CLI
     global :c, :cert, String, "AWS Private Certificate (cert-****.pem)"
     global :f, :format, String, "Output format"
     global :n, :nocolor, "Disable output colors"
-    global :C, :config, String, "Specify another configuration file to read (e.g. #{Rudy::CONFIG_FILE})"
-    global :Y, :yes, "Assume a correct answer to confirmation questions"
+    global :Y, :auto, "Skip interactive confirmation"
     global :q, :quiet, "Run with less output"
     global :O, :offline, "Be cool about the internet being down"
+    global :C, :config, String, "Specify another configuration file to read (e.g. #{Rudy::CONFIG_FILE})" do |val|
+      @configs ||= []
+      @configs << val
+    end
     global :v, :verbose, "Increase verbosity of output (e.g. -v or -vv or -vvv)" do
       @verbose ||= 0
       @verbose += 1

data/lib/rudy/cli/machines.rb

@@ -4,6 +4,7 @@ module Rudy
   module CLI
     class Machines < Rudy::CLI::CommandBase
       
+      
       def machines
         # Rudy::Machines.list takes two optional args for adding or 
         # removing metadata attributes to modify the select query. 
@@ -15,15 +16,10 @@ module Rudy
         
         mlist = Rudy::Machines.list(fields, less) || []
         if mlist.empty?
-          if @option.all
-            puts "No machines running"
-          else
-            puts "No machines running in #{current_machine_group}" 
-            puts "Try: rudy machines --all"
-          end
+          raise( NoMachines, @option.all ? nil : current_group_name)
         end
         mlist.each do |m|
-          puts @@global.verbose > 0 ? m.inspect : m.dump(@@global.format)
+          puts @@global.verbose > 0 ? m.to_yaml : "#{m.name}: #{m.dns_public}" 
         end
       end
       
@@ -44,6 +40,157 @@ module Rudy
         
       end
       
+      def associate_machines_valid?
+        @mlist = Rudy::Machines.list || []
+        @alist = Rudy::AWS::EC2::Addresses.list || []
+        @alist_used    = @alist.select { |a|  a.associated? }
+        @alist_unused  = @alist.select { |a| !a.associated? }
+        @alist_unused.collect! { |a| a.ipaddress }
+        @alist_instids = @alist_used.collect { |a| a.instid }
+        @mlist_static  = @mlist.select do |m| 
+          @alist_instids.member?(m.instid)
+        end
+        
+        unless @@global.force
+          unless @mlist_static.empty?
+            msg = "Some machines already have static IP addresses: #{$/}"
+            msg << @mlist_static.collect { |m| "#{m.name}: #{m.dns_public}" }.join($/)
+            raise Rudy::Error, msg 
+          end
+        
+          if !@argv.empty? && @mlist.size > @argv.size
+            msg = "You supplied #{@argv.size} addresses for #{@mlist.size} "
+            msg << "machines. Try: rudy --force machines -S #{@argv.join(' ')}"
+            raise Rudy::Error, msg
+          end
+        
+          if @alist_unused.size > 0 && @alist_unused.size < @mlist.size
+            msg = "There are only #{@alist_unused.size} available addresses for "
+            msg << "#{@mlist.size} machines. Try: rudy --force machines -S #{@argv.join(' ')}"
+            raise Rudy::Error, msg
+          end
+        end
+        
+        @argv.each do |address|
+          unless Rudy::AWS::EC2::Addresses.exists?(address)
+            raise "#{address} is not allocated to you" 
+          end
+          if Rudy::AWS::EC2::Addresses.associated?(address)
+            raise "#{address} is already associated!"
+          end
+        end
+        
+        @alist_unused = @argv unless @argv.empty? 
+        
+        true
+      end
+      
+      def associate_machines 
+        
+        puts "Assigning static IP addresses for:"
+        puts @mlist.collect { |m| m.name }
+        
+        execute_check(:medium)
+        
+        @mlist.each do |m|
+          next if @mlist_static.member?(m)
+          address = @alist_unused.shift
+          address ||= Rudy::AWS::EC2::Addresses.create.ipaddress
+          puts "Associating #{address} to #{m.name} (#{m.instid})"
+          Rudy::AWS::EC2::Addresses.associate(address, m.instid)
+          sleep 2
+          m.refresh!
+        end
+        
+        @alist = Rudy::AWS::EC2::Addresses.list || []
+        @alist_used    = @alist.select { |a|  a.associated? }
+        @alist_instids = @alist_used.collect { |a| a.instid }
+        @mlist_static  = @mlist.select do |m| 
+          @alist_instids.member?(m.instid)
+        end
+        
+        unless @mlist_static.empty?
+          @mlist_static.each do |m|
+            puts "%s: %s" % [m.name, m.dns_public]
+          end
+        end
+      end
+      
+      
+      def disassociate_machines_valid?
+        @mlist = Rudy::Machines.list || []
+        @alist = Rudy::AWS::EC2::Addresses.list || []
+        @alist_used    = @alist.select { |a|  a.associated? }
+        @alist_instids = @alist_used.collect { |a| a.instid }
+        @mlist_static  = @mlist.select do |m| 
+          @alist_instids.member?(m.instid)
+        end
+        raise NoMachines, current_group_name if @mlist.empty?
+        true
+      end
+      
+      
+      def disassociate_machines
+        if @mlist_static.empty?
+          puts "No machines in #{current_group_name} have static IP addresses"
+        else
+          puts "The following machines will be updated:"
+          puts @mlist_static.collect { |m| m.name }
+          puts "NOTE: Unassigned IP addresses are not removed from your account"
+          execute_check(:medium)
+          @mlist_static.each do |m|
+            address = Resolv.getaddress m.dns_public
+            puts "Disassociating #{address} from #{m.name} (#{m.instid})"
+            Rudy::AWS::EC2::Addresses.disassociate(address)
+          end
+        end
+      end
+      
+      def update_machines
+        fields, less = {}, []
+        less = Rudy::Metadata::COMMON_FIELDS if @option.all
+        mlist = Rudy::Machines.list(fields, less) || []
+        rset = Rye::Set.new(current_group_name, :parallel => @@global.parallel, :user => 'root')
+        os = current_machine_os
+        mlist.each do |m|
+          m.refresh!
+          rbox = Rye::Box.new(m.dns_public, :user => 'root')
+          rbox.add_key user_keypairpath('root')
+          rbox.nickname = m.name
+          rbox.stash = m
+          rset.add_boxes rbox
+          puts "Updating metadata"
+          if m.os.to_s != os.to_s
+            puts "os: #{os}"
+            m.os = os
+          end
+          m.save :replace
+        end
+        
+        unless os.to_s == 'win32'
+          puts "Updating hostnames for #{current_group_name}"
+          Rudy::Routines::Handlers::Host.set_hostname rset
+          puts rset.hostname.flatten
+        end
+        
+      end
+      
+      def available_machines
+        fields, less = {}, []
+        less = Rudy::Metadata::COMMON_FIELDS if @option.all
+        mlist = Rudy::Machines.list(fields, less) || []
+        mlist.each do |m|
+          print "#{m.name}: "
+          m.refresh!
+          Rudy::Utils.waiter(2, 60, STDOUT, nil, 0) {
+            Rudy::Utils.service_available?(m.dns_public, 22)
+          }
+          available = Rudy::Utils.service_available?(m.dns_public, 22)
+          puts available ? 'up' : 'down'
+        end
+        
+      end
+      
       
       def ssh
         # TODO: Give this method a good look over
@@ -52,15 +199,16 @@ module Rudy
           puts "No private key configured for #{current_machine_user} in #{current_machine_group}"
         end
         
-        # Options to be sent to Net::SSH
-        ssh_opts = { :user => current_machine_user, :debug => nil }
+        # Options to be sent to Rye::Box
+        rye_opts = { :user => current_machine_user, :debug => nil }
         if pkey 
           raise "Cannot find file #{pkey}" unless File.exists?(pkey)
-          raise InsecureKeyPermissions, @pkey unless File.stat(pkey).mode == 33152
-          ssh_opts[:keys] = pkey 
+          if Rudy.sysinfo.os != :win32 && File.stat(pkey).mode != 33152
+            raise InsecureKeyPermissions, pkey 
+          end
+          rye_opts[:keys] = pkey 
         end
-
-
+        
         # The user specified a command to run. We won't create an interactive
         # session so we need to prepare the command and its arguments
         if @argv.first
@@ -71,42 +219,95 @@ module Rudy
         else
           command, command_args = :interactive_ssh, @option.print.nil?
         end
-
-
+        
+        if command == :interactive_ssh && @global.parallel
+          raise "Cannot run interactive sessions in parallel"
+        end
+        
         checked = false
         lt = Rudy::Machines.list 
         unless lt
           puts "No machines running in #{current_machine_group}"
-          exit
+          return
         end
+        
+        rset = Rye::Set.new(current_machine_group, :parallel => @global.parallel)
         lt.each do |machine|
           machine.refresh!  # make sure we have the latest DNS info
-          
-          # mount -t ext3 /dev/sdr /rudy/disk1
-          
-          # Print header
-          if @@global.quiet
-            print "You are #{ssh_opts[:user].to_s.bright}. " if !checked # only the 1st
+          rbox = Rye::Box.new(machine.dns_public, rye_opts)
+          rbox.nickname = machine.name
+          if command == :interactive_ssh
+            # Print header
+            if @@global.quiet
+              print "You are #{rye_opts[:user].to_s.bright}. " if !checked # only the 1st
+            else
+              puts machine_separator(machine.name, machine.instid)
+              puts "Connecting #{rye_opts[:user].to_s.bright}@#{machine.dns_public} "
+              puts
+            end
           else
-            puts machine_separator(machine.name, machine.instid)
-            puts "Connecting #{ssh_opts[:user].to_s.bright}@#{machine.dns_public} "
-            puts
+            unless @global.parallel
+              rbox.pre_command_hook do |cmd,user,host,nickname|
+                print_command user, nickname, cmd
+              end
+            end
+            rbox.post_command_hook do |ret|
+              print_response ret
+            end
           end
 
           # Make sure we want to run this command on all instances
           if !checked && command != :interactive_ssh 
-            execute_check(:low) if ssh_opts[:user] == "root"
+            execute_check(:low) if rye_opts[:user] == "root"
             checked = true
           end
           
-          # Open the connection and run the command
-          rbox = Rye::Box.new(machine.dns_public, ssh_opts)
-          ret = rbox.send(command, command_args)
-          puts ret unless command == :interactive_ssh
+          # Open the connection and run the command          
+          if command == :interactive_ssh
+            rbox.send(command, command_args) 
+          else
+            rset.add_box rbox
+          end
         end
+        
+        rset.send(command, command_args) unless command == :interactive_ssh
+        
       end
 
+      
+      private 
+      # 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
+      
     end
   end
 end

data/lib/rudy/cli/networks.rb

@@ -0,0 +1,34 @@
+
+
+module Rudy
+  module CLI
+    class Networks < Rudy::CLI::CommandBase
+      
+      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)
+        end
+      end
+      
+      def update_networks
+        Rudy::Routines::Handlers::Group.authorize rescue nil
+      end
+      
+      def local_networks
+        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
+        else
+          puts "%10s: %s" % ['Internal', ia] unless @option.external && !@option.internal
+          puts "%10s: %s" % ['External', ea] unless @option.internal && !@option.external
+        end
+        @global.quiet = true  # don't print elapsed time
+      end
+      
+    end
+    
+  end
+end

data/lib/rudy/cli/routines.rb

@@ -90,7 +90,7 @@ module Rudy; module CLI;
       true
     end
     def shutdown
-      routine = fetch_routine_config(:shutdown)
+      routine = fetch_routine_config(:shutdown) rescue {}
       
       puts "All machines in #{current_machine_group} will be shutdown".bright
       if routine && routine.disks