rudy 0.6.8 → 0.7.0

data/CHANGES.txt

@@ -2,10 +2,23 @@ RUDY, CHANGES
 
 * TODO: Remove string messages for non-string output formats
 * TODO: Support for reserved instances
-* TODO: Test for zone and region support
+* TODO: Tests for zone and region support
 * TODO: Support for machine image attributes
 * TODO: Support for product codes
-* TODO: HTTPS
+* TODO: Tests for AWS HTTPS
+
+
+#### 0.7.0 (2009-04-??) ###############################
+
+* CHANGE: Upgrade to Drydock 0.6, Caesars 0.6, and Rye 0.6
+* CHANGE: Updated Routines configuration syntax for specifying shell commands 
+* ADDED: Releases via local git repository
+* ADDED: authorize and adduser directives to routines config.
+* ADDED: Improved CLI output for routines. 
+* ADDED: Commands configuration for custom SSH commands
+* ADDED: Auto-set hostname to machine name
+* ADDED: Support for arbitrary routines via passthrough
+
 
 
 #### 0.6.8 (2009-04-24) ###############################

data/README.rdoc

@@ -1,8 +1,8 @@
-= Rudy - v0.6 ALPHA
+= Rudy - v0.7 BETA
 
-*Rudy is a command-line development and deployment tool for Amazon Web Services.*
+<b>Not your grandparents' EC2 deployment tool.</b>
 
-It helps you build and manage machines in EC2 by organizing them into groups of _environments_ and _roles_. These are called _machine_ _groups_. <tt>stage</tt> is the default environment and <tt>app</tt> is the default role. You can run multiple machines with the same role. These are called _positions_. Rudy also supports running machine groups across availability _zones_. 
+Rudy is a command-line development and deployment tool for Amazon Web Services. It helps you build and manage machines in EC2 by organizing them into groups of _environments_ and _roles_. These are called _machine_ _groups_. <tt>stage</tt> is the default environment and <tt>app</tt> is the default role. You can run multiple machines with the same role. These are called _positions_. Rudy also supports running machine groups across availability _zones_. 
 
 When you put all this together, you have a unique name for every machine. The default machine is:
 
@@ -14,16 +14,22 @@ When you put all this together, you have a unique name for every machine. The de
 
 All configuration is organized into the zones, environments, and roles that you specify (Rudy assumes positions are identical which is important for backups and scaling). And as you'd expect, the defaults can be changed too (in <tt>~/.rudy/config</tt>).
 
-<b>NOTE: This is an ALPHA release. That means Rudy's not ready for production use! See Alpha Notice.</b>
+<b>See Getting-Started[http://wiki.github.com/solutious/rudy/getting-started] for more info.</b>
+
+<em>NOTE: This is a BETA release. That means Rudy's not ready for production use! See Project-Status[http://wiki.github.com/solutious/rudy/project-status].</em>
 
 == Features
 
 * Create complex environments with a single command
-  * Launch multiple instances
+  * Launch multiple instances 
   * Assign elastic IP addresses
   * Create EBS volumes, attach to instances, format, and mount
   * Run scripts locally and remotely automatically
-* Supports any Amazon machine image (AMI)
+* Organize instances into environments and roles
+* Powerful command-line tools
+  * <tt>$ rudy -u root ssh</tt>
+  * <tt>$ rudy -e testing -r database startup</tt>
+* Use _any_ Amazon machine image (AMI)
 * Complete command-line interface for EC2. See <tt>bin/rudy-ec2</tt>.
 
 == Installation
@@ -39,7 +45,8 @@ or via download:
 
 NOTE: <em>If you are not installing via RubyGems, you need to make sure the dependencies are in your LOAD_PATH (<tt>$:</tt>). Ryan Tomayko wrote a gist[http://gist.github.com/54177] about it.</em>
 
-See Getting-Started[http://wiki.github.com/solutious/rudy/getting-started] for more info.
+<b>See Getting-Started[http://wiki.github.com/solutious/rudy/getting-started] for more info.</b>
+
 
 == Pre-Requisites
 
@@ -48,7 +55,7 @@ See Getting-Started[http://wiki.github.com/solutious/rudy/getting-started] for m
   * SimpleDB[http://aws.amazon.com/simpledb/]
   * S3[http://aws.amazon.com/s3/]
 * OpenSSH[http://www.openssh.com/]
-* Ruby 1.8.x, 1.9.x, or JRuby 1.2
+* Ruby[http://ruby-lang.org] 1.8.x, 1.9.x, or JRuby[http://jruby.codehaus.org] 1.2
   * Net::SSH[http://net-ssh.rubyforge.org/]
   * Net::SCP[http://net-ssh.rubyforge.org/]
   * amazon-ec2[http://github.com/grempe/amazon-ec2]
@@ -58,21 +65,15 @@ See Getting-Started[http://wiki.github.com/solutious/rudy/getting-started] for m
   * Caesars[http://github.com/delano/caesars]
 
 
-== Alpha Notice
-
-Rudy has been well tested and is currently being used in production in a private beta, but it's not ready for general production use. There are a few things to keep in mind while Rudy is in alpha status.
-
-* If you already have private SSH keys, back them up. Rudy is quite safe but hasn't been audited so backup your keys as a precaution.
-* If you're running EC2 instances in production, create a new set of AWS credentials (access key and secret key) to use with Rudy. This will ensure that Rudy has no access to your production instances. 
-* Rudy commands and APIs may change in later releases. This means that if you create an environment with an alpha release and later upgrade Rudy, some things may not work as expected. 
-
-
 == More Info
 
-* GitHub[http://github.com/solutious/rudy]
-* Documentation[http://wiki.github.com/solutious/rudy]
-* Issues[http://github.com/solutious/rudy/issues]
-* Inspiration[http://www.youtube.com/watch?v=CgaiIW5Rzes]
+* Fork at GitHub[http://github.com/solutious/rudy]
+* Read the Documentation[http://wiki.github.com/solutious/rudy]
+* Submit issues to the IssueTracker[http://github.com/solutious/rudy/issues]
+* Start a discussion on the GoogleGroup[http://groups.google.com/group/rudy-deployment]
+* Find some Inspiration[http://www.youtube.com/watch?v=CgaiIW5Rzes]
+* For all other inquires, email me directly: delano@solutious.com
+
 
 == Thanks
 
@@ -84,11 +85,17 @@ Rudy has been well tested and is currently being used in production in a private
 * Sam Aaron
 * Everyone at Utrecht.rb[http://groups.google.com/group/utrecht-rb]
 * Jamis Buck for Net::SSH and friends
+* Glenn Rempe for amazon-ec2
+* Marcel Molina Jr. for aws-s3
 * Keshia Knight Pulliam
 
+
 == Contributions
 
-I'm very open to contributions! For bigger features please fork the git repo and send me a pull request. For small or single file changes, send me an email with the details <tt>delano@solutious.com</tt>
+I'm very open to contributions! 
+
+* For bigger features please fork the git repo and send me a pull request. 
+* For small or single file changes, send me an email with the details: <tt>delano@solutious.com</tt>
 
 
 == Credits
@@ -100,4 +107,4 @@ I'm very open to contributions! For bigger features please fork the git repo and
 
 == License
 
-See: LICENSE.txt
+See: LICENSE.txt

data/Rakefile

@@ -25,7 +25,7 @@ end
 
 
 namespace :test do
-  desc 'Measures test coverage'
+  #about 'Measures test coverage'
   task :coverage do
     rm_f "coverage"
     rm_f "coverage.data"
@@ -71,7 +71,7 @@ end
 
 # From: shoulda/tasks/list_tests.rake
 namespace :shoulda do
-  desc "List the names of the test methods in a specification like format"
+  #about "List the names of the test methods in a specification like format"
   task :list_fixed do
     $LOAD_PATH.unshift("test")
 
@@ -113,7 +113,7 @@ Rake::GemPackageTask.new(@spec) do |p|
   p.need_tar = true if RUBY_PLATFORM !~ /mswin/
 end
 
-task :release => [ :rdoc, :package ] do
+task :release => [ "publish:gem", :clean, "publish:rdoc" ] do
   $: << File.join(File.dirname(__FILE__), 'lib')
   require "rudy"
   abort if Drydock.debug?
@@ -130,12 +130,12 @@ end
 
 # Rubyforge Release / Publish Tasks ==================================
 
-desc 'Publish website to rubyforge'
+#about 'Publish website to rubyforge'
 task 'publish:rdoc' => 'doc/index.html' do
   sh "scp -rp doc/* rubyforge.org:/var/www/gforge-projects/#{name}/"
 end
 
-desc 'Public release to rubyforge'
+#about 'Public release to rubyforge'
 task 'publish:gem' => [:package] do |t|
   sh <<-end
     rubyforge add_release -o Any -a CHANGES.txt -f -n README.rdoc #{name} #{name} #{@spec.version} pkg/#{name}-#{@spec.version}.gem &&

data/Rudyfile

@@ -1,9 +1,7 @@
-# = Rudy
+# = Rudy -- Example configuration
 # 
-# This is an example Rudy configuration.
-#
-# Rudy automatically looks for configuration files in the 
-# following locations (in this order):
+# Rudy automatically looks for configuration files in the following 
+# locations (in this order):
 #
 #     ./.rudy/config
 #     ~/.rudy/config
@@ -13,15 +11,15 @@
 #     ./.rudy/*.rb
 #     /etc/rudy/*.rb
 #
-# When multuple files are found, the configuration is 
-# NOT OVERRIDDEN. It's ADDED / APPENDED. This means you can 
-# split configuration across many files as you please. 
+# When multuple files are found, the configuration is NOT OVERRIDDEN,
+# it's ADDED or APPENDED depending on context. This means you can split 
+# configuration across many files as you please. 
 #
-# There are three sections: accounts, defaults, machines, and routines.
+# There are four sections: accounts, defaults, machines, commands and routines.
 # 
 # By convention, accounts and defaults go in ~/.rudy/config or ./.rudy/config 
-# machines and routines configuration goes in ./Rudyfile or 
-# ./config/rudy/machines.rb and ./config/rudy/routines.rb
+# machines, commands and routines configuration go in ./Rudyfile or into 
+# separate files in ./.rudy or ./config/rudy (machines.rb, commands.rb, ...)
 #
 
 # ---------------------------------------------------------  MACHINES  --------
@@ -29,51 +27,44 @@
 # of your environments. 
 machines do
   
-  users do
-    # If you already have private keys for logging in to your EC2 instances
-    # EC2 instances you can specify them here and Rudy will use these instead.
-    # root :keypair => "/#{Rudy.sysinfo.home}/.rudy/root-private-key"
-  end
-  
   zone :"us-east-1b" do
-    ami 'ami-235fba4a'    # Amazon Getting Started AMI (US)
+    ami 'ami-235fba4a'               # Amazon Getting Started AMI (US)
   end
   zone :"eu-west-1b" do
-    ami 'ami-e40f2790'    # Amazon Getting Started AMI (EU)
+    ami 'ami-e40f2790'               # Amazon Getting Started AMI (EU)
   end
-
+  
+  hostname :rudy                     # One of: :default, :rudy, "your-name"
+  
   # We've defined an environment called "stage" with one role: "app". 
   # The configuration inside the env block is available to all its 
   # roles. The configuration inside the role blocks is available only
   # to machines in that specific role. 
   env :stage do
-    ami "ami-5394733a"    # ec2onrails/ec2onrails-v0_9_9_1-i386.manifest.xml
-    size 'm1.small'
-    
+    ami "ami-e348af8a"               # Debian 5.0, 32-bit (Alestic)
+    size 'm1.small'                  # EC2 machine type for all machines
+                                     # in the "stage" environment
     role :app do
-      positions 1
-      #addresses '11.22.33.44', '55.66.77.88'
+      positions 1                    # Only 1 machine in stage-app
+      #addresses '11.22.33.44'       # Define an elastic IP to reuse
       
-      # You can define disks for the stage-app machines. Rudy uses 
-      # this configuration when it executes a routine (see below).
-      disks do
-        path "/rudy/disk1" do
-          size 2
-          device "/dev/sdr"
+      disks do                       # Define EBS volumes 
+        path "/rudy/disk1" do        # The paths can be anything but
+          size 2                     # they must be unique. 
+          device "/dev/sdr"          # Devices must be unique too.
         end
       end
-      
-    end
-    
-    # Here are some examples of other roles. You can use these or
-    # remove them and create your own.
-    role :db do
     end
     
-    role :analysis do
+    role :db do                      # You can define as many roles
+    end                              # as you like. These are just 
+    role :balancer do                # a couple examples.
     end
     
-    role :balancer do
+    users do                         # Specify existing private keys per user
+      #root do                       
+      #  keypair "/path/2/private-key"
+      #end
     end
     
   end  
@@ -82,43 +73,73 @@ machines do
   # scripts. The config contained in this block is made available
   # those scripts in the form of a yaml file. The file is called
   # rudy-config.yml. 
-  config do
+  config do                 
     dbmaster 'localhost'
     newparam 573114
   end
-  
-  
 end
 
+
+# ----------------------------------------------------------- COMMANDS --------
+# The commands block defines shell commands to be allowed or denied from the 
+# default list defined by Rye::Cmd (Rudy executes all SSH commands via Rye).
+# Commands can have any name except for keywords already used by Rudy. 
+commands do
+  allow :gem_install, "/usr/bin/gem", "install", :V, "--no-rdoc", "--no-ri"
+  allow :apt_get, "/usr/bin/apt-get", :y, :q
+  deny :kill
+end
+
+
 # ----------------------------------------------------------- ROUTINES --------
 # The routines block describes the repeatable processes for each machine group.
+# To run a routine, specify its name on the command-line: rudy startup
 routines do
   
-  env :stage do
-    role :app do
-      
-      # This routine will be executed when you run "rudy startup"
-      startup do        
-        disks do
-          # Rudy creates an EBS volume for each instance, attaches
-          # it, gives it a filesystem, and mounts it. 
-          create "/rudy/disk1"
-        end
-        # You can execute a shell command on each instance after
-        # it's created. This touch command will run as root.
-        after :root => [:touch, '/rudy/disk1/rudy-was-here']
-      end
-      
-      # This routine will be executed when you run "rudy shutdown"
-      shutdown do
-        before :root => '/a/nonexistent/script'
-        disks do
-          # Rudy unounts the EBS volume and deletes it. Careful! 
-          destroy "/rudy/disk1"
-        end
-      end
-      
+  env :stage do                      # We'll define routines for the
+    role :app do                     # stage-app machine group
+                                     
+      startup do                     # $ rudy startup
+        adduser :rudy                # Create a user called "rudy"
+        authorize :rudy              # Enable passwordless logins as rudy
+                                     
+        disks do                     # Define EBS volume routines
+          create "/rudy/disk1"       # Create an EBS volume, attach it, give
+        end                          # it a filesystem, and mount it.
+                                     
+        after :rudy do               # Run remote SSH commands after startup
+          mkdir :p, "great"          # $ mkdir -p great
+          touch "great/scott"        # $ touch great/scott
+          ls :l, :a                  # $ ls -l -a
+        end                          
+      end                            
+                                     
+      shutdown do                    # $ rudy shutdown
+        before :root do              # Run remote SSH commands before shutdown
+          mysqld_initd               
+        end                          
+                                     
+        disks do                     
+          destroy "/rudy/disk1"      # Unmount and destroy the EBS volume
+        end                          
+      end                            
+                                     
+    end                              
+  end                                
+  
+  # Define global routines available
+  # to every environment and role.
+  sysupdate do                       # $ rudy sysupdate
+    before :root do                  
+      apt_get "update"               # Update debian / ubuntu 
+      apt_get "install", "apache2-prefork-dev", "libapr1-dev"
+      apt_get "install", "build-essential", "sqlite3", "libsqlite3-dev"
+      gem_install 'rudy'
     end
   end
+  
+  # Define your own routines
+  anything do                        # $ rudy anything
+  end
 end
 

data/bin/rudy

@@ -10,7 +10,7 @@
 
 $:.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 drydock rye}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
+#%w{net-ssh amazon-ec2 caesars drydock rye}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
 #require 'rubygems'
 
 #$SAFE = 1   # require is unsafe in Ruby 1.9??
@@ -23,74 +23,139 @@ require 'rudy/cli'
 # Command-line interface for /bin/rudy
 class RudyCLI < Rudy::CLI::Base
   
+  debug :on
+  default :machines
+  trawler :passthrough
+  
   # ------------------------------------------  RUDY GLOBALS  --------
   # ------------------------------------------------------------------
   
   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})"
-  
-  
 
-  # ---------------------------------  RUDY MACHINE COMMANDS  --------
-  # ------------------------------------------------------------------
 
+  # ------------------------------------------  RUDY OBJECTS  --------
+  # ------------------------------------------------------------------
 
-  #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] backups [-C] [disk name]"
+  #about "Manage Backups"
+  #option :s, :snapshot, String, "Create a backup entry from an existing snapshot"
+  #action :Z, :sync, "Check for and delete backup metadata with no snapshot. DOES NOT delete snapshots."
+  ##action :T, :tidy, "Tidy existing backups"
+  #action :D, :destroy, "Destroy a backup and DELETE its snapshots."
+  #action :C, :create, "Create a backup"
+  #argv :disk
+  #command :'backup' => Rudy::CLI::Backups
+  #command_alias :backup, :bu
+  
+  about "Manage Machines"
+  option :l, :all, "Display all machines"
+  action :W, :wash, "Wash machine metadata."
+  command :machines => Rudy::CLI::Machines
+  command_alias :machines, :m
+  
+  about "Manage Disks"
+  action :W, :wash, "Wash disk metadata."
+  command :disks => Rudy::CLI::Disks
+  command_alias :disks, :d
+  
+  about "Log in to a machine"
+  command :ssh => Rudy::CLI::Machines
+  
+  #about "Open the machine in your default browser (OSX only)"
+  #option :s, :https, "Use HTTPS"
+  #option :p, :port, Integer, "Port"
+  #command :open => Rudy::CLI::Candy
+  
+    
+  # -----------------------------------------  RUDY ROUTINES  --------
+  # ------------------------------------------------------------------
+  
+  # A "do nothing" routine. Passthrough simply executes a routine
+  # config block. Drydock's trawler uses this for unknown commands.
+  about "A skeleton routine"
+  command :passthrough => Rudy::CLI::Routines
 
+  about "Startup a machine group"
+  usage "rudy startup"
+  command :startup => Rudy::CLI::Routines
+  command_alias :startup, :s
 
+  about "Shutdown a machine group"
+  usage "rudy shutdown"
+  command :shutdown => Rudy::CLI::Routines
+  
+  about "Create a release"
+  usage "rudy release"
+  command :release => Rudy::CLI::Routines
+  command_alias :release, :r
+  command_alias :release, :rerelease
+  
+  #about "Update the release currently running in a machine group"
+  #command :rerelease => Rudy::CLI::Routines
+  #command_alias :rerelease, :rere
 
+  #about "Deploy disk snapshots from one machine to another"
+  #command :deploy => Rudy::CLI::Routines
+  
 
-  # --------------------------------  MISCELLANEOUS COMMANDS  --------
+  # ------------------------------------  RUDY MISCELLANEOUS  --------
   # ------------------------------------------------------------------
+    
+  usage "rudy [-f config-file] config [param-name]"
+  about "Check Rudy configuration."
+  option :l, :all, "Display all configs for all machines"
+  option :commands, "Display commands configuration"
+  option :defaults, "Display defaults configuration"
+  option :machines, "Display machines configuration"
+  option :accounts, "Display accounts configuration"
+  option :routines, "Display routines configuration"
+  option :script, "Output configuration identical to what is provided to scripts called in routines"
+  option :project, "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
+  command :config => Rudy::CLI::Config
+  
+  
+  about "Initialize Rudy configuration"
+  command :init do |obj|
   
-  desc "Display time (in UTC)"
+    unless File.exists?(Rudy::CONFIG_FILE)
+      Rudy::Config.init_config_dir
+    end
+  
+    begin
+
+      unless Rudy::Huxtable.domain_exists?
+        puts "Creating SimpleDB domain #{Rudy::Huxtable.domain}"
+        Rudy::Huxtable.create_domain
+        puts "Initialized"
+      else
+        puts "Already Initialized"
+      end
+    
+    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::CONFIG_FILE}"
+      exit 1
+    end
+  
+    obj.global.quiet = true  # don't print elapsed time
+  end
+
+  about "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 :p, :project, "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
-  command :config => Rudy::CLI::Config
 
   usage "rudy myaddress [-i] [-e]"
-  desc "Displays you current internal and external IP addresses"
+  about "Displays you current internal and external IP addresses"
   option :e, :external, "Display only external IP address"
   option :i, :internal, "Display only internal IP address"
   command :myaddress do |obj|
@@ -107,7 +172,7 @@ class RudyCLI < Rudy::CLI::Base
   end
 
   usage "rudy [global options] annoy [-h -m -l] [-e]"
-  desc "Play around with Rudy's annoying challenges"
+  about "Play around with Rudy's annoying challenges"
   option :s, :string, "A numeric challenge"
   option :n, :numeric, "A numeric challenge"
   option :i, :insane, "Insane annoyance factor"
@@ -124,13 +189,13 @@ class RudyCLI < Rudy::CLI::Base
     obj.global.quiet = true  # don't print elapsed time
   end
 
-  desc "Display the current Rudy slogan"
+  about "Display the current Rudy slogan"
   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::CONFIG_FILE}"
+  about "Generates a configuration template to #{Rudy::CONFIG_FILE}"
   command :generate_config do |obj|
     unless File.exists?(Rudy::CONFIG_FILE)
       Rudy::Config.init_config_dir
@@ -139,122 +204,6 @@ class RudyCLI < Rudy::CLI::Base
       puts "#{Rudy::CONFIG_FILE} already exists"
     end
   end
-
-
-  desc "Initialize Rudy configuration"
-  command :init do |obj|
-  
-    unless File.exists?(Rudy::CONFIG_FILE)
-      Rudy::Config.init_config_dir
-    end
-  
-    begin
-
-      unless Rudy::Huxtable.domain_exists?
-        puts "Creating SimpleDB domain #{Rudy::Huxtable.domain}"
-        Rudy::Huxtable.create_domain
-        puts "Initialized"
-      else
-        puts "Already Initialized"
-      end
-    
-    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::CONFIG_FILE}"
-      exit 1
-    end
-  
-    obj.global.quiet = true  # don't print elapsed time
-  end
-
-
-  # ---------------------------------  RUDY MANAGER COMMANDS  --------
-  # ------------------------------------------------------------------
-
-  #usage "rudy [global options] backups [-C] [disk name]"
-  #desc "Manage Backups"
-  #option :s, :snapshot, String, "Create a backup entry from an existing snapshot"
-  #action :Z, :sync, "Check for and delete backup metadata with no snapshot. DOES NOT delete snapshots."
-  ##action :T, :tidy, "Tidy existing backups"
-  #action :D, :destroy, "Destroy a backup and DELETE its snapshots."
-  #action :C, :create, "Create a backup"
-  #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
-
-  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  --------
-  # ------------------------------------------------------------------
-
-  #desc "Release to a Machine Group"
-  #option :g, :group, String, "A security group name"
-  #option :s, :switch, "Switch to the release branch/tag"
-  #option :m, :msg, String, "A short release note"
-  #command :release => Rudy::CLI::Release
-
-  #desc "Update the release currently running in a machine group"
-  #command :rerelease => Rudy::CLI::Release
-  #command_alias :rerelease, :rere
-
-  #desc "Deploy disk snapshots from one machine to another"
-  #command :deploy => Rudy::CLI::Deploy
-
-
-  #desc "Shutdown a Machine Group"
-  #usage "rudy [global options] shutdown [-g group-name] [instance-ID]"
-  #option :g, :group, String, "A security group name"
-  #argv :awsid
-  #command :shutdown => Rudy::CLI::Routines
-  #
-  #
-  #desc "Start a Machine Group"
-  #usage "rudy [global options] startup [-g group-name] [-i image-ID]"
-  #option :ami, String, "EC2 image ID (AMI)"
-  #option :g, :group, String, "A security group name"
-  #command :startup => Rudy::CLI::Routines
-  #command_alias :startup, :start
-
-  #desc "Restart a Machine Group"
-  #option :g, :group, String, "A security group name"
-  #argv :awsid
-  #command :restart => Rudy::CLI::Routines
-  #
-
-  
-  # -------------------------------------------  UGLY STUFFS  --------
-  # ------------------------------------------------------------------
-  debug :on
-  default :machines
-  
-
   
 end
 
@@ -264,11 +213,15 @@ end
 # 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
+
+rescue Drydock::ArgError, Drydock::OptError => ex
   STDERR.puts ex.message
   STDERR.puts ex.usage
+rescue Drydock::InvalidArgument => ex
+  STDERR.puts ex.message  
 rescue Rudy::Error => ex
   STDERR.puts ex.message
+  STDERR.puts ex.backtrace if Drydock.debug?
 rescue => ex
   STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
   STDERR.puts ex.backtrace if Drydock.debug?