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

X11Requirement: Inherit from generic class [macOS] #3548

Merged
merged 1 commit into from
Dec 8, 2017

Conversation

sjackman
Copy link
Member

@sjackman sjackman commented Dec 8, 2017

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same change?
  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes? Here's an example.
  • Have you successfully run brew tests with your changes locally?

Fix the warning: already initialized constant X11Requirement
See #3483 (comment)

@sjackman
Copy link
Member Author

sjackman commented Dec 8, 2017

Pushed too soon. Give me a sec…

Fix the warning: already initialized constant X11Requirement
@sjackman
Copy link
Member Author

sjackman commented Dec 8, 2017

The macOS version of X11Requirement now inherits from the generic version.
I modified Requirement::satisfy to permit redefining @satisfied in the derived class.
Requirement::satisfy is called in three modes.

  1. With no arguments as a predicate by satisfied?.
  2. With a block, e.g. satisfy { which "foo" }
  3. With a boolean, e.g. satisfy true

@ilovezfs
Copy link
Contributor

ilovezfs commented Dec 8, 2017

❤️

@sjackman
Copy link
Member Author

sjackman commented Dec 8, 2017

☺️

Copy link
Member

@MikeMcQuaid MikeMcQuaid left a comment

Choose a reason for hiding this comment

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

👍 once this is 🍏. Thanks for the fast turnaroud here @sjackman. If you can refactor JavaRequirement or OSXFuseRequirement at all to use the approach you've done here that'd be great.

@ilovezfs ilovezfs merged commit e57da60 into Homebrew:master Dec 8, 2017
@ilovezfs
Copy link
Contributor

ilovezfs commented Dec 8, 2017

Thanks @sjackman! 🚢'd

@sjackman sjackman deleted the x11 branch December 8, 2017 22:00
@sjackman
Copy link
Member Author

sjackman commented Dec 8, 2017

I took a quick look at JavaRequirement and OSXFuseRequirement. I didn't see any obvious code duplication or refactoring made possible by my fix to satisfy.

@Homebrew Homebrew locked and limited conversation to collaborators May 4, 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