rye 0.7.1 → 0.7.2

data/CHANGES.txt

@@ -7,10 +7,12 @@ TODO
 * Add S3 support for Rye::Box.upload / download
 
 
-#### 0.7.1 (2009-05-31) #############################
+#### 0.7.1 (2009-06-01) #############################
 
 * CHANGE: Removed broken grep method from Rye::Rap
+* FIXED: Bug which prevented setting relative paths in non-home directory
 * ADDED: Rye::Cmd#add_command helper for adding new command methods. 
+* ADDED: pre-command-hook now sends the hostname to the block
 
 
 #### 0.7.0 (2009-05-30) #############################

data/lib/rye/box.rb

@@ -32,7 +32,8 @@ module Rye
     def host; @rye_host; end
     def opts; @rye_opts; end
     def safe; @rye_safe; end
-
+    def user; (@rye_opts || {})[:user]; end
+    
     def host=(val); @rye_host = val; end
     def opts=(val); @rye_opts = val; end
     def safe=(val); @rye_safe = val; end
@@ -137,14 +138,26 @@ module Rye
     #     rbox.pwd              # => /usr/bin  ($ cd /usr/bin && pwd)
     #
     def [](key=nil)
-      @rye_current_working_directory = key
+      if key.nil? || key.index('/') == 0
+        @rye_current_working_directory = key
+      else
+        # Append to non-absolute paths
+        newpath = File.join(@rye_current_working_directory, key)
+        @rye_current_working_directory = File.expand_path(newpath)
+      end
       self
     end
     # Like [] except it returns an empty Rye::Rap object to mimick
     # a regular command method. Call with nil key (or no arg) to 
     # reset. 
     def cd(key=nil)
-      @rye_current_working_directory = key
+      if key.nil? || key.index('/') == 0
+        @rye_current_working_directory = key
+      else
+        # Append to non-absolute paths
+        newpath = File.join(@rye_current_working_directory, key)
+        @rye_current_working_directory = File.expand_path(newpath)
+      end
       ret = Rye::Rap.new(self)
     end
     
@@ -308,9 +321,6 @@ module Rye
     end
     alias :add_env :setenv  # deprecated?
     
-    # The name of the user that opened the SSH connection
-    def user; (@rye_opts || {})[:user]; end
-    
     # See Rye.keys
     def keys; Rye.keys; end
     
@@ -473,8 +483,11 @@ module Rye
     
     
     # Supply a block to be called before every command. It's called
-    # with three arguments: command name, an Array of arguments, user name
-    #
+    # with three arguments: command name, an Array of arguments, user name, hostname
+    # e.g.
+    #     rbox.pre_command_hook do |cmd,args,user,host|
+    #       ...
+    #     end
     def pre_command_hook(&block)
       @rye_pre_command_hook = block if block
       @rye_pre_command_hook
@@ -591,7 +604,7 @@ module Rye
       debug "Executing: %s" % cmd_clean
       
       if @rye_pre_command_hook.is_a?(Proc)
-        @rye_pre_command_hook.call(cmd, args, opts[:user])  
+        @rye_pre_command_hook.call(cmd, args, user, host)  
       end
       
       ## NOTE: Do not raise a CommandNotFound exception in this method.

data/lib/rye/cmd.rb

@@ -155,17 +155,20 @@ 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|
-          hard_args += args
-          block.call(*hard_args)
+          local_args = hard_args.clone
+          local_args += args
+          block.call(*local_args)
         end
       else
         define_method(meth) do |*args|
-          hard_args += args
-          cmd(path, *hard_args)
+          local_args = hard_args.clone
+          local_args += args
+          cmd(path, *local_args)
         end        
       end
     end

data/rye.gemspec

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