rudy 0.9.8.008 → 0.9.8.009

data/CHANGES.txt

@@ -12,6 +12,12 @@ Creating volume...
 (S)kip  (A)bort:
 
 
+#### 0.9.8.008 (2010-08-19) ####################### 
+
+* ADDED: Support for Rye 0.9
+* CHANGE: "rudy init" no longer authorizing SSH localhost
+ 
+
 #### 0.9.8.007 (2010-08-03) ####################### 
 
 * FIXED: Command-line arguments for routines are now passed to before and after dependencies.

data/bin/rudy

@@ -243,10 +243,7 @@ class RudyCLI < Rudy::CLI::Base
       end
       
       user, host = Rudy.sysinfo.user, Rudy::Huxtable.global.localhost
-
-      puts "Authorizing public keys for #{user}@#{host}"
-      rbox = Rye::Box.new host
-      rbox.authorize_keys_local
+      
       
     rescue Rudy::AWS::SDB::NoSecretKey, 
            Rudy::AWS::SDB::NoAccessKey, 

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

@@ -64,7 +64,7 @@ module AWS; module EC2;
       opts[:id] = @option.instid if @option.instid
       
       # Options to be sent to Rye::Box
-      rye_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => nil  }
+      rye_opts = { :user => @global.user || Rudy.sysinfo.user, :debug => nil, :info => STDOUT  }
       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

data/lib/rudy/cli/machines.rb

@@ -207,7 +207,7 @@ module Rudy
         end
         
         # Options to be sent to Rye::Box
-        rye_opts = { :user => current_machine_user, :keys => [], :debug => nil }
+        rye_opts = { :user => current_machine_user, :keys => [], :debug => nil, :info => STDOUT }
         if File.exists? pkey 
           #raise "Cannot find file #{pkey}" unless File.exists?(pkey)
           if Rudy.sysinfo.os != :windows && File.stat(pkey).mode != 33152
@@ -305,7 +305,7 @@ module Rudy
       def print_response(rap)
         # Non zero exit codes raise exceptions so  
         # the erorrs have already been handled. 
-        return if rap.exit_code != 0
+        return if rap.exit_status != 0
 
         if @@global.parallel
           cmd, user = cmd.to_s, user.to_s
@@ -316,7 +316,7 @@ module Rudy
           end
         else
           li '  ' << rap.stdout.join("#{$/}  ") if !rap.stdout.empty?
-          colour = rap.exit_code != 0 ? :red : :normal
+          colour = rap.exit_status != 0 ? :red : :normal
           unless rap.stderr.empty?
             le ("  STDERR  " << '-'*38).color(colour).bright
             le "  " << rap.stderr.join("#{$/}    ").color(colour)

data/lib/rudy/routines/handlers/base.rb

@@ -35,14 +35,14 @@ module Rudy; module Routines; module Handlers;
 
   private 
     def print_response(rap)
-      colour = rap.exit_code != 0 ? :red : :normal
+      colour = rap.exit_status != 0 ? :red : :normal
       [:stderr].each do |sumpin|
         next if rap.send(sumpin).empty?
         le
         le(("  #{sumpin.to_s.upcase}  " << '-'*38).color(colour).bright)
         le "  " << rap.send(sumpin).join("#{$/}  ").color(colour)
       end
-      le "  Exit code: #{rap.exit_code}".color(colour) if rap.exit_code != 0
+      le "  Exit code: #{rap.exit_status}".color(colour) if rap.exit_status != 0
     end
   
   end

data/lib/rudy/routines/handlers/rye.rb

@@ -17,7 +17,8 @@ module Rudy::Routines::Handlers;
          :debug => false,
          :user => current_machine_user, 
          :ostype => current_machine_os || :unix,
-         :impltype => :linux
+         :impltype => :linux, 
+         :info => STDOUT
        }.merge opts
        
        nickname = hostname
@@ -43,13 +44,16 @@ module Rudy::Routines::Handlers;
        end
 
        if @@global.verbose > 0 && !@@global.quiet
+         box.stdout_hook do |content|
+           li content
+         end
          # And this one gets called after each command method call.
          box.post_command_hook do |ret|
            print_response ret
          end
        end
 
-       box.exception_hook(::Rye::CommandError, &rbox_exception_handler)
+       box.exception_hook(::Rye::Err, &rbox_exception_handler)
        box.exception_hook(Exception, &rbox_exception_handler)
        
        ## It'd better for unknown commands to be handled elsewhere
@@ -121,7 +125,7 @@ module Rudy::Routines::Handlers;
     def print_response(rap)
       # Non zero exit codes raise exceptions so  
       # the erorrs have already been handled. 
-      return if rap.exit_code != 0
+      return if rap.exit_status != 0
 
       if @@global.parallel
         cmd, user = cmd.to_s, user.to_s
@@ -131,8 +135,7 @@ module Rudy::Routines::Handlers;
           le "#{rap.box.nickname}: " << rap.stderr.join("#{rap.box.nickname}: ")
         end
       else
-        li '  ' << rap.stdout.join("#{$/}  ") if !rap.stdout.empty?
-        colour = rap.exit_code != 0 ? :red : :normal
+        colour = rap.exit_status != 0 ? :red : :normal
         unless rap.stderr.empty?
           le ("  STDERR  " << '-'*38).color(colour).bright
           le "  " << rap.stderr.join("#{$/}    ").color(colour)
@@ -145,14 +148,13 @@ module Rudy::Routines::Handlers;
      Proc.new do |ex, cmd, user, host, nickname|
        print_exception(user, host, cmd, nickname, ex)
        unless @@global.parallel
-         choice = Annoy.get_user_input('(S)kip  (R)etry  (F)orce  (A)bort: ', nil, 3600) || ''
+         choice = Annoy.get_user_input('(S)kip  (R)etry  (I)nteractive  (A)bort: ', nil, 3600) || ''
          if choice.match(/\AS/i)
            :skip
          elsif choice.match(/\AR/i)
            :retry   # Tells Rye::Box#run_command to retry
-         elsif choice.match(/\AF/i)
-           @@global.force = true
-           :retry
+         elsif choice.match(/\AI/i)
+           :interactive
          else
            exit 12
          end
@@ -162,7 +164,7 @@ module Rudy::Routines::Handlers;
 
    def print_exception(user, host, cmd, nickname, ex)
      prefix = @@global.parallel ? "#{nickname}: #{cmd}: " : ""
-     if ex.is_a?(::Rye::CommandError)
+     if ex.is_a?(::Rye::Err)
        le prefix << ex.message.color(:red)
      else
        le prefix << "#{ex.class}: #{ex.message}".color(:red)

data/lib/rudy/routines/handlers/script.rb

@@ -68,7 +68,7 @@ module Rudy; module Routines; module Handlers;
         ### EXECUTE THE COMMANDS BLOCK
         begin
           robj.batch(argv, &proc)
-        rescue Rye::CommandError => ex
+        rescue Rye::Err => ex
           # No need to bubble exception up when in parallel mode
           raise ex unless Rye::Set == robj
         ensure

data/lib/rudy.rb

@@ -44,7 +44,7 @@ module Rudy
       MAJOR = 0.freeze
       MINOR = 9.freeze
       TINY  = 8.freeze
-      PATCH = '008'.freeze
+      PATCH = '009'.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY, PATCH].join('.'); end
     def self.to_f; self.to_s.to_f; end

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rudy"
   s.rubyforge_project = 'rudy'
-  s.version = "0.9.8.008"
+  s.version = "0.9.8.009"
   s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -16,7 +16,7 @@
   
   s.executables = %w[rudy rudy-ec2 rudy-sdb rudy-s3]
   
-  s.add_dependency 'rye',        '>= 0.8.19'
+  s.add_dependency 'rye',        '>= 0.9.0'
   s.add_dependency 'storable',   '>= 0.7.1'
   s.add_dependency 'attic',      '>= 0.5.2'
   s.add_dependency 'annoy',      '>= 0.5.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 9
   - 8
-  - 8
-  version: 0.9.8.008
+  - 9
+  version: 0.9.8.009
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-03 00:00:00 -04:00
+date: 2010-08-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 59
         segments: 
         - 0
-        - 8
-        - 19
-        version: 0.8.19
+        - 9
+        - 0
+        version: 0.9.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency