solutious-rudy 0.9.3 → 0.9.4

data/CHANGES.txt

@@ -1,6 +1,14 @@
 RUDY, CHANGES 
 
 
+#### 0.9.4 (2009-08-28) ###########################
+
+* FIXED: NoMachines exception when running various dependency scenarios
+* CHANGE: All puts to STDOUT and STDERR now go through Rudy::Huxtable.li and Rudy::Huxtable.le. This resolves the issues with the output printing in quiet mode. 
+* CHANGE: Overhaul on output formatting. 
+* ADDED: "rudy networks --create" and "rudy networks --destroy"
+
+
 #### 0.9.3 (2009-08-26) ###########################
 
 * FIXED: Updated dependencies in gemspec (Rye)
@@ -8,7 +16,6 @@ RUDY, CHANGES
   connections. This resolves the issues with creating and authorizing
   a remote user then getting an authentication error. 
   
-
 #### 0.9.2 (2009-08-25) ###########################
 
 * FIXED: Threading error in Net::HTTP by forcing a mutex during AWS::EC2 requests

data/bin/rudy

@@ -107,6 +107,8 @@ class RudyCLI < Rudy::CLI::Base
   
   about "View Network configuration"
   usage "rudy networks"
+  usage "rudy networks -C"
+  usage "rudy networks -D"
   usage "rudy networks -L"
   usage "rudy networks -L -i"
   usage "rudy networks -L -e"
@@ -124,6 +126,8 @@ class RudyCLI < Rudy::CLI::Base
   option :o, :owner, String, "Other group owner ID (account number). Use with -g!"
   action :U, :update, "Update networks based on configuration"
   action :L, :local, "Show local network configuration"
+  action :C, :create, "Create the network security group"
+  action :D, :destroy, "Create the network security group"
   action :A, :authorize, "Authorize a rule for a network security group"
   action :R, :revoke, "Revoke a rule for a network security group"
   command :networks => Rudy::CLI::Networks

data/bin/rudy-ec2

@@ -20,6 +20,7 @@ require 'rudy/cli'
 module RudyCLI_EC2
   extend Drydock
   
+  debug :off
   default :instances
   
   # -----------------------------------  AMAZON EC2 COMMANDS  --------

data/lib/rudy.rb

@@ -42,7 +42,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 9.freeze
-      TINY  = 3.freeze
+      TINY  = 4.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end

data/lib/rudy/aws/ec2.rb

@@ -1,7 +1,7 @@
 
 module Rudy; module AWS
   module EC2
-#    include Rudy::Huxtable
+    include Rudy::Huxtable
     
     @@mutex = Mutex.new 
     
@@ -18,7 +18,6 @@ module Rudy; module AWS
       port ||= DEFAULT_EC2_PORT
       
       @@ec2 = ::AWS::EC2::Base.new(:port => port, :server=> host, :access_key_id => access_key, :secret_access_key => secret_key)
-      @@logger = logger
     end
     
   protected
@@ -50,10 +49,10 @@ module Rudy; module AWS
           raise Rudy::AWS::Error, ex.message
         
         rescue Timeout::Error => ex
-          STDERR.puts "Timeout (#{timeout}): #{ex.message}!"
+          Rudy::Huxtable.le "Timeout (#{timeout}): #{ex.message}!"
         rescue SocketError => ex
-          #STDERR.puts ex.message
-          #STDERR.puts ex.backtrace
+          #Rudy::Huxtable.le ex.message
+          #Rudy::Huxtable.le ex.backtrace
           raise SocketError, "Check your Internets!" unless @@global.offline
         ensure
           response ||= default

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

@@ -244,7 +244,6 @@ module Rudy::AWS
 
       def modify_rules(meth, name, addresses, ports, protocols, &each_group)
         list(name, &each_group) if each_group
-        
         ports = [[22,22],[80,80],[443,443]] if !ports || ports.empty?
         protocols = ["tcp"] if !protocols || protocols.empty?
         addresses = [Rudy::Utils::external_ip_address] if !addresses || addresses.empty?
@@ -257,7 +256,6 @@ module Rudy::AWS
           addresses.each do |address|
             ports.each do |port|
               port_lo, port_hi = port.is_a?(Array) ? [port[0], port[1]] : [port, port]
-              @logger.puts "#{meth} for ports #{port[0]}:#{port[1]} (#{protocol}) for #{addresses.join(', ')}" if @logger
               ret = modify_rule(meth, name, port[0].to_i, (port[1] || port[0]).to_i, protocol, address)
               raise "Unknown error during #{meth}" unless ret
             end

data/lib/rudy/aws/sdb.rb

@@ -190,10 +190,10 @@ module Rudy
           end
 
         rescue Timeout::Error => ex
-          STDERR.puts "Timeout (#{timeout}): #{ex.message}!"
+          Rudy::Huxtable.le "Timeout (#{timeout}): #{ex.message}!"
         rescue SocketError => ex
-          #STDERR.puts ex.message
-          #STDERR.puts ex.backtrace
+          #Rudy::Huxtable.le ex.message
+          #Rudy::Huxtable.le ex.backtrace
           raise SocketError, "Check your Internets!" unless Rudy::Huxtable.global.offline
         ensure
           response ||= default

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

@@ -20,8 +20,8 @@ module AWS; module EC2;
       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
+      li "Destroying address: #{@argv.ipaddress}"
+      li "NOTE: this IP address will become available to other EC2 customers.".bright
       execute_check(:medium)
       execute_action { Rudy::AWS::EC2::Addresses.destroy(@argv.ipaddress) }
     end
@@ -37,7 +37,7 @@ module AWS; module EC2;
       if @option.newaddress
         print "Creating address... "
         tmp = Rudy::AWS::EC2::Addresses.create
-        puts "#{tmp.ipaddress}"
+        li "#{tmp.ipaddress}"
         address = tmp.ipaddress
       else
         address = @argv.ipaddress
@@ -53,7 +53,7 @@ module AWS; module EC2;
       instance_name = instance.dns_public
       instance_name = instance.awsid if !instance_name || instance_name.empty?
       
-      puts "Associating #{address} to #{instance_name} (#{instance.groups.join(', ')})"
+      li "Associating #{address} to #{instance_name} (#{instance.groups.join(', ')})"
       execute_check(:low)
       execute_action { Rudy::AWS::EC2::Addresses.associate(address, instance.awsid) }
       address = Rudy::AWS::EC2::Addresses.get(address)
@@ -71,7 +71,7 @@ module AWS; module EC2;
       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(', ')})"
+      li "Disassociating #{address.ipaddress} from #{instance.awsid} (#{instance.groups.join(', ')})"
       execute_check(:medium)
       execute_action { Rudy::AWS::EC2::Addresses.disassociate(@argv.ipaddress) }
       address = Rudy::AWS::EC2::Addresses.get(@argv.ipaddress)

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

@@ -21,20 +21,20 @@ module AWS; module EC2;
       
       # TODO: Create Storable object
       if @@global.format == 'yaml'
-        puts ec2.to_yaml
+        li ec2.to_yaml
       elsif @@global.format == 'json'
         require 'json'
-        puts ec2.to_json
+        li ec2.to_json
       else
-        puts "#{ec2[:title]}"
-        puts "Updated: #{ec2[:pubdate]}"
+        li "#{ec2[:title]}"
+        li "Updated: #{ec2[:pubdate]}"
         (ec2[:items] || []).each do |i|
-          puts
-          puts '%s' % i[:title]
-          puts '  %s: %s' % [i[:pubdate], i[:description]]
+          li
+          li '%s' % i[:title]
+          li '  %s: %s' % [i[:pubdate], i[:description]]
         end
         if ec2.empty? || ec2[:items].empty?
-          puts "No announcements" 
+          li "No announcements" 
           return
         end
       end
@@ -76,7 +76,7 @@ module AWS; module EC2;
       # session so we need to prepare the command and its arguments
       if @argv.first
         command, command_args = @argv.shift, @argv || []
-        puts "#{command} #{command_args.join(' ')}" if @@global.verbose > 1
+        li "#{command} #{command_args.join(' ')}" if @@global.verbose > 1
       
       # otherwise, we'll open an ssh session or print command
       else
@@ -91,7 +91,7 @@ module AWS; module EC2;
           print "You are #{rye_opts[:user].bright}. " if !checked # only the 1st
         else
           print "Connecting #{rye_opts[:user].bright}@#{inst.dns_public} "
-          puts "(#{inst.awsid}, groups: #{inst.groups.join(', ')})"
+          li "(#{inst.awsid}, groups: #{inst.groups.join(', ')})"
         end
         
         # Make sure we want to run this command on all instances
@@ -103,7 +103,7 @@ module AWS; module EC2;
         # Open the connection and run the command
         rbox = Rye::Box.new(inst.dns_public, rye_opts)
         ret = rbox.send(command, command_args)
-        puts ret unless command == :interactive_ssh
+        li ret unless command == :interactive_ssh
       end
     end
 
@@ -162,7 +162,7 @@ module AWS; module EC2;
           print "You are #{rye_opts[:user].bright}. " if !checked # only the 1st
         else
           print "Connecting #{rye_opts[:user].bright}@#{inst.dns_public} "
-          puts "(#{inst.awsid}, groups: #{inst.groups.join(', ')})"
+          li "(#{inst.awsid}, groups: #{inst.groups.join(', ')})"
         end
         
         # Make sure we want to run this command on all instances
@@ -190,12 +190,12 @@ module AWS; module EC2;
         paths.each do |path|
           from_paths << "#{user}@#{host}:#{path} "
         end  
-        #puts "Copying FROM remote TO this machine", $/
+        #li "Copying FROM remote TO this machine", $/
 
       else
         to_path = "#{user}@#{host}:#{to_path}"
         from_paths = paths.join(' ')
-        #puts "Copying FROM this machine TO remote", $/
+        #li "Copying FROM this machine TO remote", $/
       end
 
 
@@ -203,8 +203,8 @@ module AWS; module EC2;
       cmd << "-i #{keypair}" if keypair
       cmd << " #{from_paths} #{to_path}"
 
-      puts cmd if verbose
-      printonly ? (puts cmd) : system(cmd)
+      li cmd if verbose
+      printonly ? (li cmd) : system(cmd)
     end
     
     

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

@@ -17,7 +17,7 @@ module AWS; module EC2;
         Rudy::AWS::EC2::Groups.create(@argv.name, @option.description, opts[:addresses], opts[:ports], opts[:protocols])
       }
       Rudy::AWS::EC2::Groups.list(@argv.name) do |group|
-        puts @@global.verbose > 0 ? group.inspect : group.dump(@@global.format)
+        li @@global.verbose > 0 ? group.inspect : group.dump(@@global.format)
       end
     end
     
@@ -29,7 +29,7 @@ module AWS; module EC2;
     end
     
     def destroy_groups
-      puts "Destroying group: #{@argv.name}"
+      li "Destroying group: #{@argv.name}"
       execute_check(:medium)
       execute_action { Rudy::AWS::EC2::Groups.destroy(@argv.name) }
       @argv.clear # so groups will print all other groups
@@ -45,7 +45,7 @@ module AWS; module EC2;
       opts = {}
       name = @option.all ? nil : @argv.name
       Rudy::AWS::EC2::Groups.list(name).each do |group|
-        puts @@global.verbose > 0 ? group.inspect : group.dump(@@global.format)
+        li @@global.verbose > 0 ? group.inspect : group.dump(@@global.format)
       end
     end
     
@@ -72,12 +72,12 @@ module AWS; module EC2;
       opts = check_options
       if (@option.group || @option.owner)
         g = [opts[:owner], opts[:group]].join(':')
-        puts "#{action.to_s.capitalize} access to #{@argv.name.bright} from #{g.bright}"
+        li "#{action.to_s.capitalize} access to #{@argv.name.bright} from #{g.bright}"
       else
         print "#{action.to_s.capitalize} access to #{@argv.name.bright}"
-         puts " from #{opts[:addresses].join(', ').bright}"
+         li " from #{opts[:addresses].join(', ').bright}"
         print "on #{opts[:protocols].join(', ').bright} "
-         puts "ports: #{opts[:ports].map { |p| "#{p.join(' to ').bright}" }.join(', ')}"
+         li "ports: #{opts[:ports].map { |p| "#{p.join(' to ').bright}" }.join(', ')}"
       end
       execute_check(:medium)
       execute_action { 

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

@@ -17,7 +17,7 @@ module AWS; module EC2;
       
       unless @option.all
         @option.owner ||= 'amazon' 
-        puts "Images owned by #{@option.owner.bright}" unless @argv.awsid
+        li "Images owned by #{@option.owner.bright}" unless @argv.awsid
       end
       
       images = Rudy::AWS::EC2::Images.list(@option.owner, @argv) || []
@@ -31,7 +31,7 @@ module AWS; module EC2;
       true
     end
     def destroy_images
-     puts Rudy::AWS::EC2::Images.deregister(@argv.ami) ? "Done" : "Unknown error"
+     li Rudy::AWS::EC2::Images.deregister(@argv.ami) ? "Done" : "Unknown error"
     end 
     
     def register_images_valid?
@@ -41,7 +41,7 @@ module AWS; module EC2;
       true
     end
     def register_images
-      puts Rudy::AWS::EC2::Images.register(@argv.first)
+      li Rudy::AWS::EC2::Images.register(@argv.first)
     end
 
 

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

@@ -14,47 +14,47 @@ module AWS; module EC2;
           process_region region
         end
       else
-        puts $/, "Other regions: " << oregions.join(', ')
+        li $/, "Other regions: " << oregions.join(', ')
       end
     end
     
     
     private 
     def process_region(region)
-      puts " Region: %s %30s".att(:reverse) % [region, '']
-      puts "  Instances".bright
+      li " Region: %s %30s".att(:reverse) % [region, '']
+      li "  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}"
+        #li "    %s (%s): %s; %s; %s" % [inst.awsid, inst.state, inst.dns_public || '[no dns]', inst.size, inst.created]
+        li "    #{inst.to_s.noatt}"
       end
       
-      puts "  Volumes".bright
+      li "  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]
+        li "    %s (%s): %sGB; %s" % [vol.awsid, vol.instid || vol.status, vol.size, vol.created]
       end
               
-      puts "  Snapshots".bright
+      li "  Snapshots".bright
       (Rudy::AWS::EC2::Snapshots.list || []).collect do |snap|
-        puts "    %s: %s; %s" % [snap.awsid, snap.volid, snap.created]
+        li "    %s: %s; %s" % [snap.awsid, snap.volid, snap.created]
       end
       
-      puts "  Addresses".bright
+      li "  Addresses".bright
       (Rudy::AWS::EC2::Addresses.list || []).collect do |o| 
-        puts "    %s (%s)" % [o.ipaddress, o.instid || 'available']
+        li "    %s (%s)" % [o.ipaddress, o.instid || 'available']
       end
       
-      puts "  Groups".bright
-      puts (Rudy::AWS::EC2::Groups.list || []).collect { |o| "    #{o.name}" }
+      li "  Groups".bright
+      li (Rudy::AWS::EC2::Groups.list || []).collect { |o| "    #{o.name}" }
       
-      puts "  Keypairs".bright
-      puts (Rudy::AWS::EC2::Keypairs.list || []).collect { |o| "    #{o.name}" }
+      li "  Keypairs".bright
+      li (Rudy::AWS::EC2::Keypairs.list || []).collect { |o| "    #{o.name}" }
 
-      puts "  Images".bright
+      li "  Images".bright
       (Rudy::AWS::EC2::Images.list('self') || []).collect do |o|
-        puts "    %s: %s; %s; %s" % [o.awsid, o.location, o.arch, o.visibility]
+        li "    %s: %s; %s; %s" % [o.awsid, o.location, o.arch, o.visibility]
       end
-      puts
+      li
     end
     
   end

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

@@ -47,11 +47,11 @@ module AWS; module EC2;
         opts[n] = @option.send(n) if @option.send(n)
       end
       
-      puts "Creating #{opts[:size]} instance in #{@@global.zone}"
+      li "Creating #{opts[:size]} instance in #{@@global.zone}"
       
       unless opts[:keypair]
-        puts "You did not specify a keypair. Unless you've prepared a user account".bright
-        puts "on this image (#{opts[:ami]}) you will not be able to log in to it.".bright
+        li "You did not specify a keypair. Unless you've prepared a user account".bright
+        li "on this image (#{opts[:ami]}) you will not be able to log in to it.".bright
         exit unless Annoy.proceed?(:low)
       end
       
@@ -59,14 +59,14 @@ module AWS; module EC2;
       
       if instances && instances.size > 0
         instance_count = (instances.size == 1) ? 'is 1 instance' : "are #{instances.size} instances"
-        puts "There #{instance_count} running in the #{opts[:group]} group."
+        li "There #{instance_count} running in the #{opts[:group]} group."
         exit unless Annoy.proceed?(:low)
       end
       
       if @option.newaddress
         print "Creating address... "
         address = Rudy::AWS::EC2::Addresses.create
-        puts "#{address.ipaddress}"
+        li "#{address.ipaddress}"
         @option.address = address.ipaddress
       end
          
@@ -76,7 +76,7 @@ module AWS; module EC2;
         
           # Assign IP address to only the first instance
           if first_instance && @option.address
-            puts "Associating #{@option.address} to #{inst.awsid}"
+            li "Associating #{@option.address} to #{inst.awsid}"
             Rudy::AWS::EC2::Addresses.associate(@option.address, inst.awsid)
             first_instance = false
           end
@@ -128,7 +128,7 @@ module AWS; module EC2;
       opts[:id] &&= [opts[:id]].flatten
       
       lt = Rudy::AWS::EC2::Instances.list_group(opts[:group], :any, opts[:id]) do |inst|
-        puts instance_separator(inst.dns_public || inst.state, inst.awsid)
+        li instance_separator(inst.dns_public || inst.state, inst.awsid)
         console = Rudy::AWS::EC2::Instances.console(inst.awsid)
         output = console ? Base64.decode64(console) : "Unavailable"
         
@@ -137,20 +137,20 @@ module AWS; module EC2;
         # clear specifically. Otherwise the display is messed!
         output &&= output.noansi 
         
-        puts output 
+        li output 
         
         if output.match(/<Password>(.+)<\/Password>/m)  # /m, match multiple lines
-          puts
+          li
           if @@global.pkey
             encrtypted_text = ($1 || '').strip
             k = Rye::Key.from_file(@@global.pkey)
             pword = k.decrypt(encrtypted_text)
             answer = "%s: %s" % ['password', pword] 
             Annoy.timed_display(answer, STDERR, 10)
-            puts
+            li
           else
-            puts "Please supply a private key path to decode the administrator password"
-            puts "rudy-ec2 -k path/2/privatekey console [-g group] [instance ID]"
+            li "Please supply a private key path to decode the administrator password"
+            li "rudy-ec2 -k path/2/privatekey console [-g group] [instance ID]"
           end
         end
         
@@ -172,9 +172,9 @@ module AWS; module EC2;
 
       opts[:id] = @argv.instid if @argv.instid
       opts[:id] &&= [opts[:id]].flatten
-    
+      
       ilist = Rudy::AWS::EC2::Instances.list_group(opts[:group], opts[:state], opts[:id])
-      ilist.nil? ? puts( "No instances running" ) : print_stobjects(ilist)
+      ilist.nil? ? li( "No instances running" ) : print_stobjects(ilist)
     end
     alias :instances :status
 
@@ -198,7 +198,7 @@ module AWS; module EC2;
       
       print "#{action.to_s.capitalize} #{instance_count} (#{inst_names.join(', ')}) "
       print "in #{opts[:group]}" if opts[:group]
-      puts
+      li
       execute_check(:medium)
       
       execute_action("#{action.to_s.capitalize} Failed") {