diff options
| author | Adam Vandenberg | 2012-02-17 23:07:16 -0800 |
|---|---|---|
| committer | Adam Vandenberg | 2012-02-17 23:07:16 -0800 |
| commit | 847a2732eea116008fca0e01c615114a62e4e0ce (patch) | |
| tree | 00522ba0395a7d1fc74a8d73439996be3d1909bf /Library/Homebrew | |
| parent | 40811ae64c37fbe1f976800944c99a77623c7095 (diff) | |
| download | brew-847a2732eea116008fca0e01c615114a62e4e0ce.tar.bz2 | |
Update return values of install and install_symlink
These now return an Array of all the target destinations.
Previously, if a single argument was passed a single non-
Array was returned.
This behavior has been changed so that an Array is always returned
even for a single argument.
Updated the test.
Hopefully this won't break any custom code out there.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/extend/pathname.rb | 16 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_bucket.rb | 3 |
2 files changed, 12 insertions, 7 deletions
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb index d1b043097..0dbff65c6 100644 --- a/Library/Homebrew/extend/pathname.rb +++ b/Library/Homebrew/extend/pathname.rb @@ -3,16 +3,18 @@ require 'pathname' # we enhance pathname to make our code more readable class Pathname def install *sources + results = [] sources.each do |src| case src when Array - src.collect {|src| install_p(src) } + src.each {|s| results << install_p(s) } when Hash - src.collect {|src, new_basename| install_p(src, new_basename) } + src.each {|s, new_basename| results << install_p(s, new_basename) } else - install_p(src) + results << install_p(src) end end + return results end def install_p src, new_basename = nil @@ -50,16 +52,18 @@ class Pathname # Creates symlinks to sources in this folder. def install_symlink *sources + results = [] sources.each do |src| case src when Array - src.collect {|src| install_symlink_p(src) } + src.each {|s| results << install_symlink_p(s) } when Hash - src.collect {|src, new_basename| install_symlink_p(src, new_basename) } + src.each {|s, new_basename| results << install_symlink_p(s, new_basename) } else - install_symlink_p(src) + results << install_symlink_p(src) end end + return results end def install_symlink_p src, new_basename = nil diff --git a/Library/Homebrew/test/test_bucket.rb b/Library/Homebrew/test/test_bucket.rb index fda9f356f..0c14f39c0 100644 --- a/Library/Homebrew/test/test_bucket.rb +++ b/Library/Homebrew/test/test_bucket.rb @@ -149,7 +149,8 @@ class BeerTasting < Test::Unit::TestCase abcd=orig_abcd=HOMEBREW_CACHE+'abcd' FileUtils.cp ABS__FILE__, abcd - abcd=HOMEBREW_PREFIX.install abcd + installed_paths=HOMEBREW_PREFIX.install abcd + abcd = installed_paths[0] assert (HOMEBREW_PREFIX+orig_abcd.basename).exist? assert abcd.exist? assert_equal HOMEBREW_PREFIX+'abcd', abcd |
