rudy 0.8.5 → 0.9.0

data/lib/rudy/cli/metadata.rb

@@ -2,34 +2,48 @@
 
 module Rudy
   module CLI
-    class MetaData < Rudy::CLI::CommandBase
+    class Metadata < Rudy::CLI::CommandBase
       
+      def metadata_valid?
+        @option.rtype ||= 'm'
+        @metaobj = Rudy::Metadata.get_rclass @option.rtype
+        true
+      end
       
       def metadata
-        more, less = [], []
-        less = [:environment, :role, :zone, :region] if @option.all
-        more += [:rtype, @option.otype] if @option.otype
+        unless @argv.empty?
+          h = Rudy::Metadata.get(@argv.first)
+          return if h.nil?
+          @metaobj = Rudy::Metadata.get_rclass h['rtype'].first
+          objlist = Hash[@argv.first => @metaobj.from_hash(h)]
+        else
+          more, less = {}, []
+          less = [:environment, :role, :zone, :region, :position] if @option.all
+          objlist = @metaobj.list_as_hash(more, less) || {}
+        end
         
-        rdebug = Rudy::MetaData::Debug.new
-        objlist = rdebug.list(more, less) || []
-        objlist.each do |o|
-          p o
+        objlist.each_pair do |k,o|
+          puts "#{k}: " << o.inspect
         end
       end
       
       def metadata_delete_valid?
         raise "Must supply object ID" unless @argv.oid
+        raise Rudy::Metadata::UnknownObject, @argv.oid unless Rudy::Metadata.exists? @argv.oid
         true
       end
       
       def metadata_delete
-        rdebug = Rudy::MetaData::Debug.new
+
         unless @@global.quiet
           msg = "NOTE: This will delete only the metadata and "
           msg << "not the EC2 object (volume, instance, etc...)"
           puts msg
         end
-        p rdebug.get( @argv.oid)
+        
+        execute_check(:medium)
+        
+        Rudy::Metadata.destroy @argv.oid
       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

@@ -3,6 +3,30 @@
 module Rudy; module CLI;
   class Routines < Rudy::CLI::CommandBase
     
+    def routines_valid?
+      raise Rudy::NoRoutinesConfig unless @@config.routines
+      true
+    end
+    
+    def routines
+      if @@config.nil? || @@config.empty?
+        return if @@global.quiet
+        raise Rudy::NoConfig
+      end
+      
+      if @option.all
+        routine = @@config.routines
+      else
+        routine = {}
+        routine.merge! @@config.routines.find_deferred(@@global.environment, @@global.role) || {}
+        routine.merge! @@config.routines.find(@@global.role) || {}
+      end
+      
+      outform = @@global.format == :json ? :to_json : :to_yaml
+      
+      puts routine.to_hash.send(outform)
+    end
+    
     def startup_valid?
       @rr = Rudy::Routines::Startup.new(@alias, @option, @argv)
       @rr.raise_early_exceptions
@@ -12,7 +36,7 @@ module Rudy; module CLI;
       machines = @rr.execute || []
       puts $/, "The following machines are now available:" unless machines.empty?
       machines.each do |machine|
-        puts @@global.verbose > 2 ? machine.inspect : machine.dump(@@global.format)
+        puts machine
       end
     end
     
@@ -25,7 +49,7 @@ module Rudy; module CLI;
       machines = @rr.execute
       puts $/, "The following machines have been restarted:"
       machines.each do |machine|
-        puts @@global.verbose > 2 ? machine.inspect : machine.dump(@@global.format)
+        puts machine
       end
     end
     
@@ -48,12 +72,13 @@ module Rudy; module CLI;
     # raise an exception.
     #
     def passthrough
+            
       machines = @rr.execute
       
-      unless machines.empty?
+      if @global.verbose > 1 && !machines.empty?
         puts $/, "The following machines were processed:"
         machines.each do |machine|
-          puts @@global.verbose > 2 ? machine.inspect : machine.dump(@@global.format)
+          puts machine
         end
       end
       
@@ -65,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
@@ -78,9 +103,10 @@ module Rudy; module CLI;
       execute_check :medium
       
       machines = @rr.execute
+      
       puts $/, "The following instances have been destroyed:"
       machines.each do |machine|
-        puts '%s %s ' % [machine.name.bright, machine.awsid]
+        puts '%s %s ' % [machine.name.bright, machine.instid]
       end
       
       

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

@@ -10,19 +10,13 @@ module Rudy
     dsl Rudy::Config::Routines::DSL    # Organized processes
     dsl Rudy::Config::Machines::DSL    # Organized instances
     dsl Rudy::Config::Commands::DSL    # Custom SSH commands
-    #dsl Rudy::Config::Networks::DSL    # Network design
-    #dsl Rudy::Config::Controls::DSL    # Network access
-    #dsl Rudy::Config::Services::DSL    # Stuff running on ports
-    
-    def accounts?; self.respond_to?(:accounts) && !self[:accounts].nil?; end #a
-    def defaults?; self.respond_to?(:defaults) && !self[:defaults].nil?; end #u
-    def machines?; self.respond_to?(:machines) && !self[:machines].nil?; end #t
-    def commands?; self.respond_to?(:commands) && !self[:commands].nil?; end #o
-    def routines?; self.respond_to?(:routines) && !self[:routines].nil?; end #g
-    #def networks?; self.respond_to?(:networks) && !self[:networks].nil?; end #e
-    #def controls?; self.respond_to?(:controls) && !self[:controls].nil?; end #n
-    #def services?; self.respond_to?(:services) && !self[:services].nil?; end #!
     
+    def accounts?; self.respond_to?(:accounts) && !self[:accounts].nil?; end 
+    def defaults?; self.respond_to?(:defaults) && !self[:defaults].nil?; end 
+    def machines?; self.respond_to?(:machines) && !self[:machines].nil?; end 
+    def commands?; self.respond_to?(:commands) && !self[:commands].nil?; end 
+    def routines?; self.respond_to?(:routines) && !self[:routines].nil?; end 
+
     # This method is called by Caesars::Config.refresh for every DSL 
     # file that is loaded and parsed. If we want to run processing
     # for a particular config (machines, @routines, etc...) we can
@@ -50,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')
@@ -58,23 +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
       
-      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
@@ -89,18 +112,18 @@ module Rudy
 
       unless File.exists?(Rudy::CONFIG_FILE)
         puts "Creating #{Rudy::CONFIG_FILE}"
-        rudy_config = Rudy::Utils.without_indent %Q{
-          accounts do                           # Account Access Indentifiers
-            aws do                              # amazon web services 
+        rudy_config = Rudy::Utils.without_indent %Q`
+          accounts {                           # Account Access Indentifiers
+            aws {                              # amazon web services 
               name "Rudy Default"
-              accountnum ""
-              accesskey ""
-              secretkey ""
-              privatekey "~/path/2/pk-xxxx.pem" 
+              accountnum "012345678912"
+              accesskey "ACCESSACCESS"
+              secretkey "SECRETSECRET"
+              pkey "~/path/2/pk-xxxx.pem" 
               cert "~/path/2/cert-xxxx.pem"
-            end
-          end
-        }
+            }
+          }
+        `
         Rudy::Utils.write_to_file(Rudy::CONFIG_FILE, rudy_config, 'w', 0600)
       end
     end

data/lib/rudy/config/objects.rb

@@ -9,6 +9,8 @@ class Rudy::Config
   end
   
   class Accounts < Caesars
+    include Gibbler::Complex
+    
     def valid?
       (!aws.nil? && !aws.accesskey.nil? && !aws.secretkey.nil?) &&
       (!aws.account.empty? && !aws.accesskey.empty? && !aws.secretkey.empty?)
@@ -18,6 +20,8 @@ class Rudy::Config
   # Default configuration. All of the defaults can be overridden 
   # on the command line with global options.
   class Defaults < Caesars
+    include Gibbler::Complex
+    
     class DoubleDefined < Rudy::Config::Error
       def message; "Check your defaults config. '#{@obj}' has been defined twice"; end
     end
@@ -29,10 +33,14 @@ class Rudy::Config
         next unless self[k].is_a?(Array)
         raise Defaults::DoubleDefined.new(:defaults, k)
       end
+      self.keydir &&= File.expand_path(self.keydir)
     end
   end
   
-  class Machines < Caesars; end
+  class Machines < Caesars
+    include Gibbler::Complex
+    
+  end
   
   # Modify the SSH command available in routines. The default
   # set of commands is defined by Rye::Cmd (Rudy executes all
@@ -42,6 +50,8 @@ class Rudy::Config
   # important that new keywords do not conflict with existing
   # Rudy keywords. Strange things may happen!
   class Commands < Caesars
+    include Gibbler::Complex
+    
     class AlreadyDefined < Rudy::Config::Error
       def message; "The command '#{@obj}' has already been defined for this project"; end
     end
@@ -102,12 +112,12 @@ 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 @@global.verbose > 0
+          STDERR.puts "Redefining #{cmd}" if Rudy::Huxtable.global.verbose > 2
         end
         
         if args.last.is_a?(Proc)
           block = args.pop
-          Rye::Cmd.add_command(cmd, nil, args, &block)
+          Rye::Cmd.add_command(cmd, nil, *args, &block)
         else
           # If no path was specified, we can assume cmd is in the remote path so
           # when we add the method to Rye::Cmd, we'll it the path is "cmd".
@@ -115,7 +125,7 @@ class Rudy::Config
           
           raise PathNotString.new(:commands, cmd) if path && !path.is_a?(String)
           
-          Rye::Cmd.add_command cmd, path, args
+          Rye::Cmd.add_command cmd, path, *args
           
         end
         
@@ -137,6 +147,11 @@ class Rudy::Config
   end
   
   class Routines < Caesars
+    include Gibbler::Complex
+    
+    # All routines
+    forced_array :before         
+    forced_array :after
     
     # Disk routines
     forced_hash :create
@@ -147,37 +162,36 @@ class Rudy::Config
     forced_hash :mount
     forced_hash :attach
     forced_hash :detach
-    forced_hash :snapshot
+    forced_hash :archive
     forced_hash :restore
+    forced_hash :format
     
-    # Script blocks
-    forced_hash :before        
-    forced_hash :after         
-    forced_hash :script_local
-    forced_hash :before_local  
-    forced_hash :after_local     # We force hash the script keywords b/c
-    forced_hash :script          # we want them to store the usernames 
-    chill :before                # as hash keys. 
-    chill :after                 # We also chill them b/c we want to execute
-    chill :before_local          # the command blocks with an instance_eval
-    chill :after_local           # inside a Rye::Box object.
-    chill :script
-    chill :script_local
-    
-    # Version control systems
-    forced_hash :git
-    forced_hash :svn
-    
+    # Passthrough routines
+    forced_hash :local              # Force hash b/c we want to 
+    forced_hash :remote             # store the usernames.
+    chill :local                    # Chill b/c we want to execute
+    chill :remote                   # the blocks with Rye::Box#batch
+    forced_hash :xlocal              
+    forced_hash :xremote             
+    chill :xlocal                    
+    chill :xremote                   
+        
+    forced_hash :network
+    chill :network
+       
+    # Startup, Shutdown, Reboot routines
+    forced_hash :before_local
+    forced_hash :before_remote
+    forced_hash :after_local
+    forced_hash :after_remote            
+    chill :before_local
+    chill :before_remote
+    chill :after_local           
+    chill :after_remote
+                       
     def init      
     end
 
   end
   
-  
-  class Networks < Caesars #:nodoc:all
-  end
-  class Controls < Caesars #:nodoc:all
-  end
-  class Services < Caesars #:nodoc:all
-  end
 end