rudy 0.7.3 → 0.7.4

data/lib/rudy/routines/helpers/dependshelper.rb

@@ -0,0 +1,34 @@
+
+module Rudy; module Routines; 
+  module DependsHelper
+    include Rudy::Routines::HelperBase  # TODO: use execute_rbox_command
+    extend self 
+    
+    def has_depends?(timing, routine)
+      (!routine.is_a?(Caesars::Hash) || routine[timing].is_a?(Caesars::Hash))
+    end
+    
+    # Returns an Array of the dependent routines for the given +timing+ (before/after)
+    def get(timing, routine)
+      return if !(routine.is_a?(Caesars::Hash) || routine[timing].is_a?(Caesars::Hash))
+      
+      # This will produce an Array containing the routines to run. The 
+      # elements are the valid routine names. 
+      # NOTE: The "timing" elements are removed from the routines hash. 
+      dependencies = []
+      routine[timing].each_pair do |n,v| 
+        next unless v.nil?  # this skips all "script" blocks
+        raise "#{timing}: #{n} is not a known routine" unless valid_routine?(n)
+        routine[timing].delete(n)
+        dependencies << n
+      end
+
+      # We need to return only the keys b/c the values are nil
+      dependencies = nil if dependencies.empty?
+      dependencies
+    end
+    
+
+  end
+  
+end; end

data/lib/rudy/routines/helpers/diskhelper.rb

@@ -28,8 +28,10 @@ module Rudy; module Routines;
       # We give it a funny name so we can delete it. 
       def @rbox.rudy_mkfs(*args); cmd('mkfs', args); end
       
-      
-      return unless disks?(routine)
+      unless disks?(routine)
+        STDERR.puts "[nothing to do]"
+        return
+      end
 
       modified = []
       routine.disks.each_pair do |action, disks|
@@ -45,11 +47,96 @@ module Rudy; module Routines;
       
     end
     
+    def snapshot(disks)
+      rdisk = Rudy::Disks.new
+      rback = Rudy::Backups.new
+      
+      disks.each_pair do |path, props|
+        adisk = Rudy::MetaData::Disk.new(path, props[:size], props[:device], @machine.position)
+        disk = rdisk.get(adisk.name)
+        if disk == nil
+          puts "Not found: #{adisk.name}".color(:red)
+          return
+        end
+        back = disk.backup
+        puts "Created backup: #{back.name}"
+      end
+    end
+    
+    def restore(disks)
+      rdisk = Rudy::Disks.new
+      rback = Rudy::Backups.new
+      
+      disks.each_pair do |path, props|
+        disk = Rudy::MetaData::Disk.new(path, props[:size], props[:device], @machine.position)
+        
+        olddisk = rdisk.get(disk.name)
+        back = nil
+        if olddisk && olddisk.exists?
+          olddisk.update
+          puts "Disk found: #{olddisk.name}. Skipping...".color(:red)
+          return
+        else
+          disk.fstype = props[:fstype] || 'ext3'
+          back = (rback.list(nil, nil, props) || []).first
+          raise "No backup found" unless back
+          puts "Found backup #{back.name} "
+        end
+        
+        
+        
+        unless disk.exists? # Checks the EBS volume
+          msg = "Creating volume from snapshot (#{back.awsid})... "
+          disk.create(back.size, @@global.zone, back.awsid)
+          Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
+            disk.available?
+          }
+        end
+        
+        msg = "Attaching #{disk.awsid} to #{@machine.awsid}... "
+        disk.attach(@machine.awsid)
+        Rudy::Utils.waiter(2, 10, STDOUT, msg) { 
+          disk.attached?
+        }
+        
+        sleep 2
+        
+        begin
+          @rbox.mkdir(:p, disk.path)
+          
+          print "Mounting at #{disk.path}... "
+      
+          ret = @rbox.mount(:t, disk.fstype, disk.device, disk.path) 
+          print_response ret
+          if ret.exit_code > 0
+            STDERR.puts "Error creating disk".color(:red)
+            return
+          else
+            puts "done"
+          end
+          disk.mounted = true
+          disk.save
+          
+        rescue Net::SSH::AuthenticationFailed, Net::SSH::HostKeyMismatch => ex  
+          STDERR.puts "Error creating disk".color(:red)
+          STDERR.puts ex.message.color(:red)
+         rescue Rye::CommandNotFound => ex
+          puts "  CommandNotFound: #{ex.message}".color(:red)
+          
+        rescue
+          STDERR.puts "Error creating disk" .color(:red)
+          Rudy::Utils.bug
+        end
+        
+      end
+    end
+    
+    
     def create(disks)
       rdisk = Rudy::Disks.new
       
       disks.each_pair do |path, props|
-        disk = Rudy::Disk.new(path, props[:size], props[:device], @machine.position)
+        disk = Rudy::MetaData::Disk.new(path, props[:size], props[:device], @machine.position)
         olddisk = rdisk.get(disk.name)
         if olddisk && olddisk.exists?
           olddisk.update
@@ -122,12 +209,94 @@ module Rudy; module Routines;
  
       end
     end
+    
+    def mount(disks)
+      rdisk = Rudy::Disks.new
+      disks.each_pair do |path, props|
+        adisk = Rudy::MetaData::Disk.new(path, props[:size], props[:device], @machine.position)
+        disk = rdisk.get(adisk.name)
+        if disk == nil
+          puts "Not found: #{adisk.name}".color(:red)
+          return
+        end
+        
+        msg = "Attaching #{disk.awsid} to #{@machine.awsid}... "
+        disk.attach(@machine.awsid)
+        Rudy::Utils.waiter(2, 10, STDOUT, msg) { 
+          disk.attached?
+        }
+        
+        sleep 2
+        
+        begin
+          @rbox.mkdir(:p, disk.path)
+          
+          print "Mounting at #{disk.path}... "
       
+          ret = @rbox.mount(:t, disk.fstype, disk.device, disk.path) 
+          print_response ret
+          if ret.exit_code > 0
+            STDERR.puts "Error creating disk".color(:red)
+            return
+          else
+            puts "done"
+          end
+          disk.mounted = true
+          disk.save
+          
+        rescue Net::SSH::AuthenticationFailed, Net::SSH::HostKeyMismatch => ex  
+          STDERR.puts "Error creating disk".color(:red)
+          STDERR.puts ex.message.color(:red)
+         rescue Rye::CommandNotFound => ex
+          puts "  CommandNotFound: #{ex.message}".color(:red)
+          
+        rescue
+          STDERR.puts "Error creating disk" .color(:red)
+          Rudy::Utils.bug
+        end
+        
+      end
+    end
+    
+    
+    def umount(disks)
+      rdisk = Rudy::Disks.new
+      disks.each_pair do |path, props|
+        adisk = Rudy::MetaData::Disk.new(path, props[:size], props[:device], @machine.position)
+        disk = rdisk.get(adisk.name)
+        if disk == nil
+          puts "Not found: #{adisk.name}".color(:red)
+          return
+        end
+        
+        if disk.mounted?
+          print "Unmounting #{disk.path}..."
+          execute_rbox_command { @rbox.umount(disk.path) }
+          puts " done"
+          sleep 0.5
+        end
+        
+        sleep 2
+        
+        if disk.attached?
+          msg = "Detaching #{disk.awsid}..."
+          disk.detach 
+          Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
+            disk.available? 
+          }
+          sleep 0.5
+        end
+        
+        
+      end
+    end
+    alias_method :unmount, :umount
+    
     def destroy(disks)
       rdisk = Rudy::Disks.new
       
       disks.each_pair do |path, props|
-        adisk = Rudy::Disk.new(path, props[:size], props[:device], @machine.position)
+        adisk = Rudy::MetaData::Disk.new(path, props[:size], props[:device], @machine.position)
         disk = rdisk.get(adisk.name)
         if disk == nil
           puts "Not found: #{adisk.name}".color(:red)
@@ -157,6 +326,6 @@ module Rudy; module Routines;
         
       end
     end
-      
+    
   end
 end;end

data/lib/rudy/routines/helpers/scmhelper.rb

@@ -10,8 +10,8 @@ module Rudy; module Routines;
       scmnames = SUPPORTED_SCM_NAMES & routine.keys    # Find intersections.
       return false if scmnames.empty?                  # Nothing to do. 
       scmnames.each do |scm|                          
-        routine[scm].values.each do |p|                # Each SCM should have a
-        raise "Bad #{scm} config" if !p.kind_of?(Hash) # Hash config. Otherwise
+        routine[scm].values.each do |t|                # Each SCM should have a
+        raise "Bad #{scm} config" if !t.kind_of?(Hash) # Hash config. Otherwise
         end                                            # it's misconfigured.
       end
       true

data/lib/rudy/routines/helpers/scripthelper.rb

@@ -74,6 +74,11 @@ module Rudy; module Routines;
     def execute_command?(timing, routine)
       hasconf = (routine.is_a?(Caesars::Hash) && routine.has_key?(timing))
       return false unless hasconf
+      unless routine[timing].kind_of?(Hash)
+        STDERR.puts "No user supplied for #{timing} block".color(:red)
+        exit 12 unless keep_going?
+        return false
+      end
       routine[timing].each_pair do |user,proc|
         #p [timing, user, proc].join(', ')
         if proc.nil? || !proc.is_a?(Proc)
@@ -99,7 +104,8 @@ module Rudy; module Routines;
         Rudy::Utils.write_to_file(tf.path, sconf.to_hash.to_yaml, 'w')
       end
       
-      if execute_command?(timing, routine) # i.e. before_local?
+      # Do we need to run this again? It's called in generic_routine_runner
+      ##if execute_command?(timing, routine) # i.e. before_local?
 
         # We need to explicitly add the rm command for rbox so we
         # can delete the script config file when we're done. This
@@ -179,9 +185,10 @@ module Rudy; module Routines;
         
         # Return the borrowed rbox instance to the user it was provided with
         rbox.switch_user original_user
-      else
-        puts "Nothing to do"
-      end
+      
+      ##else
+      ##  puts "Nothing to do"
+      ##end
       
       tf.delete # delete local copy of script config
       

data/lib/rudy/routines/passthrough.rb

@@ -28,7 +28,9 @@ module Rudy; module Routines;
       rmach = Rudy::Machines.new
       raise Rudy::PrivateKeyNotFound, root_keypairpath unless has_keypair?(:root)
       raise MachineGroupNotDefined, current_machine_group unless known_machine_group?
-      raise MachineGroupNotRunning, current_machine_group unless rmach.running?
+      if !@@global.offline && !rmach.running?
+        raise MachineGroupNotRunning, current_machine_group
+      end
     end
     
   end

data/lib/rudy/routines/reboot.rb

@@ -0,0 +1,75 @@
+
+
+module Rudy; module Routines;
+  class Reboot < Rudy::Routines::Base
+    
+    def init(*args)
+      @routine = fetch_routine_config(:reboot)
+    end
+    
+    # * +each_mach+ is an optional block which is executed between 
+    # disk creation and the after scripts. The will receives two 
+    # arguments: instances of Rudy::Machine and Rye::Box.
+    def execute(&each_mach)
+      routine_separator(:reboot)
+      unless @routine
+        STDERR.puts "[this is a generic reboot routine]"
+        @routine = {}
+      end
+      machines = []
+      generic_machine_runner(:list) do |machine,rbox|
+        puts $/, "Rebooting...", $/
+        rbox.disconnect
+        machine.restart
+        sleep 4
+        msg = preliminary_separator("Checking if instance is running...")
+        Rudy::Utils.waiter(3, 120, STDOUT, msg, 0) {
+          machine.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 occurs 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 
+        
+        sleep 4
+        
+        msg = preliminary_separator("Waiting for SSH daemon...")
+        Rudy::Utils.waiter(3, 120, STDOUT, msg, 0) {
+          Rudy::Utils.service_available?(machine.dns_public, 22)
+        }
+        
+        # NOTE: THIS IS INCOMPLETE
+        
+        sleep 1  # Avoid IOError: closed stream on SSH
+        
+      
+        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
+
+        machines << machine
+      end
+      machines
+    end
+
+    # Called by generic_machine_runner
+    def raise_early_exceptions
+      rmach = Rudy::Machines.new
+      # There's no keypair check here because Rudy::Machines will attempt 
+      # to create one.
+      raise MachineGroupNotDefined, current_machine_group unless known_machine_group?
+      raise MachineGroupNotRunning, current_machine_group unless rmach.running?
+    end
+    
+  end
+
+end; end

data/lib/rudy/routines/startup.rb

@@ -18,7 +18,6 @@ module Rudy; module Routines;
       end
       machines = []
       generic_machine_runner(:create) do |machine,rbox|
-        puts $/, "Starting up...", $/
         machines << machine
       end
       machines
@@ -27,9 +26,10 @@ module Rudy; module Routines;
     # Called by generic_machine_runner
     def raise_early_exceptions
       rmach = Rudy::Machines.new
-      # There's no keypair check here because Rudy::Machines will attempt 
-      # to create one.
+      # There's no keypair check here because Rudy::Machines will create one 
       raise MachineGroupNotDefined, current_machine_group unless known_machine_group?
+      # We don't check @@global.offline b/c we can't create EC2 instances
+      # without an internet connection. Use passthrough for routine tests.
       raise MachineGroupAlreadyRunning, current_machine_group if rmach.running?
     end
     

data/lib/rudy/scm/git.rb

@@ -17,7 +17,7 @@ module Rudy
       attr_reader :rtag
       attr_reader :user
       attr_reader :pkey
-      attr_reader :commit
+      attr_reader :changes
       
       # * +args+ a hash of params from the git block in the routines config
       # 
@@ -27,11 +27,11 @@ module Rudy
           :remote => :origin,
           :branch => :master,
           :user => :root,
-          :commit => :enforce,
+          :changes => :enforce,
           :path => nil
         }.merge(args)
         @remote, @branch, @path = args[:remote], args[:branch], args[:path]
-        @user, @pkey, @commit = args[:user], args[:privatekey], args[:commit]
+        @user, @pkey, @changes = args[:user], args[:privatekey], args[:changes]
         @repo = Repo.new(Dir.pwd) if GIT.working_copy?
       end
       
@@ -99,19 +99,19 @@ module Rudy
               rbox.upload(@pkey, ".ssh/#{key}")
             end
             
-            # NOTE: The following are two attempts at telling git which 
-            # private key to use. Both fail. The only thing I could get
-            # to work is modifying the ~/.ssh/config file. 
-            #
-            # This runs fine, but "git clone" doesn't care. 
-            # git config --global --replace-all http.sslKey /home/delano/.ssh/id_rsa
-            # rbox.git('config', '--global', '--replace-all', 'http.sslKey', "#{homedir}/.ssh/#{key}")
-            
-            # "git clone" doesn't care about this either. Note that both these
-            # config attempts come directly from the git-config man page:
-            # http://www.kernel.org/pub/software/scm/git/docs/git-config.html
-            # export GIT_SSL_KEY=/home/delano/.ssh/id_rsa
-            # rbox.setenv("GIT_SSL_KEY", "#{homedir}/.ssh/#{key}")
+            ## NOTE: The following are two attempts at telling git which 
+            ## private key to use. Both fail. The only thing I could get
+            ## to work is modifying the ~/.ssh/config file. 
+            ##
+            ## This runs fine, but "git clone" doesn't care. 
+            ## git config --global --replace-all http.sslKey /home/delano/.ssh/id_rsa
+            ## rbox.git('config', '--global', '--replace-all', 'http.sslKey', "#{homedir}/.ssh/#{key}")
+            ##
+            ## "git clone" doesn't care about this either. Note that both these
+            ## config attempts come directly from the git-config man page:
+            ## http://www.kernel.org/pub/software/scm/git/docs/git-config.html
+            ## export GIT_SSL_KEY=/home/delano/.ssh/id_rsa
+            ## rbox.setenv("GIT_SSL_KEY", "#{homedir}/.ssh/#{key}")
             
             if rbox.file_exists?('.ssh/config')
               rbox.cp('.ssh/config', ".ssh/config-previous")
@@ -198,7 +198,7 @@ module Rudy
       
       def raise_early_exceptions
         raise NotAWorkingCopy, :git unless working_copy?
-        raise DirtyWorkingCopy, :git unless @commit.to_s == 'ignore' || clean_working_copy?
+        raise DirtyWorkingCopy, :git unless @changes.to_s == 'ignore' || clean_working_copy?
         raise NoRemoteURI, "remote.#{@remote}.url not set" if get_remote_uri.nil?
         raise NoRemotePath, :git if @path.nil?
         raise PrivateKeyNotFound, @pkey if @pkey && !File.exists?(@pkey)