kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

eliminating a branch we do not need. thanks @jeremy

Browse source
This commit is contained in:
Aaron Patterson 2012-03-26 16:07:28 -07:00
parent 47db156d42
commit 33da24a8db
1 changed files with 3 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
railties/lib/rails/paths.rb
View file

@ -156,25 +156,9 @@ module Rails
path = File.expand_path(p, @root.path)
if @glob
if File.directory? path
result.concat expand_dir(path, @glob)
else
# FIXME: I think we can remove this branch, but I'm not sure.
# Say the filesystem has this file:
#
# /tmp/foobar
#
# and someone adds this path:
#
# /tmp/foo
#
# with a glob of "*", then this function will return
#
# /tmp/foobar
#
# We need to figure out if that is desired behavior.
result.concat expand_file(path, @glob)
end
result.concat Dir.chdir(path) {
Dir.glob(@glob).map { |file| File.join path, file }.sort
}
else
result << path
end
@ -194,17 +178,6 @@ module Rails
end
alias to_a expanded
private
def expand_file(path, glob)
Dir[File.join(path, glob)].sort
end
def expand_dir(path, glob)
Dir.chdir(path) do
Dir.glob(glob).map { |file| File.join path, file }.sort
end
end
end
end
end