rudy 0.9.1 → 0.9.2

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

@@ -8,13 +8,8 @@ module Rudy::AWS
       field :region
       field :state  
       
-      def liner_note
-        "%-10s  %9s  %s" % [self.name, self.region, self.state]
-      end
-      
       def to_s(titles=false)
-        str = titles ? "%-20s   %s#{$/}" % ['name', 'region', 'state'] : ""
-        str << liner_note
+        [@name.bright, @region, @state].join '; '
       end
 
     end

data/lib/rudy/aws/sdb.rb

@@ -181,7 +181,7 @@ module Rudy
       # 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
+        timeout ||= 30
         raise "No block provided" unless request
         response = nil
         begin

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

@@ -7,7 +7,7 @@ module AWS; module EC2;
     
     def addresses_create
       address = Rudy::AWS::EC2::Addresses.create
-      puts @@global.verbose > 0 ? address.inspect : address.dump(@@global.format)
+      print_stobject address
     end
     
     def addresses_destroy_valid?
@@ -24,7 +24,6 @@ module AWS; module EC2;
       puts "NOTE: this IP address will become available to other EC2 customers.".bright
       execute_check(:medium)
       execute_action { Rudy::AWS::EC2::Addresses.destroy(@argv.ipaddress) }
-      self.addresses
     end
 
     def associate_addresses_valid?
@@ -58,7 +57,7 @@ module AWS; module EC2;
       execute_check(:low)
       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)
+      print_stobject address
     end
     
     def disassociate_addresses_valid?
@@ -76,17 +75,12 @@ module AWS; module EC2;
       execute_check(:medium)
       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)
+      print_stobject address
     end
     
     def addresses
       addresses = Rudy::AWS::EC2::Addresses.list || []
-      
-      addresses.each do |address|
-        puts @@global.verbose > 0 ? address.inspect : address.dump(@@global.format)
-      end
-      
-      puts "No Addresses" if addresses.empty?
+      print_stobjects addresses
     end
     
     

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

@@ -33,7 +33,6 @@ module AWS; module EC2;
       execute_check(:medium)
       execute_action { Rudy::AWS::EC2::Groups.destroy(@argv.name) }
       @argv.clear # so groups will print all other groups
-      groups
     end
     
     def revoke_groups_valid?; modify_group_valid?; end

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

@@ -21,10 +21,7 @@ module AWS; module EC2;
       end
       
       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?
+      print_stobjects images
     end
     
     def destroy_images_valid?

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

@@ -0,0 +1,63 @@
+
+
+module Rudy; module CLI
+module AWS; module EC2;
+
+  class Info < Rudy::CLI::CommandBase
+
+    def info
+      process_region @@global.region
+      oregions = Rudy::AWS::VALID_REGIONS - [@@global.region.to_sym]
+      if @option.all
+        oregions.each do |region| 
+          Rudy::AWS::EC2.connect @@global.accesskey, @@global.secretkey, region
+          process_region region
+        end
+      else
+        puts $/, "Other regions: " << oregions.join(', ')
+      end
+    end
+    
+    
+    private 
+    def process_region(region)
+      puts " Region: %s %30s".att(:reverse) % [region, '']
+      puts "  Instances".bright
+      istatus = @option.all ? :any : :running
+      (Rudy::AWS::EC2::Instances.list(istatus) || []).collect do |inst| 
+        #puts "    %s (%s): %s; %s; %s" % [inst.awsid, inst.state, inst.dns_public || '[no dns]', inst.size, inst.created]
+        puts "    #{inst.to_s.noatt}"
+      end
+      
+      puts "  Volumes".bright
+      (Rudy::AWS::EC2::Volumes.list || []).collect do |vol|
+        puts "    %s (%s): %sGB; %s" % [vol.awsid, vol.instid || vol.status, vol.size, vol.created]
+      end
+              
+      puts "  Snapshots".bright
+      (Rudy::AWS::EC2::Snapshots.list || []).collect do |snap|
+        puts "    %s: %s; %s" % [snap.awsid, snap.volid, snap.created]
+      end
+      
+      puts "  Addresses".bright
+      (Rudy::AWS::EC2::Addresses.list || []).collect do |o| 
+        puts "    %s (%s)" % [o.ipaddress, o.instid || 'available']
+      end
+      
+      puts "  Groups".bright
+      puts (Rudy::AWS::EC2::Groups.list || []).collect { |o| "    #{o.name}" }
+      
+      puts "  Keypairs".bright
+      puts (Rudy::AWS::EC2::Keypairs.list || []).collect { |o| "    #{o.name}" }
+
+      puts "  Images".bright
+      (Rudy::AWS::EC2::Images.list('self') || []).collect do |o|
+        puts "    %s: %s; %s; %s" % [o.awsid, o.location, o.arch, o.visibility]
+      end
+      puts
+    end
+    
+  end
+  
+end; end
+end; end

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

@@ -81,7 +81,7 @@ module AWS; module EC2;
             first_instance = false
           end
         
-          puts @@global.verbose > 0 ? inst.inspect : inst.dump(@@global.format)
+          print_stobject(inst)
         end
       end
     end
@@ -173,10 +173,8 @@ module AWS; module EC2;
       opts[:id] = @argv.instid if @argv.instid
       opts[:id] &&= [opts[:id]].flatten
     
-      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?
+      ilist = Rudy::AWS::EC2::Instances.list_group(opts[:group], opts[:state], opts[:id])
+      ilist.nil? ? puts( "No instances running" ) : print_stobjects(ilist)
     end
     alias :instances :status
 

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

@@ -18,7 +18,7 @@ module AWS; module EC2;
         puts "Set the permissions to 0600 and keep it safe.", $/
         puts kp.private_key
       else
-        puts @@global.verbose > 0 ? kp.inspect : kp.dump(@@global.format)
+         print_stobject kp
       end
     end
     
@@ -35,10 +35,8 @@ module AWS; module EC2;
     end
     
     def keypairs
-      (Rudy::AWS::EC2::Keypairs.list || []).each do |kp|
-        puts @@global.verbose > 0 ? kp.inspect : kp.dump(@@global.format)
-      end
-      puts "No keypairs" unless Rudy::AWS::EC2::Keypairs.any?
+      klist = Rudy::AWS::EC2::Keypairs.list
+      print_stobjects klist
     end
     
     

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

@@ -13,7 +13,7 @@ module AWS; module EC2;
     end
     def create_snapshots
       snap = execute_action { Rudy::AWS::EC2::Snapshots.create(@volume.awsid) }
-      puts @@global.verbose > 0 ? snap.inspect : snap.dump(@@global.format)
+      print_stobject snap
     end
     
     def destroy_snapshots_valid?
@@ -26,15 +26,11 @@ module AWS; module EC2;
       puts "Destroying: #{@snap.awsid}"
       execute_check(:medium)
       execute_action { Rudy::AWS::EC2::Snapshots.destroy(@snap.awsid) }
-      snapshots
     end
     
     def snapshots
       snaps = Rudy::AWS::EC2::Snapshots.list || []
-      snaps.each do |snap|
-        puts @@global.verbose > 0 ? snap.inspect : snap.dump(@@global.format)
-      end
-      puts "No snapshots" if snaps.empty?
+      print_stobjects snaps
     end
     
     

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

@@ -7,10 +7,8 @@ module AWS; module EC2;
     
     
     def zones
-      Rudy::AWS::EC2::Zones.list_as_hash(@argv.name).each_value do |zon|
-        puts zon.dump(@@global.format)
-      end
-      puts "No zones" unless Rudy::AWS::EC2::Zones.any?
+      zlist = Rudy::AWS::EC2::Zones.list(@argv.name)
+      print_stobjects zlist
     end
     
     

data/lib/rudy/cli/backups.rb

@@ -6,17 +6,12 @@ module Rudy
 
       
       def backups
-        more, less = {}, []
-        less = [:environment, :role] if @option.all
-        # We first get the disk metadata
-        b_list = Rudy::Backups.list(more, less) || []
-        b_list.each do |back|
-          puts @global.verbose > 0 ? "#{back.name}: #{back.inspect}" : back.name
-        end
+        blist = get_backups
+        print_stobjects blist
       end
       
       def backups_wash
-        dirt = (Rudy::Backups.list || []).select { |b| !b.snapshot_exists? }
+        dirt = (get_backups || []).select { |b| !b.snapshot_exists? }
         if dirt.empty?
           puts "Nothing to wash in #{current_machine_group}"
           return
@@ -28,11 +23,27 @@ module Rudy
         execute_check(:medium)
 
         dirt.each do |b|
-          b.destroy(:force)
+          b.destroy
         end
         
       end
       
+      def backups_create_valid?
+        @dlist = Rudy::Disks.list
+        raise "No disks" if @dlist.nil?
+        raise "No path provided" unless @argv.first
+        raise "Disk does not exist" unless Rudy::Disks.exists? @argv.first
+        true
+      end
+      
+      def backups_create
+        @dlist.each do |d|
+          puts "Creating backup for #{d.name}"
+          back = d.archive
+          puts back
+        end
+      end
+      
     end
   end
 end

data/lib/rudy/cli/base.rb

@@ -35,7 +35,7 @@ module Rudy::CLI
       @@global.auto ? Annoy.enable_skip : Annoy.disable_skip
       
       # ANSI codes look like garbage in DOS
-      if Rudy.sysinfo.os.to_s == 'win32'
+      if Rudy.sysinfo.os.to_s == 'windows'
         String.disable_color 
         raise Rudy::Error, 'Ruby 1.9 is not supported (yet)' if Rudy.sysinfo.ruby == [1,9,1]
       end
@@ -95,10 +95,67 @@ module Rudy::CLI
         end
       end
     end
-
+    
+    # +stobjects+ is an Array of Storable objects
+    # +noverbose+ when not false, will force to print with Object#to_s
+    def print_stobjects(stobjects=[], noverbose=false)
+      stobjects.each do |m|
+        print_stobject m, noverbose
+      end
+    end
+    
+    def print_stobject(obj, noverbose=false)
+      format = @@global.format
+      format = :yaml if @@global.verbose > 0 && @@global.format == :string
+      format = :string if noverbose
+      puts obj.dump(format)
+    end
+    
     def machine_separator(name, awsid)
       ('%s %-50s awsid: %s ' % [$/, name, awsid]).att(:reverse)
     end
-
+    
+    
+  private 
+  
+    # See get_metadata
+    def get_machines(fields={}, less=[])
+      list = get_metadata Rudy::Machines, fields, less
+      if list.empty?
+        if @@global.position.nil?
+          raise Rudy::MachineGroupNotRunning, (@option.all ? nil : current_machine_group)
+        else
+          raise Rudy::MachineNotRunning, current_machine_name 
+        end
+      end
+      list
+    end
+    
+    # See get_metadata
+    def get_disks(fields={}, less=[])
+      get_metadata Rudy::Disks, fields, less
+    end
+   
+    # See get_metadata
+    def get_backups(fields={}, less=[])
+      get_metadata Rudy::Backups, fields, less
+    end
+    
+    # * +klass+ a Rudy::Metadata class. e.g. Rudy::Machines
+    #
+    # This method takes two optional args for adding or 
+    # removing metadata attributes to modify the select query. 
+    # When all is specified we want to find disks in every env
+    # environment and role to we remove these attributes from
+    # the select.
+    def get_metadata(klass, fields={}, less=[])
+      if @option.all
+        # Don't remove keys specified in fields
+        less += (Rudy::Metadata::COMMON_FIELDS - fields.keys)
+      end
+      klass.list(fields, less) || []
+    end
+    
+    
   end
 end

data/lib/rudy/cli/candy.rb

@@ -12,7 +12,7 @@ module Rudy
           puts "No machines"
         end
       end
-      
+
     end
   end
 end

data/lib/rudy/cli/disks.rb

@@ -3,13 +3,9 @@
 module Rudy
   module CLI
     class Disks < Rudy::CLI::CommandBase
-
       
       def disks
-        more, less = {}, []
-        less = [:environment, :role] if @option.all
-        # We first get the disk metadata
-        disk_list = Rudy::Disks.list(more, less) || []
+        disk_list = get_disks
         # If there are no disks currently, there could be backups
         # so we grab those to create a list of disks. 
         if @option.backups
@@ -23,7 +19,7 @@ module Rudy
         disk_list.each do |d|
           next if seen.member?(d.name)
           seen << d.name
-          puts @@global.verbose > 0 ? d.inspect : d.dump(@@global.format)
+          print_stobject d
           if @option.backups
             d.backups.each_with_index do |b, index|
               puts '  %s' % b.name
@@ -34,7 +30,7 @@ module Rudy
       end
       
       def disks_wash
-        dirt = (Rudy::Disks.list || []).select { |d| !d.volume_exists? }
+        dirt = (get_disks || []).select { |d| !d.volume_exists? }
         if dirt.empty?
           puts "Nothing to wash in #{current_machine_group}"
           return
@@ -51,6 +47,68 @@ module Rudy
         
       end
       
+      def disks_create_valid?
+        @mlist = Rudy::Machines.list
+        raise "No machines" if @mlist.nil?
+        
+        raise "No path provided" unless @argv.first
+        if !@@global.force && Rudy::Disks.exists?( @argv.first)
+          raise "Disk exists" if Rudy::Disks.get(@argv.first).volume_attached?
+        end
+        raise "No size provided" unless @option.size
+        
+        true
+      end
+      
+      
+      def disks_create
+        @mlist.each do |m|  
+          puts machine_separator(m.name, m.instid)
+          rbox = Rudy::Routines::Handlers::RyeTools.create_box m
+          rbox.stash = m
+          disk = Rudy::Disk.new m.position, @argv.first
+          disk.device = @option.device if @option.device
+          disk.size = @option.size if @option.size
+          disk.refresh! if disk.exists?  # We need the volume ID if available
+          li "Creating disk: #{disk.name}"
+          volumes = m.attached_volumes
+          # don't include the current disk in the count. 
+          volumes.reject! { |v| v.awsid == disk.volid } if disk.volid && disk.volume_attached?
+          disk_index = volumes.size + 2
+          Rudy::Routines::Handlers::Disks.create rbox, disk, disk_index
+        end
+      end
+      
+      
+      def disks_destroy_valid?
+        @dlist = Rudy::Disks.list
+        raise "No disks" if @dlist.nil?
+        
+        @mlist = Rudy::Machines.list
+        raise "No machines" if @mlist.nil? && !@@global.force
+        
+        raise "No path provided" unless @argv.first
+        raise "Disk does not exist" unless Rudy::Disks.exists? @argv.first
+        true
+      end
+      
+      def disks_destroy
+        execute_check(:medium)
+        if @mlist
+          @mlist.each do |m|  
+            rbox = Rudy::Routines::Handlers::RyeTools.create_box m
+            rbox.stash = m
+            disk = Rudy::Disk.new m.position, @argv.first
+            li "Destroying disk: #{disk.name}"
+            Rudy::Routines::Handlers::Disks.destroy rbox, disk, 0
+          end
+        else
+          @dlist.each do |d|
+            li "Destroying disk: #{d.name}"
+            Rudy::Routines::Handlers::Disks.destroy nil, d, 0
+          end
+        end
+      end
     end
   end
 end