summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-14 14:27:43 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-14 14:27:43 +0000
commite8262c8f044505690aec95b65daf78b40ae8b2dd ()
treeeb4cf2236864b5fdbc06820d438b02b1dc45b67d
parent34a18bb5264f65f6851f24f6d55731ac91158fab (diff)
* lib/un.rb: use OptionParser instead of getopts.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/un.rb52
2 files changed, 34 insertions, 22 deletions
@@ -1,3 +1,7 @@
Sat Feb 14 11:28:14 2004 Masatoshi SEKI <[email protected]>
* sample/drb/*: import lib/drb/sample
@@ -21,20 +21,19 @@
# ruby -run -e touch -- [OPTION] FILE
# ruby -run -e help [COMMAND]
-require 'fileutils'
-require 'getopts'
module FileUtils
-# @fileutils_label = ''
@fileutils_output = $stdout
end
def setup(options = "")
- options += "v"
ARGV.map! do |x|
case x
when /^-/
- x.delete "^-#{options}"
when /[*?\[{]/
Dir[x]
else
@@ -42,13 +41,18 @@ def setup(options = "")
end
end
ARGV.flatten!
- ARGV.delete_if{|x| x == '-'}
- getopts(options)
- options = {}
- options[:verbose] = true if $OPT["v"]
- options[:force] = true if $OPT["f"]
- options[:preserve] = true if $OPT["p"]
- yield ARGV, options, $OPT
end
##
@@ -62,9 +66,10 @@ end
#
def cp
- setup("pr") do |argv, options, opt|
cmd = "cp"
- cmd += "_r" if opt["r"]
dest = argv.pop
argv = argv[0] if argv.size == 1
FileUtils.send cmd, argv, dest, options
@@ -82,9 +87,10 @@ end
#
def ln
- setup("sf") do |argv, options, opt|
cmd = "ln"
- cmd += "_s" if opt["s"]
dest = argv.pop
argv = argv[0] if argv.size == 1
FileUtils.send cmd, argv, dest, options
@@ -118,9 +124,10 @@ end
#
def rm
- setup("fr") do |argv, options, opt|
cmd = "rm"
- cmd += "_r" if opt["r"]
FileUtils.send cmd, argv, options
end
end
@@ -135,9 +142,9 @@ end
#
def mkdir
- setup("p") do |argv, options, opt|
cmd = "mkdir"
- cmd += "_p" if options.delete :preserve
FileUtils.send cmd, argv, options
end
end
@@ -168,8 +175,9 @@ end
#
def install
- setup("pm:") do |argv, options, opt|
- options[:mode] = opt["m"] ? opt["m"].oct : 0755
dest = argv.pop
argv = argv[0] if argv.size == 1
FileUtils.install argv, dest, options