rudy 0.8.5 → 0.9.0

data/bin/rudy

@@ -9,7 +9,7 @@
 # 
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') # Put our local lib in first place
-#$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'drydock', 'lib') 
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'drydock', 'lib') 
 
 #$SAFE = 1   # require is unsafe in Ruby 1.9??
 
@@ -20,56 +20,92 @@ require 'rudy/cli'
 # Command-line interface for /bin/rudy
 class RudyCLI < Rudy::CLI::Base
   
-  debug :off
   default :machines       # when no command is provided
   trawler :passthrough    # unknown command names will forward here.
   
   # ------------------------------------------  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})"
-
-
+  global :e, :environment, String, "Connect to the specified environment (e.g. #{Rudy::DEFAULT_ENVIRONMENT})"
+  global :r, :role, String, "Connect to a machine with the specified role (e.g. #{Rudy::DEFAULT_ROLE})"
+  global :p, :position, String, "Position in the machine in its group"
+  global :b, :bucket, String, "An S3 bucket name (used when creating images)"
+  global :t, :testrun, "Test run. Don't execute action (PARTIALLY SUPPORTED)."
+  global :P, :parallel, "Execute remote commands in parallel (PARTIALLY SUPPORTED)."
+  global :F, :force, "Force an action despite warnings"
+  
+  
   # ------------------------------------------  RUDY OBJECTS  --------
   # ------------------------------------------------------------------
   
   about "View Machines"
+  usage "rudy"
+  usage "rudy machines"
+  usage "rudy machines -l"
+  usage "rudy machines -U"
+  usage "rudy machines -A"
+  usage "rudy machines -S [static ip address]"
+  usage "rudy machines -D"
   option :l, :all, "Display machines for all environments and roles"
-  action :W, :wash, "Wash machine metadata."
+  action :W, :wash, "Wash machine metadata"
+  action :T, :available, "Test availablity"
+  action :U, :update, "Update machines based on configuration"
+  action :A, :associate, "Associate static IP addresses or display existing ones"
+  action :N, :disassociate, "Disassociate static IP addresses"
   command :machines => Rudy::CLI::Machines
   command_alias :machines, :m
   
   about "View Disks"
-  action :W, :wash, "Wash disk metadata."
+  usage "rudy disks"
+  usage "rudy disks -l"
+  action :W, :wash, "Wash disk metadata"
   option :b, :backups, "Display backups"
   option :l, :all, "Display all disks"
   command :disks => Rudy::CLI::Disks
   command_alias :disks, :d
-  
+
+  about "View Backups"
+  usage "rudy backups"
+  usage "rudy backups -l"
+  action :W, :wash, "Wash backup metadata"
+  option :l, :all, "Display all backups"
+  command :backups => Rudy::CLI::Backups
+  command_alias :backups, :b
+
   about "View raw metadata"
   usage "rudy metadata"
-  usage "rudy metadata -l -o [disk|back|m]"
+  usage "rudy metadata -l -r [disk|back|m]"
   usage "rudy metadata -D object-id"
-  option :o, :otype, String, "Object type. One of: disk, back, m"
+  option :r, :rtype, String, "Record type. One of: disk, back, m (default)"
   option :l, :all, "Display metadata for all environments and roles"
   action :D, :delete, "Delete an object"
   argv :oid
-  command :metadata => Rudy::CLI::MetaData
+  command :metadata => Rudy::CLI::Metadata
   
-  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
+  about "View Network configuration (local network only)"
+  usage "rudy networks"
+  usage "rudy networks -L"
+  usage "rudy networks -L -i"
+  usage "rudy networks -L -e"
+  usage "rudy networks -U"
+  option :e, :external, "Display only external IP address"
+  option :i, :internal, "Display only internal IP address"
+  action :U, :update, "Update networks based on configuration"
+  action :L, :local, "Show local network configuration"
+  command :networks => Rudy::CLI::Networks
+  command_alias :networks, :n
   
     
   # -----------------------------------------  RUDY ROUTINES  --------
   # ------------------------------------------------------------------
   
+  about "View Routines"
+  usage "rudy routines"
+  usage "rudy routines -l"
+  option :l, :all, "Display routines for all environments and roles"
+  command :routines => Rudy::CLI::Routines
+  command_alias :routines, :r
+  
   # A "do nothing" routine. Passthrough simply executes a routine
   # config block. Drydock's trawler uses this for unknown commands.
   about "A passthrough for custom routines"
@@ -95,7 +131,19 @@ class RudyCLI < Rudy::CLI::Base
 
   # ------------------------------------  RUDY MISCELLANEOUS  --------
   # ------------------------------------------------------------------
-    
+  
+  about "Display existing environment objects"  
+  option :l, :all, "Include all regions"
+  command :status => Rudy::CLI::Status
+  
+  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
+  
   usage "rudy [-f config-file] config [param-name]"
   about "Check Rudy configuration."
   option :l, :all, "Display all configs for all machines"
@@ -110,29 +158,36 @@ class RudyCLI < Rudy::CLI::Base
   #option :g, :group, String, "Display configuration for a specific group"
   argv :name
   command :config => Rudy::CLI::Config
+  command_alias :config, :configs
   
   command :print_global => Rudy::CLI::Config
+  command_alias :print_global, :globals
   command_alias :print_global, :global
-  
+   
   about "Initialize Rudy configuration"
   command :init do |obj|
     
     Rudy::Huxtable.update_config
     
-    unless File.exists?(Rudy::CONFIG_FILE)
+    unless File.exists? Rudy::CONFIG_FILE
       Rudy::Config.init_config_dir
     end
   
     begin
 
-      unless Rudy::Huxtable.domain_exists?
+      if Rudy::Huxtable.domain_exists?
+        puts "SimpleDB domain #{Rudy::Huxtable.domain} already exists"
+      else
         puts "Creating SimpleDB domain #{Rudy::Huxtable.domain}"
         Rudy::Huxtable.create_domain
-        puts "Initialized"
-      else
-        puts "Already Initialized"
       end
-    
+      
+      user, host = Rudy.sysinfo.user, Rudy::Huxtable.global.localhost
+
+      puts "Authorizing public keys for #{user}@#{host}"
+      rbox = Rye::Box.new host
+      rbox.authorize_keys_local
+      
     rescue Rudy::AWS::SDB::NoSecretKey, 
            Rudy::AWS::SDB::NoAccessKey, 
            Rudy::NoConfig => ex
@@ -150,24 +205,7 @@ class RudyCLI < Rudy::CLI::Base
     t = obj.option.local ? Time.now : Time.now.utc
     puts '%s' % t.strftime("%Y-%m-%d %T %Z (%z)")
   end
-
-  usage "rudy myaddress [-i] [-e]"
-  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|
-    ea = Rudy::Utils::external_ip_address || '' 
-    ia = Rudy::Utils::internal_ip_address || ''
-    if obj.global.quiet
-      puts ia unless obj.option.external && !obj.option.internal
-      puts ea unless obj.option.internal && !obj.option.external
-    else
-      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]"
   about "Play around with Rudy's annoying challenges"
   option :s, :string, "A numeric challenge"
@@ -202,19 +240,14 @@ class RudyCLI < Rudy::CLI::Base
     end
   end
   
-  
+  about "Display basic system information"
   command :sysinfo do
     puts Rudy.sysinfo.to_yaml
   end
 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
@@ -223,12 +256,10 @@ rescue Drydock::InvalidArgument => ex
 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?
 rescue Interrupt
   puts "#{$/}Exiting... "
   exit 1
-rescue SystemExit
-  # Don't balk
+rescue => ex
+  STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
+  STDERR.puts ex.backtrace if Drydock.debug?
 end

data/bin/rudy-ec2

@@ -20,7 +20,6 @@ require 'rudy/cli'
 module RudyCLI_EC2
   extend Drydock
   
-  debug :off
   default :instances
   
   # -----------------------------------  AMAZON EC2 COMMANDS  --------
@@ -105,11 +104,6 @@ module RudyCLI_EC2
   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 :R, :register, "Register an image"
   action :D, :destroy, "Deregister an image (does not remove image files from S3)"
   argv :ami
@@ -142,14 +136,14 @@ module RudyCLI_EC2
   command_alias :instances, :in
   command_alias :instances, :i
   
-  about "Amazon EC2 KeyPairs"
+  about "Amazon EC2 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 :keypairs => Rudy::CLI::AWS::EC2::Keypairs
   command_alias :keypairs, :keypair
   command_alias :keypairs, :k
   
@@ -211,12 +205,6 @@ module RudyCLI_EC2
   
 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
@@ -233,8 +221,6 @@ rescue => ex
 rescue Interrupt
   puts "#{$/}Exiting... "
   exit 1
-rescue SystemExit
-  # Don't balk
 end
 
 

data/bin/rudy-s3

@@ -44,18 +44,10 @@ module RudyCLI_S3
   # ------------------------------------------------------------------
   
   default :buckets
-  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
@@ -72,7 +64,5 @@ rescue => ex
 rescue Interrupt
   puts "#{$/}Exiting... "
   exit 1
-rescue SystemExit
-  # Don't balk
 end
 

data/bin/rudy-sdb

@@ -28,24 +28,25 @@ module RudyCLI_SDB
   action :D, :destroy, "Destroy a domain"
   argv :name
   command :domains => Rudy::CLI::AWS::SDB::Domains
+  command_alias :domains, :domain
+  
+  about "Displays objects contained in a SimpleDB domain"
+  argv :name, :key
+  command :objects => Rudy::CLI::AWS::SDB::Objects
+  command_alias :objects, :object
+  
+  about "Execute a SimpleDB select query"
+  argv :query
+  command :query => Rudy::CLI::AWS::SDB::Select
   
   
   # --------------------------------  RUDY-SDB MISCELLANEOUS  --------
   # ------------------------------------------------------------------
   
   default :domains
-  debug :off
-  
-  
-end
-
 
-#puts Rudy::Utils.banner("THIS IS RUBY #{RUBY_VERSION}") if Drydock.debug?
+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
@@ -62,7 +63,5 @@ rescue => ex
 rescue Interrupt
   puts "#{$/}Exiting... "
   exit 1
-rescue SystemExit
-  # Don't balk
 end
 

data/lib/rudy.rb

@@ -4,32 +4,35 @@ unless defined?(RUDY_HOME)
   RUDY_LIB = File.join(File.dirname(__FILE__), '..', 'lib')
 end
 
-local_libs = %w{net-ssh net-scp amazon-ec2 aws-s3 caesars drydock rye storable sysinfo annoy}
-#local_libs.each { |dir| $:.unshift File.join(RUDY_HOME, '..', dir, 'lib') }
+local_libs = %w{net-ssh net-scp aws-s3 caesars drydock rye storable sysinfo annoy gibbler}
+local_libs.each { |dir| $:.unshift File.join(RUDY_HOME, '..', dir, 'lib') }
 #require 'rubygems'
 
+begin; require 'json'; rescue LoadError; end # Silence!
+
 require 'digest/md5'
 require 'stringio'
 require 'ostruct'
 require 'yaml'
-require 'json'
 require 'logger'
 require 'socket'
+require 'resolv'
 require 'timeout'
+require 'gibbler'
 require 'tempfile'
 require 'rudy/mixins'
+require 'gibbler/aliases'
 require 'storable'
 require 'sysinfo'
+require 'attic'
 require 'annoy'
 require 'rye'
 
-
-
 # = Rudy
 #
 #
 # Rudy is a development and deployment tool for the Amazon Elastic Compute Cloud
-# (EC2). <a href="http://solutious.com/products/rudy/getting-started.html">Getting Started</a> today!
+# (EC2). <a href="http://solutious.com/projects/rudy/getting-started">Getting Started</a> today!
 # 
 # 
 module Rudy
@@ -38,8 +41,8 @@ module Rudy
   module VERSION #:nodoc:
     unless defined?(MAJOR)
       MAJOR = 0.freeze
-      MINOR = 8.freeze
-      TINY  = 5.freeze
+      MINOR = 9.freeze
+      TINY  = 0.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end
@@ -48,7 +51,7 @@ module Rudy
   unless defined? Rudy::DOMAIN # We can assume all constants are defined
     
     @@quiet = false
-    @@yes = false
+    @@auto = false
     @@debug = false
     @@sysinfo = SysInfo.new.freeze
     
@@ -59,109 +62,74 @@ module Rudy
   
     CONFIG_DIR = File.join(@@sysinfo.home, '.rudy').freeze
     CONFIG_FILE = File.join(Rudy::CONFIG_DIR, 'config').freeze
+    SSH_KEY_DIR = File.expand_path('~/.ssh').freeze
     
-    DEFAULT_REGION = :'us-east-1'.freeze 
     DEFAULT_ZONE = :'us-east-1b'.freeze 
-    DEFAULT_ENVIRONMENT = :'stage'.freeze
-    DEFAULT_ROLE = :'app'.freeze
-    DEFAULT_POSITION = '01'.freeze
-    
-    DEFAULT_USER = :'rudy'.freeze
-    
+    DEFAULT_REGION = DEFAULT_ZONE.to_s.gsub(/[a-z]$/, '').to_sym.freeze
+    DEFAULT_ENVIRONMENT = :stage.freeze
+    DEFAULT_ROLE = :app.freeze
+
     DEFAULT_EC2_HOST = "ec2.amazonaws.com"
     DEFAULT_EC2_PORT = 443
     
     MAX_INSTANCES = 5.freeze
     
-    SUPPORTED_SCM_NAMES = [:svn, :git].freeze
-  
     ID_MAP = {
-      :disk => 'disk',
-      :instance => 'i',
-      :backup => 'back',
-      :machine => 'm',
-      :volume => 'vol',
-      :snapshot => 'snap',
-      :kernel => 'aki',
-      :image => 'ami',
-      :ram => 'ari',
-      :log => 'log',
-      :key => 'key',
-      :awspk => 'pk',
-      :awscert => 'cert',
+      :instance    => 'i',
+      :machine     => 'm',
       :reservation => 'r',
-      :dns_public => 'ec2',
-      :dns_private => 'domU',
+      :pkey        => 'pk',
+      :volume      => 'vol',
+      :kernel      => 'aki',
+      :image       => 'ami',
+      :ramdisk     => 'ari',
+      :group       => 'grp',
+      :log         => 'log',
+      :key         => 'key',
+      :dns_public  => 'ec2',
+      :disk        => 'disk',
+      :backup      => 'back',
+      :snapshot    => 'snap',
+      :cert        => 'cert',
+      :dns_private => 'domU'
     }.freeze
 
   end
   
-  def Rudy.debug?; @@debug == true; end
   def Rudy.quiet?; @@quiet == true; end
-  def Rudy.yes?; @@yes == true; end
-  def Rudy.enable_debug; @@debug = true; end
   def Rudy.enable_quiet; @@quiet = true; end
-  def Rudy.enable_yes; @@yes = true; end
-  def Rudy.disable_debug; @@debug = false; end
   def Rudy.disable_quiet; @@quiet = false; end
-  def Rudy.disable_yes; @@yes = false; end
+  
+  def Rudy.auto?; @@auto == true; end
+  def Rudy.enable_auto; @@auto = true; end
+  def Rudy.disable_auto; @@auto = false; end
+  
+  def Rudy.debug?; @@debug == true; end
+  def Rudy.enable_debug; @@debug = true; end
+  def Rudy.disable_debug; @@debug = false; end
+  
   
   def Rudy.sysinfo; @@sysinfo; end
   def sysinfo; @@sysinfo;  end
   
-  class Error < RuntimeError
-    def initialize(obj=nil); @obj = obj; end
-    def message; "#{self.class}: #{@obj}"; end
-  end
-  class InsecureKeyPermissions < Rudy::Error
-    def message
-      lines = ["Insecure file permissions for #{@obj}"]
-      lines << "Try: chmod 600 #{@obj}"
-      lines.join($/)
-    end
-  end
-  
-  #--
-  # TODO: Update exception Syntax based on:
-  # http://blog.rubybestpractices.com/posts/gregory/anonymous_class_hacks.html
-  #++
-  class NoConfig < Rudy::Error
-    def message; "No configuration found!"; end
-  end
-  class NoGlobal < Rudy::Error
-    def message; "No globals defined!"; end
-  end
-  class NoMachinesConfig < Rudy::Error
-    def message; "No machines configuration. Check your configs!"; end
-  end
-  class NoRoutinesConfig < Rudy::Error
-    def message; "No routines configuration. Check your configs!"; end
-  end
-  class ServiceUnavailable < Rudy::Error
-    def message; "#{@obj} is not available. Check your internets!"; end
-  end
-  class MachineGroupAlreadyRunning < Rudy::Error
-    def message; "Machine group #{@obj} is already running."; end
-  end
-  class MachineGroupNotRunning < Rudy::Error
-    def message; "Machine group #{@obj} is not running."; end
-  end
-  class MachineGroupNotDefined < Rudy::Error 
-    def message; "#{@obj} is not defined in machines config."; end
-  end
-  class PrivateKeyFileExists < Rudy::Error
-    def message; "Private key #{@obj} already exists."; end
-  end
-  class PrivateKeyNotFound < Rudy::Error
-    def message; "Private key file #{@obj} not found."; end
+end
+
+if Rudy.sysinfo.vm == :java
+  require 'java'
+  module Java
+    include_class java.net.Socket unless defined?(Java::Socket)
+    include_class java.net.InetSocketAddress unless defined?(Java::InetSocketAddress)
   end
 end
 
-require 'rudy/utils'      # The
-require 'rudy/global'     # order    
-require 'rudy/config'     # of 
-require 'rudy/huxtable'   # requires
-require 'rudy/aws'        # is
-require 'rudy/metadata'   # important
-require 'rudy/machines'
+require 'rudy/exceptions'
+require 'rudy/utils'               # The
+require 'rudy/global'              # order    
+require 'rudy/config'              # of 
+require 'rudy/huxtable'            # requires
+require 'rudy/aws'                 # is
+require 'rudy/metadata'            # super
+require 'rudy/machines'            # important.
+require 'rudy/backups'
+require 'rudy/disks'
 require 'rudy/routines'