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

Resolve issue 961 #983

Merged
merged 2 commits into from
Jul 7, 2016
Merged

Conversation

danascheider
Copy link
Contributor

Summary

This PR resolves issue #961, where bundle install fails because of cucumber-ruby-wire. It makes changes to the Gemfile so that if the user does not have cucumber-ruby-wire locally, or doesn't have it in the expected location, it will be fetched from git instead of erroring out.

Details

Added a conditional to the Gemfile to check whether the cucumber-ruby-wire code exists locally in the expected location and, if not, gets it from git instead.

Motivation and Context

This issue was causing errors in bundle install, making it harder for developers to work on Cucumber.

How Has This Been Tested?

Gemfile change probably doesn't need tests.

Screenshots (if appropriate):

Types of changes

  • [x ] Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

  • I've added tests for my code
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

@@ -6,6 +6,7 @@

### Bugfixes

* Use HTTPS instead of Git as transport protocol ([#960](https://github.com/cucumber/cucumber-ruby/pull/960))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This commit is haunting me, it wants to be in all my PRs for some reason!!

Copy link
Contributor

Choose a reason for hiding this comment

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

Of course, it is not on cucumber:master but it is on the PR branch. This time (but not in the case of #982), its parent commit is the tip of cucumber:master so I pushed it to cucumber:master, it should disappear from this PR now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you!

@danascheider
Copy link
Contributor Author

Any objections to my merging this @mattwynne or @brasmusson? Speak now or forever hold your peace!

@mattwynne
Copy link
Member

👍 but bear in mind we should make the wire plugin opt-in for 3.0 anyway so was can remove it as a dependency now I think 😀 Right @tooky?

else
gem 'cucumber-core', :git => "https://github.com/cucumber/cucumber-ruby-core.git"
gem "cucumber-core", :git => "git://github.com/cucumber/cucumber-ruby-core.git"
Copy link

@ghost ghost Jul 8, 2016

Choose a reason for hiding this comment

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

@danascheider Please don't use git:// this cannot be forwarded via HTTP proxies. Better use https:// instead. Otherwise contributors behind HTTP-proxies need to rewrite the Gemfile each time they want to submit a PR and don't have local clones.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh jeez, can't believe I didn't notice that. Thanks for pointing that out - will change.

Copy link

Choose a reason for hiding this comment

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

Thanks a lot. :-)

@danascheider danascheider mentioned this pull request Jul 14, 2016
6 tasks
@lock
Copy link

lock bot commented Oct 25, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Oct 25, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants