delano-rye 0.7.3 → 0.7.4

data/CHANGES.txt

@@ -7,6 +7,15 @@ TODO
 * Add S3 support for Rye::Box.upload / download
 
 
+#### 0.7.4 (2009-06-04) #############################
+
+* FIXED: Bug in Rye::Box#interactive_ssh related to instance variable renaming from 0.7.0.
+* FIXED: Bug in Rye::Cmd#file_append which tried to download files that didn't exist
+* CHANGE: Removed error message, "EC2 instances generate new SSH keys on first boot"
+* ADDED: Rye::Cmd#remove_method
+* ADDED: Rye::Rap#> and Rye::Rap#>> methods to emulate shell redirect to file
+
+
 #### 0.7.3 (2009-06-03) #############################
 
 * ADDED: enable_safe_mode and disable_safe_mode methods
@@ -37,7 +46,6 @@ TODO
   instance variables in batch command blocks. 
 * ADDED: Rye::Box#file_append
 
-
 #### 0.6.6 (2009-05-21) #############################
 
 * CHANGE: Key management is handled by ssh-agent again (instead of Net::SSH)

data/lib/rye/box.rb

@@ -205,7 +205,7 @@ module Rye
     def interactive_ssh(run=true)
       debug "interactive_ssh with keys: #{Rye.keys.inspect}"
       run = false unless STDIN.tty?      
-      cmd = Rye.prepare_command("ssh", "#{@rye_opts[:user]}@rye_#{@rye_host}")
+      cmd = Rye.prepare_command("ssh", "#{@rye_opts[:user]}@#{@rye_host}")
       return cmd unless run
       system(cmd)
     end
@@ -531,7 +531,6 @@ module Rye
         @rye_ssh = Net::SSH.start(@rye_host, @rye_opts[:user], @rye_opts || {}) 
       rescue Net::SSH::HostKeyMismatch => ex
         STDERR.puts ex.message
-        STDERR.puts "NOTE: EC2 instances generate new SSH keys on first boot."
         print "\a" if @rye_info # Ring the bell
         if highline.ask("Continue? ").strip.match(/\Ay|yes|sure|ya\z/i)
           @rye_opts[:paranoid] = false

data/lib/rye/cmd.rb

@@ -110,11 +110,11 @@ module Rye;
     # it will be created. If +backup+ is specified, +filepath+ will be 
     # copied to +filepath-previous+ before appending. 
     def file_append(filepath, newcontent, backup=false)
-      if self.file_exists?(filepath) && backup
-        self.cp filepath, "#{filepath}-previous"
+      if self.file_exists?(filepath)
+        self.cp filepath, "#{filepath}-previous" if backup
+        file_content = self.download filepath
       end
       
-      file_content = self.download filepath
       file_content ||= StringIO.new
       if newcontent.is_a?(StringIO)
         newcontent.rewind
@@ -216,7 +216,12 @@ module Rye;
       end
     end
     
-      
+    # A helper for removing a command from Rye::Cmd. 
+    # * +meth+ the method name
+    def Cmd.remove_command(meth)
+      remove_method(meth)
+    end
+    
     #--
     # * Consider a lock-down mode using method_added
     # * Consider Rye.sysinfo.os == :unix

data/lib/rye/rap.rb

@@ -94,6 +94,29 @@ module Rye;
       self
     end
     
+    # Output STDOUT content to (remote) +path+ 
+    # This works like a shell redirect so the file contents are 
+    # cleared before outputting. 
+    # 
+    #     rbox.ps('aux') > 'processes.log'
+    #
+    def >(path)
+      self.obj.unsafely { rm path }
+      self.obj.file_append(path, self)
+    end
+    
+    # Output STDOUT content to (remote) +path+ 
+    # This works like a shell redirect so if the target file
+    # exists the STDOUT content will be appended. 
+    #
+    #     rbox.ps('aux') >> 'processes.log'
+    #
+    def >>(path)
+      self.obj.file_append(path, self)
+    end
+    
+    
+    
     # NOTE: This is broken!
     #def grep *args
     #  self.select do |boxrap|
@@ -103,10 +126,6 @@ module Rye;
     #end
     
     
-    #def >>(*other)
-    #  p other
-    #end
-    
     #---
     # If Box's shell methods return Rap objects, then 
     # we can do stuff like this

data/rye.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rye"
   s.rubyforge_project = "rye"
-  s.version = "0.7.3"
+  s.version = "0.7.4"
   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.7.3
+  version: 0.7.4
 platform: ruby
 authors: 
 - Delano Mandelbaum