Clean paths fix #602
Clean paths fix #602
Conversation
The earlier fix for clean paths is forcing some directories to lower case which could cause some side effects. This fix removes the `File::FNM_CASEFOLD` flag from the call to `Dir.glob` and allows the OS to treat the directories as they wish. This makes the paths returned in the `clean_paths` method consistent with those returned in the `expanded_paths` method.
…SEFOLD` This change is an update to an earlier pull request to fix Issue CocoaPods#572.
| used = used_files.map(&:downcase) | ||
| files = Dir.glob(root + "**/*", File::FNM_DOTMATCH).map(&:downcase) | ||
| used = used_files | ||
| files = Dir.glob(root + "**/*", [File::FNM_DOTMATCH, File::FNM_CASEFOLD]) |
There was a problem hiding this comment.
This should probably be a union of the flags (File::FNM_DOTMATCH | File::FNM_CASEFOLD) and not an array? (See CI details.)
When I apply this change the tests fail for me. Can you confirm if that change still works for you?
There was a problem hiding this comment.
A simple illustration of the aforementioned bug:
~/C/C/CocoaPods [croach-clean-paths-fix] » irb
>> Dir.glob('foo', [File::FNM_DOTMATCH, File::FNM_CASEFOLD])
TypeError: can't convert Array into Integer
from (irb):1:in `glob'
from (irb):1
There was a problem hiding this comment.
Oops, sorry about that. I don't really use Ruby and an example I had found showed an array being passed in for the flags argument. Seemed kind of weird to me at the time, most other languages tend to do a union of all the flags, but when I tested it locally, it worked. I guess I didn't get it installed properly cause I tried it again with a fresh install and I do get an error now. I'll update the pull request. Thanks for pointing that out, sorry for taking up so much of your guys' time with this.
|
Hmm, from your public activity feed I can see you replied to my comment on your PR, however I can’t seem to find it in full anywhere. Can you repost it here? |
|
Ok, so the only real difference seems OS X 10.7 vs 10.8, right? I will have to see if I can setup a VM with that version to try to replicate the issue. Can you give me details on what Ruby version you are using? |
|
@croach Thanks for helping with this issue. There are still some changes that need to be done (using It would be great if you could check that the issue is actually resolved once the new version is out, because I still can't reproduce the issue. |
|
@alloy I'm using rbenv to manage my ruby installs and I'm using ruby v1.9.3p194. @irrationalfab Thanks working through this issue with me. I just tried out the latest version (v0.15.2) of cocoapods and it worked perfectly. I think we got the problem fixed! |
|
@croach 😂 |
Updated FlurrySDK to version 4.0.5
This pull request contains the changes discussed in #572. Specifically, the
clean_pathsandexpand_pathsmethods both use theFile::FNM_CASEFOLD flag in their calls toDir.glob`.