rudy 0.9.2 → 0.9.3

data/CHANGES.txt

@@ -1,6 +1,14 @@
 RUDY, CHANGES 
 
 
+#### 0.9.3 (2009-08-26) ###########################
+
+* FIXED: Updated dependencies in gemspec (Rye)
+* FIXED: Local SSH pubkeys are now included when creating remote SSH
+  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/lib/rudy.rb

@@ -42,7 +42,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 9.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/cli/machines.rb

@@ -209,15 +209,20 @@ module Rudy
         end
         
         # Options to be sent to Rye::Box
-        rye_opts = { :user => current_machine_user, :debug => nil }
+        rye_opts = { :user => current_machine_user, :keys => [], :debug => nil }
         if File.exists? pkey 
           #raise "Cannot find file #{pkey}" unless File.exists?(pkey)
           if Rudy.sysinfo.os != :windows && File.stat(pkey).mode != 33152
             raise InsecureKeyPermissions, pkey 
           end
-          rye_opts[:keys] = pkey 
+          rye_opts[:keys] << pkey 
         end
         
+        local_keys = Rye.keys
+        rye_opts[:keys] += local_keys if local_keys.is_a?(Array)
+        
+        puts "# SSH OPTS", rye_opts.to_yaml if @@global.verbose > 3
+        
         # The user specified a command to run. We won't create an interactive
         # session so we need to prepare the command and its arguments
         if @argv.first

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

@@ -27,7 +27,9 @@ module Rudy::Routines::Handlers;
        
        box = ::Rye::Box.new hostname, opts
        box.nickname = nickname
-       
+      
+       local_keys = Rye.keys
+       box.add_keys local_keys if local_keys.is_a?(Array)
        box.add_key user_keypairpath(opts[:user])
        
        # We define hooks so we can still print each command and its output

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.9.2"
+	s.version = "0.9.3"
 	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.7'
+  s.add_dependency 'rye',        '>= 0.8.9'
   s.add_dependency 'attic',      '>= 0.4.0'
   s.add_dependency 'annoy',      '>= 0.5.5'
   s.add_dependency 'drydock',    '>= 0.6.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-25 00:00:00 -04:00
+date: 2009-08-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.7
+        version: 0.8.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: attic