diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-01 09:37:17 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-01 09:37:17 +0000 |
| commit | 91799a2fd95ac0e393d950104c5476b4cef616f7 (patch) | |
| tree | fa350d331fa64a738160890eba86b1d1410e7efd /lib | |
| parent | 13a22e389490ef6c11afd7362ce346634a805358 (diff) | |
merges r30786, r30787 and r30797 from trunk into ruby_1_9_2.
--
* test/fileutils/fileasserts.rb: add message arguments.
--
* lib/fileutils.rb (FileUtils::LowMethods): make low level methods
in NoWrite and DryRun to do nothing. [ruby-dev:43129]
--
* test/fileutils/fileasserts.rb (assert_block): pass arguments
as-is. [ruby-dev:43174]
--
* test/fileutils/fileasserts.rb (assert_block): little workaround
for [ruby-dev:43174].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fileutils.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 7cc223c17e..9cd1a7cc76 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1524,6 +1524,12 @@ module FileUtils OPT_TABLE.keys.select {|m| OPT_TABLE[m].include?(opt) } end + LOW_METHODS = singleton_methods(false) - collect_method(:noop).map(&:intern) + module LowMethods + module_eval("private\n" + ::FileUtils::LOW_METHODS.map {|name| "def #{name}(*)end"}.join("\n"), + __FILE__, __LINE__) + end + METHODS = singleton_methods() - [:private_module_function, :commands, :options, :have_option?, :options_of, :collect_method] @@ -1559,6 +1565,7 @@ module FileUtils # module NoWrite include FileUtils + include LowMethods @fileutils_output = $stderr @fileutils_label = '' ::FileUtils.collect_method(:noop).each do |name| @@ -1585,6 +1592,7 @@ module FileUtils # module DryRun include FileUtils + include LowMethods @fileutils_output = $stderr @fileutils_label = '' ::FileUtils.collect_method(:noop).each do |name| |