solutious-rudy 0.5.1 → 0.6.0

data/bin/rudy

@@ -1,5 +1,6 @@
 #!/usr/bin/ruby
 
+
 # = Rudy
 # 
 # === Not your granparent's deployment tool
@@ -8,172 +9,81 @@
 # 
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') # Put our local lib in first place
+$:.unshift File.join(File.dirname(__FILE__), '..', 'vendor', 'highline-1.5.1', 'lib')
+#%w{amazon-ec2 rye}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
+#require 'rubygems'
+
+#$SAFE = 1   # require is unsafe in Ruby 1.9??
 
-require 'date'
 require 'drydock'
 require 'rudy'
 require 'rudy/cli'
 
-# Is there a bug in Ruby 1.9 open-uri?
-#$ /usr/local/bin/ruby bin/rudy myaddress
-#/usr/local/lib/ruby/1.9.1/open-uri.rb:260:in `require': Insecure operation - require (SecurityError)
-#$SAFE = 2
 
-
-module RudyCLI
-  extend Drydock
+# Command-line interface for /bin/rudy
+class RudyCLI < Rudy::CLI::Base
+  
+  # ------------------------------------------  RUDY GLOBALS  --------
+  # ------------------------------------------------------------------
   
-  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 (ie: #{Rudy::DEFAULT_REGION})"
-  global :n, :nocolor, "Disable output colors"
-  global :f, :config, String, "Specify another configuration file to read (ie: #{Rudy::RUDY_CONFIG_FILE})"
-  global :z, :zone, String, "Connect to a specific EC2 zone (ie: #{Rudy::DEFAULT_ZONE})"
   global :e, :environment, String, "Connect to the specified environment (ie: #{Rudy::DEFAULT_ENVIRONMENT})"
   global :r, :role, String, "Connect to a machine with the specified role (ie: #{Rudy::DEFAULT_ROLE})"
   global :p, :position, String, "Position in the machine in its group (ie: #{Rudy::DEFAULT_POSITION})"
-  global :u, :user, String, "Provide a username (ie: #{Rudy::DEFAULT_USER})"
-  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
-
+  
+  
 
   # ---------------------------------  RUDY MACHINE COMMANDS  --------
   # ------------------------------------------------------------------
 
 
-  desc "Machine Status"
-  usage "rudy [global options] status [-g group-name] [-s state] [--all] [instance-ID]"
-  option :g, :group, String, "A security group name"
-  option :s, :state, String, "Machine state. One of: running (default), pending, terminated"
-  option :l, :all, "Show all machines in this group, regardless of state."
-  argv :awsid
-  command :status => Rudy::CLI::Instances
-
-  usage "rudy [global options] connect [-g group-name] [-i instance-ID] [cmd]"
-  desc "Open an SSH connection"
-  option :print, "Only print the SSH command, don't connect"
-  option :g, :group, String, "A security group name"
-  option :i, :awsid, String, "An instance ID"
-  argv :cmd
-  command :connect => Rudy::CLI::Instances 
-  command_alias :connect, :ssh
-
-  usage "rudy [global options] copy [-p] [-r] source target"
-  desc "Copy files to or from machines. NOTE: You must use quotes when using a tilda for your remote dir ('~/')."
-  option :r, :recursive, "Recursively copy entire directories"
-  option :p, :preserve, "Preserve atimes and ctimes."
-  option :d, :download, "Download FROM the remote machine to the local machine"
-  option :print, "Only print the SSH command, don't connect"
-  option :g, :group, String, "A security group name"
-  option :i, :awsid, String, "An instance ID"
-  command :copy => Rudy::CLI::Instances
-  command_alias :copy, :scp
-  command_alias :copy, :upload
-  command_alias :copy, :download
-
-
-
-  # -----------------------------------  AMAZON EC2 COMMANDS  --------
-  # ------------------------------------------------------------------
+  #desc "Machine Status"
+  #usage "rudy [global options] status [-g group-name] [-s state] [--all] [instance-ID]"
+  #option :g, :group, String, "A security group name"
+  #option :s, :state, String, "Machine state. One of: running (default), pending, terminated"
+  #option :l, :all, "Show all machines in this group, regardless of state."
+  #argv :awsid
+  #command :status => Rudy::CLI::Machines
+  #
+  #usage "rudy [global options] connect [-g group-name] [-i instance-ID] [cmd]"
+  #desc "Open an SSH connection"
+  #option :print, "Only print the SSH command, don't connect"
+  #option :g, :group, String, "A security group name"
+  #option :i, :awsid, String, "An instance ID"
+  #argv :cmd
+  #command :connect => Rudy::CLI::Machines 
+  #command_alias :connect, :ssh
+  #
+  #usage "rudy [global options] copy [-p] [-r] source target"
+  #desc "Copy files to or from machines. NOTE: You must use quotes when using a tilda for your remote dir ('~/')."
+  #option :r, :recursive, "Recursively copy entire directories"
+  #option :p, :preserve, "Preserve atimes and ctimes."
+  #option :d, :download, "Download FROM the remote machine to the local machine"
+  #option :print, "Only print the SSH command, don't connect"
+  #option :g, :group, String, "A security group name"
+  #option :i, :awsid, String, "An instance ID"
+  #command :copy => Rudy::CLI::Machines
+  #command_alias :copy, :scp
+  #command_alias :copy, :upload
+  #command_alias :copy, :download
 
-  usage "rudy [global options] addresses [-A address instance ID]"
-  desc "Manage Amazon Elastic IP addresses"
-  argv :ipaddress, :instid
-  action :A, :associate, "Associate an IP address to a running instance"
-  action :C, :create, "Create an IP address"
-  action :D, :destroy, "Destroy an IP address"
-  command :addresses => Rudy::CLI::Addresses
-  command_alias :addresses, :address
-
-  usage "rudy [global options] groups [-C -R -A] [-a IP addresses] [-p ports] [group name]"
-  usage "rudy groups -C               (create a group)"
-  usage "rudy -e prod groups          (list groups in the prod environment)"
-  usage "rudy groups -A -p 81,82,83   (open ports to a group from this machine)"
-  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 port ranges in the form FROM:TO (default: 22,80,443)"
-  option :a, :addresses, Array, "List of comma-separated IP addresses (default: your current external IP)"
-  option :g, :group, String, "A group name to authorize or revoke network rule. Must also supply -o!"
-  option :o, :owner, String, "A group owner ID (account number). Must also supply -g!"
-  action :C, :create, "Create a security group"
-  action :D, :destroy, "Destroy a security group"
-  action :A, :authorize, "Authorize a rule for a security group"
-  action :R, :revoke, "Revoke a rule for a security group"
-  argv :name
-  command :group => Rudy::CLI::Groups
-  command_alias :group, :groups
-
-  desc "Manage EC2 Volumes"
-  usage "rudy volumes"
-  usage "rudy volume -C -s size [-d device-path]"
-  usage "rudy volume -A volume-id instance-id"
-  usage "rudy volume -N volume-id"
-  usage "rudy volume -D volume-id"
-  option :s, :size, String, "Size (in GB)"
-  option :d, :device, String, "Device path (default: /dev/sdh)"
-  action :D, :destroy, "Destroy a volume"
-  action :C, :create, "Create a volume"
-  action :A, :attach, "Attach a volume to a running instance"
-  action :N, :detach, "Detach a volume from an instance"
-  argv :volid, :insid
-  command :volume => Rudy::CLI::Volumes
-  command_alias :volume, :volumes
-
-  desc "Manage KeyPairs"
-  usage "rudy keypairs [-C] [-D] [name]"
-  action :D, :destroy, "Destroy KeyPair"
-  action :C, :create, "Create KeyPair"
-  argv :kpname
-  command :keypair => Rudy::CLI::KeyPairs
-  command_alias :keypair, :keypairs
-
-  usage "rudy console [-g group] [instance ID]"
-  desc "Displays system console output for given instance(s)"
-  option :g, :group, String, "A group name to authorize or revoke network rule. Must also supply -o!"
-  argv :awsid
-  command :console => Rudy::CLI::Instances
 
-  desc "Manage Machines"
-  usage "rudy [global options] machines [-g group-name] [-s state] [instance-ID]"
-  option :g, :group, String, "The security group name"
-  option :i, :ami, String, "The machine image ID (ami-)"
-  option :t, :itype, String, "The instance type (default: m1.small)"
-  option :k, :keypair, String, "The SSH keypair to use for launch"
-  option :a, :address, String, "The IP address to associate"
-  action :C, :create, "Create a machine instance"
-  action :D, :destroy, "Destroy a machine instance"
-  argv :awsid
-  command :instance => Rudy::CLI::Instances
-  command_alias :instance, :instances
-
-  #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"     # TODO: change to --ami
-  #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::CLI::Images
-  #command_alias :images, :image
 
 
   # --------------------------------  MISCELLANEOUS COMMANDS  --------
   # ------------------------------------------------------------------
-
+  
+  desc "Display time (in UTC)"
+  option :l, :local, "Display local time"
+  command :time do |obj|
+    t = obj.option.local ? Time.now : Time.now.utc
+    puts '%s' % t.strftime("%Y-%m-%d %T %Z (%z)")
+  end
+  
   usage "rudy [-f config-file] config [param-name]"
   desc "Check Rudy configuration."
   option :l, :all, "Display configs for all machines"
+  option :s, :script, "Output configuration identical to what is provided to scripts called in routines"
+  option :r, :rudy, "Output a skeleton Rudyfile"
   option :d, :defaults, "Display the default value for the supplied parameter"
   option :g, :group, String, "Display configuration for a specific group"
   argv :name
@@ -193,6 +103,7 @@ module RudyCLI
       puts "%10s: %s" % ['Internal', ia] unless obj.option.external && !obj.option.internal
       puts "%10s: %s" % ['External', ea] unless obj.option.internal && !obj.option.external
     end
+    obj.global.quiet = true  # don't print elapsed time
   end
 
   usage "rudy [global options] annoy [-h -m -l] [-e]"
@@ -210,20 +121,22 @@ module RudyCLI
     factor = [:insane, :high, :medium, :low].detect { |v| obj.option.send(v) } || :medium
     success = Annoy.challenge?("Is this annoying?", factor, flavor)
     puts (success ? "Correct!" : "WRONG!").bright
+    obj.global.quiet = true  # don't print elapsed time
   end
 
   desc "Display the current Rudy slogan"
-  command :slogan do
+  command :slogan do |obj|
     puts "Rudy: Not your grandparent's deployment tool!"
+    obj.global.quiet = true  # don't print elapsed time
   end
 
-  desc "Generates a configuration template to #{Rudy::RUDY_CONFIG_FILE}"
+  desc "Generates a configuration template to #{Rudy::CONFIG_FILE}"
   command :generate_config do |obj|
-    unless File.exists?(Rudy::RUDY_CONFIG_FILE)
+    unless File.exists?(Rudy::CONFIG_FILE)
       Rudy::Config.init_config_dir
-      puts "Add your AWS credentials to #{Rudy::RUDY_CONFIG_FILE}"
+      puts "Add your AWS credentials to #{Rudy::CONFIG_FILE}"
     else
-      puts "#{Rudy::RUDY_CONFIG_FILE} already exists"
+      puts "#{Rudy::CONFIG_FILE} already exists"
     end
   end
 
@@ -231,71 +144,35 @@ module RudyCLI
   desc "Initialize Rudy configuration"
   command :init do |obj|
   
-    unless File.exists?(Rudy::RUDY_CONFIG_FILE)
+    unless File.exists?(Rudy::CONFIG_FILE)
       Rudy::Config.init_config_dir
     end
   
     begin
-      rdom = Rudy::Domains.new(:global => obj.global)
-  
-      unless rdom.exists?
-        puts "Creating SimpleDB domain #{rdom.name}"
-        rdom.create
+
+      unless Rudy::Huxtable.domain_exists?
+        puts "Creating SimpleDB domain #{Rudy::Huxtable.domain}"
+        Rudy::Huxtable.create_domain
         puts "Initialized"
       else
         puts "Already Initialized"
       end
     
-    
-      exit 0 # a quick hack to not print elapsed time
-    
-    rescue Rudy::NoConfig => ex
+    rescue Rudy::AWS::SDB::NoSecretKey, 
+           Rudy::AWS::SDB::NoAccessKey, 
+           Rudy::NoConfig => ex
       puts "AWS credentials must be configured to continue."
-      puts "You can modify these in #{Rudy::RUDY_CONFIG_FILE}"
+      puts "You can modify these in #{Rudy::CONFIG_FILE}"
       exit 1
     end
   
-
-  
+    obj.global.quiet = true  # don't print elapsed time
   end
 
-  desc "Displays the SimpleDB domains associated to your account"
-  command :domains => Rudy::CLI::Domains
-
 
   # ---------------------------------  RUDY MANAGER COMMANDS  --------
   # ------------------------------------------------------------------
 
-  #usage "rudy init"
-  #desc "Run this the first time you use Rudy (it's immutable so running it again does no harm)."
-  #command :create_domain => Rudy::CLI::Manager
-  #
-  #usage "rudy info"
-  #desc "Displays info about the current Rudy configuration"
-  #command :info => Rudy::CLI::Manager
-
-  #desc "Update a Machine Group with the current version of Rudy"
-  #option :g, :group, String, "A security group name"
-  #command :update => Rudy::CLI::Manager
-
-
-  #usage "#{$/} [global options] disks [-C -p path -d device -s size] [-A] [-D] [path]"
-  #desc "Manage Disks"
-  #option :l, :all, "Display all disk definitions"
-  #option :i, :awsid, String, "EC2 Instance ID"
-  #option :g, :group, String, "Machine group name"
-  #option :p, :path, String, "The filesystem path to use as the mount point"
-  #option :d, :device, String, "The device id (default: /dev/sdh)"
-  #option :s, :size, Integer, "The size of disk (in GB)"
-  #action :C, :create, "Create a disk definition"
-  #action :D, :destroy, "Destroy a disk definition"
-  #action :A, :attach, "Attach a disk"
-  #action :N, :unattach, "Unattach a disk"
-  #argv :diskname
-  #command :disk => Rudy::CLI::Disks
-  #command_alias :disk, :disks
-
-
   #usage "rudy [global options] backups [-C] [disk name]"
   #desc "Manage Backups"
   #option :s, :snapshot, String, "Create a backup entry from an existing snapshot"
@@ -306,13 +183,34 @@ module RudyCLI
   #argv :disk
   #command :'backup' => Rudy::CLI::Backups
   #command_alias :backup, :bu
+  
+  desc "Startup a machine group"
+  usage "rudy startup"
+  command :startup => Rudy::CLI::Routines
+  command_alias :startup, :s
+
+  desc "Shutdown a machine group"
+  usage "rudy shutdown"
+  command :shutdown => Rudy::CLI::Routines
+  
+  desc "Create a release"
+  usage "rudy release"
+  command :release => Rudy::CLI::Routines
+  command_alias :release, :r
 
-  #usage "rudy [global options] metadata instance-ID"
-  #desc "Display Rudy metadata."
-  #command :metadata => Rudy::CLI::Manager
-  #command_alias :metadata, :md
-
-
+  desc "Manage Machines"
+  action :W, :wash, "Wash machine metadata."
+  command :machines => Rudy::CLI::Machines
+  command_alias :machines, :m
+  
+  desc "Log in to a machine"
+  command :ssh => Rudy::CLI::Machines
+  
+  desc "Manage Disks"
+  action :W, :wash, "Wash disk metadata."
+  command :disks => Rudy::CLI::Disks
+  command_alias :disks, :d
+  
   # --------------------------  RUDY RELEASE/DEPLOY COMMANDS  --------
   # ------------------------------------------------------------------
 
@@ -350,20 +248,30 @@ module RudyCLI
   #command :restart => Rudy::CLI::Routines
   #
 
-
-
+  
   # -------------------------------------------  UGLY STUFFS  --------
   # ------------------------------------------------------------------
   debug :off
-  default :status
-  #capture :stderr       
-  before do
-    @start = Time.now
-  end
-  after do |obj|
-    unless obj.global.quiet
-      @elapsed = Time.now - @start
-      puts $/, "Elapsed: %.2f seconds" % @elapsed.to_f if @elapsed > 0.1
-    end
-  end
+  default :machines
+  
+
+  
+end
+
+# We call Drydock specifically otherwise it will run at_exit. Rye also
+# uses at_exit for shutting down the ssh-agent. Ruby executes at_exit
+# blocks in reverse order so if Drydock is required first, it's block
+# will run after Rye shuts down the ssh-agent. 
+begin
+  Drydock.run!(ARGV, STDIN) if Drydock.run? && !Drydock.has_run?
+rescue Drydock::ArgError, Drydock::OptError=> ex
+  STDERR.puts ex.message
+  STDERR.puts ex.usage
+rescue Rudy::Error => ex
+  STDERR.puts ex.message
+rescue => ex
+  STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
+  STDERR.puts ex.backtrace if Drydock.debug?
+rescue SystemExit
+  # Don't balk
 end

data/bin/rudy-ec2

@@ -0,0 +1,240 @@
+#!/usr/bin/ruby
+
+# = Rudy EC2
+# 
+# === A Rudy interface to Amazon EC2
+#
+# 
+# 
+# See rudy-ec2 -h for usage
+# 
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib') # Put our local lib in first place
+$:.unshift File.join(File.dirname(__FILE__), '..', 'vendor', 'highline-1.5.1', 'lib')
+#%w{net-scp amazon-ec2 caesars rye}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
+#require 'rubygems'
+
+require 'rudy'
+require 'rudy/cli'
+
+require 'drydock'
+
+# Command-line interface for bin/rudy-ec2
+module RudyCLI_EC2
+  extend Drydock
+  
+  
+  # -----------------------------------  AMAZON EC2 COMMANDS  --------
+  # ------------------------------------------------------------------
+  
+  desc "Amazon EC2 Elastic IP addresses"
+  usage "rudy-ec2 addresses"
+  usage "rudy-ec2 addresses -A -i instance-id address"
+  usage "rudy-ec2 addresses -A -i instance-id -n"
+  usage "rudy-ec2 addresses -N address"
+  usage "rudy-ec2 addresses -D address"
+  usage "rudy-ec2 addresses -C"
+  option :i, :instance, String, "Instance ID"
+  option :n, :newaddress, "Create and assign a new elastic IP"
+  action :A, :associate, "Associate an IP address to a running instance"
+  action :N, :disassociate, "Disassociate an IP address from an instance"
+  action :C, :create, "Request an IP address from Amazon"
+  action :D, :destroy, "Return an IP address to Amazon (this is permanent!)"
+  argv :ipaddress
+  command :addresses => Rudy::CLI::AWS::EC2::Addresses
+  command_alias :addresses, :address
+  command_alias :addresses, :a
+  
+  desc "Amazon EC2 instance console output"
+  usage "rudy-ec2 console [-g group] [instance ID]"
+  option :g, :group, String, "A security group name"
+  argv :awsid
+  command :consoles => Rudy::CLI::AWS::EC2::Instances
+  command_alias :consoles, :console
+  command_alias :consoles, :c
+  
+  desc "Copy files to or from machines."
+  usage "rudy-ec2 copy [-p] [-r] [-u user] [-k path/2/privatekey] source target"
+  usage "rudy-ec2 upload -k path/2/privatekey -u username local-source target"
+  usage "rudy-ec2 download remote-source target"
+  usage "NOTE: Use quotes when using a tilda or asterisk in remote paths ('~/')."
+  usage "rudy-ec2 download '~/*' /tmp/"
+  option :r, :recursive, "Recursively copy entire directories"
+  option :p, :preserve, "Preserve atimes and ctimes."
+  option :d, :download, "Download FROM the remote machine to the local machine"
+  option :print, "Only print the SSH command, don't connect"
+  option :g, :group, String, "A security group name"
+  option :i, :awsid, String, "An instance ID"
+  option :u, :user, String, "Username"
+  command :copy => Rudy::CLI::AWS::EC2::Candy 
+  command_alias :copy, :ul
+  command_alias :copy, :dl
+  command_alias :copy, :scp
+  command_alias :copy, :upload
+  command_alias :copy, :download
+  
+  desc "Amazon EC2 EC2 Security Groups"
+  usage "rudy-ec2 groups"
+  usage "rudy-ec2 groups -C [-p ports] [-a addresses] [-r protocols] name"
+  usage "rudy-ec2 groups -A [-p ports] [-a addresses] [-r protocols] name"
+  usage "rudy-ec2 groups -A -p 81,8000-9000 -a 127.0.0.1,127.0.0.2 name"
+  usage "rudy-ec2 groups -A -g default -o 123456789012 name"
+  usage "rudy-ec2 groups -R -g default name"
+  usage "rudy-ec2 groups -D name"
+  option :all, "Display all security groups"
+  option :r, :protocols, Array, "List of protocols. One of: tcp (default), udp, icmp"
+  option :p, :ports, Array, "List of port ranges (default: 22,80,443)"
+  option :a, :addresses, Array, "List of IP addresses (default: your current external IP)"
+  option :g, :group, String, "Other group to authorize or revoke. Use with -o!"
+  option :o, :owner, String, "Other group owner ID (account number). Use with -g!"
+  option :d, :description, String, "A group description"
+  action :C, :create, "Create a security group"
+  action :D, :destroy, "Destroy a security group"
+  action :A, :authorize, "Authorize a rule for a security group"
+  action :R, :revoke, "Revoke a rule for a security group"
+  argv :name
+  command :groups => Rudy::CLI::AWS::EC2::Groups
+  command_alias :groups, :group
+  command_alias :groups, :g
+  
+  desc "Amazon EC2 Machine Images (AMIs)"
+  usage "rudy-ec2 im"
+  usage "rudy-ec2 image"
+  usage "rudy-ec2 images image-id"
+  usage "rudy-ec2 images -o 123456789012"
+  usage "rudy-ec2 images -o amazon"
+  usage "rudy-ec2 images -o self"
+  option :o, :owner, String, "Amazon Account Number or one of: amazon, self"
+  option :l, :all, "Display all registered machine images (warning: slow)"
+  #option :p, :private, "Private images only"
+  option :b, :bucket, String, "The name of the bucket that will store the image"
+  option :n, :name, String, "The name of the image file (to create)"
+  option :u, :user, String, "Username to connect as (used for creating an 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 (does not remove image files from S3)"
+  argv :ami
+  command :images => Rudy::CLI::AWS::EC2::Images
+  command_alias :images, :image
+  command_alias :images, :im
+  
+  desc "Amazon EC2 Instances"
+  usage "rudy-ec2 i"
+  usage "rudy-ec2 instance"
+  usage "rudy-ec2 instances"
+  usage "rudy-ec2 instances [-g group-name] [instance-ID]"
+  usage "rudy-ec2 instances -C -g group-name -s m1.small -k keypair-name"
+  usage "rudy-ec2 instances -C -a 255.255.255.255 -k keypair-name"
+  usage "rudy-ec2 instances -R instance-ID"
+  usage "rudy-ec2 instances -D instance-ID"
+  usage "rudy-ec2 instances -R -g group-name"
+  usage "rudy-ec2 instances -D -g group-name"
+  option :g, :group, String, "The security group name"
+  option :m, :ami, String, "The machine image ID (ami)"
+  option :s, :size, String, "The instance size (default: m1.small)"
+  option :k, :keypair, String, "The SSH keypair to use for launch"
+  option :a, :address, String, "The IP address to associate to the new instance"
+  option :n, :newaddress, "Create and assign a new elastic IP"
+  option :p, :private, "Do not give the instance a public IP address"
+  action :C, :create, "Create a machine instance"
+  action :R, :restart, "Restart a machine instance"
+  action :D, :destroy, "Destroy a machine instance"
+  argv :instid
+  command :instances => Rudy::CLI::AWS::EC2::Instances
+  command_alias :instances, :instance
+  command_alias :instances, :in
+  command_alias :instances, :i
+  
+  desc "Amazon EC2 KeyPairs"
+  usage "rudy-ec2 keypairs"
+  usage "rudy-ec2 keypairs -C name"
+  usage "rudy-ec2 keypairs -D name"
+  action :D, :destroy, "Unregister keypair from EC2 (this is permanent!)"
+  action :C, :create, "Create and register a keypair with EC2"
+  argv :name
+  command :keypairs => Rudy::CLI::AWS::EC2::KeyPairs
+  command_alias :keypairs, :keypair
+  command_alias :keypairs, :k
+  
+  desc "Amazon EC2 Snapshots"
+  usage "rudy-ec2 snapshots"
+  usage "rudy-ec2 snapshots -C -v volume-id"
+  usage "rudy-ec2 snapshots -D snapshot-id"
+  option :v, :volume, String, "Volume ID"
+  action :D, :destroy, "Destroy a snapshot (this is permanent!)"
+  action :C, :create, "Create a snapshot"
+  argv :snapid
+  command :snapshots => Rudy::CLI::AWS::EC2::Snapshots
+  command_alias :snapshots, :snapshot
+  command_alias :snapshots, :t
+  
+  desc "Open an SSH connection"
+  usage "rudy-ec2 ssh"
+  usage "rudy-ec2 -u root -k path/2/key ssh"
+  usage "rudy-ec2 -u root -k path/2/key ssh uname -a"
+  usage "rudy-ec2 ssh -g group-name"
+  usage "rudy-ec2 ssh -i instance-id"
+  option :print, "Only print the SSH command, don't connect"
+  option :g, :group, String, "A security group name"
+  option :i, :instid, String, "An instance ID"
+  argv :cmd
+  command :ssh => Rudy::CLI::AWS::EC2::Candy 
+  command_alias :ssh, :connect
+  
+  desc "Amazon EC2 status"
+  command :status => Rudy::CLI::AWS::EC2::Candy
+  
+  desc "Amazon EC2 Volumes"
+  usage "rudy-ec2 volumes"
+  usage "rudy-ec2 volumes -C -s size [-d device-path]"
+  usage "rudy-ec2 volumes -A volume-id instance-id"
+  usage "rudy-ec2 volumes -N volume-id"
+  usage "rudy-ec2 volumes -D volume-id"
+  option :i, :instance, String, "Instance ID"
+  option :s, :size, String, "Size (in GB)"
+  option :t, :snapshot, String, "Snapshot ID (snap)"
+  option :d, :device, String, "Device path (default: /dev/sdh)"
+  action :D, :destroy, "Destroy a volume (this is permanent!)"
+  action :C, :create, "Create a volume"
+  action :A, :attach, "Attach a volume to a running instance"
+  action :N, :detach, "Detach a volume from an instance"
+  argv :volid
+  command :volumes => Rudy::CLI::AWS::EC2::Volumes
+  command_alias :volumes, :volume
+  command_alias :volumes, :v
+  
+  desc "Availability Zones"
+  argv :name
+  command :zones => Rudy::CLI::AWS::EC2::Zones
+  command_alias :zones, :zone
+  command_alias :zones, :z
+  
+  
+  # --------------------------------  RUDY-EC2 MISCELLANEOUS  --------
+  # ------------------------------------------------------------------
+  
+  default :instances
+  debug :off
+  
+end
+
+#puts Rudy::Utils.banner("THIS IS RUBY #{RUBY_VERSION}") if Drydock.debug?
+
+# We call Drydock specifically otherwise it will run at_exit. Rye also
+# uses at_exit for shutting down the ssh-agent. Ruby executes at_exit
+# blocks in reverse order so if Drydock is required first, it's block
+# will run after Rye shuts down the ssh-agent. 
+begin
+  Drydock.run!(ARGV, STDIN) if Drydock.run? && !Drydock.has_run?
+rescue Drydock::ArgError, Drydock::OptError=> ex
+  STDERR.puts ex.message
+  STDERR.puts ex.usage
+rescue Rudy::Error => ex
+  STDERR.puts ex.message
+rescue => ex
+  STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
+  STDERR.puts ex.backtrace if Drydock.debug?
+rescue SystemExit
+  # Don't balk
+end
+