Handle BUNDLED WITH deletion in windows #1108
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Related ticket https://heroku.support/950520 |
|
Default stack bump made some tests fail, I'll fix that in another PR and rebase when done. |
Windows Gemfile.lock uses `\r\n` instead of `\n` for newlines which can cause issues when matching regex. We are using regex to strip out BUNDLED WITH and were not previously handling windows Gemfile.lock by mistake.
There is other code that reads in the major version of BUNDLED WITH and it uses a read mode of `rt` which solves the problem.
The solution is to change this other location to also use a read mode of `rt`:
```
irb(main):009:0> !!File.read("./spec/fixtures/windows_lockfile/Gemfile.lock").match(/^BUNDLED WITH$(\r?\n) (?<major>\d+)\.\d+\.\d+/m)
=> false
irb(main):010:0> !!File.read("./spec/fixtures/windows_lockfile/Gemfile.lock", mode: 'rt').match(/^BUNDLED WITH$(\r?\n) (?<major>\d+)\.\d+
\.\d+/m)
=> true
```
The test now also assert the desired behavior of removing BUNDLED WITH occurs.
schneems
force-pushed
the
schneems/handle-windows-gemfilelock
branch
from
0ed9058 to
e99732c
Compare
|
Awesome thanks for getting this sorted @schneems |
|
Happy to help. I'll let this sit on |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Windows Gemfile.lock uses
\r\ninstead of\nfor newlines which can cause issues when matching regex. We are using regex to strip out BUNDLED WITH and were not previously handling windows Gemfile.lock by mistake.There is other code that reads in the major version of BUNDLED WITH and it uses a read mode of
rtwhich solves the problem.The solution is to change this other location to also use a read mode of
rt:The test now also assert the desired behavior of removing BUNDLED WITH occurs.