solutious-rudy 0.4.0 → 0.5.0

data/tryouts/nested_methods.rb

@@ -0,0 +1,36 @@
+
+
+module Helper
+
+  def test1
+    puts "test1"
+
+    def test2
+      def test3
+        puts "AWESOME"
+      end
+      
+      puts "test2"
+      yield
+    end
+    
+    def test3
+      puts "test3"
+    end
+    yield
+  end
+  
+end
+
+include Helper
+
+test1 do 
+  puts "1"
+  test3      # => test3
+  test2 do 
+    test3    # => AWESOME
+    puts "2"
+  end
+end
+
+# test2    # => throws error

data/tryouts/session_tryout.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+
+require 'rubygems'
+require 'session'
+require 'net/ssh'
+require 'rye'
+require 'yaml'
+require 'stringio'
+
+#p Rye.command('ssh', '-i', '', '')
+
+module Rye::Box::Commands
+  def rudy(*args); command("/proj/git/rudy/bin/rudy", args);  end
+end
+
+logger = StringIO.new
+rbox = Rye::Box.new('localhost', 'delano', :stderr => logger).connect
+#rbox2 = Rye::Box.new('ec2-174-129-173-3.compute-1.amazonaws.com', 'root')
+#rbox.add_keys('/Users/delano/Projects/git/rudy/.rudy/key-test-app')
+#rbox.connect
+#puts rbox.date
+#puts rbox.pwd
+puts rbox['/usr/bin'].pwd
+puts rbox.uptime
+puts rbox.can
+puts rbox.echo '$HOME'
+puts rbox.rudy('myaddress')
+rbox.disconnect
+#puts logger.read
+#>> 
+
+__END__
+
+
+rgroup = Rye::Group.new('root', 'keydir/file')
+rgroup.add_hosts('ec2-174-129-173-3.compute-1.amazonaws.com')
+rgroup.command('hostname')
+
+
+
+#shell = Session::Shell.new 
+
+#p shell.execute('ssh -T -t -i /Users/delano/Projects/git/rudy/.rudy/key-test-app.private root@ec2-174-129-82-193.compute-1.amazonaws.com')
+
+#Net::SSH.configuration_for(localhost, ssh_options.fetch(:config, true)).merge(ssh_options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: solutious-rudy
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-25 00:00:00 -08:00
+date: 2009-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: drydock
+  name: echoe
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -23,7 +23,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: caesars
+  name: amazon-ec2
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -33,7 +33,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: echoe
+  name: aws-sdb
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -43,7 +43,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: right_aws
+  name: net-ssh
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -53,7 +53,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
+  name: net-scp
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -63,7 +63,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: net-scp
+  name: net-ssh-gateway
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -73,7 +73,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: net-ssh-gateway
+  name: net-ssh-multi
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -83,7 +83,17 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: net-ssh-multi
+  name: drydock
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: caesars
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -93,7 +103,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: rye
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -102,65 +112,124 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Your friend in staging and deploying with EC2.
+description: Not your grandparent's deployment tool.
 email: delano@solutious.com
 executables: 
 - rudy
-- rudy-ec2
+- ird
 extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
 - LICENSE.txt
+- CHANGES.txt
 files: 
 - CHANGES.txt
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- Rudyfile
+- bin/ird
 - bin/rudy
-- bin/rudy-ec2
+- lib/annoy.rb
 - lib/aws_sdb.rb
 - lib/aws_sdb/error.rb
 - lib/aws_sdb/service.rb
 - lib/console.rb
+- lib/escape.rb
 - lib/rudy.rb
 - lib/rudy/aws.rb
 - lib/rudy/aws/ec2.rb
+- lib/rudy/aws/ec2/address.rb
+- lib/rudy/aws/ec2/group.rb
+- lib/rudy/aws/ec2/image.rb
+- lib/rudy/aws/ec2/instance.rb
+- lib/rudy/aws/ec2/keypair.rb
+- lib/rudy/aws/ec2/snapshot.rb
+- lib/rudy/aws/ec2/volume.rb
 - lib/rudy/aws/s3.rb
 - lib/rudy/aws/simpledb.rb
+- lib/rudy/cli.rb
+- lib/rudy/cli/addresses.rb
+- lib/rudy/cli/backups.rb
+- lib/rudy/cli/config.rb
+- lib/rudy/cli/deploy.rb
+- lib/rudy/cli/disks.rb
+- lib/rudy/cli/domains.rb
+- lib/rudy/cli/groups.rb
+- lib/rudy/cli/images.rb
+- lib/rudy/cli/instances.rb
+- lib/rudy/cli/keypairs.rb
+- lib/rudy/cli/manager.rb
+- lib/rudy/cli/release.rb
+- lib/rudy/cli/routines.rb
+- lib/rudy/cli/volumes.rb
 - lib/rudy/command/addresses.rb
 - lib/rudy/command/backups.rb
-- lib/rudy/command/base.rb
-- lib/rudy/command/config.rb
-- lib/rudy/command/deploy.rb
+- lib/rudy/command/disks-old.rb
 - lib/rudy/command/disks.rb
-- lib/rudy/command/environment.rb
+- lib/rudy/command/domains.rb
 - lib/rudy/command/groups.rb
-- lib/rudy/command/images.rb
 - lib/rudy/command/instances.rb
-- lib/rudy/command/machines.rb
-- lib/rudy/command/metadata.rb
-- lib/rudy/command/release.rb
+- lib/rudy/command/keypairs.rb
+- lib/rudy/command/manager.rb
 - lib/rudy/command/volumes.rb
 - lib/rudy/config.rb
-- lib/rudy/metadata.rb
+- lib/rudy/config/objects.rb
+- lib/rudy/huxtable.rb
 - lib/rudy/metadata/backup.rb
 - lib/rudy/metadata/disk.rb
+- lib/rudy/metadata/machine.rb
+- lib/rudy/routines.rb
+- lib/rudy/routines/disk_handler.rb
+- lib/rudy/routines/release.rb
+- lib/rudy/routines/script_runner.rb
+- lib/rudy/routines/shutdown.rb
+- lib/rudy/routines/startup.rb
 - lib/rudy/scm/svn.rb
 - lib/rudy/utils.rb
 - lib/storable.rb
+- lib/sysinfo.rb
 - lib/tryouts.rb
 - rudy.gemspec
 - support/mailtest
+- support/randomize-root-password
 - support/rudy-ec2-startup
+- support/update-ec2-ami-tools
+- test/05_config/00_setup_test.rb
+- test/05_config/30_machines_test.rb
+- test/20_sdb/00_setup_test.rb
+- test/20_sdb/10_domains_test.rb
+- test/25_ec2/00_setup_test.rb
+- test/25_ec2/10_keypairs_test.rb
+- test/25_ec2/20_groups_test.rb
+- test/25_ec2/30_addresses_test.rb
+- test/25_ec2/40_volumes_test.rb
+- test/25_ec2/50_snapshots_test.rb
+- test/26_ec2_instances/00_setup_test.rb
+- test/26_ec2_instances/10_instances_test.rb
+- test/26_ec2_instances/50_images_test.rb
+- test/30_sdb_metadata/00_setup_test.rb
+- test/30_sdb_metadata/10_disks_test.rb
+- test/30_sdb_metadata/20_backups_test.rb
+- test/50_commands/00_setup_test.rb
+- test/50_commands/10_keypairs_test.rb
+- test/50_commands/20_groups_test.rb
+- test/50_commands/40_volumes_test.rb
+- test/50_commands/50_instances_test.rb
+- test/coverage.txt
+- test/helper.rb
 - tryouts/console_tryout.rb
+- tryouts/disks.rb
+- tryouts/nested_methods.rb
+- tryouts/session_tryout.rb
 has_rdoc: true
 homepage: http://github.com/solutious/rudy
 post_install_message: 
 rdoc_options: 
 - --line-numbers
 - --title
-- "Rudy: Your friend in staging and deploying with EC2."
+- "Rudy: Not your grandparent's deployment tool."
 - --main
 - README.rdoc
 require_paths: 
@@ -183,6 +252,6 @@ rubyforge_project: rudy
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Your friend in staging and deploying with EC2.
+summary: Not your grandparent's deployment tool.
 test_files: []
 

data/bin/rudy-ec2

@@ -1,108 +0,0 @@
-#!/usr/bin/ruby
-
-# Rudy -- Your friend in staging and deploying to EC2
-#
-#   See rudy -h for usage
-# 
-
-#
-# No Ruby 1.9.1 support. Only 1.8.x for now :[
-unless RUBY_VERSION < "1.9"
-  puts "Sorry! We're using the right_aws gem and it doesn't support Ruby 1.9 (md5 error)."
-  exit 1
-else
- require 'rubygems'
-end
-
-RUDY_HOME = File.join(File.dirname(__FILE__), '..')
-RUDY_LIB = File.join(RUDY_HOME, 'lib')
-$:.unshift RUDY_LIB # Put our local lib in first place
-
-require 'drydock'
-extend Drydock
-
-project "Rudy"  # This also runs require 'ruby'
-
-debug :on
-
-capture :stderr       
-
-global :A, :accesskey, String, "AWS Access Key"
-global :S, :secretkey, String, "AWS Secret Access Key"
-global :R, :region, String, "Connect to a specific EC2 region (default: #{Rudy::DEFAULT_REGION})"
-global :z, :zone, String, "Connect to a specific EC2 zone (default: #{Rudy::DEFAULT_ZONE})"
-global :q, :quiet, "Run with less output"
-global :v, :verbose, "Increase verbosity of output (i.e. -v or -vv or -vvv)" do
-  @verbose ||= 0
-  @verbose += 1
-end
-global :V, :version, "Display version number" do
-  puts "Rudy version: #{Rudy::VERSION}"
-  exit 0
-end
-
-
-
-
-
-# -----------------------------------  AMAZON EC2 COMMANDS  --------
-# ------------------------------------------------------------------
-
-usage "rudy [global options] addresses [-A address instance ID]"
-desc "Manage Amazon Elastic IP addresses"
-argv :address, :instanceid
-action :A, :associate, "Associate an address to a running instance"
-command :addresses => Rudy::Command::Addresses
-command_alias :addresses, :address
-
-
-usage "rudy images [-C -i name [-b bucket -a account]] [-D AMI-ID]"
-desc "Manage EC2 Machine Images (AMIs)"
-option :a, :account, String, "Your Amazon Account Number"
-option :i, :image_name, String, "The name of the image"
-option :p, :print, "Print-only (don't execute commands)"
-option :b, :bucket_name, String, "The name of the bucket that will store the image"
-action :C, :create, "Create an image"
-#action :P, :prepare, "Prepare a running instance to be used as an image"
-action :D, :destroy, "Deregister an image (currently _does not_ remove images files from S3)"
-argv :ami
-command :images => Rudy::Command::Images
-command_alias :images, :image
-
-
-desc "Manage EC2 Volumes"
-action :D, :destroy, "Destroy a volume"
-argv :vol
-command :volumes => Rudy::Command::Volumes
-command_alias :volumes, :volume
-
-
-usage "rudy [global options] instances [-D] [-S -i image ID] [instance ID OR group name]"
-desc "Manage EC2 Instances"
-option :all, "Display all instances"
-option :a, :address, String, "Amazon elastic IP"
-option :i, :image, String, "Amazon machine image ID (ami)"
-#option :v, :volume, String, "Amazon volume ID"
-action :D, :destroy, "Destroy the given instance IDs. All data will be lost!"
-#action :S, :start, "Start an instance"
-#action :R, :restart, "Restart an instance"
-argv :filter
-command :instances => Rudy::Command::Instances
-command_alias :instances, :instance
-
-
-usage "rudy [global options] groups [-C] [-a IP addresses] [-p ports] [group name]"
-desc "Manage EC2 Security Groups"
-option :all, "Display all security groups"
-option :r, :protocols, Array, "Comma-separated list of protocols. One of: tcp (default), udp, icmp"
-option :p, :ports, Array, "List of comma-separated ports to authorize (default: 22,80,443)"
-option :a, :addresses, Array, "List of comma-separated IP addresses to authorize (default: your external IP)"
-action :C, :create, "Create a security group"
-action :D, :destroy, "Destroy a security group"
-action :M, :modify, "Modify a security group"
-argv :group
-command :groups => Rudy::Command::Groups
-command_alias :groups, :group
-
-
-

data/lib/rudy/command/base.rb

@@ -1,839 +0,0 @@
-
-module Rudy
-  class UnknownInstance < RuntimeError; end
-end
-
-module Rudy
-  module Command
-    class NoCred < RuntimeError; end;
-    
-    class Base < Drydock::Command
-
-      attr_reader :scm
-  
-      attr_reader :rscripts
-      attr_reader :domains
-      attr_reader :machine_images
-      
-      attr_reader :config
-      
-      
-      def init
-        
-        
-        raise "PRODUCTION ACCESS IS DISABLED IN DEBUG MODE" if @global.environment == "prod" && Drydock.debug?
-        
-        @global.config ||= RUDY_CONFIG_FILE
-        
-        unless File.exists?(@global.config)
-          init_config_dir
-        end
-        
-        @config = Rudy::Config.new(@global.config, {:verbose => (@global.verbose > 0)} )
-        @config.look_and_load
-        
-        raise "There is no machine group configured" if @config.machines.nil?
-        raise "There is no AWS info configured" if @config.awsinfo.nil?
-        
-        
-        @global.accesskey ||= @config.awsinfo.accesskey || ENV['AWS_ACCESS_KEY']
-        @global.secretkey ||= @config.awsinfo.secretkey || ENV['AWS_SECRET_KEY'] || ENV['AWS_SECRET_ACCESS_KEY']
-        @global.account ||= @config.awsinfo.account || ENV['AWS_ACCOUNT_NUMBER'] 
-        
-        @global.cert ||= @config.awsinfo.cert || ENV['EC2_CERT']
-        @global.privatekey ||= @config.awsinfo.privatekey || ENV['EC2_PRIVATE_KEY']
-        
-        @global.cert = File.expand_path(@global.cert || '')
-        @global.privatekey = File.expand_path(@global.privatekey || '')
-        
-        @global.region ||= @config.defaults.region || DEFAULT_REGION
-        @global.zone ||= @config.defaults.zone || DEFAULT_ZONE
-        @global.environment ||= @config.defaults.environment || DEFAULT_ENVIRONMENT
-        @global.role ||= @config.defaults.role || DEFAULT_ROLE
-        @global.position ||= @config.defaults.position || DEFAULT_POSITION
-        @global.user ||= @config.defaults.user || DEFAULT_USER
-        
-        @global.local_user = ENV['USER'] || :user
-        @global.local_hostname = Socket.gethostname || :host
-        
-        
-        if @global.verbose > 1
-          puts "GLOBALS:"
-          @global.marshal_dump.each_pair do |n,v|
-            puts "#{n}: #{v}"
-          end
-          ["machines", "routines"].each do |type|
-            puts "#{$/*2}#{type.upcase}:"
-            val = @config.send(type).find_deferred(@global.environment, @global.role)
-            puts val.to_hash.to_yaml
-          end
-          puts
-        end
-        
-        
-        
-        # TODO: enforce home directory permissions
-        #if File.exists?(RUDY_CONFIG_DIR)
-        #  puts "Checking #{check_environment} permissions..."
-        #end
-        
-        if has_keys?
-          @ec2 = Rudy::AWS::EC2.new(@global.accesskey, @global.secretkey)
-          @sdb = Rudy::AWS::SimpleDB.new(@global.accesskey, @global.secretkey)
-          #@s3 = Rudy::AWS::SimpleDB.new(@global.accesskey, @global.secretkey)
-        end
-      end
-      protected :init
-      
-      def machine_data
-        machine_data = {
-          # Give the machine an identity
-          :zone => @global.zone,
-          :environment => @global.environment,
-          :role => @global.role,
-          :position => @global.position,
-          
-          # Add hosts to the /etc/hosts file
-          :hosts => {
-            :dbmaster => "127.0.0.1",
-          }
-        } 
-        
-        machine_data.to_hash
-      end
-      
-      
-      # Raises exceptions if the requested user does 
-      # not have a valid keypair configured. (See: EC2_KEYPAIR_*)
-      def check_keys
-        raise "No SSH key provided for #{@global.user}! (check #{RUDY_CONFIG_FILE})" unless has_keypair?
-        raise "SSH key provided but cannot be found! (check #{RUDY_CONFIG_FILE})" unless File.exists?(keypairpath)
-      end  
-      
-      def has_pem_keys?
-        (@global.cert       && File.exists?(@global.cert) && 
-         @global.privatekey && File.exists?(@global.privatekey))
-      end
-       
-      def has_keys?
-        (@global.accesskey && !@global.accesskey.empty? && @global.secretkey && !@global.secretkey.empty?)
-      end
-      
-      def keypairpath(name=nil)
-        name ||= @global.user
-        raise "No default user configured" unless name
-        kp = @config.machines.find(@global.environment, @global.role, :users, name, :keypair2)
-        kp ||= @config.machines.find(@global.environment, :users, name, :keypair)
-        kp ||= @config.machines.find(:users, name, :keypair)
-        kp &&= File.expand_path(kp)
-        kp
-      end
-      def has_keypair?(name=nil)
-        kp = keypairpath(name)
-        (!kp.nil? && File.exists?(kp))
-      end
-      
-      # Opens an SSH session. 
-      # <li>+host+ the hostname to connect to. Defaults to the machine specified
-      # by @global.environment, @global.role, @global.position.</li>
-      # <li>+b+ a block to execute on the host. Receives |session|</li>
-      # 
-      #      ssh do |session|
-      #        session.exec(cmd)
-      #      end
-      #
-      # See Net::SSH
-      #
-      def ssh(host=nil, &b)
-        host ||= machine_hostname
-        raise "No host provided for SSH" unless host
-        raise "No block provided for SSH" unless b
-        
-        Net::SSH.start(host, @global.user, :keys => [keypairpath]) do |session|
-          b.call(session)
-        end
-      end
-      
-      # Secure copy. 
-      # 
-      #      scp do |scp|
-      #        # upload a file to a remote server
-      #        scp.upload! "/local/path", "/remote/path"
-      #
-      #        # upload from an in-memory buffer
-      #        scp.upload! StringIO.new("some data to upload"), "/remote/path"
-      #
-      #        # run multiple downloads in parallel
-      #        d1 = scp.download("/remote/path", "/local/path")
-      #        d2 = scp.download("/remote/path2", "/local/path2")
-      #        [d1, d2].each { |d| d.wait }
-      #      end
-      #
-      def scp(host=nil, &b)
-        host ||= machine_hostname
-        raise "No host provided for scp" unless host
-        raise "No block provided for scp" unless b
-        
-        Net::SCP.start(host, @global.user, :keys => [keypairpath]) do |scp|
-          b.call(scp)
-        end
-      end
-      
-      # +name+ the name of the remote user to use for the remainder of the command
-      # (or until switched again). If no name is provided, the user will be revert
-      # to whatever it was before the previous switch. 
-      def switch_user(name=nil)
-        if name == nil && @switch_user_previous
-          @global.user = @switch_user_previous
-        elsif @global.user != name
-          puts "Remote commands will be run as #{name} user"
-          @switch_user_previous = @global.user
-          @global.user = name
-        end
-      end
-      
-      # Returns a hash of info for the requested machine. If the requested machine
-      # is not running, it will raise an exception. 
-      def find_current_machine
-        find_machine(machine_group)
-      end
-        
-      def find_machine(group)
-        machine_list = @ec2.instances.list(group)
-        machine = machine_list.values.first  # NOTE: Only one machine per group, for now...
-        raise "There's no machine running in #{group}" unless machine
-        raise "The primary machine in #{group} is not in a running state" unless machine[:aws_state] == 'running'
-        machine
-      end
-      
-      def machine_hostname(group=nil)
-        group ||= machine_group
-        find_machine(group)[:dns_name]
-      end
-      
-      def machine_group
-        [@global.environment, @global.role].join(RUDY_DELIM)
-      end
-      
-      def machine_image
-        ami = @config.machines.find_deferred(@global.environment, @global.role, :ami)
-        raise "There is no AMI configured for #{machine_group}" unless ami
-        ami
-      end
-      
-      def machine_address
-        @config.machines.find_deferred(@global.environment, @global.role, :address)
-      end
-      
-      # TODO: fix machine_group to include zone
-      def machine_name
-        [@global.zone, machine_group, @global.position].join(RUDY_DELIM)
-      end
-
-      def instance_id?(id=nil)
-        (id && id[0,2] == "i-")
-      end
-      
-      def image_id?(id=nil)
-        (id && id[0,4] == "ami-")
-      end
-      
-      def volume_id?(id=nil)
-        (id && id[0,4] == "vol-")
-      end
-      
-      def snapshot_id?(id=nil)
-        (id && id[0,5] == "snap-")
-      end
-      
-      
-      def wait_for_machine(id)
-        
-        print "Waiting for #{id} to become available"
-        STDOUT.flush
-        
-        while @ec2.instances.pending?(id)
-          sleep 2
-          print '.'
-          STDOUT.flush
-        end
-        
-        machine = @ec2.instances.get(id)
-        
-        puts " It's up!\a\a" # with bells
-        print "Waiting for SSH daemon at #{machine[:dns_name]}"
-        STDOUT.flush
-        
-        while !Rudy::Utils.service_available?(machine[:dns_name], 22)
-          print '.'
-          STDOUT.flush
-        end
-        puts " It's up!\a\a\a"
-
-      end
-      
-      
-      def device_to_path(machine, device)
-        # /dev/sdr            10321208    154232   9642688   2% /rilli/app
-        dfoutput = ssh_command(machine[:dns_name], keypairpath, @global.user, "df #{device} | tail -1").chomp
-        dfvals = dfoutput.scan(/(#{device}).+\s(.+?)$/).flatten  # ["/dev/sdr", "/rilli/app"]
-        dfvals.last
-      end
-      
-      # +action+ is one of: :shutdown, :start, :deploy
-      # +machine+ is a right_aws machine instance hash
-      def execute_disk_routines(machines, action)
-        machines = [machines] unless machines.is_a?( Array)
-        
-        puts "Running #{action.to_s.capitalize} DISK routines".att(:bright)
-        
-        disks = @config.machines.find_deferred(@global.environment, @global.role, :disks)
-        routines = @config.routines.find(@global.environment, @global.role, action, :disks)
-        
-        unless routines
-          puts "No #{action} disk routines."
-          return
-        end
-        
-        switch_user("root")
-        
-        machines.each do |machine|
-
-          unless machine[:aws_instance_id]
-            puts "Machine given has no instance ID. Skipping disks."
-            return
-          end
-        
-          unless machine[:dns_name]
-            puts "Machine given has no DNS name. Skipping disks."
-            return
-          end
-          
-          if routines.destroy
-            disk_paths = routines.destroy.keys
-            vols = @ec2.instances.volumes(machine[:aws_instance_id]) || []
-            puts "No volumes to destroy for (#{machine[:aws_instance_id]})" if vols.empty?
-            vols.each do |vol|
-              disk = Rudy::MetaData::Disk.find_from_volume(@sdb, vol[:aws_id])
-              if disk
-                this_path = disk.path
-              else
-                puts "No disk metadata for volume #{vol[:aws_id]}. Going old school..."
-                this_path = device_to_path(machine, vol[:aws_device])
-              end
-              
-              dconf = disks[this_path]
-              
-              unless dconf
-                puts "#{this_path} is not defined for this machine. Check your machines config."
-                next
-              end
-              
-              if disk_paths.member?(this_path) 
-              
-                unless disks.has_key?(this_path)
-                  puts "#{this_path} is not defined as a machine disk. Skipping..."
-                  next
-                end
-                
-                begin
-                  puts "Unmounting #{this_path}..."
-                  ssh_command machine[:dns_name], keypairpath, @global.user, "umount #{this_path}"
-                  sleep 3
-                rescue => ex
-                  puts "Error while unmounting #{this_path}: #{ex.message}"
-                  puts ex.backtrace if Drydock.debug?
-                  puts "We'll keep going..."
-                end
-                
-                begin
-                  
-                  if @ec2.volumes.attached?(disk.awsid)
-                    puts "Detaching #{vol[:aws_id]}"
-                    @ec2.volumes.detach(vol[:aws_id])
-                    sleep 3 # TODO: replace with something like wait_for_machine
-                  end
-                  
-                  puts "Destroying #{this_path} (#{vol[:aws_id]})"
-                  if @ec2.volumes.available?(disk.awsid)
-                    @ec2.volumes.destroy(vol[:aws_id])
-                  else
-                    puts "Volume is still attached (maybe a web server of database is running?)"
-                  end
-                  
-                  if disk
-                    puts "Deleteing metadata for #{disk.name}"
-                    Rudy::MetaData::Disk.destroy(@sdb, disk)
-                  end
-                
-                rescue => ex
-                  puts "Error while detaching volume #{vol[:aws_id]}: #{ex.message}"
-                  puts ex.backtrace if Drydock.debug?
-                  puts "Continuing..."
-                end
-                
-              end
-              puts
-              
-            end
-          
-          end
-          
-          
-          if routines.mount
-            disk_paths = routines.mount.keys
-            vols = @ec2.instances.volumes(machine[:aws_instance_id]) || []
-            puts "No volumes to mount for (#{machine[:aws_instance_id]})" if vols.empty?
-            vols.each do |vol|
-              disk = Rudy::MetaData::Disk.find_from_volume(@sdb, vol[:aws_id])
-              if disk
-                this_path = disk.path
-              else
-                puts "No disk metadata for volume #{vol[:aws_id]}. Going old school..."
-                this_path = device_to_path(machine, vol[:aws_device])
-              end
-              
-              next unless disk_paths.member?(this_path)
-                
-              dconf = disks[this_path]
-              
-              unless dconf
-                puts "#{this_path} is not defined for this machine. Check your machines config."
-                next
-              end
-              
-              
-              begin
-                unless @ec2.instances.attached_volume?(machine[:aws_instance_id], vol[:aws_device])
-                  puts "Attaching #{vol[:aws_id]} to #{machine[:aws_instance_id]}".att(:bright)
-                  @ec2.volumes.attach(machine[:aws_instance_id], vol[:aws_id],vol[:aws_device])
-                  sleep 3
-                end
-
-                puts "Mounting #{this_path} to #{vol[:aws_device]}".att(:bright)
-                ssh_command machine[:dns_name], keypairpath, @global.user, "mkdir -p #{this_path} && mount -t ext3 #{vol[:aws_device]} #{this_path}"
-
-                sleep 1
-              rescue => ex
-                puts "There was an error mounting #{this_path}: #{ex.message}"
-                puts ex.backtrace if Drydock.debug?
-              end
-              puts 
-            end
-          end
-        
-        
-          
-          if routines.restore
-            
-            routines.restore.each_pair do |path,props|
-              from = props[:from] || "unknown"
-              unless from.to_s == "backup"
-                puts "Sorry! You can currently only restore from backup. Check your routines config."
-                next
-              end
-              
-              begin 
-                puts "Restoring disk for #{path}"
-                
-                dconf = disks[path]
-                
-                unless dconf
-                  puts "#{path} is not defined for this machine. Check your machines config."
-                  next
-                end
-                    
-                zon = props[:zone] || @global.zone
-                env = props[:environment] || @global.environment
-                rol = props[:role] || @global.role
-                pos = props[:position] || @global.position
-                puts "Looking for backup from #{zon}-#{env}-#{rol}-#{pos}"
-                backup = find_most_recent_backup(zon, env, rol, pos, path)
-                
-                unless backup
-                  puts "No backups found"
-                  next
-                end
-                
-                puts "Found: #{backup.name}".att(:bright)
-                
-                disk = Rudy::MetaData::Disk.new
-                disk.path = path
-                [:region, :zone, :environment, :role, :position].each do |n|
-                  disk.send("#{n}=", @global.send(n)) if @global.send(n)
-                end
-                
-                disk.device = dconf[:device]
-                size = (backup.size.to_i > dconf[:size].to_i) ? backup.size : dconf[:size]
-                disk.size = size.to_i
-                
-                
-                if Rudy::MetaData::Disk.is_defined?(@sdb, disk)
-                  puts "The disk #{disk.name} already exists."
-                  puts "You probably need to define when to destroy the disk."
-                  puts "Skipping..."
-                  next
-                end
-
-                if @ec2.instances.attached_volume?(machine[:aws_instance_id], disk.device)
-                  puts "Skipping disk for #{disk.path} (device #{disk.device} is in use)"
-                  next
-                end
-
-                # NOTE: It's important to use Caesars' hash syntax b/c the disk property
-                # "size" conflicts with Hash#size which is what we'll get if there's no 
-                # size defined. 
-                unless disk.size.kind_of?(Integer)
-                  puts "Skipping disk for #{disk.path} (size not defined)"
-                  next
-                end
-
-                if disk.path.nil?
-                  puts "Skipping disk for #{disk.path} (no path defined)"
-                  next
-                end
-
-                unless disk.valid?
-                  puts "Skipping #{disk.name} (not enough info)"
-                  next
-                end
-
-                puts "Creating volume... (from #{backup.awsid})".att(:bright)
-                volume = @ec2.volumes.create(@global.zone, disk.size, backup.awsid)
-
-                puts "Attaching #{volume[:aws_id]} to #{machine[:aws_instance_id]}".att(:bright)
-                @ec2.volumes.attach(machine[:aws_instance_id], volume[:aws_id], disk.device)
-                sleep 3
-
-                puts "Mounting #{disk.device} to #{disk.path}".att(:bright)
-                ssh_command machine[:dns_name], keypairpath, @global.user, "mkdir -p #{disk.path} && mount -t ext3 #{disk.device} #{disk.path}"
-
-                puts "Creating disk metadata for #{disk.name}"
-                disk.awsid = volume[:aws_id]
-                Rudy::MetaData::Disk.save(@sdb, disk)
-
-                sleep 1
-              rescue => ex
-                puts "There was an error creating #{path}: #{ex.message}"
-                puts ex.backtrace if Drydock.debug?
-                if disk
-                  puts "Removing metadata for #{disk.name}"
-                  Rudy::MetaData::Disk.destroy(@sdb, disk)
-                end
-              end
-              puts
-            end
-          end
-          
-          
-          
-          if routines.create
-            routines.create.each_pair do |path,props|
-        
-              begin 
-                puts "Creating disk for #{path}"
-                
-                dconf = disks[path]
-
-                unless dconf
-                  puts "#{path} is not defined for this machine. Check your machines config."
-                  next
-                end
-                
-                disk = Rudy::MetaData::Disk.new
-                disk.path = path
-                [:region, :zone, :environment, :role, :position].each do |n|
-                  disk.send("#{n}=", @global.send(n)) if @global.send(n)
-                end
-                [:device, :size].each do |n|
-                  disk.send("#{n}=", dconf[n]) if dconf.has_key?(n)
-                end
-            
-                if Rudy::MetaData::Disk.is_defined?(@sdb, disk)
-                  puts "The disk #{disk.name} already exists."
-                  puts "You probably need to define when to destroy the disk."
-                  puts "Skipping..."
-                  next
-                end
-            
-                if @ec2.instances.attached_volume?(machine[:aws_instance_id], disk.device)
-                  puts "Skipping disk for #{disk.path} (device #{disk.device} is in use)"
-                  next
-                end
-            
-                # NOTE: It's important to use Caesars' hash syntax b/c the disk property
-                # "size" conflicts with Hash#size which is what we'll get if there's no 
-                # size defined. 
-                unless disk.size.kind_of?(Integer)
-                  puts "Skipping disk for #{disk.path} (size not defined)"
-                  next
-                end
-            
-                if disk.path.nil?
-                  puts "Skipping disk for #{disk.path} (no path defined)"
-                  next
-                end
-            
-                unless disk.valid?
-                  puts "Skipping #{disk.name} (not enough info)"
-                  next
-                end
-                        
-                puts "Creating volume... (#{disk.size}GB in #{@global.zone})".att(:bright)
-                volume = @ec2.volumes.create(@global.zone, disk.size)
-            
-                puts "Attaching #{volume[:aws_id]} to #{machine[:aws_instance_id]}".att(:bright)
-                @ec2.volumes.attach(machine[:aws_instance_id], volume[:aws_id], disk.device)
-                sleep 6
-                
-                puts "Creating the filesystem (mkfs.ext3 -F #{disk.device})".att(:bright)
-                ssh_command machine[:dns_name], keypairpath, @global.user, "mkfs.ext3 -F #{disk.device}"
-                sleep 3
-                
-                puts "Mounting #{disk.device} to #{disk.path}".att(:bright)
-                ssh_command machine[:dns_name], keypairpath, @global.user, "mkdir -p #{disk.path} && mount -t ext3 #{disk.device} #{disk.path}"
-              
-                puts "Creating disk metadata for #{disk.name}"
-                disk.awsid = volume[:aws_id]
-                Rudy::MetaData::Disk.save(@sdb, disk)
-              
-                sleep 1
-              rescue => ex
-                puts "There was an error creating #{path}: #{ex.message}"
-                if disk
-                  puts "Removing metadata for #{disk.name}"
-                  Rudy::MetaData::Disk.destroy(@sdb, disk)
-                end
-              end
-              puts
-            end
-          end
-        end
-      end
-      
-      def find_most_recent_backup(zon, env, rol, pos, path)
-        criteria = [zon, env, rol, pos, path]
-        (Rudy::MetaData::Backup.list(@sdb, *criteria) || []).first
-      end
-      
-      def execute_routines(machines, action, before_or_after)
-        machines = [machines] unless machines.is_a?( Array)
-        config = @config.routines.find_deferred(@global.environment, @global.role, :config) || {}        
-        config[:global] = @global.marshal_dump
-        config[:global].reject! { |n,v| n == :cert || n == :privatekey }
-        
-        # The config file contains settings from ~/.rudy/config 
-        #
-        #     routines do 
-        #       config do
-        #       end
-        #     end
-        #
-        config_file = "#{action}-config.yaml"
-        tf = Tempfile.new(config_file)
-        write_to_file(tf.path, config.to_hash.to_yaml, 'w')
-        puts "Running #{action.to_s.capitalize} #{before_or_after.to_s.upcase} routines".att(:bright)
-        machines.each do |machine|
-          
-          rscripts = @config.routines.find_deferred(@global.environment, @global.role, action, before_or_after) || []
-          rscripts = [rscripts] unless rscripts.is_a?(Array)
-          
-          puts "No scripts defined." if !rscripts || rscripts.empty?
-          
-          rscripts.each do |rscript|
-            user, script = rscript.shift
-            
-            switch_user(user) # scp and ssh will run as this user
-        
-            puts "Transfering #{config_file}..."
-            scp do |scp|
-              scp.upload!(tf.path, "~/#{config_file}") do |ch, name, sent, total|
-                "#{name}: #{sent}/#{total}"
-              end
-            end
-            ssh do |session|
-              puts "Running #{script}...".att(:bright)
-              session.exec!("chmod 700 ~/#{config_file}")
-              session.exec!("chmod 700 #{script}")
-              puts session.exec!("#{script}")
-          
-              puts "Removing remote copy of #{config_file}..."
-              session.exec!("rm ~/#{config_file}")
-            end
-            puts $/
-          end
-        end
-        
-        tf.delete     # remove local copy of config_file
-        #switch_user   # return to the requested user
-      end
-      
-      # Print a default header to the screen for every command.
-      # +cmd+ is the name of the command current running. 
-      def print_header(cmd=nil)
-        title = "RUDY v#{Rudy::VERSION}" unless @global.quiet
-        now_utc = Time.now.utc.strftime("%Y-%m-%d %H:%M:%S")
-        criteria = []
-        [:zone, :environment, :role, :position].each do |n|
-          val = @global.send(n)
-          next unless val
-          criteria << "#{n.to_s.slice(0,1).att :normal}:#{val.att :bright}"
-        end
-        puts '%s -- %s UTC' % [title, now_utc] unless @global.quiet
-        puts '[%s]' % criteria.join("  ") unless @global.quiet
-        
-        puts unless @global.quiet
-        
-        if (@global.environment == "prod") 
-          msg = without_indent %q(
-          =======================================================
-          =======================================================
-          !!!!!!!!!   YOU ARE PLAYING WITH PRODUCTION   !!!!!!!!!
-          =======================================================
-          =======================================================)
-          puts msg.colour(:red).bgcolour(:white).att(:bright), $/  unless @global.quiet
-          
-        end
-        
-        if Rudy.in_situ?
-          msg = %q(============ THIS IS EC2 ============)
-          puts msg.colour(:blue).bgcolour(:white).att(:bright), $/ unless @global.quiet
-        end
-        
-      end
-      
-      def print_footer
-        
-      end
-      
-
-
-      
-      def group_metadata(env=@global.environment, role=@global.role)
-        query = "['environment' = '#{env}'] intersection ['role' = '#{role}']"
-        @sdb.query_with_attributes(RUDY_DOMAIN, query)
-      end
-      
-      private 
-        # Print info about a running instance
-        # +inst+ is a hash
-        def print_instance(inst)
-          puts '-'*60
-          puts "Instance: #{inst[:aws_instance_id].att(:bright)} (AMI: #{inst[:aws_image_id]})"
-          [:aws_state, :dns_name, :private_dns_name, :aws_availability_zone, :aws_launch_time, :ssh_key_name].each do |key|
-             printf(" %22s: %s#{$/}", key, inst[key]) if inst[key]
-           end
-          printf(" %22s: %s#{$/}", 'aws_groups', inst[:aws_groups].join(', '))
-          puts
-        end
-        
-        def print_image(img)
-          puts '-'*60
-          puts "Image: #{img[:aws_id].att(:bright)}"
-          img.each_pair do |key, value|
-             printf(" %22s: %s#{$/}", key, value) if value
-           end
-          puts
-        end
-        
-        def print_disk(disk, backups=[])
-          puts '-'*60
-          puts "Disk: #{disk.name.att(:bright)}"
-          puts disk.to_s
-          puts "#{backups.size} most recent backups:", backups.collect { |back| "#{back.nice_time} (#{back.awsid})" }
-          puts
-        end
-        
-        
-        def print_volume(vol, disk)
-          puts '-'*60
-          puts "Volume: #{vol[:aws_id].att(:bright)} (disk: #{disk.name if disk})"
-          vol.each_pair do |key, value|
-             printf(" %22s: %s#{$/}", key, value) if value
-           end
-          puts
-        end
-        
-        # Print info about a a security group
-        # +group+ is an OpenStruct
-        def print_group(group)
-          puts '-'*60
-          puts "%12s: %s" % ['GROUP', group[:aws_group_name].att(:bright)]
-          puts 
-          
-          group_ip = {}
-          group[:aws_perms].each do |perm| 
-             (group_ip[ perm[:cidr_ips] ] ||= []) << "#{perm[:protocol]}/#{perm[:from_port]}-#{perm[:to_port]}"
-          end
-           
-          puts "%22s  %s" % ["source address/mask", "protocol/ports (from, to)"]
-          
-           
-          group_ip.each_pair do |ip, perms|
-            puts "%22s  %s" % [ip, perms.shift]
-            perms.each do |perm|
-              puts "%22s  %s" % ['', perm]
-            end
-            puts
-          end
-        end
-        
-        def init_config_dir
-          unless File.exists?(RUDY_CONFIG_DIR)
-            puts "Creating #{RUDY_CONFIG_DIR}"
-            Dir.mkdir(RUDY_CONFIG_DIR, 0700)
-          end
-
-          unless File.exists?(RUDY_CONFIG_FILE)
-            puts "Creating #{RUDY_CONFIG_FILE}"
-            rudy_config = without_indent %Q{
-              # Amazon Web Services 
-              # Account access indentifiers.
-              awsinfo do
-                account ""
-                accesskey ""
-                secretkey ""
-                privatekey "~/path/2/pk-xxxx.pem"
-                cert "~/path/2/cert-xxxx.pem"
-              end
-              
-              # Machine Configuration
-              # Specify your private keys here. These can be defined globally
-              # or by environment and role like in machines.rb.
-              machines do
-                ami "ami-0734d36e"    # gentoo-m1.small-v5
-                users do
-                  root :keypair => "path/2/root-private-key"
-                end
-              end
-              
-              # Routine Configuration
-              # Define stuff here that you don't want to be stored in version control. 
-              routines do
-                config do 
-                  # ...
-                end
-              end
-
-              # Global Defaults 
-              # Define the values to use unless otherwise specified on the command-line. 
-              defaults do
-                region "us-east-1" 
-                zone "us-east-1b"
-                environment "stage"
-                role "app"
-                position "01"
-                user ENV['USER']
-              end
-            }
-            write_to_file(RUDY_CONFIG_FILE, rudy_config, 'w')
-          end
-
-          #puts "Creating SimpleDB domain called #{RUDY_DOMAIN}"
-          #@sdb.domains.create(RUDY_DOMAIN)
-        end
-    end
-  end
-end
-
-