rye 0.8.5 → 0.8.6

data/CHANGES.txt

@@ -6,6 +6,11 @@ TODO
 * Fingerprints: ssh-keygen -l -f id_rsa_repos.pub
 
 
+#### 0.8.6 (2009-08-04) #############################
+
+* FIXED: SystemCallError / "Broken Pipe" error when disconnecting in JRuby 1.3
+* FIXED: CommandNotFound: nil error in Windows
+
 #### 0.8.5 (2009-07-14) #############################
 
 * CHANGE: Rye::Box#getenv now accepts an option key name
@@ -19,13 +24,11 @@ TODO
 
 * FIXED: Reference to (still) non-existent net-ssh 2.0.12 is now 2.0.11
 
-
 #### 0.8.3 (2009-06-30) #############################
 
 * ADDED: JRuby 1.3 support
 * ADDED: Tryouts (i.e. better testing)
 
-
 #### 0.8.2 (2009-06-23) #############################
 
 * FIXED: Rye::Box.switch_user will disconnect but not create a new connection.

data/README.rdoc

@@ -1,6 +1,6 @@
 = Rye - v0.8
 
-<strong>Safely run SSH commands on a bunch of machines at the same time (from Ruby).</strong>
+<b>Safely run SSH commands on a bunch of machines at the same time (from Ruby)</b>.
 
 Inspired by Rush[http://rush.heroku.com] and compatible with Ruby 1.8, 1.9, and JRuby 1.3+!
 
@@ -11,7 +11,34 @@ Rye is a Ruby abstraction for executing shell commands via SSH. By default, Rye
 
 Rye does not require anything to be installed on the server side (other than an SSH daemon) so it can be run from any machine with Ruby, OpenSSL, and OpenSSH.
 
-    
+=== SSH keys
+
+You need SSH keys to use Rye. After installing Rye, you can check if you have any by running:
+
+    $ rye
+
+If you get the message <i>"The agent has no identities"</i> you will need to generate a keypair.
+
+    $ ssh-keygen
+
+
+=== Passwordless SSH authorization
+
+The easiest way to work with Rye is to authorize your remote accounts for passwordless logins (otherwise you'll be prompted for a password for every connection). 
+
+Enable passwordless logins to remote HOST1 and HOST2:
+
+    $ rye authorize HOST1 HOST2    
+
+This will copy your public SSH keys to the <tt>~/.ssh/authorized_keys</tt> and <tt>~/.ssh/authorized_keys2</tt> files on the remote machine(s). 
+
+Enable passwordless logins to the local machine:
+
+    $ rye authorize-local
+
+See <tt>rye -h</tt> for more info.
+
+
 == Example 1 -- Execute commands on a remote machine
 
 Shell commands are executed by calling methods on a Rye::Box object. 
@@ -82,15 +109,14 @@ See the "About Safe Mode" section below for more information.
 
 Shell commands can be executed on multiple machines using a Rye::Set object. Create a "set" of machines.
 
-    rbox = Rye::Box.new 'HOST1
+    rbox = Rye::Box.new 'HOST1'
     rset = Rye::Set.new
-    rset.add_boxes(rbox, 'HOST2')          # Add boxes as hostnames or objects
+    rset.add_boxes rbox, 'HOST2'           # Add boxes as hostnames or objects
     
 Then call methods just like with Rye::Box, except now the return value is an Array of Arrays. The order of return values matches the order the machines were added to the set.
     
     rset.hostname                          # => [["HOST1"], ["HOST2"]]
     rset.uname                             # => [["Darwin"], ["Linux"]]
-    rset.
     
 == Example 5b -- Accessing Multiple Machines in Parallel
    
@@ -140,18 +166,6 @@ The return value is a Rye::Rap object (just like with Rye::Box) so you have acce
     ret.class            # => Rye::Rap
 
 
-== Example 8 -- SSH Authorization
-
-Does it annoy you to manually authorize remote SSH accounts? Rye can help!
-
-Enable passwordless logins to HOST1 and HOST2:
-
-    $ rye authorize HOST1 HOST2    
-
-This will copy your public SSH keys to the <tt>~/.ssh/authorized_keys</tt> and <tt>~/.ssh/authorized_keys2</tt> files on the remote machine(s). 
-
-See <tt>rye -h</tt> for more info.
-
 
 == About Safe-Mode
 
@@ -197,11 +211,13 @@ or via download:
 * rye-latest.zip[http://github.com/delano/rye/zipball/latest]
 
 
+
 == Known Issues
 
 * Rye doesn't read the ~/.ssh/config file yet
 * Rye uses OpenSSH's ssh-agent (if it exists). Rye starts it up as a child process and shuts it down using at_exit. If you have code in an at_exit that rely's on Rye, make sure your code runs before Rye's at_exit block is called. For example, Drydock uses at_exit too which is why in bin/rye you can see that Drydock is called explicitly so that Rye's at_exit is executed after Drydock executes a command. 
-* No support for STDIN. 
+* No support for STDIN for commands.
+* Limited support for interactive shells. 
 
 If you find one let me know!
 

data/bin/rye

@@ -9,7 +9,7 @@
 #
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-#%w{net-ssh sysinfo drydock}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
+%w{net-ssh net-scp sysinfo drydock}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
 
 require 'stringio'
 require 'yaml'
@@ -36,6 +36,20 @@ after do
 
 end
 
+option :u, :user, String, "User name to connect as"
+option :i, :identity, String, "Private key"
+argv :host
+command :ssh do |obj|
+  raise "No host supplied" if obj.argv.empty?
+  opts = { :debug => true }
+  opts[:user] = obj.option.user || Rye.sysinfo.user
+  opts[:keys] = [obj.option.identity] || []
+  obj.argv.each do |host|
+    rbox = Rye::Box.new host, opts
+    p rbox.connect
+  end
+end
+
 about "Add your public keys to one or more remote machines"
 usage "rye authorize [-u username] host"
 option :u, :user, String, "Username"
@@ -92,7 +106,7 @@ command_alias :hostkeys, :hostkey
 about "Display your private keys"
 command :keys do |obj|
   Rye.keys.each do |key|
-    puts key.join(' ')
+    puts key
   end
 end
 
@@ -112,7 +126,7 @@ command_alias :pubkeys, :pubkey
 
 
 default :keys
-debug :off
+debug :on
 
 # We call Drydock specifically otherwise it will run at_exit. Rye also
 # uses at_exit for shutting down the ssh-agent. Ruby executes at_exit

data/lib/rye.rb

@@ -43,7 +43,7 @@ module Rye
   extend self
 
   unless defined?(SYSINFO)
-    VERSION = "0.8.5".freeze
+    VERSION = "0.8.6".freeze
     SYSINFO = SysInfo.new.freeze
   end
   
@@ -134,11 +134,12 @@ module Rye
   def keys
     # 2048 76:cb:d7:82:90:92:ad:75:3d:68:6c:a9:21:ca:7b:7f /Users/rye/.ssh/id_rsa (RSA)
     # 2048 7b:a6:ba:55:b1:10:1d:91:9f:73:3a:aa:0c:d4:88:0e /Users/rye/.ssh/id_dsa (DSA)
-    keystr = Rye.shell("ssh-add", '-l')
-    return nil unless keystr
-    keystr.collect do |key|
-      key.split(/\s+/)
-    end
+    #keystr = Rye.shell("ssh-add", '-l')
+    #return nil unless keystr
+    #keystr.collect do |key|
+    #  key.split(/\s+/)
+    #end
+    Dir.glob(File.join(Rye.sysinfo.home, '.ssh', 'id_*sa'))
   end
   
   def remote_host_keys(*hostnames)
@@ -165,15 +166,15 @@ module Rye
   #
   def prepare_command(cmd, *args)
     args &&= [args].flatten.compact
-    cmd = Rye.which(cmd)
-    raise CommandNotFound.new(cmd || 'nil') unless cmd
+    found_cmd = Rye.which(cmd)
+    raise CommandNotFound.new(cmd || '[unknown]') unless found_cmd
     # Symbols to switches. :l -> -l, :help -> --help
     args.collect! do |a|
       a = "-#{a}" if a.is_a?(Symbol) && a.to_s.size == 1
       a = "--#{a}" if a.is_a?(Symbol)
       a
     end
-    Rye.escape(@safe, cmd, *args)
+    Rye.escape(@safe, found_cmd, *args)
   end
   
   # An all ruby implementation of unix "which" command. 
@@ -314,19 +315,19 @@ module Rye
   
   Rye.reload
   
-  begin
-    @@mutex.synchronize {                   # One thread only
-      start_sshagent_environment            # Run this now
-      at_exit { end_sshagent_environment }  # Run this before Ruby exits
-    }
-    
-  rescue => ex
-    STDERR.puts "Error initializing the SSH Agent (is OpenSSH installed?):"
-    STDERR.puts ex.message
-    STDERR.puts ex.backtrace
-    exit 1
+  unless Rye.sysinfo.os == :win32
+    begin
+      @@mutex.synchronize {                   # One thread only
+        start_sshagent_environment            # Run this now
+        at_exit { end_sshagent_environment }  # Run this before Ruby exits
+      }
+    rescue => ex
+      STDERR.puts "Error initializing the SSH Agent (is OpenSSH installed?):"
+      STDERR.puts ex.message
+      STDERR.puts ex.backtrace
+      exit 1
+    end
   end
-  
 end
 
 

data/lib/rye/box.rb

@@ -120,6 +120,7 @@ module Rye
       
       @rye_opts[:logger] = Logger.new(@rye_debug) if @rye_debug # Enable Net::SSH debugging
       @rye_opts[:paranoid] = true unless @rye_safe == false # See Net::SSH.start
+      @rye_opts[:keys] = [@rye_opts[:keys]].flatten.compact
       
       # Add the given private keys to the keychain that will be used for @rye_host
       add_keys(@rye_opts[:keys])
@@ -127,7 +128,7 @@ module Rye
       # We don't want Net::SSH to handle the keypairs. This may change
       # but for we're letting ssh-agent do it. 
       # TODO: Check if this should ot should not be enabled. 
-      @rye_opts.delete(:keys)
+      #@rye_opts.delete(:keys)
       
       # From: capistrano/lib/capistrano/cli.rb
       STDOUT.sync = true # so that Net::SSH prompts show up
@@ -220,9 +221,14 @@ module Rye
     # * +additional_keys+ is a list of file paths to private keys
     # Returns the instance of Box
     def add_keys(*additional_keys)
+      if Rye.sysinfo.os == :win32
+        @rye_opts[:keys] ||= []
+        @rye_opts[:keys] += additional_keys.flatten
+        return @rye_opts[:keys]
+      end
       additional_keys = [additional_keys].flatten.compact || []
       return if additional_keys.empty?
-      ret = Rye.add_keys(additional_keys)
+      ret = Rye.add_keys(additional_keys) 
       if ret.is_a?(Rye::Rap)
         debug "ssh-add exit_code: #{ret.exit_code}" 
         debug "ssh-add stdout: #{ret.stdout}"
@@ -383,8 +389,8 @@ module Rye
         end
         authorized_keys ||= StringIO.new
         
-        Rye.keys.each do |key|
-          path = key[2]
+        Rye.keys.each do |path|
+          
           info "# Adding public key for #{path}"
           k = Rye::Key.from_file(path).public_key.to_ssh2
           authorized_keys.puts k
@@ -415,8 +421,7 @@ module Rye
     # authorize_keys_remote except run with local shell commands. 
     def authorize_keys_local
       added_keys = []
-      Rye.keys.each do |key|
-        path = key[2]
+      Rye.keys.each do |path|
         debug "# Public key for #{path}"
         k = Rye::Key.from_file(path).public_key.to_ssh2
         Rye.shell(:mkdir, :p, :m, '700', '$HOME/.ssh') # Silently create dir if it doesn't exist
@@ -590,7 +595,7 @@ module Rye
       debug "Opening connection to #{@rye_host} as #{@rye_opts[:user]}"
       highline = HighLine.new # Used for password prompt
       retried = 0
-      
+      @rye_opts[:keys].compact!  # A quick fix in Windows. TODO: Why is there a nil?
       begin
         @rye_ssh = Net::SSH.start(@rye_host, @rye_opts[:user], @rye_opts || {}) 
       rescue Net::SSH::HostKeyMismatch => ex
@@ -633,7 +638,7 @@ module Rye
         Timeout::timeout(3) do
           @rye_ssh.loop(0.3) { @rye_ssh.busy?; }
         end
-      rescue Timeout::Error => ex
+      rescue SystemCallError, Timeout::Error => ex
         error "Disconnect timeout (was something still running?)"
       end
       

data/lib/rye/set.rb

@@ -42,7 +42,9 @@ module Rye
       @safe = @opts.delete(:safe)
       @debug = @opts.delete(:debug)
       @error = @opts.delete(:error)
-
+      
+      @opts[:keys] = [@opts[:keys]].flatten.compact
+      
       add_keys(@opts[:keys])
     end
     
@@ -55,9 +57,9 @@ module Rye
     def add_box(*boxes)
       boxes = boxes.flatten.compact 
       @boxes += boxes.collect do |box|
-        b = box.is_a?(String) ? Rye::Box.new(box, @opts) : box
-        b.add_keys(@keys)
-        b
+        box = Rye::Box.new(box, @opts) if box.is_a?(String) 
+        box.add_keys(@keys)
+        box
       end
       self
     end
@@ -67,6 +69,11 @@ module Rye
     # * +additional_keys+ is a list of file paths to private keys
     # Returns the instance of Rye::Set
     def add_key(*additional_keys)
+      if Rye.sysinfo.os == :win32
+        @opts[:keys] ||= []
+        @opts[:keys] += additional_keys.flatten
+        return @opts[:keys]
+      end
       additional_keys = [additional_keys].flatten.compact || []
       Rye.add_keys(additional_keys)
       self

data/rye.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rye"
   s.rubyforge_project = "rye"
-  s.version = "0.8.5"
+  s.version = "0.8.6"
   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.5
+  version: 0.8.6
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-15 00:00:00 -04:00
+date: 2009-08-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency