rye 0.8.13 → 0.8.14

data/CHANGES.txt

@@ -1,10 +1,14 @@
 RYE, CHANGES
 
-TODO: Fix "rye authorize" for remote root user
+#### 0.8.14 (2010-02-25) #############################
+
+* FIXED: rye authorize command now logs in to grab the actual homedir.
+* CHANGED: Support user@host syntax for rye authorize command
+
 
 #### 0.8.13 (2010-02-12) #############################
 
-* CHANGE: Remove hanna dependency
+* CHANGE: Remove hanna dependency [Diego Elio 'Flameeyes' Pettenò]
 
 #### 0.8.12 (2010-01-16) #############################
 

data/bin/rye

@@ -51,24 +51,22 @@ command :ssh do |obj|
 end
 
 about "Add your public keys to one or more remote machines"
-usage "rye authorize [-u username] host"
-option :u, :user, String, "Username"
+usage "rye authorize [username@]host"
 argv :hostname
 command :authorize do |obj|
   raise "You must specify a host" unless obj.argv.hostname
-  user = Rye.sysinfo.user
-  
-  opts = { :debug => nil, :auth_methods => %w(publickey hostbased) }
-  opts[:user] = obj.option.user if obj.option.user
-  opts[:user] ||= user
-  
   obj.argv.each do |hostname|
-    
-    puts "Authorizing #{opts[:user]}@#{hostname}"
-    rbox = Rye::Box.new(hostname, opts)
-    puts "Added public keys for: ", rbox.authorize_keys_remote
-    puts "Now try: " << "ssh #{opts[:user]}@#{hostname}"
-    
+    if hostname.index('@')
+      user, host = *hostname.split('@')
+    else
+      user, host = user = Rye.sysinfo.user, hostname
+    end
+    opts = { :debug => nil, :user => user, :auth_methods => %w(publickey hostbased) }
+    puts "Authorizing #{user}@#{host}"
+    rbox = Rye::Box.new(host, opts)
+    rbox.authorize_keys_remote
+    puts "Added public keys for: ", Rye.keys
+    puts "Now try: " << "ssh #{user}@#{host}"
   end
   
 end

data/lib/rye.rb

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

data/lib/rye/box.rb

@@ -362,7 +362,8 @@ module Rye
       elsif ostmp == "windows"
         user_defaults['HOME'] = 'C:/Documents and Settings'
       else
-        raw = self.quietly { useradd(:D) } rescue ["HOME=/home"]
+        raw = self.quietly { useradd(:D) } rescue []
+        raw = ["HOME=/home"] if raw.nil? || raw.empty?
         raw.each do |nv|
           n, v = nv.scan(/\A([\w_-]+?)=(.+)\z/).flatten
           user_defaults[n] = v
@@ -390,7 +391,8 @@ module Rye
       
       # 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)
+      homedir = self.quietly { pwd }.first
+      homedir ||= self.guess_user_home(this_user)
       
       unless self.file_exists?(homedir)
         rap.add_exit_code(1)
@@ -401,7 +403,7 @@ module Rye
       # Let's go into the user's home directory that we now know exists.
       self.cd homedir
       
-      files = ['.ssh/authorized_keys', '.ssh/authorized_keys2']
+      files = ['.ssh/authorized_keys', '.ssh/authorized_keys2', '.ssh/identity']
       files.each do |akey_path|
         if self.file_exists?(akey_path)
           # TODO: Make Rye::Cmd.incremental_backup

data/rye.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rye"
   s.rubyforge_project = "rye"
-  s.version = "0.8.13"
+  s.version = "0.8.14"
   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.13
+  version: 0.8.14
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 -05:00
+date: 2010-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency