delano-rye 0.4.3 → 0.5.0

data/CHANGES.txt

@@ -4,6 +4,14 @@ TODO
 
 * Fingerprints: ssh-keygen -l -f id_rsa_repos.pub
 
+#### 0.5.0 (2009-04-18) #############################
+
+* ADDED: Rye::Box.switch_user
+* ADDED: Several new commands to Rye::Cmd
+* ADDED: Rye::Box.authorize_keys_local and "rye authorize-local
+* FIXED: Bug in connect which prevented key-based logins for reconnections
+* FIXED: Method errors in JRuby
+
 
 #### 0.4.3 (2009-04-14) #############################
 

data/README.rdoc

@@ -1,4 +1,4 @@
-= Rye - v0.4
+= Rye - v0.5
 
 Safely run SSH commands on a bunch of machines at the same time (from Ruby).
 

data/bin/rye

@@ -43,8 +43,8 @@ command :authorize do |obj|
   
   obj.argv.each do |hostname|
     
-    rbox = Rye::Box.new(hostname, opts).connect
     puts "Authorizing #{rbox.opts[:user]}@#{hostname}"
+    rbox = Rye::Box.new(hostname, opts).connect
     puts "Added public keys for: ", rbox.authorize_keys
     puts "Now try: " << "ssh #{rbox.opts[:user]}@#{hostname}"
     
@@ -53,6 +53,17 @@ command :authorize do |obj|
 end
 command_alias :authorize, :authorise
 
+desc "Add your public keys to your current account on this machine"
+command :authorize_local do |obj|
+  user = Rye.sysinfo.user
+  puts "Authorizing #{user}@localhost"
+  rbox = Rye::Box.new('localhost').connect
+  puts "Added public keys for: ", rbox.authorize_keys_local
+  puts "Now try: " << "ssh #{user}@localhost"
+  
+end
+command_alias :local_authorize, :local_authorise
+
 
 desc "Generate a public key from a private key"
 

data/bin/try

@@ -107,6 +107,7 @@ puts %Q(
 
 rset = Rye::Set.new('default', :parallel => true)
 rbox = Rye::Box.new
+p rbox
 
 rset.add_keys('/private/key/path')     # For passwordless logins 
 rset.add_boxes(rbox, 'localhost')      # Add boxes as hostnames or objects

data/lib/rye.rb

@@ -35,7 +35,7 @@ module Rye
   extend self
 
   unless defined?(SYSINFO)
-    VERSION = 0.4.freeze
+    VERSION = 0.5.freeze
     SYSINFO = SystemInfo.new.freeze
   end
   

data/lib/rye/box.rb

@@ -123,8 +123,12 @@ module Rye
       @current_working_directory = key
       self
     end
-    alias :cd :'[]'
-    
+#    alias :cd :'[]'  # fix for jruby
+    def cd(key=nil); 
+      @current_working_directory = key
+      self
+    end
+
     # Open an SSH session with +@host+. This called automatically
     # when you the first comamnd is run if it's not already connected.
     # Raises a Rye::NoHost exception if +@host+ is not specified.
@@ -133,9 +137,10 @@ module Rye
     def connect
       raise Rye::NoHost unless @host
       disconnect if @ssh 
-      debug "Opening connection to #{@host}"
+      debug "Opening connection to #{@host} as #{@opts[:user]}"
       highline = HighLine.new # Used for password prompt
       retried = 0
+      
       begin
         @ssh = Net::SSH.start(@host, @opts[:user], @opts || {}) 
       rescue Net::SSH::AuthenticationFailed => ex
@@ -143,7 +148,7 @@ module Rye
         if STDIN.tty? && retried <= 3
           @opts[:password] = highline.ask("Password: ") { |q| q.echo = '' }
           @opts[:auth_methods] ||= []
-          @opts[:auth_methods] = %w(password)
+          @opts[:auth_methods] << 'password'
           retry
         else
           STDERR.puts "Authentication failed."
@@ -151,10 +156,38 @@ module Rye
         end
       end
       
+      # We add :auth_methods (a Net::SSH joint) to force asking for a
+      # password if the initial (key-based) authentication fails. We
+      # need to delete the key from @opts otherwise it lingers until
+      # the next connection (if we switch_user is called for example).
+      @opts.delete :auth_methods if @opts.has_key?(:auth_methods)
+      
       @ssh.is_a?(Net::SSH::Connection::Session) && !@ssh.closed?
       self
     end
     
+    # Close the SSH session  with +@host+. This is called 
+    # automatically at exit if the connection is open. 
+    def disconnect
+      return unless @ssh && !@ssh.closed?
+      @ssh.loop(0.1) { @ssh.busy? }
+      debug "Closing connection to #{@ssh.host}"
+      @ssh.close
+    end
+    
+    # Reconnect as another user
+    # * +newuser+ The username to reconnect as 
+    #
+    # NOTE: if there is an open connection, it's disconnected
+    # and a new one is opened for the given user. 
+    def switch_user(newuser)
+      return if newuser.to_s == self.user.to_s
+      @opts ||= {}
+      @opts[:user] = newuser
+      disconnect
+      connect
+    end
+    
     # Open an interactive SSH session. This only works if STDIN.tty?
     # returns true. Otherwise it returns the SSH command that would 
     # have been run. This requires the SSH command-line executable (ssh).
@@ -169,15 +202,6 @@ module Rye
       system(cmd)
     end
     
-    # Close the SSH session  with +@host+. This is called 
-    # automatically at exit if the connection is open. 
-    def disconnect
-      return unless @ssh && !@ssh.closed?
-      @ssh.loop(0.1) { @ssh.busy? }
-      debug "Closing connection to #{@ssh.host}"
-      @ssh.close
-    end
-    
     # Add one or more private keys to the SSH Agent. 
     # * +additional_keys+ is a list of file paths to private keys
     # Returns the instance of Box
@@ -190,7 +214,7 @@ module Rye
         debug "ssh-add stdout: #{ret.stdout}"
         debug "ssh-add stderr: #{ret.stderr}"
       end
-      self
+      self #MUST RETURN itself
     end
     alias :add_key :add_keys
     
@@ -203,6 +227,10 @@ module Rye
     end
     alias :add_environment_variable :add_env
     
+    def user
+      (@opts || {})[:user]
+    end
+    
     # See Rye.keys
     def keys
       Rye.keys
@@ -236,7 +264,9 @@ module Rye
     # this box into ~/.ssh/authorized_keys and ~/.ssh/authorized_keys2. 
     # Returns an Array of the private keys files used to generate the public keys.
     #
-    # NOTE: authorize_keys disables safe-mode for this box while it runs. 
+    # NOTE: authorize_keys disables safe-mode for this box while it runs
+    # which will hit you funky style if your using a single instance
+    # of Rye::Box in a multithreaded situation. 
     #
     def authorize_keys
       added_keys = []
@@ -255,11 +285,32 @@ module Rye
       added_keys
     end
     
+    # Authorize the current user to login to the local machine via
+    # SSH without a password. This is the same functionality as
+    # authorize_keys except run with local shell commands. 
+    def authorize_keys_local
+      added_keys = []
+      Rye.keys.each do |key|
+        path = key[2]
+        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
+        Rye.shell(:echo, "'#{k}' >> $HOME/.ssh/authorized_keys")
+        Rye.shell(:echo, "'#{k}' >> $HOME/.ssh/authorized_keys2")
+        Rye.shell(:chmod, '-R', '0600', '$HOME/.ssh/authorized_keys*')
+        added_keys << path
+      end
+      added_keys
+    end
+    
     # A handler for undefined commands. 
     # Raises Rye::CommandNotFound exception.
     def method_missing(meth, *args, &block)
       raise Rye::CommandNotFound, "#{meth.to_s} (args: #{args.join(' ')})"
     end
+    def preview_command(*args)
+      prep_args(*args).join(' ')
+    end
     
   private
       
@@ -300,18 +351,9 @@ module Rye
     def run_command(*args)
       debug "run_command with keys: #{Rye.keys.inspect}"
       
-      connect if !@ssh || @ssh.closed?
-      args = args.flatten.compact
-      args = args.first.split(/\s+/) if args.size == 1
-      cmd = args.shift
-      
-      # 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
+      cmd, args = prep_args(*args)
       
+      connect if !@ssh || @ssh.closed?
       raise Rye::NotConnected, @host unless @ssh && !@ssh.closed?
 
       cmd_clean = Rye.escape(@safe, cmd, args)
@@ -336,6 +378,24 @@ module Rye
     end
     alias :cmd :run_command
     
+
+    
+    # Takes a list of arguments appropriate for run_command or
+    # preview_command and returns: [cmd, args]
+    def prep_args(*args)
+      args = args.flatten.compact
+      args = args.first.split(/\s+/) if args.size == 1
+      cmd = args.shift
+      
+      # 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
+      [cmd, args]
+    end
+    
     # Executes +command+ via SSH
     # Returns an Array with 4 elements: [stdout, stderr, exit code, exit signal]
     def net_ssh_exec!(command)

data/lib/rye/cmd.rb

@@ -25,6 +25,8 @@ module Rye;
     #def rm(*args); cmd('rm', args); end
     def ps(*args); cmd('ps', args); end
     def sh(*args); cmd('sh', args); end
+    def df(*args); cmd('df', args); end
+    def du(*args); cmd('du', args); end
     
     def env(*args); cmd "env"; end
     def pwd(*args); cmd "pwd"; end
@@ -44,15 +46,17 @@ module Rye;
     def bash(*args); cmd('bash', args); end
     def echo(*args); cmd('echo', args); end
     def test(*args); cmd('test', args); end
+    def mkfs(*args); cmd('mkfs', args); end
     
-    def mount(*args); cmd("mount"); end
+    def mount(*args); cmd("mount", args); end
     def sleep(seconds=1); cmd("sleep", seconds); end
     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('chmod', args); end
     
-    def uptime(*args); cmd("uptime"); end
+    def umount(*args); cmd("umount", args); end
+    def uptime(*args); cmd("uptime", args); end
     def python(*args); cmd('python', args); end
     def printenv(*args); cmd('printenv', args); end
     def hostname(*args); cmd('hostname', args); end

data/lib/rye/set.rb

@@ -90,8 +90,12 @@ module Rye
       run_command(:cd, key)
       self
     end
-    alias :cd :'[]'
-    
+#    alias :cd :'[]'  # fix for jruby
+    def cd(key=nil)
+      run_command(:cd, key)
+      self
+    end
+
     # Catches calls to Rye::Box commands. If +meth+ is the name of an 
     # instance method defined in Rye::Cmd then we call it against all 
     # the boxes in +@boxes+. Otherwise this method raises a
@@ -118,6 +122,7 @@ module Rye
     
     # Run the command on all boxes in parallel
     def run_command_parallel(meth, *args)
+      p @boxes
       debug "P: #{meth} on #{@boxes.size} boxes (#{@boxes.collect {|b| b.host }.join(', ')})"
       threads = []
       

data/rye.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rye"
   s.rubyforge_project = "rye"
-  s.version = "0.4.3"
+  s.version = "0.5.0"
   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: delano-rye
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors: 
 - Delano Mandelbaum