rudy 0.8.5 → 0.9.0

data/lib/rudy/routines/shutdown.rb

@@ -3,34 +3,85 @@
 module Rudy; module Routines;
   class Shutdown < Rudy::Routines::Base
     
+    Rudy::Routines.add_routine :shutdown, self
+    
+    @@allowed_actions = [:before, :disks, :adduser, :authorize,
+                         :local, :remote, :after_local, :after]
+                         
     def init(*args)
-      @routine = fetch_routine_config(:shutdown)
+      @machines = Rudy::Machines.list || []
+      @@rset = create_rye_set @machines unless defined?(@@rset)
+      @routine ||= {}
     end
     
+    # Startup routines run in the following order:
+    # * before dependencies
+    # * all other actions (except after_local)
+    # * Shutdown instances
+    # * after_local (if present)
+    # * after dependencies
     def execute
-      routine_separator(:list)
-      unless @routine
-        STDERR.puts "[this is a generic shutdown routine]"
-        @routine = {}
-      end
-
-      machines = generic_machine_runner(:list) do |machine|
-        machine.destroy
+      ld "Executing routine: #{@name}"
+      ld "[this is a generic routine]" if @routine.empty?
+      
+      # We need to remove after_local so the runner doesn't see it
+      after_local = @routine.delete(:after_local)
+      
+      if run?
+        Rudy::Routines.rescue {
+          Rudy::Routines::Handlers::Group.authorize rescue nil
+        }
+        
+        Rudy::Routines::Handlers::Depends.execute_all @before
+      
+        # This is the meat of the sandwich
+        Rudy::Routines.runner(@routine, @@rset, @@lbox, @argv)
+        
+        @machines.each do |machine|
+          Rudy::Routines.rescue { machine.destroy }
+        end
+      
+        if after_local
+          handler = Rudy::Routines.get_handler :local
+          Rudy::Routines.rescue {
+            handler.execute(:local, after_local, nil, @@lbox, @argv)
+          }
+        end
+      
+        Rudy::Routines::Handlers::Depends.execute_all @after
       end
-      machines
+      
+      @machines
     end
-
+    
     # Called by generic_machine_runner
     def raise_early_exceptions
-      rmach = Rudy::Machines.new
-      raise MachineGroupNotRunning, current_machine_group unless rmach.running?
+      raise NoMachinesConfig unless @@config.machines
+      
+      # If this is a test run we don't care if the group is running
+      if run?
+        if @@global.position.nil?
+          raise MachineGroupNotRunning, current_machine_group unless Rudy::Machines.running?
+        else
+          unless Rudy::Machines.running? @@global.position
+            m = Rudy::Machine.new @@global.position
+            raise MachineNotRunning, m.name 
+          end
+        end
+      end
+      
       ## NOTE: This check is disabled for now. If the private key doesn't exist
       ## it prevents shutting down.
       # Check private key after machine group, otherwise we could get an error
       # about there being no key which doesn't make sense if the group isn't running.
       ##raise Rudy::PrivateKeyNotFound, root_keypairpath unless has_keypair?(:root)
+      if @routine
+        bad = @routine.keys - @@allowed_actions
+        raise UnsupportedActions.new(@name, bad) unless bad.empty?
+      end
     end
     
   end
 
-end; end
+end; end
+

data/lib/rudy/routines/startup.rb

@@ -3,34 +3,129 @@
 module Rudy; module Routines;
   class Startup < Rudy::Routines::Base
     
+    Rudy::Routines.add_routine :startup, self
+    
+    @@allowed_actions = [:before, :before_local, :disks, :adduser, 
+                         :authorize, :local, :remote, :after]
+    
     def init(*args)
-      @routine = fetch_routine_config(:startup)   # NOTE: could use @cmdname here
+      @routine ||= {}
     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.
-    # Returns an Array of Rudy::Machine objects
-    def execute(&each_mach)
-      routine_separator(:startup)
-      unless @routine
-        STDERR.puts "[this is a generic startup routine]"
-        @routine = {}
+    # Startup routines run in the following order:
+    # * before dependencies
+    # * before_local (if present)
+    # * Startup instances
+    # * Set hostname
+    # * all other actions
+    # * after dependencies
+    def execute
+      ld "Executing routine: #{@name}"
+      ld "[this is a generic routine]" if @routine.empty?
+      
+      
+      if run?
+        Rudy::Routines::Handlers::Depends.execute_all @before
+      
+        if @routine.has_key? :before_local
+          handler = Rudy::Routines.get_handler :local
+          Rudy::Routines.rescue {
+            handler.execute(:local, @routine.delete(:before_local), nil, @@lbox, @argv)
+          }
+        end
+        
+        Rudy::Routines.rescue {
+          unless Rudy::Routines::Handlers::Group.exists? 
+            Rudy::Routines::Handlers::Group.create
+          end
+          # Run this every startup incase the ip address has changed. 
+          # If there's an exception it's probably b/c the address is
+          # already authorized for port 22. 
+          Rudy::Routines::Handlers::Group.authorize rescue nil
+        }
+        
+        Rudy::Routines.rescue {
+          unless Rudy::Routines::Handlers::Keypair.exists? 
+            Rudy::Routines::Handlers::Keypair.create
+          end
+        }
+        
+      end
+      
+      ## puts Rudy::Routines.machine_separator(machine.name, machine.awsid)
+      
+      # If this is a testrun we won't create new instances
+      # we'll just grab the list of machines in this group. 
+      # NOTE: Expect errors if there are no machines.
+      Rudy::Routines.rescue {
+        @machines = run? ? Rudy::Machines.create : Rudy::Machines.list
+        @@rset = create_rye_set @machines unless defined?(@@rset)
+      }
+      
+      Rudy::Routines.rescue {
+        if !Rudy::Routines::Handlers::Host.is_running? @@rset
+          a = @@rset.boxes.select { |box| !box.stash.instance_running? }
+          raise GroupNotRunning, a
+        end
+      }
+      
+      # This is important b/c the machines will not 
+      # have DNS info until after they are running. 
+      Rudy::Routines.rescue { Rudy::Routines::Handlers::Host.update_dns @@rset }
+      
+      Rudy::Routines.rescue {
+        if !Rudy::Routines::Handlers::Host.is_available? @@rset
+          a = @@rset.boxes.select { |box| !box.stash.instance_available? }
+          raise GroupNotAvailable, a
+        end
+      }
+      Rudy::Routines.rescue {
+        Rudy::Routines::Handlers::Host.set_hostname @@rset      
+      }
+      
+      if run?
+        # This is the meat of the sandwich
+        Rudy::Routines.runner @routine, @@rset, @@lbox, @argv
+
+        Rudy::Routines.rescue {
+          Rudy::Routines::Handlers::Depends.execute_all @after
+        }
+        
       end
-      machines = generic_machine_runner(:create) 
-      machines
+      
+      @machines
     end
 
     # Called by generic_machine_runner
     def raise_early_exceptions
-      rmach = Rudy::Machines.new
+      raise NoMachinesConfig unless @@config.machines
       # 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?
+        
+      unless (1..MAX_INSTANCES).member?(current_machine_count)
+        raise "Instance count must be more than 0, less than #{MAX_INSTANCES}"
+      end
+      
+      # If this is a testrun, we don't create instances anyway so
+      # it doesn't matter if there are already instances running.
+      if run? && !@@global.force
+        if @@global.position.nil?
+          raise MachineGroupAlreadyRunning, current_machine_group if Rudy::Machines.running?
+          raise MachineGroupMetadataExists, current_machine_group if Rudy::Machines.exists?
+        else
+          if Rudy::Machines.running? @@global.position
+            m = Rudy::Machine.new @@global.position
+            raise MachineAlreadyRunning, m.name 
+          end
+        end
+      end
+      
+      if @routine
+        bad = @routine.keys - @@allowed_actions
+        raise UnsupportedActions.new(@name, bad) unless bad.empty?
+      end
     end
     
   end
 
-end; end
+end; end

data/lib/rudy/utils.rb

@@ -25,7 +25,6 @@ module Rudy
       rescue SocketError, Errno::ETIMEDOUT => ex
         STDERR.puts "Connection Error. Check your internets!"
       end
-      ip += "/32" if ip
       ip
     end
     
@@ -36,47 +35,34 @@ module Rudy
       # turn off reverse DNS resolution temporarily 
       orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true   
       ip = UDPSocket.open {|s| s.connect('75.101.137.7', 1); s.addr.last } # Solutious IP
-      ip += "/24" if ip
       ip
     ensure  
       Socket.do_not_reverse_lookup = orig
     end
     
     # Generates a canonical tag name in the form:
-    #     rudy-2009-12-31-01
-    # where r1 refers to the revision number that day
-    def generate_tag(revision=1)
+    #     2009-12-31-USER-SUFFIX
+    # where USER is equal to the user executing the Rudy process and 
+    # SUFFIX is equal to +suffix+ (optional)
+    def generate_tag(suffix=nil)
       n = DateTime.now
-      y = n.year.to_s.rjust(4, "20")
-      m = n.month.to_s.rjust(2, "0")
-      d = n.mday.to_s.rjust(2, "0")
-      "rudy-%4s-%2s-%2s-r%s" % [y, m, d, revision.to_s.rjust(2, "0")] 
+      y, m = n.year.to_s.rjust(4, "20"), n.month.to_s.rjust(2, "0")
+      d, u = n.mday.to_s.rjust(2, "0"), Rudy.sysinfo.user
+      criteria = [y, m, d, u]
+      criteria << suffix unless suffix.nil? || suffix.empty?
+      criteria.join Rudy::DELIM 
     end
     
-    
-    
-    
-    # Determine if we're running directly on EC2 or
-    # "some other machine". We do this by checking if
-    # the file /etc/ec2/instance-id exists. This
-    # file is written by /etc/init.d/rudy-ec2-startup. 
-    # NOTE: Is there a way to know definitively that this is EC2?
-    # We could make a request to the metadata IP addresses. 
-    def Rudy.in_situ?
-      File.exists?('/etc/ec2/instance-id')
-    end
-
-
     # Wait for something to happen. 
     # * +duration+ seconds to wait between tries (default: 2).
-    # * +max+ maximum time to wait (default: 120). Throws an exception when exceeded.
+    # * +max+ maximum time to wait (default: 240). Throws an exception when exceeded.
     # * +logger+ IO object to print +dot+ to.
     # * +msg+ the message to print before executing the block. 
     # * +bells+ number of terminal bells to ring. Set to nil or false to keep the waiter silent
     #
     # The +check+ block must return false while waiting. Once it returns true
     # the waiter will return true too.
-    def waiter(duration=2, max=120, logger=STDOUT, msg=nil, bells=0, &check)
+    def waiter(duration=2, max=240, logger=STDOUT, msg=nil, bells=0, &check)
       # TODO: Move to Drydock. [ed-why?]
       raise "The waiter needs a block!" unless check
       duration = 1 if duration < 1
@@ -100,7 +86,7 @@ module Rudy
       end
       
       if msg && logger
-        logger.puts " done"
+        logger.puts
         logger.flush
       end
       
@@ -157,7 +143,7 @@ module Rudy
       Rudy::ID_MAP[key]
     end
 
-    # Return a string ID without the identifier. i.e. key-stage-app-root => stage-app-root
+    # Return a string ID without the identifier. e.g. key-stage-app-root => stage-app-root
     def noid(str)
       el = str.split('-')
       el.shift
@@ -214,15 +200,28 @@ module Rudy
     # Errno::EAFNOSUPPORT, Errno::ECONNREFUSED, SocketError, Timeout::Error
     #
     def service_available?(host, port, wait=3)
-      begin
-        status = Timeout::timeout(wait) do
-          socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
-          sockaddr = Socket.pack_sockaddr_in( port, host )
-          socket.connect( sockaddr )
+      if Rudy.sysinfo.vm == :java
+        begin
+          iadd = Java::InetSocketAddress.new host, port      
+          socket = Java::Socket.new
+          socket.connect iadd, wait * 1000  # milliseconds
+          success = !socket.isClosed && socket.isConnected
+        rescue NativeException => ex
+          puts ex.message, ex.backtrace if Rudy.debug?
+          false
+        end
+      else 
+        begin
+          status = Timeout::timeout(wait) do
+            socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+            sockaddr = Socket.pack_sockaddr_in( port, host )
+            socket.connect( sockaddr )
+          end
+          true
+        rescue Errno::EAFNOSUPPORT, Errno::ECONNREFUSED, SocketError, Timeout::Error => ex
+          puts ex.class, ex.message, ex.backtrace if Rudy.debug?
+          false
         end
-        true
-      rescue Errno::EAFNOSUPPORT, Errno::ECONNREFUSED, SocketError, Timeout::Error => ex
-        false
       end
     end
     
@@ -279,42 +278,10 @@ module Rudy
       str.gsub(/^[[:blank:]]{#{indent}}/, '')
     end
       
-    
-    
-    
-    ######### Everything below here is TO BE REMOVED. 
-    
-    # (TO BE REMOVED)
-    # TODO: This is old and nasty.
-    def scp_command(host, keypair, user, paths, to_path, to_local=false, verbose=false, printonly=false)
-
-      paths = [paths] unless paths.is_a?(Array)
-      from_paths = ""
-      if to_local
-        paths.each do |path|
-          from_paths << "#{user}@#{host}:#{path} "
-        end  
-        #puts "Copying FROM remote TO this machine", $/
-
-      else
-        to_path = "#{user}@#{host}:#{to_path}"
-        from_paths = paths.join(' ')
-        #puts "Copying FROM this machine TO remote", $/
-      end
-
-
-      cmd = "scp -r "
-      cmd << "-i #{keypair}" if keypair
-      cmd << " #{from_paths} #{to_path}"
-
-      puts cmd if verbose
-      printonly ? (puts cmd) : system(cmd)
-    end
-
   end
 end
 
-# = RSSReader
+# = Rudy::Utils::RSSReader
 #
 # A rudimentary way to read an RSS feed as a hash.
 # Adapted from: http://snippets.dzone.com/posts/show/68

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.8.5"
+	s.version = "0.9.0"
 	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
@@ -12,26 +12,29 @@
   s.has_rdoc = true
   s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.rdoc"]
   s.require_paths = %w[lib]
-  s.rubygems_version = '1.1.1'
+  s.rubygems_version = '1.3.0'
   
-  s.add_dependency 'drydock', '>= 0.6.5'
-  s.add_dependency 'caesars', '>= 0.7.1'
-  s.add_dependency 'rye', '>= 0.7.4'
-  s.add_dependency 'sysinfo', '>= 0.5.1'
-  s.add_dependency 'storable', '>= 0.5.3'
-  s.add_dependency 'annoy', '>= 0.5.2'
+  s.add_dependency 'rye',        '>= 0.8.6'
+  s.add_dependency 'attic',      '>= 0.4.0'
+  s.add_dependency 'annoy',      '>= 0.5.5'
+  s.add_dependency 'drydock',    '>= 0.6.6'
+  s.add_dependency 'caesars',    '>= 0.7.3'
+  s.add_dependency 'sysinfo',    '>= 0.6.3'
+  s.add_dependency 'gibbler',    '>= 0.6.0'
+  s.add_dependency 'tryouts',    '>= 0.8.4'
+  s.add_dependency 'storable',   '>= 0.5.6'
   
-  s.add_dependency 'echoe'
+  s.add_dependency 'aws-s3',     '>= 0.6.1'  # Ruby 1.9.1 compatability
+  s.add_dependency 'highline',   '>= 1.5.1'  # Ruby 1.9.1 compatability
   s.add_dependency 'amazon-ec2', '>= 0.3.8'  # Region fix
-  s.add_dependency 'aws-s3', '>= 0.6.1'      # Ruby 1.9.1 compatability
-  s.add_dependency 'highline', '>= 1.5.1'
 
-  # One of the other dependencies needs these gems but doesn't seem
-  # to specify them. Why I outta!
+  # One of the other dependencies needs these gems 
+  # but doesn't seem to specify them. Why I outta!
+  s.add_dependency 'tenderlove-frex'
   s.add_dependency 'archive-tar-minitar'
   s.add_dependency 'nokogiri'
+  s.add_dependency 'echoe'
   s.add_dependency 'racc'
-  s.add_dependency 'tenderlove-frex'
   s.add_dependency 'hoe'
   
   # libxml2 libxml2-dev libxslt-dev
@@ -52,7 +55,6 @@
   README.rdoc
   Rakefile
   Rudyfile
-  bin/ird
   bin/rudy
   bin/rudy-ec2
   bin/rudy-s3
@@ -71,6 +73,7 @@
   lib/rudy/aws/s3.rb
   lib/rudy/aws/sdb.rb
   lib/rudy/aws/sdb/error.rb
+  lib/rudy/backups.rb
   lib/rudy/cli.rb
   lib/rudy/cli/aws/ec2/addresses.rb
   lib/rudy/cli/aws/ec2/candy.rb
@@ -84,33 +87,45 @@
   lib/rudy/cli/aws/s3/buckets.rb
   lib/rudy/cli/aws/s3/store.rb
   lib/rudy/cli/aws/sdb/domains.rb
+  lib/rudy/cli/aws/sdb/objects.rb
+  lib/rudy/cli/aws/sdb/select.rb
+  lib/rudy/cli/backups.rb
+  lib/rudy/cli/base.rb
   lib/rudy/cli/candy.rb
   lib/rudy/cli/config.rb
   lib/rudy/cli/disks.rb
+  lib/rudy/cli/execbase.rb
   lib/rudy/cli/machines.rb
   lib/rudy/cli/metadata.rb
+  lib/rudy/cli/networks.rb
   lib/rudy/cli/routines.rb
+  lib/rudy/cli/status.rb
   lib/rudy/config.rb
   lib/rudy/config/objects.rb
+  lib/rudy/disks.rb
+  lib/rudy/exceptions.rb
   lib/rudy/global.rb
   lib/rudy/guidelines.rb
   lib/rudy/huxtable.rb
   lib/rudy/machines.rb
   lib/rudy/metadata.rb
   lib/rudy/metadata/backup.rb
-  lib/rudy/metadata/backups.rb
-  lib/rudy/metadata/debug.rb
   lib/rudy/metadata/disk.rb
-  lib/rudy/metadata/disks.rb
-  lib/rudy/metadata/objectbase.rb
+  lib/rudy/metadata/machine.rb
   lib/rudy/mixins.rb
   lib/rudy/mixins/hash.rb
+  lib/rudy/mixins/symbol.rb
   lib/rudy/routines.rb
-  lib/rudy/routines/helper.rb
-  lib/rudy/routines/helpers/dependshelper.rb
-  lib/rudy/routines/helpers/diskhelper.rb
-  lib/rudy/routines/helpers/scripthelper.rb
-  lib/rudy/routines/helpers/userhelper.rb
+  lib/rudy/routines/base.rb
+  lib/rudy/routines/handlers/base.rb
+  lib/rudy/routines/handlers/depends.rb
+  lib/rudy/routines/handlers/disks.rb
+  lib/rudy/routines/handlers/group.rb
+  lib/rudy/routines/handlers/host.rb
+  lib/rudy/routines/handlers/keypair.rb
+  lib/rudy/routines/handlers/machines.rb
+  lib/rudy/routines/handlers/script.rb
+  lib/rudy/routines/handlers/user.rb
   lib/rudy/routines/passthrough.rb
   lib/rudy/routines/reboot.rb
   lib/rudy/routines/shutdown.rb
@@ -119,8 +134,50 @@
   rudy.gemspec
   support/mailtest
   support/randomize-root-password
-  support/rudy-ec2-startup
   support/update-ec2-ami-tools
+  tryouts/01_mixins/01_hash_tryouts.rb
+  tryouts/10_require_time/10_rudy_tryouts.rb
+  tryouts/10_require_time/15_global_tryouts.rb
+  tryouts/12_config/10_load_config_tryouts.rb
+  tryouts/12_config/20_defaults_tryouts.rb
+  tryouts/12_config/30_accounts_tryouts.rb
+  tryouts/12_config/40_machines_tryouts.rb
+  tryouts/12_config/50_commands_tryouts.rb
+  tryouts/12_config/60_routines_tryouts.rb
+  tryouts/15_huxtable/10_huxtable_tryouts.rb
+  tryouts/15_huxtable/20_user_tryouts.rb
+  tryouts/20_simpledb/10_domains_tryouts.rb
+  tryouts/20_simpledb/20_objects_tryouts.rb
+  tryouts/25_ec2/10_keypairs_tryouts.rb
+  tryouts/25_ec2/20_groups_tryouts.rb
+  tryouts/25_ec2/21_groups_authorize_address_tryouts.rb
+  tryouts/25_ec2/22_groups_authorize_account_tryouts.rb
+  tryouts/25_ec2/30_addresses_tryouts.rb
+  tryouts/25_ec2/40_volumes_tryouts.rb
+  tryouts/25_ec2/50_snapshots_tryouts.rb
+  tryouts/26_ec2_instances/10_instance_tryouts.rb
+  tryouts/26_ec2_instances/50_images_tryouts.rb
+  tryouts/30_metadata/10_include_tryouts.rb
+  tryouts/30_metadata/13_object_tryouts.rb
+  tryouts/30_metadata/50_disk_tryouts.rb
+  tryouts/30_metadata/51_disk_digest_tryouts.rb
+  tryouts/30_metadata/53_disk_list_tryouts.rb
+  tryouts/30_metadata/56_disk_volume_tryouts.rb
+  tryouts/30_metadata/60_backup_tryouts.rb
+  tryouts/30_metadata/63_backup_list_tryouts.rb
+  tryouts/30_metadata/64_backup_disk_tryouts.rb
+  tryouts/30_metadata/66_backup_snapshot_tryouts.rb
+  tryouts/30_metadata/70_machine_tryouts.rb
+  tryouts/30_metadata/73_machine_list_tryouts.rb
+  tryouts/30_metadata/76_machine_instance_tryouts.rb
+  tryouts/30_metadata/77_machines_tryouts.rb
+  tryouts/40_routines/10_keypair_handler_tryouts.rb
+  tryouts/40_routines/11_group_handler_tryouts.rb
+  tryouts/80_cli/10_rudyec2_tryouts.rb
+  tryouts/80_cli/60_rudy_tryouts.rb
+  tryouts/exploration/console.rb
+  tryouts/exploration/machine.rb
+  tryouts/failer
   )