delano-rye 0.8.7 → 0.8.8

data/CHANGES.txt

@@ -1,6 +1,14 @@
 RYE, CHANGES
 
 
+#### 0.8.8 (2009-08-25) #############################
+
+* FIXED: Rye::Box#guess_user_home for Windows SSH support
+* CHANGE: Renamed Rye::Box#cmd -> Rye::Box#__allow
+* ADDED: New whitelist commands: wget, curl, dir
+* ADDED: Rye::Box#file_write
+
+
 #### 0.8.7 (2009-08-11) #############################
 
 * FIXED: Rye::Box info level output is cleaner 

data/bin/try

@@ -179,7 +179,7 @@ rbox = Rye::Box.new("localhost", :info => false)
 
 # Rye ships without an rm method (for safety!). Here 
 # we add the rm method only to this instance of rbox.
-def rbox.rm(*args); cmd('rm', args); end
+def rbox.rm(*args); __allow('rm', args); end
 
 rbox.rm(:r, :f, dir_upload) # Silently delete test dirs
 rbox.rm(:r, :f, dir_download)

data/lib/rye.rb

@@ -43,7 +43,7 @@ module Rye
   extend self
 
   unless defined?(SYSINFO)
-    VERSION = "0.8.7".freeze
+    VERSION = "0.8.8".freeze
     SYSINFO = SysInfo.new.freeze
   end
   
@@ -315,7 +315,7 @@ module Rye
   
   Rye.reload
   
-  unless Rye.sysinfo.os == :win32
+  unless Rye.sysinfo.os == :windows
     begin
       @@mutex.synchronize {                   # One thread only
         start_sshagent_environment            # Run this now

data/lib/rye/box.rb

@@ -62,7 +62,9 @@ module Rye
     def info; @rye_info; end
     def debug; @rye_debug; end
     def error; @rye_error; end
-
+    
+    def ostype=(val); @rye_ostype = val; end 
+    def impltype=(val); @rye_impltype = val; end 
     def pre_command_hook=(val); @rye_pre_command_hook = val; end
     def post_command_hook=(val); @rye_post_command_hook = val; end
     # A Hash. The keys are exception classes, the values are Procs to execute
@@ -111,6 +113,7 @@ module Rye
       @rye_safe, @rye_debug = @rye_opts.delete(:safe), @rye_opts.delete(:debug)
       @rye_info, @rye_error = @rye_opts.delete(:info), @rye_opts.delete(:error)
       @rye_getenv = {} if @rye_opts.delete(:getenv) # Enable getenv with a hash
+      @rye_ostype, @rye_impltype = @rye_opts.delete(:ostype), @rye_opts.delete(:impltype)
       @rye_quiet = @rye_opts.delete(:quiet)
       
       # Just in case someone sends a true value rather than IO object
@@ -221,7 +224,7 @@ module Rye
     # * +additional_keys+ is a list of file paths to private keys
     # Returns the instance of Box
     def add_keys(*additional_keys)
-      if Rye.sysinfo.os == :win32
+      if Rye.sysinfo.os == :windows
         @rye_opts[:keys] ||= []
         @rye_opts[:keys] += additional_keys.flatten
         return @rye_opts[:keys]
@@ -249,6 +252,10 @@ module Rye
       @rye_ostype = os
     end
     
+    def impltype
+      @rye_impltype
+    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. 
@@ -328,21 +335,24 @@ module Rye
       # /etc/default/useradd, HOME=/home OR useradd -D
       # /etc/adduser.config, DHOME=/home OR ??
       user_defaults = {}
-      raw = self.quietly { useradd(:D) } rescue ["HOME=/home"]
       ostmp = self.ostype
-      raw.each do |nv|
-
-        if ostmp == "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'
-        elsif ostmp == "darwin"
-          user_defaults['HOME'] = '/Users'
-        else
+      ostmp &&= ostype.to_s
+      
+      if ostmp == "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'
+      elsif ostmp == "darwin"
+        user_defaults['HOME'] = '/Users'
+      elsif ostmp == "windows"
+        user_defaults['HOME'] = 'C:/Documents and Settings'
+      else
+        raw = self.quietly { useradd(:D) } rescue ["HOME=/home"]
+        raw.each do |nv|
           n, v = nv.scan(/\A([\w_-]+?)=(.+)\z/).flatten
           user_defaults[n] = v
         end
@@ -769,7 +779,7 @@ module Rye
       
       rap
     end
-    alias :cmd :run_command
+    alias :__allow :run_command
     
     # Takes a list of arguments appropriate for run_command or
     # preview_command and returns: [cmd, args]. 

data/lib/rye/cmd.rb

@@ -11,7 +11,7 @@ module Rye;
   #
   #     require 'rye'
   #     module Rye::Box::Cmd
-  #       def special(*args); cmd("/your/special/command", args); end
+  #       def special(*args); __allow("/your/special/command", args); end
   #     end
   #
   #     rbox = Rye::Box.new('somehost')
@@ -19,73 +19,77 @@ module Rye;
   #
   module Cmd
     
-    #--
-    # TODO: Clean this trite mess up!
-    #++
-    
     # 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 ps(*args); cmd('ps', args); end
-    def sh(*args); cmd('sh', args); end
-    def df(*args); cmd('df', args); end
-    def du(*args); cmd('du', args); end
+    #def cd(*args); __allow('cd', args); end
+    #def rm(*args); __allow('rm', args); end
+    def wc(*args); __allow('wc', args); end
+    def cp(*args); __allow("cp", args); end
+    def mv(*args); __allow("mv", args); end
+    def ls(*args); __allow('ls', args); end
+    def ps(*args); __allow('ps', args); end
+    def sh(*args); __allow('sh', args); end
+    def df(*args); __allow('df', args); end
+    def du(*args); __allow('du', args); end
+    
+    def env; __allow "env"; end
+    def rye(*args); __allow "rye", args; end
+    def pwd(*args); __allow "pwd", args; end
+    def svn(*args); __allow('svn', args); end
+    def cvs(*args); __allow('cvs', args); end
+    def git(*args); __allow('git', args); end
+    def sed(*args); __allow('sed', args); end
+    def awk(*args); __allow('awk', args); end
+    def cat(*args); __allow('cat', args); end
+    def tar(*args); __allow('tar', args); end
     
-    def env; cmd "env"; end
-    def rye(*args); cmd "rye", args; end
-    def pwd(*args); cmd "pwd", args; end
-    def svn(*args); cmd('svn', args); end
-    def cvs(*args); cmd('cvs', args); end
-    def git(*args); cmd('git', args); end
-    def sed(*args); cmd('sed', args); end
-    def awk(*args); cmd('awk', args); end
-    def cat(*args); cmd('cat', args); end
-    def tar(*args); cmd('tar', args); end
+    #def kill(*args); __allow('kill', args); end
+    def rake(*args); __allow('sudo', args); end
+    def sudo(*args); __allow('sudo', args); end
+    def grep(*args); __allow('grep', args); end
+    def date(*args); __allow('date', args); end
+    def ruby(*args); __allow('ruby', args); end
+    def rudy(*args); __allow('rudy', args); end
+    def perl(*args); __allow('perl', args); end
+    def bash(*args); __allow('bash', args); end
+    def echo(*args); __allow('echo', args); end
+    def test(*args); __allow('test', args); end
+    def mkfs(*args); __allow('mkfs', args); end
+    def gzip(*args); __allow('gzip', args); end
+    def make(*args); __allow('make', args); end
+    def wget(*args); __allow('wget', args); end
+    def curl(*args); __allow('curl', 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
-    def ruby(*args); cmd('ruby', args); end
-    def rudy(*args); cmd('rudy', args); end
-    def perl(*args); cmd('perl', args); end
-    def bash(*args); cmd('bash', args); end
-    def echo(*args); cmd('echo', args); end
-    def test(*args); cmd('test', args); end
-    def mkfs(*args); cmd('mkfs', args); end
-    def gzip(*args); cmd('gzip', args); end
-    def make(*args); cmd('make', args); end
+    def mount(*args); __allow("mount", args); end
+    def sleep(*args); __allow("sleep", args); end
+    def mkdir(*args); __allow('mkdir', args); end
+    def touch(*args); __allow('touch', args); end
+    def uname(*args); __allow('uname', args); end
+    def chmod(*args); __allow('chmod', args); end
+    def chown(*args); __allow('chown', args); end
+    def unzip(*args); __allow('unzip', args); end
+    def bzip2(*args); __allow('bzip2', args); end
+    def which(*args); __allow('which', args); end
     
-    def mount(*args); cmd("mount", args); end
-    def sleep(*args); cmd("sleep", args); end
-    def mkdir(*args); cmd('mkdir', args); end
-    def touch(*args); cmd('touch', args); end
-    def uname(*args); cmd('uname', args); end
-    def chmod(*args); cmd('chmod', args); end
-    def chown(*args); cmd('chown', args); end
-    def unzip(*args); cmd('unzip', args); end
-    def bzip2(*args); cmd('bzip2', args); end
-    def which(*args); cmd('which', args); end
+    def umount(*args); __allow("umount", args); end
+    def uptime(*args); __allow("uptime", args); end
+    def python(*args); __allow('python', args); end
+    def gunzip(*args); __allow('gunzip', args); end
+    def useradd(*args); __allow('useradd', args); end
+    def bunzip2(*args); __allow('bunzip2', args); end
+    def getconf(*args); __allow('getconf', args); end
+    def history(*args); __allow('history', args); end
+    def rudy_s3(*args); __allow('rudy-s3', args); end
+    def printenv(*args); __allow('printenv', args); end
+    def hostname(*args); __allow('hostname', args); end
+    def rudy_ec2(*args); __allow('rudy-ec2', args); end
+    def rudy_sdb(*args); __allow('rudy-sdb', args); end
+    def configure(*args); __allow('./configure', args); end
+    
+    #--
+    # WINDOWS
+    #++
+    def dir(*args); __allow('cmd', args); end
     
-    def umount(*args); cmd("umount", args); end
-    def uptime(*args); cmd("uptime", args); end
-    def python(*args); cmd('python', args); end
-    def gunzip(*args); cmd('gunzip', args); end
-    def useradd(*args); cmd('useradd', args); end
-    def bunzip2(*args); cmd('bunzip2', args); end
-    def getconf(*args); cmd('getconf', args); end
-    def history(*args); cmd('history', args); end
-    def rudy_s3(*args); cmd('rudy-s3', args); end
-    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_sdb(*args); cmd('rudy-sdb', args); end
-    def configure(*args); cmd('./configure', args); end
     
     # Transfer files to a machine via Net::SCP. 
     # * +paths+ is an Array of files to upload. The last element is the 
@@ -151,15 +155,28 @@ module Rye;
         file_content = self.file_download filepath
       end
 
-      file_content ||= StringIO.new
+      content ||= StringIO.new
       if newcontent.is_a?(StringIO)
         newcontent.rewind
-        file_content.puts newcontent.read
+        content.puts newcontent.read
       else
-        file_content.puts newcontent
+        content.puts newcontent
+      end
+      
+      self.file_upload content, filepath
+    end
+    
+    # Write +newcontent+ to remote +filepath+. If the file exists
+    # it will be overwritten. If +backup+ is specified, +filepath+
+    # will be copied to +filepath-previous+ before appending.
+    def file_write(filepath, newcontent, backup=false)
+      if self.file_exists?(filepath)
+        self.cp filepath, "#{filepath}-previous" if backup
       end
       
-      self.file_upload file_content, filepath
+      content = StringIO.new
+      content.puts newcontent
+      self.file_upload content, filepath
     end
     
     #--   
@@ -252,7 +269,7 @@ module Rye;
         define_method(meth) do |*args|
           local_args = hard_args.clone
           local_args += args
-          cmd(path, *local_args)
+          __allow(path, *local_args)
         end        
       end
     end

data/lib/rye/set.rb

@@ -69,7 +69,7 @@ module Rye
     # * +additional_keys+ is a list of file paths to private keys
     # Returns the instance of Rye::Set
     def add_key(*additional_keys)
-      if Rye.sysinfo.os == :win32
+      if Rye.sysinfo.os == :windows
         @opts[:keys] ||= []
         @opts[:keys] += additional_keys.flatten
         return @opts[:keys]

data/rye.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rye"
   s.rubyforge_project = "rye"
-  s.version = "0.8.7"
+  s.version = "0.8.8"
   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"
@@ -13,6 +13,7 @@
   s.add_dependency 'drydock'
   s.add_dependency 'sysinfo'
   s.add_dependency 'storable'
+  s.add_dependency 'sysinfo', '>= 0.7.0'
   
   s.add_dependency 'highline', '>= 1.5.1'
   s.add_dependency 'net-ssh', '>= 2.0.11'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delano-rye
 version: !ruby/object:Gem::Version 
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -42,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: sysinfo
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: highline
   type: :runtime