rudy 0.8.5 → 0.9.0

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)

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

@@ -49,9 +49,8 @@ module AWS; module EC2;
         raise "Insecure permissions for #{@@global.pkey}" unless (File.stat(@@global.pkey).mode & 600) == 0
       end
       if @option.group
-        rgroup = Rudy::AWS::EC2::Groups.new(@@global.accesskey, @@global.secretkey, @@global.region)
         raise "Cannot supply group and instance ID" if @option.instid
-        raise "Group #{@option.group} does not exist" unless rgroup.exists?(@option.group)
+        raise "Group #{@option.group} does not exist" unless Rudy::AWS::EC2::Groups.exists?(@option.group)
       end
       if @option.instid && !Rudy::Utils.is_id?(:instance, @option.instid)
         raise "#{@option.instid} is not an instance ID" 
@@ -65,11 +64,11 @@ module AWS; module EC2;
       opts[:id] = @option.instid if @option.instid
       
       # Options to be sent to Rye::Box
-      ssh_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => nil  }
+      rye_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => nil  }
       if @@global.pkey 
         raise "Cannot find file #{@@global.pkey}" unless File.exists?(@@global.pkey)
         raise InsecureKeyPermissions, @@global.pkey unless File.stat(@@global.pkey).mode == 33152
-        ssh_opts[:keys] = @@global.pkey 
+        rye_opts[:keys] = @@global.pkey 
       end
       
       
@@ -85,25 +84,24 @@ module AWS; module EC2;
       end
       
       checked = false
-      rudy = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      lt = rudy.list_group(opts[:group], :running, opts[:id]) do |inst|
+      lt = Rudy::AWS::EC2::Instances.list_group(opts[:group], :running, opts[:id]) do |inst|
         
         # Print header
         if @@global.quiet
-          print "You are #{ssh_opts[:user].bright}. " if !checked # only the 1st
+          print "You are #{rye_opts[:user].bright}. " if !checked # only the 1st
         else
-          print "Connecting #{ssh_opts[:user].bright}@#{inst.dns_public} "
+          print "Connecting #{rye_opts[:user].bright}@#{inst.dns_public} "
           puts "(#{inst.awsid}, groups: #{inst.groups.join(', ')})"
         end
         
         # Make sure we want to run this command on all instances
         if !checked && command != :interactive_ssh 
-          execute_check(:medium) if ssh_opts[:user] == "root"
+          execute_check(:medium) if rye_opts[:user] == "root"
           checked = true
         end
         
         # Open the connection and run the command
-        rbox = Rye::Box.new(inst.dns_public, ssh_opts)
+        rbox = Rye::Box.new(inst.dns_public, rye_opts)
         ret = rbox.send(command, command_args)
         puts ret unless command == :interactive_ssh
       end
@@ -125,11 +123,11 @@ module AWS; module EC2;
       opts[:id] &&= [opts[:id]].flatten
       
       # Options to be sent to Net::SSH
-      ssh_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => nil  }
+      rye_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => nil  }
       if @@global.pkey 
         raise "Cannot find file #{@@global.pkey}" unless File.exists?(@@global.pkey)
         raise InsecureKeyPermissions, @@global.pkey unless File.stat(@@global.pkey).mode == 33152
-        ssh_opts[:keys] = @@global.pkey 
+        rye_opts[:keys] = @@global.pkey 
       end
       
       opts[:paths] = @argv
@@ -143,28 +141,27 @@ module AWS; module EC2;
     
       # Options to be sent to Rye::Box
       info = @@global.quiet ? nil : STDERR
-      ssh_opts = { :user => @global.user || Rudy.sysinfo.user, :info => info }
+      rye_opts = { :user => @global.user || Rudy.sysinfo.user, :info => info }
       if @@global.pkey 
         raise "Cannot find file #{@@global.pkey}" unless File.exists?(@@global.pkey)
         raise InsecureKeyPermissions, @@global.pkey unless File.stat(@@global.pkey).mode == 33152
-        ssh_opts[:keys] = @@global.pkey 
+        rye_opts[:keys] = @@global.pkey 
       end
       
 
       checked = false
-      rudy = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      lt = rudy.list_group(opts[:group], :running, opts[:id]) do |inst|
+      lt = Rudy::AWS::EC2::Instances.list_group(opts[:group], :running, opts[:id]) do |inst|
         
         if @option.print
-          Rudy::Utils.scp_command inst.dns_public, @@global.pkey, opts[:user], opts[:paths], opts[:dest], (opts[:task] == :download), false, @option.print
+          scp_command inst.dns_public, @@global.pkey, opts[:user], opts[:paths], opts[:dest], (opts[:task] == :download), false, @option.print
           next
         end
         
         # Print header
         if @@global.quiet
-          print "You are #{ssh_opts[:user].bright}. " if !checked # only the 1st
+          print "You are #{rye_opts[:user].bright}. " if !checked # only the 1st
         else
-          print "Connecting #{ssh_opts[:user].bright}@#{inst.dns_public} "
+          print "Connecting #{rye_opts[:user].bright}@#{inst.dns_public} "
           puts "(#{inst.awsid}, groups: #{inst.groups.join(', ')})"
         end
         
@@ -175,7 +172,7 @@ module AWS; module EC2;
         end
         
         # Open the connection and run the command
-        rbox = Rye::Box.new(inst.dns_public, ssh_opts)
+        rbox = Rye::Box.new(inst.dns_public, rye_opts)
         rbox.send(opts[:task], opts[:paths], opts[:dest])
       end
 
@@ -183,6 +180,34 @@ module AWS; module EC2;
     
     
     
+    private 
+    
+    def scp_command(host, keypair, user, paths, to_path, to_local=false, verbose=false, printonly=false)
+
+      paths = [paths] unless paths.is_a?(Array)
+      from_paths = ""
+      if to_local
+        paths.each do |path|
+          from_paths << "#{user}@#{host}:#{path} "
+        end  
+        #puts "Copying FROM remote TO this machine", $/
+
+      else
+        to_path = "#{user}@#{host}:#{to_path}"
+        from_paths = paths.join(' ')
+        #puts "Copying FROM this machine TO remote", $/
+      end
+
+
+      cmd = "scp -r "
+      cmd << "-i #{keypair}" if keypair
+      cmd << " #{from_paths} #{to_path}"
+
+      puts cmd if verbose
+      printonly ? (puts cmd) : system(cmd)
+    end
+    
+    
     
   end
   

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

@@ -7,33 +7,31 @@ module AWS; module EC2;
 
     
     def create_groups_valid?
-      @rgroups = Rudy::AWS::EC2::Groups.new(@@global.accesskey, @@global.secretkey, @@global.region)
       raise Drydock::ArgError.new('group name', @alias) unless @argv.name
-      raise "Group #{@argv.name} alread exists" if @rgroups.exists?(@argv.name)
+      raise "Group #{@argv.name} alread exists" if Rudy::AWS::EC2::Groups.exists?(@argv.name)
       true
     end
     def create_groups
       opts = check_options
       execute_action { 
-        @rgroups.create(@argv.name, @option.description, opts[:addresses], opts[:ports], opts[:protocols])
+        Rudy::AWS::EC2::Groups.create(@argv.name, @option.description, opts[:addresses], opts[:ports], opts[:protocols])
       }
-      @rgroups.list(@argv.name) do |group|
+      Rudy::AWS::EC2::Groups.list(@argv.name) do |group|
         puts @@global.verbose > 0 ? group.inspect : group.dump(@@global.format)
       end
     end
     
     
     def destroy_groups_valid?
-      @rgroups = Rudy::AWS::EC2::Groups.new(@@global.accesskey, @@global.secretkey, @@global.region)
       raise Drydock::ArgError.new('group name', @alias) unless @argv.name
-      raise "Group #{@argv.name} does not exist" unless @rgroups.exists?(@argv.name)
+      raise "Group #{@argv.name} does not exist" unless Rudy::AWS::EC2::Groups.exists?(@argv.name)
       true
     end
     
     def destroy_groups
       puts "Destroying group: #{@argv.name}"
       execute_check(:medium)
-      execute_action { @rgroups.destroy(@argv.name) }
+      execute_action { Rudy::AWS::EC2::Groups.destroy(@argv.name) }
       @argv.clear # so groups will print all other groups
       groups
     end
@@ -47,8 +45,7 @@ module AWS; module EC2;
     def groups
       opts = {}
       name = @option.all ? nil : @argv.name
-      rgroups = Rudy::AWS::EC2::Groups.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      rgroups.list(name).each do |group|
+      Rudy::AWS::EC2::Groups.list(name).each do |group|
         puts @@global.verbose > 0 ? group.inspect : group.dump(@@global.format)
       end
     end
@@ -69,7 +66,7 @@ module AWS; module EC2;
       end
       
       raise Drydock::ArgError.new('group name', @alias) unless @argv.name
-      @groups = Rudy::AWS::EC2::Groups.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      true
     end
     
     def modify_group(action)
@@ -83,13 +80,12 @@ module AWS; module EC2;
         print "on #{opts[:protocols].join(', ').bright} "
          puts "ports: #{opts[:ports].map { |p| "#{p.join(' to ').bright}" }.join(', ')}"
       end
-      rgroups = Rudy::AWS::EC2::Groups.new(@@global.accesskey, @@global.secretkey, @@global.region)
       execute_check(:medium)
       execute_action { 
         if (@option.group || @option.owner)
-          rgroups.send("#{action.to_s}_group", @argv.name, opts[:group], opts[:owner])
+          Rudy::AWS::EC2::Groups.send("#{action.to_s}_group", @argv.name, opts[:group], opts[:owner])
         else
-          rgroups.send(action, @argv.name, opts[:addresses], opts[:ports], opts[:protocols])
+          Rudy::AWS::EC2::Groups.send(action, @argv.name, opts[:addresses], opts[:ports], opts[:protocols])
         end
       }
       groups # prints on the modified group b/c of @argv.name