rye 0.8.16 → 0.8.17

data/CHANGES.txt

@@ -1,10 +1,17 @@
 RYE, CHANGES
 
+#### 0.8.17 (2010-05-19) #############################
+
+* FIXED: authorize_keys_remote was using incorrect home directory
+* CHANGE: More descriptive output for file transfers
+
+
 #### 0.8.16 (2010-05-19) #############################
 
 * ADDED: Updated whitelist: hg, ab, siege, stella, ln, su
 * CHANGE: file transfers now print the file path to STDOUT unless in quiet mode
 
+
 #### 0.8.15 (2010-03-29) #############################
 
 * FIXED: "rake" was mapped to "sudo". Closes GH-8 [mjmsmith]

data/lib/rye.rb

@@ -42,7 +42,7 @@ require 'esc'
 module Rye
   extend self
   
-  VERSION = "0.8.16".freeze unless defined?(VERSION)
+  VERSION = "0.8.17".freeze unless defined?(VERSION)
   
   @@sysinfo = nil
   @@agent_env = Hash.new  # holds ssh-agent env vars

data/lib/rye/box.rb

@@ -383,17 +383,21 @@ module Rye
     # of Rye::Box in a multithreaded situation. 
     #
     def authorize_keys_remote(other_user=nil)
-      this_user = other_user || opts[:user]
+      if other_user.nil?
+        this_user = opts[:user]
+        homedir = self.quietly { pwd }.first
+      else
+        this_user = other_user 
+        # The homedir path is important b/c this is where we're going to 
+        # look for the .ssh directory. That's where auth love is stored.
+        homedir = self.guess_user_home(this_user)
+      end
+      
       added_keys = []
       rap = Rye::Rap.new(self)
       
       prevdir = self.current_working_directory
       
-      # The homedir path is important b/c this is where we're going to 
-      # look for the .ssh directory. That's where auth love is stored.
-      homedir = self.quietly { pwd }.first
-      homedir ||= self.guess_user_home(this_user)
-      
       unless self.file_exists?(homedir)
         rap.add_exit_code(1)
         rap.add_stderr("Path does not exist: #{homedir}")
@@ -986,7 +990,11 @@ module Rye
         files.each do |file|
           debug file.to_s
           prev = ""
-          STDOUT.puts "transfering #{file}" unless @rye_quiet
+          unless @rye_quiet
+            tmp_file = file.is_a?(StringIO) ? '<string>' : file
+            tmp_target = target.is_a?(StringIO) ? '<string>' : target
+            STDOUT.puts "[#{direction}] #{tmp_file} #{tmp_target}" 
+          end
           transfers << scp.send(direction, file, target, :recursive => recursive)  do |ch, n, s, t|
             line = "%-50s %6d/%-6d bytes" % [n, s, t]
             spaces = (prev.size > line.size) ? ' '*(prev.size - line.size) : ''

data/rye.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rye"
   s.rubyforge_project = "rye"
-  s.version = "0.8.16"
+  s.version = "0.8.17"
   s.summary = "Rye: Safely run SSH commands on a bunch of machines at the same time (from Ruby)."
   s.description = s.summary
   s.author = "Delano Mandelbaum"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rye
 version: !ruby/object:Gem::Version 
-  version: 0.8.16
+  version: 0.8.17
 platform: ruby
 authors: 
 - Delano Mandelbaum