This repository has been archived by the owner on Apr 14, 2021. It is now read-only.
print an error message when a non-git gem is given a branch option
#5559
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
segiddins
reviewed
Apr 3, 2017
lib/bundler/dsl.rb
Outdated
| @@ -321,6 +321,10 @@ def normalize_options(name, version, opts) | |||
|
|
|||
| normalize_hash(opts) | |||
|
|
|||
| if opts["branch"] && !(opts["git"] || opts["github"]) | |||
There was a problem hiding this comment.
Why not do this in validate_keys?
There was a problem hiding this comment.
I was being lazy and really should have checked. Thanks for the feedback!
segiddins
reviewed
Apr 4, 2017
spec/bundler/dsl_spec.rb
Outdated
|
|
||
| it "rejects branch option on non-git gems" do | ||
| expect { subject.gem("foo", :branch => "test") }. | ||
| to raise_error(Bundler::GemfileError, /The `branch` option for `gem "foo"` is not allowed. Only gems with a git source can specify a branch/) |
There was a problem hiding this comment.
quotes don't match, hence the test failure
| @@ -144,6 +144,11 @@ | |||
| expect { subject.gem(:foo) }. | |||
| to raise_error(Bundler::GemfileError, /You need to specify gem names as Strings. Use 'gem "foo"' instead/) | |||
| end | |||
|
|
|||
| it "rejects branch option on non-git gems" do | |||
There was a problem hiding this comment.
please also test that specifying a branch when using a user-defined git source still passes? (or make sure such a test exists?)
|
Only thing left is a test with a custom git source, otherwise this is 🚀 |
colby-swandale
force-pushed
the
gem-branch-exception
branch
from
484eb47 to
261afb9
Compare
|
@bundlerbot r+ |
|
📌 Commit 261afb9 has been approved by |
bundlerbot
added a commit
that referenced
this pull request
Apr 8, 2017
print an error message when a non-git gem is given a `branch` option When the user supplies the `branch` option to a non-git gem an error message should be printed. Relates to #5530.
|
☀️ Test successful - status-travis |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
When the user supplies the
branchoption to a non-git gem an error message should be printed.Relates to #5530.