solutious-rudy 0.8.5 → 0.9.0

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 amazon-ec2 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 '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
@@ -59,109 +62,66 @@ 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.yes?; @@yes == true; end
+  def Rudy.enable_yes; @@yes = true; end
   def Rudy.disable_yes; @@yes = 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
 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'

data/lib/rudy/aws.rb

@@ -1,7 +1,7 @@
 
 
-require 'EC2'       # Motley
-require 'aws/s3'    # crew
+require 'EC2'       # amazon-ec2 gem
+
 
 module Rudy
   module AWS
@@ -20,48 +20,7 @@ module Rudy
     def escape!(str)
       str.to_s.tr!("[\0\n\r\032\\\\]", '').gsub!(/([\'\"])/, '\\1\\1')
     end
-    
-    module ObjectBase
-      include Rudy::Huxtable
-      
-    protected
-
-      # Execute AWS requests safely. This will trap errors and return
-      # a default value (if specified).
-      # * +default+ A default response value
-      # * +request+ A block which contains the AWS request
-      # Returns the return value from the request is returned untouched
-      # or the default value on error or if the request returned nil. 
-      def execute_request(default=nil, timeout=nil, &request)
-        timeout ||= 30
-        raise "No block provided" unless request
-        response = nil
-        begin
-          Timeout::timeout(timeout) do
-            response = request.call
-          end
-        # Raise the EC2 exceptions
-        rescue ::EC2::Error, ::EC2::InvalidInstanceIDMalformed => ex  
-          raise Rudy::AWS::Error, ex.message
         
-        # NOTE: The InternalError is returned for non-existent volume IDs. 
-        # It's probably a bug so we're ignoring it -- Dave. 
-        rescue ::EC2::InternalError => ex
-          raise Rudy::AWS::Error, ex.message
-          
-        rescue Timeout::Error => ex
-          STDERR.puts "Timeout (#{timeout}): #{ex.message}!"
-        rescue SocketError => ex
-          #STDERR.puts ex.message
-          #STDERR.puts ex.backtrace
-          raise SocketError, "Check your Internets!" unless @@global.offline
-        ensure
-          response ||= default
-        end
-        response
-      end
-    end
-    
     require 'rudy/aws/sdb'
     require 'rudy/aws/ec2'
     require 'rudy/aws/s3'

data/lib/rudy/aws/ec2.rb

@@ -1,23 +1,59 @@
 
 module Rudy; module AWS
   module EC2
-    module Base
-      attr_accessor :ec2
-      def initialize(access_key=nil, secret_key=nil, region=nil, logger=nil)
-        
-        if region
-          raise InvalidRegion, region unless Rudy::AWS.valid_region?(region)
-          host = "#{region}.ec2.amazonaws.com"
-        elsif ENV['EC2_URL']
-          host = URL.parse(ENV['EC2_URL']).host
+#    include Rudy::Huxtable
+    
+    def self.connect(access_key=nil, secret_key=nil, region=nil, logger=nil)
+      
+      if region
+        raise InvalidRegion, region unless Rudy::AWS.valid_region?(region)
+        host = "#{region}.ec2.amazonaws.com"
+      elsif ENV['EC2_URL']
+        host = URL.parse(ENV['EC2_URL']).host
+      end
+      
+      host ||= DEFAULT_EC2_HOST
+      port ||= DEFAULT_EC2_PORT
+      
+      @@ec2 ||= ::EC2::Base.new(:port => port, :server=> host, :access_key_id => access_key, :secret_access_key => secret_key)
+      @@logger = logger
+    end
+    
+  protected
+  
+    # Execute AWS requests safely. This will trap errors and return
+    # a default value (if specified).
+    # * +default+ A default response value
+    # * +request+ A block which contains the AWS request
+    # Returns the return value from the request is returned untouched
+    # or the default value on error or if the request returned nil. 
+    def self.execute_request(default=nil, timeout=nil, &request)
+      timeout ||= 15
+      raise "No block provided" unless request
+      response = nil
+      begin
+        Timeout::timeout(timeout) do
+          response = request.call
         end
+      # Raise the EC2 exceptions
+      rescue ::EC2::Error, ::EC2::InvalidInstanceIDMalformed => ex  
+        raise Rudy::AWS::Error, ex.message
+      
+      # NOTE: The InternalError is returned for non-existent volume IDs. 
+      # It's probably a bug so we're ignoring it -- Dave. 
+      rescue ::EC2::InternalError => ex
+        raise Rudy::AWS::Error, ex.message
         
-        host ||= DEFAULT_EC2_HOST
-        port ||= DEFAULT_EC2_PORT
-        
-        @ec2 = ::EC2::Base.new(:port => port, :server=> host, :access_key_id => access_key, :secret_access_key => secret_key)
-        @logger = logger
+      rescue Timeout::Error => ex
+        STDERR.puts "Timeout (#{timeout}): #{ex.message}!"
+      rescue SocketError => ex
+        #STDERR.puts ex.message
+        #STDERR.puts ex.backtrace
+        raise SocketError, "Check your Internets!" unless @@global.offline
+      ensure
+        response ||= default
       end
+      response
     end
     
     class NoRunningInstances < Rudy::Error; end
@@ -25,7 +61,7 @@ module Rudy; module AWS
     class InvalidRegion < Rudy::Error; end
     class UnknownState < Rudy::Error; end
     class NoGroup < Rudy::Error; end
-    class NoKeyPair < Rudy::Error; end
+    class NoKeypair < Rudy::Error; end
     class NoAMI < Rudy::Error; end
     
     class NoAddress < Rudy::Error; end
@@ -34,13 +70,13 @@ module Rudy; module AWS
     class AddressAssociated < Rudy::Error; end
     class ErrorCreatingAddress < Rudy::Error; end
     class AddressNotAssociated < Rudy::Error; end
-    class InsecureKeyPairPermissions < Rudy::Error; end
+    class InsecureKeypairPermissions < Rudy::Error; end
     
-    class InsecureKeyPairPermissions < Rudy::Error; end
-    class ErrorCreatingKeyPair < Rudy::Error; end
+    class InsecureKeypairPermissions < Rudy::Error; end
+    class ErrorCreatingKeypair < Rudy::Error; end
     class NoPrivateKeyFile < Rudy::Error; end
-    class KeyPairExists < Rudy::Error; end
-    class KeyPairAlreadyDefined < Rudy::Error
+    class KeypairExists < Rudy::Error; end
+    class KeypairAlreadyDefined < Rudy::Error
       def message
         "A keypair is defined for #{@obj}. Check your Rudy config."
       end
@@ -49,6 +85,7 @@ module Rudy; module AWS
     class VolumeAlreadyAttached < Rudy::Error; end
     class VolumeNotAvailable < Rudy::Error; end
     class VolumeNotAttached < Rudy::Error; end
+    class UnknownVolume < Rudy::Error; end
     class NoInstanceID < Rudy::Error; end
     class NoVolumeID < Rudy::Error; end
     class UnknownState < Rudy::Error; end