solutious-rudy 0.8.5 → 0.9.0

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" 
@@ -85,8 +84,7 @@ 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
@@ -152,11 +150,10 @@ module AWS; module EC2;
       
 
       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
         
@@ -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

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

@@ -5,11 +5,6 @@ module AWS; module EC2;
   
   class Images < Rudy::CLI::CommandBase
     
-    #def print_header
-    #  puts @global.print_header, @@global.print_header
-    #end
-    
-    
     def images_valid?
       if @option.owner == 'self'
         raise "AWS_ACCOUNT_NUMBER not set" unless @@global.accountnum 
@@ -20,159 +15,36 @@ module AWS; module EC2;
     end
     def images
       
-      rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
       unless @option.all
         @option.owner ||= 'amazon' 
         puts "Images owned by #{@option.owner.bright}" unless @argv.awsid
       end
       
-      images = rimages.list(@option.owner, @argv) || []
+      images = Rudy::AWS::EC2::Images.list(@option.owner, @argv) || []
       images.each do |img|
         puts @@global.verbose > 0 ? img.inspect : img.dump(@@global.format)
       end
       puts "No images" if images.empty?
     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[:id] = @option.instid if @option.instid
-      
-      @@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 => 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
-      
-      lt = @rinst.list_group(nil, :running, opts[:id]) do |inst|
-        
-        puts inst.to_s
-        
-        # Open the connection and run the command
-        rbox = Rye::Box.new(inst.dns_public, ssh_opts)
-        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 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)
-        
-        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 destroy_images_valid?
       unless @argv.ami && Rudy::Utils.is_id?(:image, @argv.ami)  
         raise "Must supply an AMI ID (ami-XXXXXXX)" 
       end
-      @rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      true
     end
     def destroy_images
-     puts @rimages.deregister(@argv.ami) ? "Done" : "Unknown error"
+     puts Rudy::AWS::EC2::Images.deregister(@argv.ami) ? "Done" : "Unknown error"
     end 
     
     def register_images_valid?
       unless @argv.first
         raise "Must supply a valid manifest path (bucket/ami-name.manifest.xml)"
       end
-      @rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      true
     end
     def register_images
-      puts @rimages.register(@argv.first)
+      puts Rudy::AWS::EC2::Images.register(@argv.first)
     end
 
 

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

@@ -16,8 +16,9 @@ module AWS; module EC2;
       raise "Cannot supply an instance ID" if @option.instid
       
       if @option.group
-        rgroup = Rudy::AWS::EC2::Groups.new(@@global.accesskey, @@global.secretkey, @@global.region)
-        raise "Group #{@option.group} does not exist" unless rgroup.exists?(@option.group)
+        unless Rudy::AWS::EC2::Groups.exists?(@option.group)
+          raise "Group #{@option.group} does not exist"
+        end
       end
       
       true
@@ -30,14 +31,15 @@ module AWS; module EC2;
         :size => 'm1.small',
         :zone => @@global.zone
       }
-      
-      radd = Rudy::AWS::EC2::Addresses.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      rinst = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      
+            
       if @option.address
         raise "Cannot specify both -a and -n" if @option.newaddress
-        raise "#{@option.address} is not allocated to you" unless radd.exists?(@option.address)
-        raise "#{@option.address} is already associated!" if radd.associated?(@option.address)
+        unless Rudy::AWS::EC2::Addresses.exists?(@option.address)
+          raise "#{@option.address} is not allocated to you" 
+        end
+        if Rudy::AWS::EC2::Addresses.associated?(@option.address)
+          raise "#{@option.address} is already associated!" 
+        end
       end
       
       # These can be sent directly to EC2 class
@@ -53,7 +55,7 @@ module AWS; module EC2;
         exit unless Annoy.proceed?(:low)
       end
       
-      instances = rinst.list_group(opts[:group], :running)
+      instances = Rudy::AWS::EC2::Instances.list_group(opts[:group], :running)
       
       if instances && instances.size > 0
         instance_count = (instances.size == 1) ? 'is 1 instance' : "are #{instances.size} instances"
@@ -63,19 +65,19 @@ module AWS; module EC2;
       
       if @option.newaddress
         print "Creating address... "
-        address = radd.create
+        address = Rudy::AWS::EC2::Addresses.create
         puts "#{address.ipaddress}"
         @option.address = address.ipaddress
       end
          
       execute_action do
         first_instance = true
-        rinst.create(opts) do |inst| # Rudy::AWS::EC2::Instance objects
+        Rudy::AWS::EC2::Instances.create(opts) do |inst| # Rudy::AWS::EC2::Instance objects
         
           # Assign IP address to only the first instance
           if first_instance && @option.address
             puts "Associating #{@option.address} to #{inst.awsid}"
-            radd.associate(@option.address, inst.awsid)
+            Rudy::AWS::EC2::Addresses.associate(@option.address, inst.awsid)
             first_instance = false
           end
         
@@ -89,16 +91,16 @@ module AWS; module EC2;
       raise NoInstanceError.new(nil, @alias) if !@option.group && !@argv.instid
       
       if @option.group
-        rgroup = Rudy::AWS::EC2::Groups.new(@@global.accesskey, @@global.secretkey, @@global.region)
-        raise "Group #{@option.group} does not exist" unless rgroup.exists?(@option.group)
+        unless Rudy::AWS::EC2::Groups.exists?(@option.group)
+          raise "Group #{@option.group} does not exist"
+        end
       end
       
       if @option.private
         raise Drydock::OptsError.new(nil, @alias, "Cannot allocate public IP for private instance") if @option.address || @option.newadress
       end
       
-      @rinst = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      raise "No instances" unless @rinst.any?
+      raise "No instances" unless Rudy::AWS::EC2::Instances.any?
       true
     end
     alias :instances_destroy_valid? :instances_restart_valid?
@@ -112,12 +114,11 @@ module AWS; module EC2;
     end
     
     def consoles_valid?
-      @rinst = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
       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
       end
-      raise "No instances" unless @rinst.any?
+      raise "No instances" unless Rudy::AWS::EC2::Instances.any?
       true
     end
     def consoles
@@ -126,9 +127,9 @@ module AWS; module EC2;
       opts[:id] = @argv.instid if @argv.instid
       opts[:id] &&= [opts[:id]].flatten
       
-      lt = @rinst.list_group(opts[:group], :any, opts[:id]) do |inst|
+      lt = Rudy::AWS::EC2::Instances.list_group(opts[:group], :any, opts[:id]) do |inst|
         puts instance_separator(inst.dns_public || inst.state, inst.awsid)
-        console = @rinst.console(inst.awsid)
+        console = Rudy::AWS::EC2::Instances.console(inst.awsid)
         output = console ? Base64.decode64(console) : "Unavailable"
         
         # The linux console can include ANSI escape codes for color, 
@@ -163,7 +164,7 @@ module AWS; module EC2;
       opts[:group] = @option.group if @option.group
       opts[:state] = @option.state if @option.state
 
-      # A nil value forces the @ec2.instances.list to return all instances
+      # A nil value forces the @@ec2.instances.list to return all instances
       if @option.all
         opts[:state] = :any
         opts[:group] = :any
@@ -172,8 +173,7 @@ module AWS; module EC2;
       opts[:id] = @argv.instid if @argv.instid
       opts[:id] &&= [opts[:id]].flatten
     
-      rudy = Rudy::AWS::EC2::Instances.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      lt = rudy.list_group(opts[:group], opts[:state], opts[:id]) do |inst|
+      lt = Rudy::AWS::EC2::Instances.list_group(opts[:group], opts[:state], opts[:id]) do |inst|
         puts @@global.verbose > 0 ? inst.inspect : inst.dump(@@global.format)
       end
       puts "No instances running" if !lt || lt.empty?
@@ -190,7 +190,7 @@ module AWS; module EC2;
       opts[:id] = @argv.instid if @argv.instid
       opts[:id] &&= [opts[:id]].flatten
       
-      instances = @rinst.list_group(opts[:group], :running, opts[:id])
+      instances = Rudy::AWS::EC2::Instances.list_group(opts[:group], :running, opts[:id])
       raise "No matching instances running" if instances.nil?
       
       inst_names = instances.collect { |inst| inst.dns_public || inst.awsid }
@@ -204,7 +204,7 @@ module AWS; module EC2;
       execute_check(:medium)
       
       execute_action("#{action.to_s.capitalize} Failed") { 
-        @rinst.send(action, inst_ids)
+        Rudy::AWS::EC2::Instances.send(action, inst_ids)
       }
       status
     end