rye 0.6.2 → 0.6.3

data/CHANGES.txt

@@ -2,9 +2,17 @@ RYE, CHANGES
 
 TODO
 
+* Re-implement Rye::Rap as an Observable StringIO object for dynamic printing of output. 
 * Fingerprints: ssh-keygen -l -f id_rsa_repos.pub
 
 
+#### 0.6.3 (2009-05-02) #############################
+
+* FIXED: Rye::Box.guess_user_home wasn't handling the username arg (only using default name)
+* ADDED: Rye::Cmd.can?
+* ADDED: Rye::Cmd.ostype
+
+
 #### 0.6.2 (2009-04-29) #############################
 
 * FIXED: I forgot to add highline to the gemspec file manifest. Cripes!

data/bin/rye

@@ -41,16 +41,18 @@ option :u, :user, String, "Username"
 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 #{obj.option.user}@#{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 #{obj.option.user}@#{hostname}"
+    puts "Now try: " << "ssh #{opts[:user]}@#{hostname}"
     
   end
   
@@ -60,6 +62,7 @@ command_alias :authorize, :authorise
 about "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')
   puts "Added public keys for: ", rbox.authorize_keys_local

data/bin/try

@@ -194,7 +194,7 @@ p rbox.cat("#{dir_upload}/applejack.txt")   # => "Some in-memory content"
 
 filecontent = StringIO.new
 rbox.download("#{dir_upload}/applejack.txt", filecontent)
-              
+filecontent.rewind           
 p filecontent.read
 
 

data/lib/rye/box.rb

@@ -301,10 +301,17 @@ module Rye
       Rye.remote_host_keys(@host)
     end
     
+    
     # Uses the output of "useradd -D" to determine the default home
     # directory. This returns a GUESS rather than the a user's real
     # home directory. Currently used only by authorize_keys_remote.
     def guess_user_home(other_user=nil)
+      this_user = other_user || opts[:user]
+      @guessed_homes ||= {}
+      
+      # A simple cache. 
+      return @guessed_homes[this_user] if @guessed_homes.has_key?(this_user)
+      
       # Some junk to determine where user home directories are by default.
       # We're relying on the command "useradd -D" so this may not work on
       # different Linuxen and definitely won't work on Windows.
@@ -314,10 +321,22 @@ module Rye
       user_defaults = {}
       raw = self.useradd(:D) rescue ["HOME=/home"]
       raw.each do |nv|
-        n, v = nv.scan(/\A([\w_-]+?)=(.+)\z/).flatten
-        user_defaults[n] = v
+
+        if self.ostype == "sunos"
+          #nv.scan(/([\w_-]+?)=(.+?)\s/).each do |n, v|
+          #  n = 'HOME' if n == 'basedir'
+          #  user_defaults[n.upcase] = v.strip
+          #end
+          # In Solaris, useradd -D says the default home path is /home
+          # but that directory is not writable. See: http://bit.ly/IJDD0
+          user_defaults['HOME'] = '/export/home'
+        else
+          n, v = nv.scan(/\A([\w_-]+?)=(.+)\z/).flatten
+          user_defaults[n] = v
+        end
       end
-      "#{user_defaults['HOME']}/#{other_user}"
+      
+      @guessed_homes[this_user] = "#{user_defaults['HOME']}/#{this_user}"
     end
     
     # Copy the local public keys (as specified by Rye.keys) to 
@@ -402,7 +421,7 @@ module Rye
     # A handler for undefined commands. 
     # Raises Rye::CommandNotFound exception.
     def method_missing(meth, *args, &block)
-      raise Rye::CommandNotFound, "#{meth.to_s} (args: #{args.join(' ')})"
+      raise Rye::CommandNotFound, "#{meth.to_s}"
     end
     def preview_command(*args)
       prep_args(*args).join(' ')
@@ -481,6 +500,10 @@ module Rye
       rap.exit_signal = esignal
       rap.cmd = cmd
       
+      # It seems a convention for various commands to return -1
+      # when something only mildly concerning happens. ls even 
+      # returns -1 for apparently no reason sometimes. In any
+      # case, the real errors are the ones greater than zero
       raise Rye::CommandError.new(rap) if ecode > 0
       
       rap

data/lib/rye/cmd.rb

@@ -109,6 +109,17 @@ module Rye;
       ret.stderr.empty?
     end
     
+    # Return the value of uname in lowercase
+    # This is a temporary fix. We can use SysInfo for this, upload
+    # it, execute it directly, parse the output.
+    def ostype
+      return @ostype if @ostype # simple cache
+      os = self.uname.first rescue nil
+      os ||= 'unknown'
+      os &&= os.downcase
+      @ostype = os
+    end
+    
     # Returns the hash containing the parsed output of "env" on the 
     # remote machine. If the initialize option +:getenv+ was set to 
     # false, this will return an empty hash. 
@@ -117,6 +128,9 @@ module Rye;
     #
     #      puts rbox.getenv['HOME']    # => "/home/gloria" (remote)
     #
+    # NOTE: This method should not raise an exception under normal
+    # circumstances. 
+    #
     def getenv
       if @getenv && @getenv.empty? && self.can?(:env)
         env = self.env rescue []
@@ -143,7 +157,9 @@ module Rye;
     alias :command? :can?
     alias :cmd? :can?
     
-    
+    def Cmd.can?(meth)
+      instance_methods.member?(meth)
+    end
     
     #--
     # * Consider a lock-down mode using method_added

data/lib/sys.rb

@@ -295,3 +295,8 @@ class SystemInfo #:nodoc:all
   
   
 end
+
+
+if $0 == __FILE__
+  puts SystemInfo.new.to_yaml
+end

data/rye.gemspec

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