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

[VersionConflict] Allow customizing incompatible_version_message_for_conflict #99

Merged
merged 3 commits into from
Aug 7, 2018

Conversation

segiddins
Copy link
Member

No description provided.

Copy link

@indirect indirect left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@indirect
Copy link

indirect commented Aug 1, 2018

@segiddins I'll let you sort out the build, but this seems like a good approach. I like it.

bundlerbot added a commit to rubygems/bundler that referenced this pull request Aug 5, 2018
…, r=colby-swandale

[DNM] Make version conflict messages better

This is a WIP. Need to wait until CocoaPods/Molinillo#99 is merged & released

### What was the end-user problem that led to this PR?

The problem was Bundler version messages could be confusing.

Closes #6642
Closes #6620

### What was your diagnosis of the problem?

My diagnosis was we barf out a bunch of "conflicts", not all of which are actually conflicts. We could also print a whole bunch of requirements that didn't _actually_ contribute to the conflict at hand.

Messaging was also super weird when there were `required_ruby_version` conflicts, since we called "ruby" a gem.

### What is your fix for the problem, implemented in this PR?

Improves Bundler version conflict messages in multiple cases. (conflict on `required_ruby_version`, conflict on 2.0 containing redundant platforms, conflict on 2.0 not being reduced to minimal form, showing irrelevant conflicts that dont actually conflict, actually reducing all type of conflicts to the minimal set).

### Why did you choose this fix out of the possible options?

I chose this fix because...
@segiddins segiddins force-pushed the segiddins/customize-incompatible-message branch from 9c34035 to 70f72d1 Compare August 7, 2018 05:50
@segiddins segiddins merged commit 1ea466a into master Aug 7, 2018
@segiddins segiddins deleted the segiddins/customize-incompatible-message branch August 7, 2018 05:58
buffer << io.readpartial(chunk_size)
rescue EOFError
break
out, err = Bundler.with_original_env do
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

bundlerbot added a commit to rubygems/bundler that referenced this pull request Aug 14, 2018
…, r=indirect

Make version conflict messages better

~~This is a WIP. Need to wait until CocoaPods/Molinillo#99 is merged & released~~

### What was the end-user problem that led to this PR?

The problem was Bundler version messages could be confusing.

Closes #6642
Closes #6620

### What was your diagnosis of the problem?

My diagnosis was we barf out a bunch of "conflicts", not all of which are actually conflicts. We could also print a whole bunch of requirements that didn't _actually_ contribute to the conflict at hand.

Messaging was also super weird when there were `required_ruby_version` conflicts, since we called "ruby" a gem.

### What is your fix for the problem, implemented in this PR?

Improves Bundler version conflict messages in multiple cases. (conflict on `required_ruby_version`, conflict on 2.0 containing redundant platforms, conflict on 2.0 not being reduced to minimal form, showing irrelevant conflicts that dont actually conflict, actually reducing all type of conflicts to the minimal set).

### Why did you choose this fix out of the possible options?

I chose this fix because...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants