solutious-rudy 0.7.3 → 0.7.4

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

@@ -64,7 +64,7 @@ module AWS; module EC2;
       opts[:group] = :any if @option.all
       opts[:id] = @option.instid if @option.instid
       
-      # Options to be sent to Net::SSH
+      # Options to be sent to Rye::Box
       ssh_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => nil  }
       if @@global.pkey 
         raise "Cannot find file #{@@global.pkey}" unless File.exists?(@@global.pkey)
@@ -124,12 +124,13 @@ module AWS; module EC2;
       opts[:id] = @argv.shift if Rudy::Utils.is_id?(:instance, @argv.first)
       opts[:id] &&= [opts[:id]].flatten
       
-      # * +:recursive: recursively transfer directories (default: false)
-      # * +:preserve: preserve atimes and ctimes (default: false)
-      # * +:task+ one of: :upload (default), :download.
-      # * +:paths+ an array of paths to copy. The last element is the "to" path.
-      opts[:recursive] = @option.recursive ? true : false
-      opts[:preserve] = @option.preserve ? true : false
+      # Options to be sent to Net::SSH
+      ssh_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 
+      end
       
       opts[:paths] = @argv
       opts[:dest] = opts[:paths].pop
@@ -139,14 +140,16 @@ module AWS; module EC2;
       opts[:task] ||= :upload
       opts[:user] = @global.user || Rudy.sysinfo.user
     
-      # Options to be sent to Net::SSH
-      ssh_opts = { :user => opts[:user], :debug => nil  }
-      ssh_opts[:keys] = @@global.pkey if @@global.pkey
-
-      if @@global.pkey
+    
+      # Options to be sent to Rye::Box
+      info = @@global.quiet ? nil : STDERR
+      ssh_opts = { :user => @global.user || Rudy.sysinfo.user, :info => info }
+      if @@global.pkey 
         raise "Cannot find file #{@@global.pkey}" unless File.exists?(@@global.pkey)
-        raise "Insecure permissions for #{@@global.pkey}" unless (File.stat(@@global.pkey).mode & 600) == 0
+        raise InsecureKeyPermissions, @@global.pkey unless File.stat(@@global.pkey).mode == 33152
+        ssh_opts[:keys] = @@global.pkey 
       end
+      
 
       checked = false
       rudy = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
@@ -171,46 +174,14 @@ module AWS; module EC2;
           checked = true
         end
         
-        scp_opts = {
-          :recursive => opts[:recursive],
-          :preserve => opts[:preserve],
-          :chunk_size => 16384
-        }
-
-        Candy.scp(opts[:task], inst.dns_public, opts[:user], @@global.pkey, opts[:paths], opts[:dest], scp_opts)
-        puts 
-        puts unless @@global.quiet
+        # Open the connection and run the command
+        rbox = Rye::Box.new(inst.dns_public, ssh_opts)
+        rbox.send(opts[:task], opts[:paths], opts[:dest])
       end
 
     end
     
     
-  private
-    
-    def Candy.scp(task, host, user, keypairpath, paths, dest, opts)
-      
-      connect_opts = {}
-      connect_opts[:keys] = [keypairpath] if keypairpath
-      
-      Net::SCP.start(host, user, connect_opts) do |scp|
-        
-        paths.each do |path| 
-          prev_path = nil
-          scp.send("#{task}", path, dest, opts) do |ch, name, sent, total|
-            #print "#{name}: #{sent}/#{total}\r"
-            msg = ((prev_path == name) ? "\r" : "\n") # new line for new file
-            msg << "#{name}: #{sent}/#{total}"  # otherwise, update the same line
-            print msg
-            STDOUT.flush        # update the screen every cycle
-            prev_path = name
-            break if sent == total
-          end
-          puts unless prev_path == path
-        end
-        
-      end
-    end
-    
     
     
   end

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

@@ -33,161 +33,148 @@ module AWS; module EC2;
       puts "No images" if images.empty?
     end
 
-    def prepare_images_valid?
-      true
-    end
-    def prepare_images
-      opts = {}
-      opts[:group] = @option.group if @option.group
-      opts[:group] = :any if @option.all
-      opts[:id] = @option.instid if @option.instid
-      
-      puts "This will do the following:"
-      puts "- Clear bash history"
-      # NOTE: We can't delete the host keys here. Otherwise we can't create the image. 
-      #puts "- Delete host SSH keys (this is permanent!)"
-      puts "" 
-      
-      # Options to be sent to Net::SSH
-      ssh_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => STDERR  }
-      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 
-      end
-      
-      execute_check(:medium)
-      
-      rudy = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      lt = rudy.list_group(opts[:group], :running, opts[:id]) do |inst|
-        
-        puts "Preparing #{inst.dns_public}..."
-        
-        # Open the connection and run the command
-        rbox = Rye::Box.new(inst.dns_public, ssh_opts)
-        rbox.safe = false
-        # We need to explicitly add the rm command for rbox so we
-        # can delete the SSH host keys. This is will force the instance
-        # to re-create it's SSH keys on first boot.
-        def rbox.rm(*args); cmd('rm', args); end
-        p ret = rbox.history(:c)
-        p ret.exit_code
-        p ret.stderr
-        p ret.stdout
-        
-      end
-      
-      puts "done"
-    end
+    ##def prepare_images_valid?
+    ##  true
+    ##end
+    ##def prepare_images
+    ##  opts = {}
+    ##  opts[:id] = @option.instid if @option.instid
+    ##  
+    ##  puts "This will do the following:"
+    ##  puts "- Clear bash history"
+    ##  # NOTE: We can't delete the host keys here. Otherwise we can't create the image. 
+    ##  #puts "- Delete host SSH keys (this is permanent!)"
+    ##  puts "" 
+    ##  
+    ##  ## TODO:       
+    ##  ## ~/.rudy, /etc/motd, history -c, /etc/hosts, /var/log/rudy*
+    ##  
+    ##  execute_check(:medium)
+    ##  
+    ##
+    ##  # Options to be sent to Net::SSH
+    ##  ssh_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => STDERR  }
+    ##  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 
+    ##  end
+    ##  
+    ##  
+    ##  rudy = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
+    ##  lt = rudy.list_group(nil, :running, opts[:id]) do |inst|
+    ##    
+    ##    puts "Preparing #{inst.dns_public}..."
+    ##    
+    ##    # Open the connection and run the command
+    ##    rbox = Rye::Box.new(inst.dns_public, ssh_opts)
+    ##    
+    ##    # We need to explicitly add the rm command for rbox so we
+    ##    # can delete the SSH host keys. This is will force the instance
+    ##    # to re-create it's SSH keys on first boot.
+    ##    def rbox.rm(*args); cmd('rm', args); end
+    ##    p ret = rbox.history(:c)
+    ##    p ret.exit_code
+    ##    p ret.stderr
+    ##    p ret.stdout
+    ##    
+    ##  end
+    ##  
+    ##  puts "done"
+    ##end
     
     def create_images_valid?
       raise "No account number" unless @@global.accountnum
       raise "No Amazon cert-***.pem" unless @@global.cert
       raise "No Amazon pk-***.pem" unless @@global.privatekey
+      raise "You must supply a root keypair path" unless @@global.pkey
+      
+      @rinst = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      @rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      @s3 = Rudy::AWS::S3.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      raise "No instances" unless @rinst.any?
+      raise "You must supply an S3 bucket name. See: 'rudy-s3 buckets'" unless @option.bucket
+      raise "You must supply an image name" unless @option.name
+      raise "The bucket '#{@option.bucket}' does not exist" unless @s3.bucket_exists?(@option.bucket)
       true
     end
     
     def create_images
       opts = {}
-      opts[:group] = @option.group if @option.group
-      opts[:group] = :any if @option.all
       opts[:id] = @option.instid if @option.instid
       
-      puts "You may want to run rudy-ec2 #{@alias} --prepare before this.".bright
-      puts "This feature is experimental. Make sure you enter the bucket"
-      puts "and image names correctly because if they're wrong the image"
-      puts "won't get created and you'll be annoyed that you waited."
+      @@global.user = 'root'
       
+      puts "You may want to run rudy-ec2 #{@alias} --prepare first".bright
+      puts "NOTE 1: This process is currently Linux-only"
+      puts "NOTE 2: If you plan to create a public machine image, there are "
+      puts "additional steps to take to remove any sensitive information"
+      puts "before creating the image. See:"
+      puts "http://docs.amazonwebservices.com/AWSEC2/latest/DeveloperGuide/AESDG-chapter-sharingamis.html"
+      exit unless Annoy.pose_question("  Continue?\a ", /yes|y|ya|sure|you bet!/i, STDERR)
+
       # Options to be sent to Net::SSH
-      ssh_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => STDERR  }
+      ssh_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 
       end
       
-      unless @option.name
-        print "Enter the image name: "
-        @option.image_name = gets.chomp
-      end
-
-      unless @option.bucket
-        print "Enter the S3 bucket that will store the image: "
-        @option.bucket_name = gets.chomp
-      end
-      
-      execute_check(:medium)
-      
-      rudy = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      lt = rudy.list_group(opts[:group], :running, opts[:id]) do |inst|
+      lt = @rinst.list_group(nil, :running, opts[:id]) do |inst|
         
-        puts inst.dns_public
+        puts inst.to_s
         
         # Open the connection and run the command
         rbox = Rye::Box.new(inst.dns_public, ssh_opts)
-        
-        # TODO: Replace with rbox.upload
-        
-        # ~/.rudy, /etc/motd, history -c, /etc/hosts, /var/log/rudy*
-        cert = File.read(@@global.cert)
-        pk = File.read(@@global.privatekey)
-        rbox.safe = false
-        rbox.echo("'#{cert}' > /mnt/cert-temporary.pem")
-        rbox.echo("'#{pk}' > /mnt/pk-temporary.pem")
-        rbox.safe = true
+        def rbox.bundle_vol(*args); cmd('ec2-bundle-vol', args); end
+        def rbox.upload_vol(*args); cmd('ec2-upload-bundle', args); end
+
+        rbox.upload(@@global.cert, @@global.privatekey, "/mnt")
         rbox.touch("/root/firstrun")
         
-        # TODO: 
-        # We have to delete the host keys just before we run the bundle command. 
-        # The problem is that if we lose the connection we won't be able to connect
-        # to the instance again. A better solution is to ass the keys to the ignore
-        # list for the bundle command. 
+        ## TODO: 
+        ## We have to delete the host keys just before we run the bundle command. 
+        ## The problem is that if we lose the connection we won't be able to connect
+        ## to the instance again. A better solution is to add the keys to the ignore
+        ## list for the bundle command. 
+        ##ret = rbox.rm('/etc/ssh/ssh_host_*_key*')
+
+        puts "Starting bundling process..."
+        
+        pkeyfile = File.basename(@@global.privatekey)
+        certfile = File.basename(@@global.cert)
         
-        #ret = rbox.rm('/etc/ssh/ssh_host_*_key*')
-        #puts "Starting bundling process...".bright
-        #puts ssh_command(machine[:dns_name], keypairpath, @global.user, "ec2-bundle-vol -r i386 -p #{@option.image_name} -k /mnt/pk-*pem -c /mnt/cert*pem -u #{@option.account}", @option.print)
-        #puts ssh_command(machine[:dns_name], keypairpath, @global.user, "ec2-upload-bundle -b #{@option.bucket_name} -m /tmp/#{@option.image_name}.manifest.xml -a #{@global.accesskey} -s #{@global.secretkey}", @option.print)
-        #
-        #@ec2.images.register("#{@option.bucket_name}/#{@option.image_name}.manifest.xml") unless @option.print
+        rbox.bundle_vol(:r, "i386", :p, @option.name, :k, "/mnt/#{pkeyfile}", :c, "/mnt/#{certfile}", :u, @@global.accountnum)
+        rbox.upload_vol(:b, @option.bucket, :m, "/tmp/#{@option.name}.manifest.xml", :a, @@global.accesskey, :s, @@global.secretkey)
+
+        @rimages.register("#{@option.bucket}/#{@option.name}.manifest.xml")
         
         break
       end
       
     end
     
-   #def create_images_valid?
-   #  puts "Make sure the machine is clean. I don't want archive no crud!"
-   #  switch_user("root")
-   #  
-   #    raise "No EC2 .pem keys provided" unless has_pem_keys?
-   #    raise "No SSH key provided for #{@global.user}!" unless has_keypair?
-   #    raise "No SSH key provided for root!" unless has_keypair?(:root)
-   #  true
-   #end
-   #
-   #
-   #def prepare_images
-   #  # TODO: Avail hooks for clean an instance
-   #  # Clean off Rudy specific crap. 
-   #end
-   #
-   #
-   
-   #
-   #def deregister
-   #  ami = @argv.first
-   #  raise "You must supply an AMI ID (ami-XXXXXXX)" unless ami
-   #  puts "Deregistering AMI: #{ami}"
-   #  
-   #  exit unless Annoy.are_you_sure?
-   #  
-   #  if @ec2.images.deregister(ami)
-   #    puts "Done!"
-   #  else
-   #    puts "There was an unknown problem!"
-   #  end
-   #  
-   #end
+    def deregister_valid?
+      unless @argv.ami && Rudy::Utils.is_id?(:image, @argv.ami)  
+        raise "You must supply an AMI ID (ami-XXXXXXX)" 
+      end
+    end
+    def deregister
+      puts "Deregistering #{@argv.ami}"
+      
+      execute_check(:medium)
+      
+      rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      
+      if rimages.deregister(ami)
+        puts "Done!"
+      else
+        puts "There was an unknown problem!"
+      end
+      
+    end
+
 
   end
 

data/lib/rudy/cli/aws/s3/buckets.rb

@@ -26,9 +26,8 @@ module AWS; module S3;
       true
     end
     def create_buckets
-      execute_check(:low)
       s3 = Rudy::AWS::S3.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      s3.create_bucket(@argv.name)
+      s3.create_bucket(@argv.name, @option.location)
       buckets
     end
     

data/lib/rudy/cli/config.rb

@@ -63,6 +63,19 @@ module Rudy
         end
         
       end
+      
+      def print_global
+        # NOTE: This method cannot be called just "global" b/c that conflicts 
+        # with the global accessor for Drydock::Command classes. 
+        if @@global.nil?
+          raise Rudy::NoGlobal
+        end
+        gtmp = @@global.clone
+        gtmp.format = "yaml" if gtmp.format == :s || gtmp.format == :string
+        gtmp.accesskey = gtmp.secretkey = "[not displayed]"
+        puts gtmp.dump(gtmp.format)
+      end
+      
     end
   end
 end

data/lib/rudy/cli/disks.rb

@@ -7,8 +7,31 @@ module Rudy
       
       def disks
         rdisk = Rudy::Disks.new
-        rdisk.list do |d|
+        rback = Rudy::Backups.new
+        more, less = [], []
+        less = [:environment, :role] if @option.all
+        # We first get the disk metadata
+        disk_list = rdisk.list(more, less) || []
+        # If there are no disks currently, there could be backups
+        # so we grab those to create a list of disks. 
+        if @option.backups
+          backups = rback.list(more, less) || []
+          backups.each_with_index do |b, index|
+            disk_list << b.disk
+          end
+        end
+        # We go through the list of disks but we'll skip ones we've seen
+        seen = []
+        disk_list.each do |d|
+          next if seen.member?(d.name)
+          seen << d.name
           puts @@global.verbose > 0 ? d.inspect : d.dump(@@global.format)
+          if @option.backups
+            d.list_backups.each_with_index do |b, index|
+              puts '  %s' % b.name
+              break if @option.all.nil? && index >= 2 # display only 3, unless all
+            end
+          end
         end
       end
       

data/lib/rudy/cli/routines.rb

@@ -9,25 +9,24 @@ module Rudy; module CLI;
       true
     end
     def startup
-      machines = @rr.execute
-      puts $/, "The following machines are now available:"
+      machines = @rr.execute || []
+      puts $/, "The following machines are now available:" unless machines.empty?
       machines.each do |machine|
         puts machine.to_s
       end
     end
     
-    def restart_valid?
-      @rr = Rudy::Routines::Restart.new
+    def reboot_valid?
+      @rr = Rudy::Routines::Reboot.new
       @rr.raise_early_exceptions
       true
     end
-    def restart
-      #machines = @rr.execute
-      #puts $/, "The following machines have been restarted:"
-      #machines.each do |machine|
-      #  puts machine.to_s
-      #end
-      #puts "Restart is disabled"
+    def reboot
+      machines = @rr.execute
+      puts $/, "The following machines have been restarted:"
+      machines.each do |machine|
+        puts machine.to_s
+      end
     end
     
     def release_valid?