rye 0.4 → 0.4.1

data/CHANGES.txt

@@ -5,6 +5,13 @@ TODO
 * Fingerprints: ssh-keygen -l -f id_rsa_repos.pub
 
 
+#### 0.4.1 (2009-04-06) #############################
+
+* FIXED: Rye::Box.authorize_keys was not disabling safe mode properly
+* ADDED: "rye authorize" now specifically enforces the auth method order 
+* FIXED: Disabled debug mode. 
+
+
 #### 0.4.0 (2009-04-06) #############################
 
 * ADDED: to_s and inspect methods for cleaner debugging output

data/bin/rye

@@ -41,15 +41,16 @@ command :authorize do |obj|
   
   highline = HighLine.new # Used for password prompt
   
-  opts = { :debug => nil }
+  opts = { :debug => nil, :auth_methods => %w(publickey hostbased) }
   opts[:user] = obj.option.user if obj.option.user
   
   obj.argv.each do |hostname|
-    puts "Authorizing #{hostname}"
+    
     
     retried = 0
     begin
       rbox = Rye::Box.new(hostname, opts).connect
+      puts "Authorizing #{rbox.opts[:user]}@#{hostname}" if retried == 0
       
       # We know we're already authorized b/c we didn't have to give a password
       if retried == 0
@@ -61,12 +62,16 @@ command :authorize do |obj|
     # An authentication failure means either the requested user doesn't
     # exist on the remote machine or we need to supply a password. 
     rescue Net::SSH::AuthenticationFailed => ex
+      STDERR.puts
       retried += 1
-      opts[:password] = highline.ask("Password: ") { |q| q.echo = '' }
-      retry unless retried > 3
-    rescue Net::SSH::AuthenticationFailed
-      STDERR.puts "Authentication failed."
-      exit 1
+      if retried <= 3
+        #opts[:password] = highline.ask("Password: ") { |q| q.echo = '' }
+        opts[:auth_methods] = %w(password keyboard-interactive)
+        retry
+      else
+        STDERR.puts "Authentication failed."
+        exit 1 
+      end
     end
     
     puts "Added public keys for: ", rbox.authorize_keys
@@ -117,7 +122,7 @@ command_alias :pubkeys, :pubkey
 
 
 default :keys
-debug :on
+debug :off
 
 # We can 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/box.rb

@@ -197,18 +197,18 @@ module Rye
     #
     def authorize_keys
       added_keys = []
-      opts[:safe] = false
+      @safe= false
       Rye.keys.each do |key|
         path = key[2]
         debug "# Public key for #{path}"
         k = Rye::Key.from_file(path).public_key.to_ssh2
-        self.mkdir('-p', '~/.ssh') # Silently create dir if it doesn't exist
-        self.echo("'#{k}' >> ~/.ssh/authorized_keys")
-        self.echo("'#{k}' >> ~/.ssh/authorized_keys2")
-        self.chmod('-R', '0600', '.ssh')
+        self.mkdir('-p', '$HOME/.ssh') # Silently create dir if it doesn't exist
+        self.echo("'#{k}' >> $HOME/.ssh/authorized_keys")
+        self.echo("'#{k}' >> $HOME/.ssh/authorized_keys2")
+        self.chmod('-R', '0600', '$HOME/.ssh/authorized_keys*')
         added_keys << path
       end
-      opts[:safe] = true
+      @safe = true
       added_keys
     end
     

data/lib/rye/cmd.rb

@@ -50,7 +50,7 @@ module Rye;
     def mkdir(*args); cmd('mkdir', args); end
     def touch(*args); cmd('touch', args); end
     def uname(*args); cmd('uname', args); end
-    def chmod(*args); cmd('uname', args); end
+    def chmod(*args); cmd('chmod', args); end
     
     def uptime; cmd("uptime"); end
     def python(*args); cmd('python', args); end

data/rye.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rye"
   s.rubyforge_project = "rye"
-  s.version = "0.4"
+  s.version = "0.4.1"
   s.summary = "Rye: Run system commands via SSH locally and remotely in a Ruby way."
   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.4"
+  version: 0.4.1
 platform: ruby
 authors: 
 - Delano Mandelbaum