rye 0.9.6 → 0.9.7

data/CHANGES.txt

@@ -1,8 +1,15 @@
 RYE, CHANGES
 
+#### 0.9.7 (2012-07-06) #############################
+
+* FIXED: STDERR output was printing to STDOUT in one case (Thanks rrepen)
+* FIXED: Pass options from Set to Box
+* ADDED: Feature/raise auth failure if publickey only [Dan Richert]
+
+
 #### 0.9.6 (2012-05-10) #############################
 
-* Added: Feature/capture parallel set exceptions [Dan Richert]
+* ADDED: Feature/capture parallel set exceptions [Dan Richert]
 
 #### 0.9.5 (2012-01-05) #############################
 

data/lib/rye.rb

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

data/lib/rye/box.rb

@@ -677,10 +677,16 @@ module Rye
       rescue Net::SSH::AuthenticationFailed => ex
         print "\a" if retried == 0 && @rye_info # Ring the bell once
         retried += 1
-        if STDIN.tty? && retried <= 3
+
+        @rye_opts[:auth_methods] ||= []
+
+        # Raise Net::SSH::AuthenticationFailed if publickey is the 
+        # only auth method
+        if @rye_opts[:auth_methods] == ["publickey"]
+          raise Net::SSH::AuthenticationFailed
+        elsif STDIN.tty? && retried <= 3
           STDERR.puts "Passwordless login failed for #{@rye_user}"
           @rye_opts[:password] = highline.ask("Password: ") { |q| q.echo = '' }.strip
-          @rye_opts[:auth_methods] ||= []
           @rye_opts[:auth_methods].push *['keyboard-interactive', 'password']
           retry
         else
@@ -1091,7 +1097,7 @@ module Rye
         end
         channel.on_process                { 
           channel[:handler] = :on_process
-          print channel[:stderr].read if channel[:stderr].available > 0
+          STDERR.print channel[:stderr].read if channel[:stderr].available > 0
           begin
             send("state_#{channel[:state]}", channel) unless channel[:state].nil?
           rescue Interrupt

data/lib/rye/set.rb

@@ -41,9 +41,9 @@ module Rye
 
       @parallel = @opts.delete(:parallel) # Rye::Box doesn't have :parallel
 
-      @safe = @opts.delete(:safe)
-      @debug = @opts.delete(:debug)
-      @error = @opts.delete(:error)
+      @safe = @opts[:safe]
+      @debug = @opts[:debug]
+      @error = @opts[:error]
 
       @opts[:keys] = [@opts[:keys]].flatten.compact
 

data/rye.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rye"
   s.rubyforge_project = "rye"
-  s.version = "0.9.6"
+  s.version = "0.9.7"
   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.9.6
+  version: 0.9.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
+date: 2012-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: annoy
@@ -134,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 614630044624283309
+      hash: -1540559610647947478
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 614630044624283309
+      hash: -1540559610647947478
 requirements: []
 rubyforge_project: rye
 rubygems_version: 1.8.22