diff options
| author | keiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-20 12:38:58 +0000 |
|---|---|---|
| committer | keiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-20 12:38:58 +0000 |
| commit | 42a81120e510c2c2fb7822ff4d5738db6ba392bf () | |
| tree | 3f6024dcb1fe3a3ca6b3fd613f436fd99c80c80c /lib/shell/command-processor.rb | |
| parent | d9d838a45beff13576e4fba42e0d5b611d0df706 (diff) | |
* lib/shell.rb, lib/shell: support for ruby 1.9(YARV) thread model.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/shell/command-processor.rb | 87 |
1 files changed, 54 insertions, 33 deletions
@@ -1,9 +1,9 @@ # # shell/command-controller.rb - -# $Release Version: 0.6.0 $ # $Revision$ # $Date$ -# by Keiju ISHITSUKA(Nippon Rational Inc.) # # -- # @@ -26,7 +26,13 @@ class Shell # # initialize of Shell and related classes. # - NoDelegateMethods = ["initialize", "expand_path"] def self.initialize install_builtin_commands @@ -111,13 +117,20 @@ class Shell # Dir#open (when path is directory) # mode has an effect only when path is a file # - def open(path, mode) path = expand_path(path) if File.directory?(path) - Dir.open(path) else - effect_umask do - File.open(path, mode) end end end @@ -130,12 +143,15 @@ class Shell # File#unlink (when path is file) # def unlink(path) path = expand_path(path) if File.directory?(path) Dir.unlink(path) else IO.unlink(path) end end # @@ -155,6 +171,7 @@ class Shell # sh[:exists?, "foo"] # sh["exists?", "foo"] # def test(command, file1, file2=nil) file1 = expand_path(file1) file2 = expand_path(file2) if file2 @@ -162,7 +179,11 @@ class Shell case command when Integer - top_level_test(command, file1, file2) when String if command.size == 1 if file2 @@ -194,9 +215,23 @@ class Shell # same as Dir.mkdir() # def mkdir(*path) for dir in path - Dir.mkdir(expand_path(dir)) end end # @@ -205,9 +240,13 @@ class Shell # same as Dir.rmdir() # def rmdir(*path) for dir in path Dir.rmdir(expand_path(dir)) end end # @@ -299,35 +338,17 @@ class Shell # %pwd, %cwd -> @pwd def notify(*opts, &block) - Thread.exclusive do - Shell.notify(*opts) {|mes| - yield mes if iterator? - mes.gsub!("%pwd", "#{@cwd}") - mes.gsub!("%cwd", "#{@cwd}") - } - end end # # private functions # - def effect_umask - if @shell.umask - Thread.critical = true - save = File.umask - begin - yield - ensure - File.umask save - Thread.critical = false - end - else - yield - end - end - private :effect_umask - def find_system_command(command) return command if /^\// =~ command case path = @system_commands[command] @@ -343,7 +364,7 @@ class Shell for p in @shell.system_path path = join(p, command) - if FileTest.exists?(path) @system_commands[command] = path return path end |