rudy 0.6.8 → 0.7.0

data/lib/rudy/global.rb

@@ -42,9 +42,9 @@ module Rudy
       postprocess
       # These attributes MUST have values. 
       @verbose ||= 0
-      @nocolor ||= false
+      @nocolor = true unless @nocolor == "false" || @nocolor.is_a?(FalseClass)
       @quiet ||= false
-      @format ||= 'string' # as in, to_s
+      @format ||= :string # as in, to_s
       @print_header = true if @print_header == nil
       @yes = false if @yes.nil?
     end
@@ -52,16 +52,18 @@ module Rudy
     def apply_config(config)
       return unless config.is_a?(Rudy::Config)
       if config.defaults?
+        # Apply the "color" default before "nocolor" so nocolor has presedence
+        @nocolor = !config.defaults.color unless config.defaults.color.nil?
         %w[region zone environment role position user nocolor quiet].each do |name|
           val = config.defaults.send(name)
-          self.send("#{name}=", val) if val
+          self.send("#{name}=", val) unless val.nil?
         end
       end
       
       if config.accounts? && config.accounts.aws
         %w[accesskey secretkey accountnum cert privatekey].each do |name|
           val = config.accounts.aws.send(name)
-          self.send("#{name}=", val) if val
+          self.send("#{name}=", val) unless val.nil?
         end
       end
       
@@ -88,10 +90,12 @@ module Rudy
     def postprocess
       apply_environment_variables
       apply_system_defaults
-
+      
+      @nocolor = !@color unless @color.nil?
       @cert &&= File.expand_path(@cert)
       @privatekey &&= File.expand_path(@privatekey)
       @position &&= @position.to_s.rjust(2, '0')  
+      @format &&= @format.to_sym rescue nil
       
       String.disable_color if @nocolor
       Rudy.enable_quiet if @quiet

data/lib/rudy/guidelines.rb

@@ -0,0 +1,18 @@
+
+
+module Rudy
+  module Guidelines #:nodoc:all
+    extend self
+    AFE = "Always fail early"   # [ed: the A's are a work in progress]
+    ABA = "Always be accurate"
+    CBC = "Consistency before cuteness"
+    UNO = "Ugly's not okay"
+    def inspect
+      all = Guidelines.constants
+      g = all.collect { |c| '%s="%s"' % [c, const_get(c)] }
+      %q{#<Rudy::Guidelines:%s %s>} % [self.object_id, g.join(' ')]
+    end
+  end
+end
+
+puts Rudy::Guidelines.inspect if __FILE__ == $0

data/lib/rudy/huxtable.rb

@@ -22,6 +22,7 @@ module Rudy
     # TODO: investigate @@debug bug. When this is true, Caesars.debug? returns true
     # too. It's possible this is intentional but probably not. 
     @@debug = false
+    @@abort = false
     
     @@config = Rudy::Config.new
     @@global = Rudy::Global.new
@@ -42,8 +43,6 @@ module Rudy
       @@global.apply_config(@@config)
     end
     
-    update_config
-    
     def self.update_global(ghash={})
       @@global.update(ghash)
     end
@@ -72,8 +71,8 @@ module Rudy
     def self.change_environment(v); @@global.environment = v; end  
     def self.change_position(v); @@global.position = v; end
     
-    def debug?; @@debug == true; end
-    
+    def debug?; Rudy::Huxtable.debug?; end
+    def Huxtable.debug?; @@debug == true; end
     def check_keys
       raise "No EC2 .pem keys provided" unless has_pem_keys?
       raise "No SSH key provided for #{current_user}!" unless has_keypair?
@@ -156,10 +155,6 @@ module Rudy
     def current_user_keypairpath
       user_keypairpath(current_user)
     end
-    def current_machine_hostname(group=nil)
-      group ||= machine_group
-      find_machine(group)[:dns_name]
-    end
     
     def current_machine_group
       [@@global.environment, @@global.role].join(Rudy::DELIM)
@@ -173,16 +168,21 @@ module Rudy
       fetch_machine_param(:positions) || 1
     end
     
+    def current_machine_hostname
+      # NOTE: There is an issue with Caesars that a keyword that has been
+      # defined as forced_array (or forced_hash, etc...) is like that for
+      # all subclasses of Caesars. There is a conflict between "hostname" 
+      # in the machines config and routines config. The routines config 
+      # parses hostname with forced_array because it's a shell command
+      # in Rye::Cmd. Machines config expects just a symbol. The issue
+      # is with Caesars so this is a workaround to return a symbol.
+      hn = fetch_machine_param(:hostname) || :rudy
+      hn = hn.flatten.compact.first if hn.is_a?(Array)
+      hn
+    end
+    
     def current_machine_image
       fetch_machine_param(:ami)
-      #zon, env, rol = @@global.zone, @@global.environment, @@global.role
-      #ami = @@config.machines.find_deferred([zon, env, rol]) || {}
-      #ami.merge!(@@config.machines.find_deferred(env, rol, :ami))
-      #ami.merge!(@@config.machines.find_deferred(rol, :ami))
-      ## I commented this out while cleaning (start of 0.6 branch) . It
-      ## seems like a bad idea. I don't want Huxtables throwing exceptions. 
-      ##raise Rudy::NoMachineImage, current_machine_group unless ami
-      #ami
     end
     
     def current_machine_size
@@ -268,22 +268,29 @@ module Rudy
     #            :size: 1
     #      
     def fetch_routine_config(action)
+      raise "No action specified" unless action
       raise NoConfig unless @@config
       raise NoRoutinesConfig unless @@config.routines
       raise NoGlobal unless @@global
       
       zon, env, rol = @@global.zone, @@global.environment, @@global.role
       
-      disk_defs = fetch_machine_param(:disks)
+      disk_defs = fetch_machine_param(:disks) || {}
       
-      routine = @@config.routines.find(@@global.environment, @@global.role, action)
+      # We want to find only one routines config with the name +action+. 
+      # This is unlike the routines config where it's okay to merge via
+      # precedence. 
+      routine = @@config.routines.find_deferred(@@global.environment, @@global.role, action)
+      routine ||= @@config.routines.find_deferred([@@global.environment, @@global.role], action)
+      routine ||= @@config.routines.find_deferred(@@global.role, action)
       return nil unless routine
+      return routine unless routine.has_key?(:disks)
       
       routine.disks.each_pair do |raction,disks|
 
         disks.each_pair do |path, props|
           unless disk_defs.has_key?(path)
-            @logger.puts "#{path} is not defined. Check your #{action} routines config.".color(:red)
+            @@logger.puts "#{path} is not defined. Check your #{action} machines config.".color(:red)
             routine.disks[raction].delete(path) 
             next
           end
@@ -298,6 +305,7 @@ module Rudy
     
     
     def fetch_machine_param(parameter)
+      raise "No parameter specified" unless parameter
       raise NoConfig unless @@config
       raise NoMachinesConfig unless @@config.machines
       raise NoGlobal unless @@global
@@ -331,6 +339,7 @@ module Rudy
     # :region, :zone, :environment, :role, :position
     def fetch_script_config
       sconf = fetch_machine_param :config
+      sconf ||= {}
       extras = {
         :region => @@global.region,
         :zone => @@global.zone,
@@ -345,3 +354,4 @@ module Rudy
     
   end
 end
+

data/lib/rudy/machines.rb

@@ -91,8 +91,9 @@ module Rudy
         @state = @instance.state
         save
       elsif @instance.nil?
-        @dns_public = @dns_private = nil
-        @state = 'unknown'
+        @awsid = @dns_public = @dns_private = nil
+        @state = 'rogue'
+        # Don't save it b/c it's possible the EC2 server is just down. 
       end
     end
     
@@ -120,14 +121,14 @@ module Rudy
         @awsid = inst.awsid
         @created = @starts = Time.now
         @state = inst.state
-        # Assign IP address to only the first instance
+        # Assign IP address only if we have one for that position
         if current_machine_address(@position)
           address = current_machine_address(@position)
           puts "Associating #{address} to #{inst.awsid}"
           begin
             @radd.associate(address, inst.awsid)
           rescue => ex 
-            STDERR.puts "Error while associating address."
+            STDERR.puts "Error while associating address (#{ex.class.to_s})"
             Rudy::Utils.bug()
           end
         end
@@ -201,7 +202,9 @@ module Rudy
       machines = []
       current_machine_count.times do  |i|
         machine = Rudy::Machine.new
-        puts "Starting %s" % machine.name
+        
+        #puts "Starting %s" % machine.name
+        
         machine.start
         machines << machine
       end
@@ -215,13 +218,13 @@ module Rudy
       raise MachineGroupNotRunning, current_machine_group unless running?
       list.each { |m| each_mach.call(m); } if each_mach
       list do |mach|
-        puts "Destroying #{mach.name}"
+        #puts "Destroying #{mach.name}"
         mach.destroy
       end
     end
     
     def list(more=[], less=[], &each_mach)
-      machines = list_as_hash(&each_mach)
+      machines = list_as_hash(more, less, &each_mach)
       machines &&= machines.values
       machines
     end

data/lib/rudy/mixins/hash.rb

@@ -0,0 +1,25 @@
+
+class Hash
+  
+  # A depth-first look to find the deepest point in the Hash. 
+  # The top level Hash is counted in the total so the final
+  # number is the depth of its children + 1. An example:
+  # 
+  #     ahash = { :level1 => { :level2 => {} } }
+  #     ahash.deepest_point  # => 3
+  #
+  def deepest_point(h=self, steps=0)
+    if h.is_a?(Hash)
+      steps += 1
+      h.each_pair do |n,possible_h|
+        ret = deepest_point(possible_h, steps)
+        steps = ret if steps < ret
+      end
+    else
+      return 0
+    end
+    steps
+  end
+
+end
+

data/lib/rudy/routines.rb

@@ -2,10 +2,14 @@
 
 module Rudy
   module Routines
+    class NoRoutine < Rudy::Error
+      def message; "No routine configuration for #{@obj}"; end
+    end
+    
     class Base
       include Rudy::Huxtable
     
-      def initialize
+      def initialize(*args)
         a, s, r = @@global.accesskey, @@global.secretkey, @@global.region
         @sdb = Rudy::AWS::SDB.new(a, s, r)
         @rinst = Rudy::AWS::EC2::Instances.new(a, s, r)
@@ -13,35 +17,181 @@ module Rudy
         @rkey = Rudy::AWS::EC2::KeyPairs.new(a, s, r)
         @rvol = Rudy::AWS::EC2::Volumes.new(a, s, r)
         @rsnap = Rudy::AWS::EC2::Snapshots.new(a, s, r)
-        init
+        init(*args)
       end
       
       def init
       end
       
-
       def execute
         raise "Override execute method"
       end
       
+      def raise_early_exceptions
+        raise "Must override raise_early_exceptions"
+      end
+      
+      # * +machine_action+ a method on Rudy::Machines, one of: create, destroy, list
+      # * +skipcheck+ Skip checking if machine is up and SSH is available (default: false)
+      # * +routine_action+ is an optional block which represents the action
+      # for a specific routine. For example, a startup routine will start
+      # an EC2 instance. Arguments: instances of Rudy::Machine and Rye::Box.
+      def generic_machine_runner(machine_action, skipcheck=false, &routine_action)
+        rmach = Rudy::Machines.new
+        raise "No routine supplied" unless @routine
+        raise "No machine action supplied" unless machine_action
+        unless rmach.respond_to?(machine_action)
+          raise "Unknown machine action #{machine_action}" 
+        end
+        
+        lbox = Rye::Box.new('localhost')
+        sconf = fetch_script_config
+        
+        
+        if Rudy::Routines::ScriptHelper.before_local?(@routine)  # before_local
+          # Runs "before_local" scripts of routines config. 
+          # NOTE: Does not run "before" scripts b/c there are no remote machines
+          puts task_separator("LOCAL SHELL")
+          Rudy::Routines::ScriptHelper.before_local(@routine, sconf, lbox)
+        end
+        
+        # Execute the action (create, list, destroy) & apply the block to each
+        rmach.send(machine_action) do |machine|
+          puts machine_separator(machine.name, machine.awsid)
+          
+          unless skipcheck
+            msg = preliminary_separator("Checking if instance is running...")
+            Rudy::Utils.waiter(3, 120, STDOUT, msg, 0) {
+              inst = machine.get_instance
+              inst && inst.running?
+            } 
+          
+            # Add instance info to machine and save it. This is really important
+            # for the initial startup so the metadata is updated right away. But
+            # it's also important to call here because if a routine was executed
+            # and an unexpected exception occurrs before this update is executed
+            # the machine metadata won't contain the DNS information. Calling it
+            # here ensure that the metadata is always up-to-date. 
+            machine.update 
+          
+            msg = preliminary_separator("Waiting for SSH daemon...")
+            Rudy::Utils.waiter(2, 60, STDOUT, msg, 0) {
+              Rudy::Utils.service_available?(machine.dns_public, 22)
+            }
+          end
+          
+          
+          # TODO: trap rbox errors. We could get an authentication error. 
+          opts = { :keys =>  root_keypairpath, :user => 'root', :info => @@global.verbose > 0 }
+          begin
+            rbox = Rye::Box.new(machine.dns_public, opts)
+            rbox.connect
+          rescue Rye::NoHost => ex
+          
+            exit 65
+          end
+        
+          # Set the hostname if specified in the machines config. 
+          # :rudy -> change to Rudy's machine name
+          # :default -> leave the hostname as it is
+          # Anything else other than nil -> change to that value
+          # NOTE: This will set hostname every time a routine is
+          # run so we may want to make this an explicit action. 
+          hn = current_machine_hostname || :rudy
+          if hn != :default
+            hn = machine.name if hn == :rudy
+            print preliminary_separator("Setting hostame to #{hn}... ")
+            rbox.hostname(hn) 
+            puts "done"
+          end
+          
+          if Rudy::Routines::UserHelper.adduser?(@routine)       # adduser
+            puts task_separator("ADD USER")
+            Rudy::Routines::UserHelper.adduser(@routine, machine, rbox)
+          end
+          
+          if Rudy::Routines::UserHelper.authorize?(@routine)     # authorize
+            puts task_separator("AUTHORIZE USER")
+            Rudy::Routines::UserHelper.authorize(@routine, machine, rbox)
+          end
+          
+          if Rudy::Routines::ScriptHelper.before?(@routine)      # before
+            puts task_separator("REMOTE SHELL")
+            Rudy::Routines::ScriptHelper.before(@routine, sconf, machine, rbox)
+          end
+          
+          if Rudy::Routines::DiskHelper.disks?(@routine)         # disk
+            puts task_separator("DISKS")
+            if rbox.ostype == "sunos"
+              puts "Sorry, Solaris is not supported yet!"
+            else
+              Rudy::Routines::DiskHelper.execute(@routine, machine, rbox)
+            end    
+          end
+
+          # Startup, shutdown, release, deploy, etc...
+          routine_action.call(machine, rbox) if routine_action
+
+          if Rudy::Routines::ScriptHelper.after?(@routine)       # after
+            puts task_separator("REMOTE SHELL")
+            # Runs "after" scripts of routines config
+            Rudy::Routines::ScriptHelper.after(@routine, sconf, machine, rbox)
+          end
+
+          if Rudy::Routines::DiskHelper.disks?(@routine)
+            # TODO: Print only the requested disks
+            puts task_separator("INFO")
+            puts "Filesystem on #{machine.name}:"
+            puts "  " << rbox.df(:h).join("#{$/}  ")
+          end
+          
+          rbox.disconnect
+        end
+
+        if Rudy::Routines::ScriptHelper.after_local?(@routine)   # after_local
+          puts task_separator("LOCAL SHELL")
+          # Runs "after_local" scripts of routines config
+          Rudy::Routines::ScriptHelper.after_local(@routine, sconf, lbox)
+        end
+
+      end
+      
+      def preliminary_separator(msg)
+        # TODO: Count number messages printed 1/3. ie:
+        # m-us-east-1b-stage-app-01                   
+        #   (1/3) Checking if instance is running... done
+        #   (2/3) Waiting for SSH daemon... done
+        #   (3/3) Setting hostame to m-us-east-1b-stage-app-01... done
+        ("  -> #{msg}")
+      end
+      
       def task_separator(title)
-        dashes = 52 - title.size # 
+        dashes = 59 - title.size 
         dashes = 0 if dashes < 1
-        ("%s---  %s  %s" % [$/, title, '-'*dashes]).bright
+        ("%s---  %s  %s" % [$/, title, '-'*dashes])
       end
       
-      def machine_separator(title)
-        dashes = 52 - title.size # 
+      def machine_separator(name, awsid)
+        dashes = 80 - name.size # 
         dashes = 0 if dashes < 1
-        ("%s---  %s  %s" % [$/, title.bright, '-'*dashes]).bright.color(:blue)
+        ('%s %-63s awsid: %s ' % [$/, name, awsid]).att(:reverse)
       end
-
+      
+      def routine_separator(name)
+        # Not used (for now)
+        name = name.to_s
+        dashes = 59 - name.size # 
+        dashes = 0 if dashes < 1
+        #puts '%-40s' % [name.bright]
+      end
+      
+      
     end
     
   end
 end
 
-Rudy::Utils.require_glob(RUDY_LIB, 'rudy', 'routines', 'helpers', '*.rb')
 Rudy::Utils.require_glob(RUDY_LIB, 'rudy', 'routines', '*.rb')
+Rudy::Utils.require_glob(RUDY_LIB, 'rudy', 'routines', 'helpers', '*.rb')