rye 0.8.19 → 0.9.0

data/lib/rye/cmd.rb

@@ -11,7 +11,7 @@ module Rye;
   #
   #     require 'rye'
   #     module Rye::Box::Cmd
-  #       def special(*args); __allow("/your/special/command", args); end
+  #       def special(*args); run_command("/your/special/command", args); end
   #     end
   #
   #     rbox = Rye::Box.new('somehost')
@@ -19,83 +19,120 @@ module Rye;
   #
   module Cmd
     
+    def __shell(cmd, *args, &blk)
+      self.rye_shell = true
+      rap = run_command cmd, *args, &blk
+      self.rye_shell = false
+      rap
+    end
+    private :__shell
+    
+    # When called without a block this will open an 
+    # interactive shell session. 
+    def bash(*args, &blk)
+      setenv('PS1', "(rye) \\h:\\w \\u\\$\ ")
+      __shell 'bash', *args, &blk
+    end
+    
+    # When called without a block this will open an 
+    # interactive shell session.
+    def irb(*args, &blk)
+        __shell 'irb', *args, &blk
+    end
+    
+    # When called without a block this will open an 
+    # interactive shell session.
+    def sh(*args, &blk)
+      setenv('PS1', "(rye) $\ ")
+      __shell 'sh', *args, &blk
+    end
+    
     # NOTE: See Rye::Box for the implementation of cd
-    #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 su(*args); __allow('su', args); end
-    def ln(*args); __allow('ln', args); end
-    def ab(*args); __allow('ab', args); end
-    def hg(*args); __allow('hg', args); end
+    #def cd(*args) run_command('cd', args) end
+    #def rm(*args) run_command('rm', args) end
+    def wc(*args) run_command('wc', args) end
+    def cp(*args) run_command("cp", args) end
+    def mv(*args) run_command("mv", args) end
+    def ls(*args) run_command('ls', args) end
+    def ps(*args) run_command('ps', args) end
+    def df(*args) run_command('df', args) end
+    def du(*args) run_command('du', args) end
+    def su(*args) run_command('su', args) end
+    def ln(*args) run_command('ln', args) end
+    def ab(*args) run_command('ab', args) end
+    def hg(*args) run_command('hg', args) end
+    def xz(*args) run_command('xz', 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()      run_command('env')       end
+    def rye(*args) run_command('rye', args) end
+    def pwd(*args) run_command('pwd', args) end
+    def svn(*args) run_command('svn', args) end
+    def cvs(*args) run_command('cvs', args) end
+    def git(*args) run_command('git', args) end
+    def sed(*args) run_command('sed', args) end
+    def awk(*args) run_command('awk', args) end
+    def cat(*args) run_command('cat', args) end
+    def tar(*args) run_command('tar', args) end
+    def try(*args) run_command('tar', args) end
     
-    #def kill(*args); __allow('kill', args); end
-    def rake(*args); __allow('rake', 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) run_command('kill', args) end
+    def rake(*args) run_command('rake', args) end
+    def grep(*args) run_command('grep', args) end
+    def date(*args) run_command('date', args) end
+    def rudy(*args) run_command('rudy', args) end
+    def perl(*args) run_command('perl', args) end
+    def ruby(*args) run_command('ruby', args) end
+    def echo(*args) run_command('echo', args) end
+    def test(*args) run_command('test', args) end
+    def mkfs(*args) run_command('mkfs', args) end
+    def gzip(*args) run_command('gzip', args) end
+    def make(*args) run_command('make', args) end
+    def wget(*args) run_command('wget', args) end
+    def curl(*args) run_command('curl', args) end
+    def dpkg(*args) run_command('dpkg', args) end
+    def tail(*args) run_command('tail', args) end
+    def unxz(*args) run_command('unxz', 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 siege(*args); __allow("siege", args); end
+    def mount(*args) run_command("mount", args) end
+    def sleep(*args) run_command("sleep", args) end
+    def mkdir(*args) run_command('mkdir', args) end
+    def touch(*args) run_command('touch', args) end
+    def uname(*args) run_command('uname', args) end
+    def chmod(*args) run_command('chmod', args) end
+    def chown(*args) run_command('chown', args) end
+    def unzip(*args) run_command('unzip', args) end
+    def bzip2(*args) run_command('bzip2', args) end
+    def which(*args) run_command('which', args) end
+    def siege(*args) run_command("siege", args) end
     
-    def umount(*args); __allow("umount", args); end
-    def stella(*args); __allow('stella', 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
+    def stella(*args) run_command("stella", args) end
+    def umount(*args) run_command("umount", args) end
+    def stella(*args) run_command('stella', args) end
+    def uptime(*args) run_command("uptime", args) end
+    def python(*args) run_command('python', args) end
+    def gunzip(*args) run_command('gunzip', args) end
+    def whoami(*args) run_command('whoami', args) end
+
+    def useradd(*args) run_command('useradd', args) end
+    def bunzip2(*args) run_command('bunzip2', args) end
+    def getconf(*args) run_command('getconf', args) end
+    def history(*args) run_command('history', args) end
+    def rudy_s3(*args) run_command('rudy-s3', args) end
+
+    def aptitude(*args) run_command('aptitude', args) end
+    def printenv(*args) run_command('printenv', args) end
+    def hostname(*args) run_command('hostname', args) end
+    def ldconfig(*args) run_command('ldconfig', args) end
+    def rudy_ec2(*args) run_command('rudy-ec2', args) end
+    def rudy_sdb(*args) run_command('rudy-sdb', args) end
+      
+    def configure(*args) run_command('./configure', args) end
     
     #--
     # WINDOWS
     #++
-    def dir(*args); __allow('cmd', args); end
-    
-    
+    def dir(*args); run_command('cmd', args); end
+        
     # Transfer files to a machine via Net::SCP. 
     # * +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
@@ -149,11 +186,20 @@ module Rye;
       net_scp_transfer!(:upload, StringIO.new(str), remote_path)
     end
     alias_method :str_upload, :string_upload
-      
     
+    # Shorthand for +file_append('remote/path', StringIO.new('file content'))+
+    #
+    # Appends the content of the String +str+ to +remote_path+. Returns nil
+    def string_append(filepath, newcontent, backup=false)
+      file_append(remote_path, StringIO.new(str), backup)
+    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. 
+    #
+    # NOTE: Not recommended for large files. It downloads the contents.
     def file_append(filepath, newcontent, backup=false)
       content = StringIO.new
       
@@ -185,22 +231,54 @@ module Rye;
       self.file_upload content, filepath
     end
     
-    #--   
-    #def file_modify(filepath, regexp, replace=nil, &block)
-    #  raise "File not found: #{filepath}" unless self.file_exists?(filepath)
-    #end
-    #++
+    
+    def template_write(filepath, template)
+      template_upload template, filepath
+    end
+    
+    # Parse a template and upload that as a file to remote_path.
+    def template_upload(*paths)
+      remote_path = paths.pop
+      templates = []
+      paths.collect! do |path|      
+        if StringIO === path
+          path.rewind
+          template = Rye::Tpl.new(path.read, "inline-template")
+        elsif String === path
+          raise "No such file: #{Dir.pwd}/#{path}" unless File.exists?(path)
+          template = Rye::Tpl.new(File.read(path), File.basename(path))
+        end
+        template.result!(binding)
+        templates << template
+        template.path
+      end
+      paths << remote_path
+      ret = self.file_upload *paths
+      templates.each { |template| 
+        tmp_path = File.join(remote_path, File.basename(template.path))
+        if file_exists?(tmp_path)
+          mv tmp_path, File.join(remote_path, template.basename)
+        end
+        template.delete 
+      }
+      ret
+    end
+    
+    def file_modify(filepath, regexp, replace=nil)
+      raise "File not found: #{filepath}" unless file_exists?(filepath)
+      sed :i, :r, "s/#{regexp}/#{replace}/", filepath
+    end
     
     # Does +path+ from the current working directory?
     def file_exists?(path)
       begin
         ret = self.quietly { ls(path) }
-      rescue Rye::CommandError => ex
+      rescue Rye::Err => ex
         ret = ex.rap
       end
       # "ls" returns a 0 exit code regardless of success in Linux
       # But on OSX exit code is 1. This is why we look at STDERR. 
-      ret.stderr.empty?
+      !(ret.exit_status > 0) || ret.stderr.empty?
     end
     
     # Does the calculated digest of +path+ match the known +expected_digest+?
@@ -275,7 +353,7 @@ module Rye;
         define_method(meth) do |*args|
           local_args = hard_args.clone
           local_args += args
-          __allow(path, *local_args)
+          run_command(path, *local_args)
         end        
       end
     end

data/lib/rye/rap.rb

@@ -20,7 +20,7 @@ module Rye;
     
      # An array containing any STDERR output 
     attr_reader :stderr
-    attr_reader :exit_code
+    attr_reader :exit_status
       # Only populated when calling via Rye::Shell 
     attr_reader :pid 
     attr_accessor :exit_signal
@@ -32,7 +32,7 @@ module Rye;
     # * +args+ anything that can sent to Array#new
     def initialize(obj, *args)
       @obj = obj
-      @exit_code = 0
+      @exit_status = -1
       @stderr = []
       super *args
     end
@@ -40,6 +40,10 @@ module Rye;
     alias :box :obj
     alias :set :obj
     
+    def inspect
+      "[%s, %s, %s, %s]" % [self.join("").tr("\r", ''), @stderr.join("; ").tr("\r", ''), exit_status, exit_signal]
+    end
+    
     # Returns a reference to the Rye::Rap object (which 
     # acts like an Array that contains the STDOUT from the
     # command executed over SSH). This is available to 
@@ -79,16 +83,16 @@ module Rye;
     # set to -1 (JRuby doesn't return the pid).   
     #
     # Returns the exit code as an Integer. 
-    def add_exit_code(code)
+    def add_exit_status(code)
       code = 0 if code.nil?
       if code.is_a?(Process::Status)
-        @exit_code = code.exitstatus.to_i
+        @exit_status = code.exitstatus.to_i
         @pid = Rye.sysinfo.vm == :java ? '-1' : code.pid
       else
-        @exit_code = code.to_i
+        @exit_status = code.to_i
       end
     end
-    def code; @exit_code; end
+    def code; @exit_status; end
     
     # Returns the first element if there's only the
     # one, an empty String if there's none. Returns

data/lib/rye.rb

@@ -42,7 +42,7 @@ require 'esc'
 module Rye
   extend self
   
-  VERSION = "0.8.19".freeze unless defined?(VERSION)
+  VERSION = "0.9.0".freeze unless defined?(VERSION)
   
   @@sysinfo = nil
   @@agent_env = Hash.new  # holds ssh-agent env vars
@@ -68,18 +68,18 @@ module Rye
   class NoPty < RyeError
     def message; "Could not obtain pty (i.e. an interactive ssh session)"; end
   end
-  class CommandError < RyeError
+  class Err < RyeError
     attr_reader :rap
     # * +rap+ a Rye::Rap object
     def initialize(rap)
       @rap = rap
     end
     def message
-      "%s (code: %s)" % [@rap.stderr.join($/), @rap.exit_code]
+      "%s (cmd: %s; status: %s)" % [@rap.stderr.join($/), @rap.cmd, @rap.exit_status]
     end
     def stderr; @rap.stderr if @rap; end
     def stdout; @rap.stdout if @rap; end
-    def exit_code; @rap.exit_code if @rap; end
+    def exit_status; @rap.exit_status if @rap; end
   end
   
   # Reload Rye dynamically. Useful with irb. 
@@ -223,7 +223,7 @@ module Rye
     rap = Rye::Rap.new(self)
     rap.add_stdout(stdout || '')
     rap.add_stderr(stderr || '')
-    rap.add_exit_code($?)
+    rap.add_exit_status($?)
     rap
   end
   
@@ -259,6 +259,33 @@ module Rye
      str
   end
   
+  class Tpl
+    attr_reader :src, :result, :basename
+    def initialize(src, basename='rye-template')
+      @basename = basename
+      src = src.to_s
+      @src, @template = src, ERB.new(src)
+    end
+    def path
+      if @tf.nil?
+        @tf = Tempfile.new basename
+        @tf.write @result
+        @tf.close
+      end
+      @tf.path
+    end
+    def delete
+      File.delete(@tf.path) if File.exists?(@tf.path)
+    end
+    def result!(binding)
+      @result = result(binding)
+    end
+    def result(binding)
+      @template.result(binding)
+    end
+    def to_s() src end
+  end
+  
   private 
   
   Rye.reload

data/rye.gemspec

@@ -1,18 +1,16 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rye"
   s.rubyforge_project = "rye"
-  s.version = "0.8.19"
+  s.version = "0.9.0"
   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"
   s.email = "delano@solutious.com"
-  s.homepage = "http://solutious.com/"
+  s.homepage = "http://github.com/delano/rye/"
   
   # = DEPENDENCIES =
   # Add all gem dependencies
-  s.add_dependency 'drydock'
-  s.add_dependency 'sysinfo'
-  s.add_dependency 'storable'
+  s.add_dependency 'annoy'
   s.add_dependency 'sysinfo', '>= 0.7.0'
   
   s.add_dependency 'highline', '>= 1.5.1'
@@ -24,7 +22,7 @@
   # = EXECUTABLES =
   # The list of executables in your project (if any). Don't include the path, 
   # just the base filename.
-  s.executables = %w[rye]
+  s.executables = %w[]
   
   # = MANIFEST =
   # The complete list of files to be included in the release. When GitHub packages your gem, 
@@ -38,7 +36,6 @@
   README.rdoc
   Rakefile
   Rudyfile
-  bin/rye
   bin/try
   lib/esc.rb
   lib/rye.rb

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rye
 version: !ruby/object:Gem::Version 
-  version: 0.8.19
+  hash: 59
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,83 +15,91 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-27 00:00:00 -04:00
+date: 2010-08-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: drydock
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: annoy
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         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"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: storable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sysinfo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
         version: 0.7.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
         version: 1.5.1
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 2
+        - 0
+        - 13
         version: 2.0.13
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: net-scp
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
         version: 1.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id005
 description: "Rye: Safely run SSH commands on a bunch of machines at the same time (from Ruby)."
 email: delano@solutious.com
-executables: 
-- rye
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -97,7 +111,6 @@ files:
 - README.rdoc
 - Rakefile
 - Rudyfile
-- bin/rye
 - bin/try
 - lib/esc.rb
 - lib/rye.rb
@@ -108,7 +121,7 @@ files:
 - lib/rye/set.rb
 - rye.gemspec
 has_rdoc: true
-homepage: http://solutious.com/
+homepage: http://github.com/delano/rye/
 licenses: []
 
 post_install_message: 
@@ -121,21 +134,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rye
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: "Rye: Safely run SSH commands on a bunch of machines at the same time (from Ruby)."