rye 0.8.1 → 0.8.2

data/CHANGES.txt

@@ -4,7 +4,17 @@ TODO
 
 * Re-implement Rye::Rap as an Observable StringIO object for dynamic printing of output. 
 * Fingerprints: ssh-keygen -l -f id_rsa_repos.pub
-* Add S3 support for Rye::Box.upload / download
+
+
+#### 0.8.2 (2009-06-23) #############################
+
+* FIXED: Rye::Box.switch_user will disconnect but not create a new connection.
+* FIXED: Rye::Cmd#add_command hard coded argument handling for blocks
+* CHANGE: Rye::Rap#to_s now returns stdout.join($/)
+* CHANGE: Regexp workaround for remote password prompts is now case insensitive.
+* ADDED: Rye::Cmd#string_upload and Rye::Cmd#string_download
+* ADDED: Rye.shell example to README (thanks rogerdpack)
+
 
 #### 0.8.1 (2009-06-22) #############################
 

data/README.rdoc

@@ -70,8 +70,7 @@ By default, Rye:Set connects to each machine sequentially in the order they were
     dir_upload = "#{Rye.sysinfo.tmpdir}/rye-upload/"
     dir_download = "#{Rye.sysinfo.tmpdir}/rye-download/"
     
-    rbox.file_upload("#{RYE_HOME}/README.rdoc", 
-                "#{RYE_HOME}/LICENSE.txt", dir_upload)
+    rbox.file_upload("#{RYE_HOME}/README.rdoc", "#{RYE_HOME}/LICENSE.txt", dir_upload)
 
     applejack = StringIO.new("Some in-memory content")
     rbox.file_upload(applejack, "#{dir_upload}/applejack.txt")
@@ -84,6 +83,27 @@ By default, Rye:Set connects to each machine sequentially in the order they were
 
     p filecontent.read
 
+== EXAMPLE 5 -- Local processes
+
+For local processes, you can bypass <tt>Rye::Box</tt> and execute commands directly with <tt>Rye.shell</tt>:
+
+    Rye.shell :uptime    # => 11:02  up 16:01, 3 users
+
+
+The first argument must be the command name and the remaining arguments are sent directly as arguments to the command. They're not escaped like with <tt>Rye::Box</tt> so you can use the asterisk, environment variables, pipes, and redirects etc. Also note that you can specify single character switches as symbols and you can separate arguments or put them into a single String.
+
+    Rye.shell :ls, '*'
+    Rye.shell :ls, '-l $HOME'
+    Rye.shell :ls, :l, '$HOME > $TMPDIR/crazy.txt'
+
+The return value is a Rye::Rap object (just like with Rye::Box) so you have access to the exit code and STDERR output:
+
+    ret = Rye.shell :ls, 'nofile'
+    ret.exit_code        # => 1
+    ret.stderr           # => "sh: nofile: No such file or directory"
+    ret.class            # => Rye::Rap
+
+
 
 == About Safe-Mode
 

data/bin/try

@@ -199,4 +199,19 @@ filecontent.rewind
 p filecontent.read
 
 
+puts %Q(
+# ------------------------------------------------------------------
+#   EXAMPLE 7 -- LOCAL PROCESSES
+#)
+
+p Rye.shell :uptime
+
+p Rye.shell :ls, '*'
+p Rye.shell :ls, '-l $HOME'
+p Rye.shell :ls, :l, '$HOME > crazy.txt'
+
+ret = Rye.shell :ls, 'nofile'
+p ret.exit_code                      # => 1
+p ret.stderr                         # => "sh: nofile: No such file or directory"
+p ret.class                          # => Rye::Rap
 

data/lib/rye/box.rb

@@ -190,13 +190,14 @@ module Rye
     # * +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. 
+    # but not reconnected because it's possible it wasn't 
+    # connected yet in the first place (if you create the 
+    # instance with default settings for example)
     def switch_user(newuser)
       return if newuser.to_s == self.user.to_s
       @rye_opts ||= {}
       @rye_opts[:user] = newuser
       disconnect
-      connect
     end
 
     
@@ -787,7 +788,7 @@ module Rye
         if type == :stderr
           # NOTE: Use sudo to test this since it prompts for a passwords. 
           # Use sudo -K to kill the user's timestamp (ask for a password every time)
-          if data =~ /Password:/
+          if data =~ /password:/i
             ret = Annoy.get_user_input("Password: ", '*')
             raise Rye::NoPassword if ret.nil?
             channel.send_data "#{ret}\n"

data/lib/rye/cmd.rb

@@ -112,6 +112,23 @@ module Rye;
     # NOTE: Changes to current working directory with +cd+ or +[]+ are ignored.
     def file_download(*files); net_scp_transfer!(:download, *files); end
     
+    # 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
+    end
+    alias_method :str_download, :string_download
+    
+    # Shorthand for +file_upload(StringIO.new('file content'), 'remote/path')+
+    #
+    # Uploads the content of the String +str+ to +remote_path+. Returns nil
+    def string_upload(str, remote_path)
+      net_scp_transfer!(:upload, StringIO.new(str), remote_path)
+    end
+    alias_method :str_upload, :string_upload
+      
+    
     # Append +newcontent+ to remote +filepath+. If the file doesn't exist
     # it will be created. If +backup+ is specified, +filepath+ will be 
     # copied to +filepath-previous+ before appending. 
@@ -120,7 +137,7 @@ module Rye;
         self.cp filepath, "#{filepath}-previous" if backup
         file_content = self.file_download filepath
       end
-      
+
       file_content ||= StringIO.new
       if newcontent.is_a?(StringIO)
         newcontent.rewind
@@ -132,6 +149,12 @@ module Rye;
       self.file_upload file_content, filepath
     end
     
+    #--   
+    #def file_modify(filepath, regexp, replace=nil, &block)
+    #  raise "File not found: #{filepath}" unless self.file_exists?(filepath)
+    #end
+    #++
+    
     # Does +path+ from the current working directory?
     def file_exists?(path)
       begin
@@ -204,8 +227,6 @@ module Rye;
     # An optional block can be provided which will be called instead
     # of calling a system command. 
     def Cmd.add_command(meth, path=nil, *hard_args, &block)
-
-      path ||= meth.to_s
       if block
         hard_args.unshift(path) unless path.nil? # Don't lose an argument
         define_method(meth) do |*args|
@@ -214,6 +235,7 @@ module Rye;
           block.call(*local_args)
         end
       else
+        path ||= meth.to_s
         define_method(meth) do |*args|
           local_args = hard_args.clone
           local_args += args

data/lib/rye/rap.rb

@@ -85,13 +85,10 @@ module Rye;
     end
     def code; @exit_code; end
     
-    # Returns the first element if there it's the only
-    # one, otherwise the value of Array#to_s
-    def to_s
-      return self.first if self.size == 1
-      return "" if self.size == 0
-      super
-    end
+    # Returns the first element if there's only the
+    # one, an empty String if there's none. Returns
+    # the value of self.join($/) otherwise. 
+    def to_s; self.join $/; end
     
     # Output STDOUT content to (remote) +path+ 
     # This works like a shell redirect so the file contents are 

data/lib/rye.rb

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

data/rye.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rye"
   s.rubyforge_project = "rye"
-  s.version = "0.8.1"
+  s.version = "0.8.2"
   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.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-21 00:00:00 -04:00
+date: 2009-06-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rye
-rubygems_version: 1.3.3
+rubygems_version: 1.3.2
 signing_key: 
 specification_version: 2
 summary: "Rye: Safely run SSH commands on a bunch of machines at the same time (from Ruby)."