Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix jar globbing for real now. #1468

Merged
merged 2 commits into from Feb 4, 2014
Merged

Fix jar globbing for real now. #1468

merged 2 commits into from Feb 4, 2014

Conversation

@ratnikov
Copy link
Contributor

@ratnikov ratnikov commented Feb 1, 2014

Seems like the root cause is that my JarDirectoryResource listFiles implementation was faulty. Should be fixed now.

I had to update the test to expect some "phantom" directory entries when dealing with jars. However, that's behavior that is identical to as if the jar were extracted. For example, if jar contained file "foo/bar.txt" the Dir["...jar!*/"] now correctly returns both .jar!/foo and .jar!/foo/bar.txt entries, since if extracted, foo/ directory would be created.

This should fix #1453 for real now.

@enebo
Copy link
Member

@enebo enebo commented Feb 1, 2014

@ratnikov This appears to fail the new spec you updated (your expectation looks correct) as it appears to not find /glob_target on master. I would land this as-is but we are matching too much right now which may be better than too little?

ratnikov added 2 commits Feb 1, 2014
This also includes "phantom" jar directory entries, even if a zipfile directory entry does not exist.
@ratnikov
Copy link
Contributor Author

@ratnikov ratnikov commented Feb 2, 2014

Duh! Fixed by making RubyDir.aref just use general glob_helper logic now.

jar_glob_spec now passes fully (and this time I didn't keep a lingering -e flag that was skipping tests either)

@ratnikov
Copy link
Contributor Author

@ratnikov ratnikov commented Feb 2, 2014

By the way, spec:ci_interpreted_travis passes for me locally, so I'm not sure what's up with travis.

enebo added a commit that referenced this pull request Feb 4, 2014
Fix jar globbing for real now.
@enebo enebo merged commit 96b4237 into jruby:master Feb 4, 2014
1 check failed
1 check failed
@enebo
default The Travis CI build failed
Details
@ratnikov ratnikov deleted the ratnikov:fix-glob branch Feb 4, 2014
@enebo enebo added this to the JRuby 1.7.11 milestone Feb 4, 2014
@enebo enebo added the core label Feb 4, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants