delano-rye 0.8.6 → 0.8.7

data/CHANGES.txt

@@ -1,9 +1,12 @@
 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.8.7 (2009-08-11) #############################
+
+* FIXED: Rye::Box info level output is cleaner 
+* FIXED: file_upload / download now expanding local tildas when safemode is disabled
+* ADDED: Interactive handling for removing gems
+* ADDED: dir_upload and dir_download
 
 
 #### 0.8.6 (2009-08-04) #############################
@@ -277,3 +280,8 @@ Rye.shell and Rye::Box.run_command (SSH) commands.
 
 Initial public release
 
+
+#### TODO ###########################################
+
+* Re-implement Rye::Rap as an Observable StringIO object for dynamic printing of output. 
+* Fingerprints: ssh-keygen -l -f id_rsa_repos.pub

data/lib/rye.rb

@@ -43,7 +43,7 @@ module Rye
   extend self
 
   unless defined?(SYSINFO)
-    VERSION = "0.8.6".freeze
+    VERSION = "0.8.7".freeze
     SYSINFO = SysInfo.new.freeze
   end
   

data/lib/rye/box.rb

@@ -169,7 +169,7 @@ module Rye
           @rye_current_working_directory = fpath
         end
       end
-      info "CWD: #{@rye_current_working_directory}"
+      debug "CWD: #{@rye_current_working_directory}"
       self
     end
     # Like [] except it returns an empty Rye::Rap object to mimick
@@ -720,7 +720,7 @@ module Rye
       ## raise Rye::CommandNotFound unless self.can?(cmd)
       
       begin
-        info "COMMAND: #{cmd_internal}"
+        debug "COMMAND: #{cmd_internal}"
 
         if !@rye_quiet && @rye_pre_command_hook.is_a?(Proc)
           @rye_pre_command_hook.call(cmd_clean, user, host, nickname) 
@@ -802,11 +802,11 @@ module Rye
     #
     def net_ssh_exec!(command)
 
-      block ||= Proc.new do |channel, type, data|
+      block ||= Proc.new do |channel, type, data, tt|
         
         channel[:stdout] ||= ""
         channel[:stderr] ||= ""
-        channel[:stdout] << data if type == :stdout
+        
         
         if type == :stderr
           # NOTE: Use sudo to test this since it prompts for a passwords. 
@@ -824,7 +824,15 @@ module Rye
           # return the following error and appear to hang. We
           # catch it and raise the appropriate exception.
           raise Rye::NoPty if data =~ /Pseudo-terminal will not/
-          
+        elsif type == :stdout
+          if data =~ /Select gem to uninstall/i
+            puts data
+            ret = Annoy.get_user_input('')
+            raise "No input given" if ret.nil?
+            channel.send_data "#{ret}\n"
+          else
+            channel[:stdout] << data
+          end
         end
         
       end
@@ -865,6 +873,7 @@ module Rye
     
     
     # * +direction+ is one of :upload, :download
+    # * +recursive+ should be true for directories and false for files. 
     # * +files+ is an Array of file paths, the content is direction specific.
     # For downloads, +files+ is a list of files to download. The last element
     # must be the local directory to download to. If downloading a single file
@@ -878,14 +887,14 @@ module Rye
     # parameters. An exception is raised and no files are transferred. 
     # Uploads always return nil. Downloads return nil or a StringIO object if
     # one is specified for the target. 
-    def net_scp_transfer!(direction, *files)
-      direction ||= ''
+    def net_scp_transfer!(direction, recursive, *files)
+      
       unless [:upload, :download].member?(direction.to_sym)
         raise "Must be one of: upload, download" 
       end
       
       if @rye_current_working_directory
-        info "CWD (#{@rye_current_working_directory})"
+        debug "CWD (#{@rye_current_working_directory})"
       end
       
       files = [files].flatten.compact || []
@@ -911,7 +920,10 @@ module Rye
         
         # Expand fileglobs (e.g. path/*.rb becomes [path/1.rb, path/2.rb]).
         # This should happen after checking files.size to determine the target
-        files = files.collect { |file| Dir.glob file }.flatten unless @rye_safe
+        unless @rye_safe
+          files.collect! { |file| Dir.glob File.expand_path(file) }
+          files.flatten! 
+        end
       end
               
       # Fail early. We check whether the StringIO object is available to read
@@ -924,10 +936,10 @@ module Rye
         end
       end
       
-      info "#{direction.to_s.upcase} TO: #{target}"
+      info "#{direction.to_s} to: #{target}"
       debug "FILES: " << files.join(', ')
       
-      # Make sure the remote directory exists. We can do this only when
+      # Make sure the target directory exists. We can do this only when
       # there's more than one file because "target" could be a file name
       if files.size > 1 && !target.is_a?(StringIO)
         debug "CREATING TARGET DIRECTORY: #{target}"
@@ -936,14 +948,20 @@ module Rye
       
       Net::SCP.start(@rye_host, @rye_opts[:user], @rye_opts || {}) do |scp|
         transfers = []
+        prev = ""
         files.each do |file|
           debug file.to_s
-          transfers << scp.send(direction, file, target)  do |ch, n, s, t|
-            pinfo "#{n}: #{s}/#{t}b\r"  # update line: "file: sent/total"
+          prev = ""
+          transfers << scp.send(direction, file, target, :recursive => recursive)  do |ch, n, s, t|
+            line = "%-50s %6d/%-6d bytes" % [n, s, t]
+            spaces = (prev.size > line.size) ? ' '*(prev.size - line.size) : ''
+            pinfo "%s %s \r" % [line, spaces] # update line: "file: sent/total"
             @rye_info.flush if @rye_info        # make sure every line is printed
+            prev = line
           end
         end
         transfers.each { |t| t.wait }   # Run file transfers in parallel
+        pinfo (' '*prev.size) << "\r"
         info $/
       end
       

data/lib/rye/cmd.rb

@@ -25,11 +25,11 @@ module Rye;
     
     # NOTE: See Rye::Box for the implementation of cd
     #def cd(*args); cmd('cd', args); end
+    #def rm(*args); cmd('rm', args); end
     def wc(*args); cmd('wc', args); end
     def cp(*args); cmd("cp", args); end
     def mv(*args); cmd("mv", args); end
     def ls(*args); cmd('ls', args); end
-    #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
@@ -47,6 +47,7 @@ module Rye;
     def tar(*args); cmd('tar', args); end
     
     #def kill(*args); cmd('kill', args); end
+    def rake(*args); cmd('sudo', args); end
     def sudo(*args); cmd('sudo', args); end
     def grep(*args); cmd('grep', args); end
     def date(*args); cmd('date', args); end
@@ -83,11 +84,11 @@ module Rye;
     def printenv(*args); cmd('printenv', args); end
     def hostname(*args); cmd('hostname', args); end
     def rudy_ec2(*args); cmd('rudy-ec2', args); end
-    def rudy_edb(*args); cmd('rudy-sdb', args); end
+    def rudy_sdb(*args); cmd('rudy-sdb', args); end
     def configure(*args); cmd('./configure', args); end
     
     # Transfer files to a machine via Net::SCP. 
-    # * +files+ is an Array of files to upload. The last element is the 
+    # * +paths+ is an Array of files to upload. The last element is the 
     # directory to upload to. If uploading a single file, the last element
     # can be a file path. The list of files can also include StringIO objects.
     # The target directory will be created if it does not exist, but only 
@@ -97,10 +98,10 @@ module Rye;
     # Always return nil.
     #
     # NOTE: Changes to current working directory with +cd+ or +[]+ are ignored.
-    def file_upload(*files); net_scp_transfer!(:upload, *files); end
+    def file_upload(*paths); net_scp_transfer!(:upload, false, *paths); end
 
     # Transfer files from a machine via Net::SCP. 
-    # * +files+ is an Array of files to download. The last element must be the 
+    # * +paths+ is an Array of files to download. The last element must be the 
     # local directory to download to. If downloading a single file the last 
     # element can be a file path. The target can also be a StringIO object.
     # The target directory will be created if it does not exist, but only 
@@ -110,13 +111,25 @@ module Rye;
     # Return nil or a StringIO object, if specified as the target.
     #
     # NOTE: Changes to current working directory with +cd+ or +[]+ are ignored.
-    def file_download(*files); net_scp_transfer!(:download, *files); end
+    def file_download(*paths); net_scp_transfer!(:download, false, *paths); end
+    
+    # Same as file_upload except directories are processed recursively. If
+    # any supplied paths are directories you need to use this method and not 
+    # file_upload. 
+    def dir_upload(*paths); net_scp_transfer!(:upload, true, *paths); end
+    alias_method :directory_upload, :dir_upload
+    
+    # Same as file_download except directories are processed recursively. If
+    # any supplied paths are directories you need to use this method and not 
+    # file_download. 
+    def dir_download(*paths); net_scp_transfer!(:download, true, *paths); end
+    alias_method :directory_download, :dir_download
     
     # Shorthand for +file_download('remote/path').string+
     #
-    # Returns a String containing the content of all remote *files*. 
-    def string_download(*files)
-      net_scp_transfer!(:download, *files).string
+    # Returns a String containing the content of all remote *paths*. 
+    def string_download(*paths)
+      net_scp_transfer!(:download, *paths).string
     end
     alias_method :str_download, :string_download
     

data/rye.gemspec

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