solutious-rudy 0.9.1 → 0.9.2

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
@@ -200,15 +209,20 @@ module Rudy
         end
         
         # 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
+        rye_opts = { :user => current_machine_user, :keys => [], :debug => nil }
+        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 
+          rye_opts[:keys] << pkey 
         end
         
+        local_keys = Rye.keys
+        rye_opts[:keys] += local_keys if local_keys.is_a?(Array)
+        
+        puts "# SSH OPTS", rye_opts.to_yaml if @@global.verbose > 3
+        
         # 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
@@ -225,12 +239,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
     
 

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