Fix upgrade/remove with new binstub variations #445
Merged
Conversation
This file contains hidden or 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
There are three variations of the new style spring binstub: * older with double quotes * newer with single quotes * newest which does not swallow unrelated load errors This does not handle removing the old style if/else binstub. To remove is a two-step upgrade and remove is required.
|
(@rails-bot has picked a reviewer for you, use r? to override) |
|
@rafaelfranca This should probably be assigned to @grosser, because he handled #444. |
| @@ -48,6 +48,12 @@ class Binstub < Command | |||
|
|
|||
| OLD_BINSTUB = %{if !Process.respond_to?(:fork) || Gem::Specification.find_all_by_name("spring").empty?} | |||
|
|
|||
| BINSTUB_VARIATIONS = Regexp.union [ | |||
| %{begin\n load File.expand_path("../spring", __FILE__)\nrescue LoadError\nend\n}, | |||
There was a problem hiding this comment.
these 2 lines look pretty similar ?
There was a problem hiding this comment.
Double vs. single quotes.
|
r? @grosser |
|
great tests! :) |
grosser
added a commit
that referenced
this pull request
Nov 17, 2015
…nstub-variations Fix upgrade/remove with new binstub variations
|
1.4.3 since it's kind of a fix for the previous ... even though it includes a new feature ... but should be safe ... |
|
I agree, this is a bug fix release. Thanks for taking the time to review. |
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.
This is a followup to #444 which adds support for upgrading to the new loader code as well as supporting
bin/spring binstub --removewith both single and double quoted variants of the previous loader code, which was not handled in #437.I've also added an acceptance test for
bin/spring binstub --remove --allwhich tests for the removal ofbin/springand added a mention of the--removeoption to the spring client binstub help output.