rudy 0.9.1 → 0.9.2

data/lib/rudy/cli/execbase.rb

@@ -6,8 +6,6 @@ module Rudy::CLI
   class Base
     extend Drydock
     
-    debug :off
-    
     before do |obj|
       # Don't print Rudy header unless requested to
       obj.global.print_header = false  if (obj.global.verbose == 0)

data/lib/rudy/cli/images.rb

@@ -0,0 +1,97 @@
+
+module Rudy
+  module CLI
+    class Images < Rudy::CLI::CommandBase
+      
+      def bundle_valid?
+        raise "No S3 bucket provided. See rudy bundle -h" unless @@global.bucket
+        raise "No image name provided. See rudy bundle -h" unless @argv.name
+          
+        @machines = Rudy::Machines.list
+        raise "No machines" if @machines.nil?
+        
+        @machines = @machines.select { |m| m.windows? }
+        raise "No Windows machines" if @machines.nil?
+        
+        true
+      end
+      
+      def bundle
+
+        @machines.each do |m|
+          puts machine_separator(m.name, m.instid)
+
+          cmd = "ec2-bundle-instance"
+          args = [m.instid, "--region", @@global.region.to_s]
+          args += ["-b", @@global.bucket, "-p", @argv.name]
+          args += ["-o", @@global.accesskey, "-w", @@global.secretkey]
+          args += ["-K", @@global.pkey, "-C", @@global.cert]
+          
+          # S3 returned 301 (Moved Permanently) for ACL on bucket [EU-BUCKET]
+          args += ["--no-bucket-setup"] if @@global.region.to_s == 'eu-west-1'
+          
+          if @@global.verbose > 0
+            puts "Running: " << Rye.prepare_command(cmd, args), $/
+          end
+          
+          unless @@global.quiet
+            puts "Bundling can take up to 60 minutes."
+            puts "Check the status with the following command:"
+            puts Rudy::Huxtable.generate_rudy_command('bundle-status').bright
+            puts $/, "When complete, register the image with the command:"
+            puts Rudy::Huxtable.generate_rudy_command('images', '-R', @argv.name).bright
+          end
+          
+          execute_check(:medium)
+          
+          ret = Rye.shell cmd, args
+          puts ret.stderr, ret.stdout
+        end
+      end
+      
+      def bundle_status
+        cmd = 'ec2-describe-bundle-tasks'
+        args = ["--region", @@global.region.to_s]
+        args += ["-K", @@global.pkey, "-C", @@global.cert]
+        
+        if @@global.verbose > 0
+          puts "Running: " << Rye.prepare_command(cmd, args), $/
+        end
+        
+        ret = Rye.shell cmd, args
+        puts ret.stderr, ret.stdout
+          
+      end
+      
+      def register_images_valid?
+        raise "No S3 bucket provided. See rudy bundle -h" unless @@global.bucket
+        raise "No image name provided. See rudy bundle -h" unless @argv.name
+        
+        true
+      end
+      def register_images
+        name = "#{@@global.bucket}/#{@argv.name}.manifest.xml"
+        puts Rudy::AWS::EC2::Images.register(name)
+      end
+      
+      def deregister_images_valid?
+        unless @argv.first && Rudy::Utils.is_id?(:image, @argv.first)  
+          raise "Must supply an AMI ID. See rudy images -h" 
+        end
+        true
+      end
+      def deregister_images
+        execute_check(:low)
+        puts Rudy::AWS::EC2::Images.deregister(@argv.ami) ? "Done" : "Unknown error"
+      end
+      
+      def images
+        @option.owner ||= 'self'
+        images = Rudy::AWS::EC2::Images.list(@option.owner, @argv) || []
+        print_stobjects images
+      end
+      
+      
+    end
+  end
+end

data/lib/rudy/cli/info.rb

@@ -0,0 +1,48 @@
+
+
+module Rudy
+  module CLI
+    class Info < Rudy::CLI::CommandBase
+
+      def info
+        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 "  Machines".bright
+        
+        (get_machines(:region => region) rescue []).collect do |m| 
+          m.refresh!
+          puts "    " << m.to_s.noatt
+        end
+        
+        puts "  Disks".bright
+        (get_disks(:region => region) || []).collect do |d|
+          d.refresh!
+          puts "    " << d.to_s.noatt
+        end
+                
+        puts "  Backups".bright
+        (get_backups(:region => region) || []).collect do |b|
+          b.refresh!
+          puts "    " << b.to_s.noatt
+        end
+        
+        puts
+      end
+      
+    end
+  end
+end

data/lib/rudy/cli/keypairs.rb

@@ -0,0 +1,43 @@
+
+
+module Rudy
+  module CLI
+    class Keypairs < Rudy::CLI::CommandBase
+      
+      
+      def keypairs_add_valid?
+        true
+      end
+      
+      def keypairs_add 
+        puts current_group_name
+      end
+      
+      def keypairs_valid?
+        @pkey = current_user_keypairpath
+        unless File.exists? @pkey
+          raise "No private key file for #{current_machine_user} in #{current_group_name}"
+        end
+        true
+      end
+      
+      def keypairs
+        puts Rudy::AWS::EC2::Keypairs.get(current_user_keypairname)
+      end
+
+      def keypairs_show_valid?
+        keypairs_valid?
+      end
+            
+      def keypairs_show
+        content = File.read(@pkey)
+        rkey = Rye::Key.new content
+        puts "# #{@pkey}"
+        puts content
+        puts rkey.public_key
+      end
+      
+    end
+  end
+end
+

data/lib/rudy/cli/machines.rb

@@ -4,27 +4,32 @@ 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. 
-        # When all is specified we want to find machines in every
-        # environment and role to we remove these attributes from
-        # the select. 
-        fields, less = {}, []
-        less = Rudy::Metadata::COMMON_FIELDS if @option.all
-        
-        mlist = Rudy::Machines.list(fields, less) || []
-        if mlist.empty?
-          raise( NoMachines, @option.all ? nil : current_group_name)
+        mlist = get_machines
+        print_stobjects mlist
+      end
+      
+      def machines_console
+        mlist = get_machines
+        mlist.each do |machine|
+          puts machine_separator(machine.name, machine.instid)
+          puts machine.get_console
         end
-        mlist.each do |m|
-          puts @@global.verbose > 0 ? m.to_yaml : "#{m.name}: #{m.dns_public}" 
+      end
+      
+      def machines_password
+        mlist = get_machines
+        mlist.each do |machine|
+          puts machine_separator(machine.name, machine.instid)
+          puts "Password for %s: %s" % [machine.dns_public, machine.get_password]
         end
+        Rudy::Routines::Handlers::Group.authorize rescue nil
       end
       
       def machines_wash
-        dirt = (Rudy::Machines.list || []).select { |m| !m.instance_running? }
+        mlist = get_machines
+        dirt = mlist.select { |m| !m.instance_running? }
+        
         if dirt.empty?
           puts "Nothing to wash in #{current_machine_group}"
           return
@@ -41,7 +46,7 @@ module Rudy
       end
       
       def associate_machines_valid?
-        @mlist = Rudy::Machines.list || []
+        @mlist = get_machines
         @alist = Rudy::AWS::EC2::Addresses.list || []
         @alist_used    = @alist.select { |a|  a.associated? }
         @alist_unused  = @alist.select { |a| !a.associated? }
@@ -118,7 +123,7 @@ module Rudy
       
       
       def disassociate_machines_valid?
-        @mlist = Rudy::Machines.list || []
+        @mlist = get_machines
         @alist = Rudy::AWS::EC2::Addresses.list || []
         @alist_used    = @alist.select { |a|  a.associated? }
         @alist_instids = @alist_used.collect { |a| a.instid }
@@ -147,19 +152,17 @@ module Rudy
       end
       
       def update_machines
-        fields, less = {}, []
-        less = Rudy::Metadata::COMMON_FIELDS if @option.all
-        mlist = Rudy::Machines.list(fields, less) || []
+        mlist = get_machines
         rset = Rye::Set.new(current_group_name, :parallel => @@global.parallel, :user => 'root')
         os = current_machine_os
         mlist.each do |m|
+          puts "Updating #{m.name}"
           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
@@ -167,7 +170,7 @@ module Rudy
           m.save :replace
         end
         
-        unless os.to_s == 'win32'
+        unless os.to_s == 'windows'
           puts "Updating hostnames for #{current_group_name}"
           Rudy::Routines::Handlers::Host.set_hostname rset
           puts rset.hostname.flatten
@@ -176,23 +179,29 @@ module Rudy
       end
       
       def available_machines
-        fields, less = {}, []
-        less = Rudy::Metadata::COMMON_FIELDS if @option.all
-        mlist = Rudy::Machines.list(fields, less) || []
+        mlist = get_machines
         mlist.each do |m|
           print "#{m.name}: "
           m.refresh!
+          port = m.windows? ? 3389 : 22
           Rudy::Utils.waiter(2, 60, STDOUT, nil, 0) {
-            Rudy::Utils.service_available?(m.dns_public, 22)
+            Rudy::Utils.service_available?(m.dns_public, port)
           }
-          available = Rudy::Utils.service_available?(m.dns_public, 22)
+          available = Rudy::Utils.service_available?(m.dns_public, port)
           puts available ? 'up' : 'down'
         end
         
       end
       
       
+      def ssh_valid?
+        #raise "SSH not supported on Windows" if current_machine_os.to_s == 'windows'
+        true
+      end
+      
       def ssh
+
+        
         # TODO: Give this method a good look over
         pkey = current_user_keypairpath
         unless pkey
@@ -201,9 +210,9 @@ module Rudy
         
         # 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)
-          if Rudy.sysinfo.os != :win32 && File.stat(pkey).mode != 33152
+        if File.exists? pkey 
+          #raise "Cannot find file #{pkey}" unless File.exists?(pkey)
+          if Rudy.sysinfo.os != :windows && File.stat(pkey).mode != 33152
             raise InsecureKeyPermissions, pkey 
           end
           rye_opts[:keys] = pkey 
@@ -225,12 +234,8 @@ module Rudy
         end
         
         checked = false
-        lt = Rudy::Machines.list 
-        unless lt
-          puts "No machines running in #{current_machine_group}"
-          return
-        end
-        
+        lt = get_machines
+
         rset = Rye::Set.new(current_machine_group, :parallel => @global.parallel)
         lt.each do |machine|
           machine.refresh!  # make sure we have the latest DNS info

data/lib/rudy/cli/networks.rb

@@ -13,6 +13,7 @@ module Rudy
       
       def update_networks
         Rudy::Routines::Handlers::Group.authorize rescue nil
+        networks
       end
       
       def local_networks
@@ -28,7 +29,74 @@ module Rudy
         @global.quiet = true  # don't print elapsed time
       end
       
+      
+      def modify_group_valid?
+        if @option.owner == 'self'
+          raise "AWS_ACCOUNT_NUMBER not set" unless @@global.accountnum 
+          @option.owner = @@global.accountnum 
+        end
+
+        if (@option.addresses || @option.ports) && (@option.group || @option.owner)
+          raise Drydock::OptError.new('', @alias, "Cannot mix group and network authorization")
+        end
+        if @option.owner && !@option.group
+          raise Drydock::OptError.new('', @alias, "Must provide -g with -o")
+        end
+
+        true
+      end
+      
+      def revoke_networks_valid?; modify_group_valid?; end
+      def revoke_networks; modify_group(:revoke); end
+
+      def authorize_networks_valid?; modify_group_valid?; end
+      def authorize_networks; modify_group(:authorize); end
+      
+    private
+    
+      def modify_group(action)
+        group = current_group_name
+        
+        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}"
+        else
+          print "#{action.to_s.capitalize} access to #{group.bright}"
+           puts " from #{opts[:addresses].join(', ').bright}"
+          print "on #{opts[:protocols].join(', ').bright} "
+           puts "ports: #{opts[:ports].map { |p| "#{p.join(' to ').bright}" }.join(', ')}"
+        end
+        execute_check(:medium)
+        execute_action { 
+          if (@option.group || @option.owner)
+            Rudy::AWS::EC2::Groups.send("#{action.to_s}_group", group, opts[:group], opts[:owner])
+          else
+            Rudy::AWS::EC2::Groups.send(action, group, opts[:addresses], opts[:ports], opts[:protocols])
+          end
+        }
+        networks
+      end
+
+      def check_options
+        opts = {}
+        [:addresses, :protocols, :owner, :group, :ports].each do |opt|
+          opts[opt] = @option.send(opt) if @option.respond_to?(opt)
+        end
+        unless @option.group || @option.owner
+          opts[:ports].collect! { |port| port.split(/[:-]/) } if opts[:ports]
+          opts[:ports] ||= [[22,22],[80,80],[443,443]]
+          opts[:addresses] ||= [Rudy::Utils::external_ip_address]
+          opts[:protocols] ||= [:tcp]
+        else
+          opts[:owner] ||= @@global.accountnum
+        end
+        opts
+      end
+
     end
     
+    
+    
   end
 end

data/lib/rudy/cli/routines.rb

@@ -35,9 +35,7 @@ module Rudy; module CLI;
     def startup
       machines = @rr.execute || []
       puts $/, "The following machines are now available:" unless machines.empty?
-      machines.each do |machine|
-        puts machine
-      end
+      print_stobjects machines, :noverbose
     end
     
     def reboot_valid?
@@ -48,9 +46,7 @@ module Rudy; module CLI;
     def reboot
       machines = @rr.execute
       puts $/, "The following machines have been restarted:"
-      machines.each do |machine|
-        puts machine
-      end
+      print_stobjects machines, :noverbose
     end
     
     def passthrough_valid?
@@ -77,9 +73,7 @@ module Rudy; module CLI;
       
       if @global.verbose > 1 && !machines.empty?
         puts $/, "The following machines were processed:"
-        machines.each do |machine|
-          puts machine
-        end
+        print_stobjects machines, :noverbose
       end
       
     end
@@ -109,7 +103,6 @@ module Rudy; module CLI;
         puts '%s %s ' % [machine.name.bright, machine.instid]
       end
       
-      
     end