pathname: remove unused return values
Return value was used only by one test, rewrote test to know expected value.
This commit is contained in:
parent
b730a85e3a
commit
7c1671667f
@ -8,36 +8,32 @@ class Pathname
|
|||||||
BOTTLE_EXTNAME_RX = /(\.[a-z_]+(32)?\.bottle\.(\d+\.)?tar\.gz)$/
|
BOTTLE_EXTNAME_RX = /(\.[a-z_]+(32)?\.bottle\.(\d+\.)?tar\.gz)$/
|
||||||
|
|
||||||
def install *sources
|
def install *sources
|
||||||
results = []
|
|
||||||
sources.each do |src|
|
sources.each do |src|
|
||||||
case src
|
case src
|
||||||
when Array
|
when Array
|
||||||
if src.empty?
|
if src.empty?
|
||||||
opoo "tried to install empty array to #{self}"
|
opoo "tried to install empty array to #{self}"
|
||||||
return []
|
return
|
||||||
end
|
end
|
||||||
src.each {|s| results << install_p(s) }
|
src.each {|s| install_p(s) }
|
||||||
when Hash
|
when Hash
|
||||||
if src.empty?
|
if src.empty?
|
||||||
opoo "tried to install empty hash to #{self}"
|
opoo "tried to install empty hash to #{self}"
|
||||||
return []
|
return
|
||||||
end
|
end
|
||||||
src.each {|s, new_basename| results << install_p(s, new_basename) }
|
src.each {|s, new_basename| install_p(s, new_basename) }
|
||||||
else
|
else
|
||||||
results << install_p(src)
|
install_p(src)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return results
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def install_p src, new_basename = nil
|
def install_p src, new_basename = nil
|
||||||
if new_basename
|
if new_basename
|
||||||
new_basename = File.basename(new_basename) # rationale: see Pathname.+
|
new_basename = File.basename(new_basename) # rationale: see Pathname.+
|
||||||
dst = self+new_basename
|
dst = self+new_basename
|
||||||
return_value = Pathname.new(dst)
|
|
||||||
else
|
else
|
||||||
dst = self
|
dst = self
|
||||||
return_value = self+File.basename(src)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
src = src.to_s
|
src = src.to_s
|
||||||
@ -59,25 +55,21 @@ class Pathname
|
|||||||
# this function when installing from the temporary build directory
|
# this function when installing from the temporary build directory
|
||||||
FileUtils.mv src, dst
|
FileUtils.mv src, dst
|
||||||
end
|
end
|
||||||
|
|
||||||
return return_value
|
|
||||||
end
|
end
|
||||||
protected :install_p
|
protected :install_p
|
||||||
|
|
||||||
# Creates symlinks to sources in this folder.
|
# Creates symlinks to sources in this folder.
|
||||||
def install_symlink *sources
|
def install_symlink *sources
|
||||||
results = []
|
|
||||||
sources.each do |src|
|
sources.each do |src|
|
||||||
case src
|
case src
|
||||||
when Array
|
when Array
|
||||||
src.each {|s| results << install_symlink_p(s) }
|
src.each {|s| install_symlink_p(s) }
|
||||||
when Hash
|
when Hash
|
||||||
src.each {|s, new_basename| results << install_symlink_p(s, new_basename) }
|
src.each {|s, new_basename| install_symlink_p(s, new_basename) }
|
||||||
else
|
else
|
||||||
results << install_symlink_p(src)
|
install_symlink_p(src)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return results
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def install_symlink_p src, new_basename = nil
|
def install_symlink_p src, new_basename = nil
|
||||||
@ -86,14 +78,8 @@ class Pathname
|
|||||||
else
|
else
|
||||||
dst = self+File.basename(new_basename)
|
dst = self+File.basename(new_basename)
|
||||||
end
|
end
|
||||||
|
|
||||||
src = src.to_s
|
|
||||||
dst = dst.to_s
|
|
||||||
|
|
||||||
mkpath
|
mkpath
|
||||||
FileUtils.ln_s src, dst
|
FileUtils.ln_s src.to_s, dst.to_s
|
||||||
|
|
||||||
return dst
|
|
||||||
end
|
end
|
||||||
protected :install_symlink_p
|
protected :install_symlink_p
|
||||||
|
|
||||||
|
|||||||
@ -95,14 +95,11 @@ class PathnameExtensionTests < Test::Unit::TestCase
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_install_removes_original
|
def test_install_removes_original
|
||||||
orig_file = @file
|
|
||||||
touch @file
|
touch @file
|
||||||
|
@dst.install(@file)
|
||||||
|
|
||||||
@file, _ = @dst.install(@file)
|
assert (@dst/@file.basename).exist?
|
||||||
|
assert !@file.exist?
|
||||||
assert_equal orig_file.basename, @file.basename
|
|
||||||
assert @file.exist?
|
|
||||||
assert !orig_file.exist?
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def setup_install_test
|
def setup_install_test
|
||||||
@ -200,13 +197,6 @@ class PathnameExtensionTests < Test::Unit::TestCase
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_install_returns_installed_paths
|
|
||||||
foo, bar = @src+'foo', @src+'bar'
|
|
||||||
touch [foo, bar]
|
|
||||||
dirs = @dst.install(foo, bar)
|
|
||||||
assert_equal [@dst+'foo', @dst+'bar'], dirs
|
|
||||||
end
|
|
||||||
|
|
||||||
def test_install_creates_intermediate_directories
|
def test_install_creates_intermediate_directories
|
||||||
touch @file
|
touch @file
|
||||||
assert !@dir.directory?
|
assert !@dir.directory?
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user