solutious-rudy 0.8.5 → 0.9.0

data/lib/rudy/aws/ec2/zone.rb

@@ -19,9 +19,9 @@ module Rudy::AWS
 
     end
     
-    class Zones
-      include Rudy::AWS::ObjectBase
-      include Rudy::AWS::EC2::Base
+    module Zones
+      include Rudy::AWS::EC2  # important! include,
+      extend self             # then extend
       
       def list(*names)
         zones = list_as_hash(names)
@@ -31,13 +31,14 @@ module Rudy::AWS
       
       def list_as_hash(*names)
         names = names.flatten
-        zlist = @ec2.describe_availability_zones(:zone_name => names)
+        zlist = @@ec2.describe_availability_zones(:zone_name => names)
         return unless zlist['availabilityZoneInfo'].is_a?(Hash)
         zones = {}
         zlist['availabilityZoneInfo']['item'].each do |zhash| 
           zon = Zones.from_hash(zhash)
           zones[zon.name] = zon
         end
+        zones = nil if zones.empty?
         zones
       end
 

data/lib/rudy/aws/s3.rb

@@ -3,7 +3,8 @@ module Rudy::AWS
   class S3
     
     def initialize(access_key=nil, secret_key=nil, region=nil, debug=nil)
-     
+      require 'aws/s3'    
+      
       url ||= 'http://sdb.amazonaws.com'
       # There is a bug with passing :server to EC2::Base.new so 
       # we'll use the environment variable for now. 

data/lib/rudy/aws/sdb.rb

@@ -13,7 +13,6 @@ module Rudy
     class SDB
       class NoAccessKey < RuntimeError; end
       class NoSecretKey < RuntimeError; end
-      include Rudy::AWS::ObjectBase
       
       require 'rudy/aws/sdb/error'
       
@@ -33,7 +32,7 @@ module Rudy
         @base_url = url
         @debug = debug || StringIO.new
       end
-
+      
       def list_domains(max = nil, token = nil)
         params = { 'Action' => 'ListDomains' }
         params['NextToken'] =
@@ -63,12 +62,11 @@ module Rudy
       end
       
       
-      # Takes a zipped Array or Hash of criteria.
+      # Takes a Hash of criteria.
       # Returns a string suitable for a SimpleDB Select
-      def self.generate_select(fields, domain, *args)
-        q = args.first.is_a?(Hash)? args.first : Hash[*args.flatten]
+      def self.generate_select(domain, fields={})
         query = []
-        q.each_pair do |n,v| 
+        fields.each_pair do |n,v| 
           query << "#{Rudy::AWS.escape n}='#{Rudy::AWS.escape v}'"
         end
         str = "select * from #{domain} " 
@@ -76,18 +74,6 @@ module Rudy
         str
       end
 
-      
-      # Takes a zipped Array or Hash of criteria.
-      # Returns a string suitable for a SimpleDB Query
-      def self.generate_query(*args)
-        q = args.first.is_a?(Hash)? args.first : Hash[*args.flatten]
-        query = []
-        q.each do |n,v| 
-          query << "['#{Rudy::AWS.escape n}'='#{Rudy::AWS.escape v}']"
-        end
-        query.join(" intersection ")
-      end
-
 
       def select(select, token = nil)
         params = {
@@ -122,72 +108,6 @@ module Rudy
         hash_results.empty? ? nil : hash_results
       end
       
-      # <QueryResult><ItemName>in-c2ffrw</ItemName><ItemName>in-72yagt</ItemName><ItemName>in-52j8gj</ItemName>
-      def query(domain, query, max = nil, token = nil)
-        params = {
-          'Action' => 'Query',
-          'QueryExpression' => query,
-          'DomainName' => domain.to_s
-        }
-        params['NextToken'] =
-          token unless token.nil? || token.empty?
-        params['MaxNumberOfItems'] =
-          max.to_s unless max.nil? || max.to_i == 0
-
-
-        doc = call(:get, params)
-        results = []
-        if doc
-          REXML::XPath.each(doc, '//ItemName/text()') do |item|
-            results << item.to_s
-          end
-        end
-        
-        #return results, REXML::XPath.first(doc, '//NextToken/text()').to_s
-        results.empty? ? nil : results
-        
-      end
-
-
-
-      # <QueryWithAttributesResult><Item><Name>in-c2ffrw</Name><Attribute><Name>code</Name><Value>in-c2ffrw</Value></Attribute><Attribute><Name>date_created</Name><Value>2008-10-31</Value></Attribute></Item><Item>
-      def query_with_attributes(domain, query, max = nil, token = nil)
-        params = {
-          'Action' => 'QueryWithAttributes',
-          'QueryExpression' => query,
-          'DomainName' => domain.to_s
-        }
-        params['NextToken'] =
-          token unless token.nil? || token.empty?
-        params['MaxNumberOfItems'] =
-          max.to_s unless max.nil? || max.to_i == 0
-
-        doc = call(:get, params)
-        results = []
-        if doc
-          REXML::XPath.each(doc, "//Item") do |item|
-            name = REXML::XPath.first(item, './Name/text()').to_s
-
-            attributes = {'Name' => name}
-            REXML::XPath.each(item, "./Attribute") do |attr|
-              key = REXML::XPath.first(attr, './Name/text()').to_s
-              value = REXML::XPath.first(attr, './Value/text()').to_s
-              ( attributes[key] ||= [] ) << value
-            end
-            results << attributes
-          end
-          #return results, REXML::XPath.first(doc, '//NextToken/text()').to_s
-        end
-        
-        hash_results = {}
-        results.each do |item|
-          hash_results[item.delete('Name')] = item
-        end
-        
-        hash_results
-      end
-
-
 
       def put_attributes(domain, item, attributes, replace = true)
         replace = true if replace == :replace
@@ -252,7 +172,35 @@ module Rudy
 
 
     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 ||= 15
+        raise "No block provided" unless request
+        response = nil
+        begin
+          Timeout::timeout(timeout) do
+            response = request.call
+          end
 
+        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 Rudy::Huxtable.global.offline
+        ensure
+          response ||= default
+        end
+        response
+      end
+      
       def call(method, params)
         params.merge!( {
             'Version' => '2007-11-07',
@@ -276,7 +224,8 @@ module Rudy
         query = query.join('&')
         url = "#{@base_url}?#{query}"
         uri = URI.parse(url)
-        @debug.puts("#{url}") if @debug
+        
+        #Rudy::Huxtable.ld url if Rudy.debug?
         
         response = execute_request(nil) {
           Net::HTTP.new(uri.host, uri.port).send_request(method, uri.request_uri)
@@ -294,7 +243,7 @@ module Rudy
           error = doc.get_elements('*/Errors/Error')[0]
           raise(
             Module.class_eval(
-              "AwsSdb::#{error.get_elements('Code')[0].text}Error"
+              "Rudy::AWS::SDB::#{error.get_elements('Code')[0].text}Error"
             ).new(
               error.get_elements('Message')[0].text,
               doc.get_elements('*/RequestID')[0].text

data/lib/rudy/backups.rb

@@ -0,0 +1,24 @@
+module Rudy
+  
+  module Backups
+    RTYPE = 'back'.freeze
+    
+    extend self
+    extend Rudy::Metadata::ClassMethods 
+    include Rudy::Huxtable
+    extend Rudy::Huxtable
+    
+    # Returns the most recent backup object for the given path
+    def get(path)
+      tmp = Rudy::Backup.new path
+      backups = Rudy::Backups.list :path => path
+      return nil unless backups.is_a?(Array) && !backups.empty?
+      backups.first
+    end
+    
+    def from_hash(h)
+      Rudy::Backup.from_hash h
+    end
+  end
+  
+end

data/lib/rudy/cli.rb

@@ -10,6 +10,10 @@ module Rudy
   # line interfaces. See the bin/ files if you're interested. 
   # 
   module CLI
+    
+    require 'rudy/cli/execbase'
+    require 'rudy/cli/base'
+    
     class NoCred < RuntimeError #:nodoc
     end
     
@@ -19,92 +23,7 @@ module Rudy
       # Should print messages as they come
     end
     
-    class CommandBase < Drydock::Command
-      include Rudy::Huxtable
-      
-      attr_reader :config
-      
-    protected
-      def init
-        
-        if Drydock.debug?
-          #Caesars.enable_debug
-          Rudy.enable_debug
-        end
-        
-        # The CLI wants output!
-        Rudy::Huxtable.update_logger STDOUT
-        
-        # Send The Huxtables the global values from the command-line
-        Rudy::Huxtable.update_global @global
-        
-        # Reload configuration. This must come after update_global 
-        # so it will catch the @@global.config path (if supplied).
-        begin
-          Rudy::Huxtable.update_config
-        rescue Caesars::SyntaxError => ex
-          STDERR.puts ex.message
-          STDERR.puts ex.backtrace if @@global.verbose > 0
-          exit 81
-        end
-        
-        @@global.nocolor ? String.disable_color : String.enable_color
-        @@global.yes ? Annoy.enable_skip : Annoy.disable_skip
-      
-        unless @@global.accesskey && @@global.secretkey
-          STDERR.puts "No AWS credentials. Check your configs!"
-          STDERR.puts "Try: rudy init"
-          exit 1
-        end
-        
-        if @@global.environment =~ /^prod/ && Drydock.debug?
-          puts Rudy::Utils.banner("PRODUCTION ACCESS IS DISABLED IN DEBUG MODE")
-          exit 1
-        end
-        
-      end
-      
-      def execute_action(emsg="Failed", &action)
-        begin
-          ret = action.call
-          raise emsg unless ret
-          ret
-        rescue Rudy::AWS::EC2::NoAMI => ex
-          raise Drydock::OptError.new('-a', @alias)
-        end
-      end
-      
-      def execute_check(level=:medium)
-        ret = Annoy.are_you_sure?(level)
-        exit 0 unless ret
-        ret
-      end
-      
-      # Print a default header to the screen for every command.
-      #
-      def print_header
-        
-        # Send The Huxtables the global values again because they could be
-        # updated after initialization but before the command was executed
-        Rudy::Huxtable.update_global @global
-        
-        puts Rudy::CLI.generate_header(@@global, @@config) if @@global.print_header
-        
-        unless @@global.quiet
-          if @@global.environment == "prod"
-            msg = "YOU ARE PLAYING WITH PRODUCTION"
-            puts Rudy::Utils.banner(msg, :normal), $/
-          end
-          puts Rudy::Utils.banner("THIS IS EC2"), $/ if Rudy.in_situ?
-        end
-      end
-      
-      def machine_separator(name, awsid)
-        ('%s %-50s awsid: %s ' % [$/, name, awsid]).att(:reverse)
-      end
-      
-    end
-
+    
     def self.generate_header(global, config)
       return "" if global.quiet
       header = StringIO.new
@@ -128,52 +47,7 @@ module Rudy
     end
 
 
-    # A base for all Drydock executables (bin/rudy etc...). 
-    class Base
-      extend Drydock
-      
-      before do |obj|
-        # Don't print Rudy header unless requested to
-        obj.global.print_header = false  if (obj.global.verbose == 0)
-        @start = Time.now
-      end
-
-      after do |obj|  
-        if obj.global.verbose > 0
-          puts
-          @elapsed = Time.now - @start
-          puts "Elapsed: %.2f seconds" % @elapsed.to_f if @elapsed > 0.1
-        end
-      end
-      
-      
-      # These globals are used by all bin/ executables
-      global :A, :accesskey, String, "AWS Access Key"
-      global :S, :secretkey, String, "AWS Secret Access Key"
-      global :R, :region, String, "Amazon service region (ie: #{Rudy::DEFAULT_REGION})"
-      global :z, :zone, String, "Amazon Availability zone (ie: #{Rudy::DEFAULT_ZONE})"
-      global :u, :user, String, "Provide a username (ie: #{Rudy::DEFAULT_USER})"
-      global :k, :pkey, String, "Path to the private SSH key"
-      global :f, :format, String, "Output format"
-      global :n, :nocolor, "Disable output colors"
-      global :C, :config, String, "Specify another configuration file to read (ie: #{Rudy::CONFIG_FILE})"
-      global :Y, :yes, "Assume a correct answer to confirmation questions"
-      global :q, :quiet, "Run with less output"
-      global :O, :offline, "Be cool about the internet being down"
-      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
-      
-    end
-    
-    
   end
-
 end
 
 Rudy::Utils.require_glob(RUDY_LIB, 'rudy', 'cli', '**', '*.rb')

data/lib/rudy/cli/aws/ec2/addresses.rb

@@ -6,26 +6,24 @@ module AWS; module EC2;
   class Addresses < Rudy::CLI::CommandBase
     
     def addresses_create
-      radd = Rudy::AWS::EC2::Addresses.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      address = radd.create
+      address = Rudy::AWS::EC2::Addresses.create
       puts @@global.verbose > 0 ? address.inspect : address.dump(@@global.format)
     end
     
     def addresses_destroy_valid?
       raise Drydock::ArgError.new("IP address", @alias) unless @argv.ipaddress
-      @radd = Rudy::AWS::EC2::Addresses.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      raise "#{@argv.ipaddress} is not allocated to you" unless @radd.exists?(@argv.ipaddress)
-      raise "#{@argv.ipaddress} is associated!" if @radd.associated?(@argv.ipaddress)
+      raise "#{@argv.ipaddress} is not allocated to you" unless Rudy::AWS::EC2::Addresses.exists?(@argv.ipaddress)
+      raise "#{@argv.ipaddress} is associated!" if Rudy::AWS::EC2::Addresses.associated?(@argv.ipaddress)
       true
     end
     def addresses_destroy
-      address = @radd.get(@argv.ipaddress)
+      address = Rudy::AWS::EC2::Addresses.get(@argv.ipaddress)
       raise "Could not fetch #{address.ipaddress}" unless address
       
       puts "Destroying address: #{@argv.ipaddress}"
       puts "NOTE: this IP address will become available to other EC2 customers.".bright
       execute_check(:medium)
-      execute_action { @radd.destroy(@argv.ipaddress) }
+      execute_action { Rudy::AWS::EC2::Addresses.destroy(@argv.ipaddress) }
       self.addresses
     end
 
@@ -35,24 +33,21 @@ module AWS; module EC2;
       true
     end
     def associate_addresses
-      radd = Rudy::AWS::EC2::Addresses.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      rinst = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      
-      raise "Instance #{@argv.instid} does not exist!" unless rinst.exists?(@option.instance)
+      raise "Instance #{@argv.instid} does not exist!" unless Rudy::AWS::EC2::Instances.exists?(@option.instance)
       
       if @option.newaddress
         print "Creating address... "
-        tmp = radd.create
+        tmp = Rudy::AWS::EC2::Addresses.create
         puts "#{tmp.ipaddress}"
         address = tmp.ipaddress
       else
         address = @argv.ipaddress
       end
       
-      raise "#{address} is not allocated to you" unless radd.exists?(address)
-      raise "#{address} is already associated!" if radd.associated?(address)
+      raise "#{address} is not allocated to you" unless Rudy::AWS::EC2::Addresses.exists?(address)
+      raise "#{address} is already associated!" if Rudy::AWS::EC2::Addresses.associated?(address)
           
-      instance = rinst.get(@option.instance)
+      instance = Rudy::AWS::EC2::Instances.get(@option.instance)
       
       # If an instance was recently disassoiciated, the dns_public may
       # not be updated yet
@@ -61,8 +56,8 @@ module AWS; module EC2;
       
       puts "Associating #{address} to #{instance_name} (#{instance.groups.join(', ')})"
       execute_check(:low)
-      execute_action { radd.associate(address, instance.awsid) }
-      address = radd.get(address)
+      execute_action { Rudy::AWS::EC2::Addresses.associate(address, instance.awsid) }
+      address = Rudy::AWS::EC2::Addresses.get(address)
       puts @@global.verbose > 0 ? address.inspect : address.dump(@@global.format)
     end
     
@@ -71,24 +66,21 @@ module AWS; module EC2;
       true
     end
     def disassociate_addresses
-      radd = Rudy::AWS::EC2::Addresses.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      rinst = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      raise "#{@argv.ipaddress} is not allocated to you" unless radd.exists?(@argv.ipaddress)
-      raise "#{@argv.ipaddress} is not associated!" unless radd.associated?(@argv.ipaddress)
+      raise "#{@argv.ipaddress} is not allocated to you" unless Rudy::AWS::EC2::Addresses.exists?(@argv.ipaddress)
+      raise "#{@argv.ipaddress} is not associated!" unless Rudy::AWS::EC2::Addresses.associated?(@argv.ipaddress)
       
-      address = radd.get(@argv.ipaddress)
-      instance = rinst.get(address.instid)
+      address = Rudy::AWS::EC2::Addresses.get(@argv.ipaddress)
+      instance = Rudy::AWS::EC2::Instances.get(address.instid)
       
       puts "Disassociating #{address.ipaddress} from #{instance.awsid} (#{instance.groups.join(', ')})"
       execute_check(:medium)
-      execute_action { radd.disassociate(@argv.ipaddress) }
-      address = radd.get(@argv.ipaddress)
+      execute_action { Rudy::AWS::EC2::Addresses.disassociate(@argv.ipaddress) }
+      address = Rudy::AWS::EC2::Addresses.get(@argv.ipaddress)
       puts @@global.verbose > 0 ? address.inspect : address.dump(@@global.format)
     end
     
     def addresses
-      radd = Rudy::AWS::EC2::Addresses.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      addresses = radd.list || []
+      addresses = Rudy::AWS::EC2::Addresses.list || []
       
       addresses.each do |address|
         puts @@global.verbose > 0 ? address.inspect : address.dump(@@global.format)