solutious-rudy 0.7.2 → 0.7.3

data/Rudyfile

@@ -123,7 +123,7 @@ routines do
                                      
       shutdown do                    # $ rudy shutdown
         before :root do              # Run remote SSH commands before shutdown
-          mysqld_initd               
+          #mysqld_initd               
         end                          
                                      
         disks do                     

data/bin/rudy-ec2

@@ -23,6 +23,8 @@ require 'drydock'
 module RudyCLI_EC2
   extend Drydock
   
+  debug :off
+  default :instances
   
   # -----------------------------------  AMAZON EC2 COMMANDS  --------
   # ------------------------------------------------------------------
@@ -47,6 +49,8 @@ module RudyCLI_EC2
   
   about "Amazon EC2 instance console output"
   usage "rudy-ec2 console [-g group] [instance ID]"
+  usage "rudy-ec2 [-k path/2/privatekey] console [instance ID]"
+  usage "NOTE: Private key is required only for Windows instances"
   option :g, :group, String, "A security group name"
   argv :awsid
   command :consoles => Rudy::CLI::AWS::EC2::Instances
@@ -54,8 +58,8 @@ module RudyCLI_EC2
   command_alias :consoles, :c
   
   about "Copy files to or from machines."
-  usage "rudy-ec2 copy [-p] [-r] [-u user] [-k path/2/privatekey] source target"
-  usage "rudy-ec2 upload -k path/2/privatekey -u username local-source target"
+  usage "rudy-ec2 copy [-p] [-r] source target"
+  usage "rudy-ec2 [-u user] [-k path/2/privatekey] upload local-source target"
   usage "rudy-ec2 download remote-source target"
   usage "NOTE: Use quotes when using a tilda or asterisk in remote paths ('~/')."
   usage "rudy-ec2 download '~/*' /tmp/"
@@ -207,12 +211,7 @@ module RudyCLI_EC2
   command_alias :zones, :zone
   command_alias :zones, :z
   
-  
-  # --------------------------------  RUDY-EC2 MISCELLANEOUS  --------
-  # ------------------------------------------------------------------
-  
-  default :instances
-  debug :off
+
   
 end
 

data/lib/annoy.rb

@@ -186,9 +186,12 @@ class Annoy
     begin
       success = Timeout::timeout(period || @@period) do
         regexp &&= Regexp.new regexp
-        writer.print msg 
-        writer.flush if writer.respond_to?(:flush)
-        response = Annoy.get_response
+        highline = HighLine.new 
+        response = highline.ask(msg) { |q| 
+          q.echo = '*'             # Don't display response
+          q.overwrite = true       # Erase the question afterwards
+          q.whitespace = :strip    # Remove whitespace from the response
+        }
         regexp.match(response)
       end
     rescue Timeout::Error => ex
@@ -197,6 +200,27 @@ class Annoy
     end
   end
  
+ 
+  def Annoy.timed_display(msg, writer, period=nil)
+    return true unless STDIN.tty? # Only ask a question if there's a human
+    if Annoy.skip?
+      #writer.puts msg 
+      return true
+    end
+    begin
+      period ||= @@period
+      success = Timeout::timeout(period) do
+        writer.puts "Message will display for #{period} seconds"
+        writer.print msg
+        writer.flush if writer.respond_to?(:flush)
+        sleep period+1
+      end
+    rescue Timeout::Error => ex
+      writer.print "\r" << ' '*msg.size
+    end
+    
+    true
+  end
   
  private 
   def Annoy.get_response(writer=STDOUT)

data/lib/rudy.rb

@@ -45,7 +45,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 7.freeze
-      TINY  = 2.freeze
+      TINY  = 3.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/instance.rb

@@ -30,7 +30,14 @@ module Rudy::AWS
 
     def to_s(with_title=false)
       lines = []
-      lines << "%s  (%s)" % [liner_note, @groups.join(', ')]
+      if @groups
+        gpstr = [@groups].flatten.compact.join(', ')
+        gpstr &&= "(#{gpstr})"
+      else
+        gpstr = ''
+      end
+      
+      lines << "%s  %s" % [liner_note, gpstr]
       #if self.running?
       #  k, g = @keyname || 'no-keypair', self.groups.join(', ')
       #  lines << @@sformat % %w{zone size ami keyname groups} if with_title

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

@@ -14,12 +14,9 @@ module AWS; module EC2;
     end
     def create_groups
       opts = check_options
-      puts "Creating #{@argv.name}"
-      
       execute_action { 
         @rgroups.create(@argv.name, @option.description, opts[:addresses], opts[:ports], opts[:protocols])
       }
-      
       @rgroups.list(@argv.name) do |group|
         puts @@global.verbose > 0 ? group.inspect : group.dump(@@global.format)
       end

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

@@ -113,6 +113,10 @@ module AWS; module EC2;
     
     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?
       true
     end
@@ -123,11 +127,35 @@ module AWS; module EC2;
       opts[:id] &&= [opts[:id]].flatten
       
       lt = @rinst.list_group(opts[:group], :any, opts[:id]) do |inst|
-        puts '-'*50
-        puts "Console for: #{inst.liner_note}", $/
+        puts instance_separator(inst.dns_public || inst.state, inst.awsid)
         console = @rinst.console(inst.awsid)
         output = console ? Base64.decode64(console) : "Unavailable"
-        puts output.noansi # Remove color and clear, etc...
+        
+        # The linux console can include ANSI escape codes for color, 
+        # clear screen etc... We strip them out to get rid of the 
+        # clear specifically. Otherwise the display is messed!
+        output &&= output.noansi 
+        
+        puts output 
+        
+        if output.match(/<Password>(.+)<\/Password>/m)  # /m, match multiple lines
+          puts
+          if @@global.pkey
+            encrtypted_text = ($1 || '').strip
+            k = Rye::Key.from_file(@@global.pkey)
+            pword = k.decrypt(encrtypted_text)
+            ret = Annoy.pose_question("Display password?\a ", /yes|y|ya|sure|you bet!/i, STDERR)
+            if ret
+              answer = "%s: %s" % ['password', pword] 
+              Annoy.timed_display(answer, STDERR, 10)
+            end
+            puts
+          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]"
+          end
+        end
+        
       end
       
     end
@@ -184,6 +212,9 @@ module AWS; module EC2;
       status
     end
     
+    def instance_separator(name, awsid)
+      ('%s %-63s awsid: %s ' % [$/, name, awsid]).att(:reverse)
+    end
     
   end
 

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

@@ -12,7 +12,7 @@ module AWS; module EC2;
     def create_keypairs
       rkey = Rudy::AWS::EC2::KeyPairs.new(@@global.accesskey, @@global.secretkey, @@global.region)
       kp = execute_action { rkey.create(@argv.name) }
-      if %w[s string].member?(@@global.format)
+      if [:s, :string].member?(@@global.format)
         puts "Name: #{kp.name}"
         puts "Fingerprint: #{kp.fingerprint}", $/
         puts "Copy the following private key data into a file."

data/lib/rudy/routines.rb

@@ -209,8 +209,6 @@ module Rudy
       end
       
       def machine_separator(name, awsid)
-        dashes = 80 - name.size # 
-        dashes = 0 if dashes < 1
         ('%s %-63s awsid: %s ' % [$/, name, awsid]).att(:reverse)
       end
       

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.7.2"
+	s.version = "0.7.3"
 	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: solutious-rudy
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Delano Mandelbaum