Skip to content

Commit

Permalink
Pass glob through from ZipFileNameMapper.
Browse files Browse the repository at this point in the history
Just pass the basic glob straight through to the underlying Zip::File
implementation.
  • Loading branch information
hainesr committed Apr 30, 2018
1 parent 8887b70 commit 1673da7
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 5 deletions.
4 changes: 4 additions & 0 deletions lib/zip/filesystem.rb
Expand Up @@ -573,6 +573,10 @@ def get_output_stream(fileName, permissionInt = nil, &aProc)
@zipFile.get_output_stream(expand_to_entry(fileName), permissionInt, &aProc)
end

def glob(*args, &block)
@zipFile.glob(*args, &block)
end

def read(fileName)
@zipFile.read(expand_to_entry(fileName))
end
Expand Down
23 changes: 18 additions & 5 deletions test/filesystem/directory_test.rb
Expand Up @@ -3,6 +3,7 @@

class ZipFsDirectoryTest < MiniTest::Test
TEST_ZIP = 'test/data/generated/zipWithDirs_copy.zip'
GLOB_TEST_ZIP = 'test/data/globTest.zip'

def setup
FileUtils.cp('test/data/zipWithDirs.zip', TEST_ZIP)
Expand Down Expand Up @@ -93,11 +94,23 @@ def test_chroot
end
end

# Globbing not supported yet
# def test_glob
# # test alias []-operator too
# fail "implement test"
# end
def test_glob
globbed_files = [
'globTest/foo/bar/baz/foo.txt',
'globTest/foo.txt',
'globTest/food.txt'
]

::Zip::File.open(GLOB_TEST_ZIP) do |zf|
zf.dir.glob('**/*.txt') do |f|
assert globbed_files.include?(f.name)
end

zf.dir.glob('globTest/foo/**/*.txt') do |f|
assert_equal globbed_files[0], f.name
end
end
end

def test_open_new
::Zip::File.open(TEST_ZIP) do |zf|
Expand Down

0 comments on commit 1673da7

Please sign in to comment.