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.

Sign up for GitHub

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

Jump to bottom

Implement conflicts_with stanza #9319

Closed
wants to merge 14 commits into from
Closed

Implement conflicts_with stanza #9319

wants to merge 14 commits into from

Commits on Jan 30, 2015

  1. Implement conflicts_with DSL class 

    These changes are almost entirely taken from depends_on.rb.
Should probably consider moving common methods to a superclass
or utility class.
    @jawshooah
    jawshooah committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    498064b View commit details
    Browse the repository at this point in the history

  2. Permit multiple conflicts_with stanzas

    @jawshooah
    jawshooah committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    c24c9f6 View commit details
    Browse the repository at this point in the history

  3. Satisfy conflicts on install

    @jawshooah
    jawshooah committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    20f0393 View commit details
    Browse the repository at this point in the history

  4. Add conflicts_with DSL tests

    @jawshooah
    jawshooah committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    335c7e2 View commit details
    Browse the repository at this point in the history

  5. Add further tests for conflicts_with 

    Test conflicts_with :cask, :macos, :arch, and :x11.
Add todo for testing :formula.
    @jawshooah
    jawshooah committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    a72dd24 View commit details
    Browse the repository at this point in the history

  6. Use attr_reader instead of attr_accessor, eliminate redundant getter … 

    …methods
    @jawshooah
    jawshooah committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    06dccf5 View commit details
    Browse the repository at this point in the history

  7. Drop empty parentheses from method call

    @jawshooah
    jawshooah committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    1c1324c View commit details
    Browse the repository at this point in the history

  8. Drop unnecessary guards, use Array coercion instead

    @jawshooah
    jawshooah committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    2dd651b View commit details
    Browse the repository at this point in the history

  9. Add comment noting that multiple conflicts_with stanzas are permissible

    @jawshooah
    jawshooah committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    f0c2dbc View commit details
    Browse the repository at this point in the history

  10. Move conflict resolution to Hbc::Conflicts module

    @jawshooah
    jawshooah committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    73a2118 View commit details
    Browse the repository at this point in the history

  11. Move dependency logic to shared superclasses 

    Create class Hbc::DSL::Dependency to serve as superclass for
ConflictsWith and DependsOn. Move dependency and conflict validation
and resolution logic to Hbc::Dependencies and its subclasses.
    @jawshooah
    jawshooah committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    bacb2d0 View commit details
    Browse the repository at this point in the history

  12. Use Hbc::DSL::Dependency for depends_on stanza 

    Eradicate duplicate logic in Hbc::DSL::DependsOn and make it a subclass
of Hbc::DSL::Dependency.
    @jawshooah
    jawshooah committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    cada798 View commit details
    Browse the repository at this point in the history

  13. Add newline at end of dependencies.rb

    @jawshooah
    jawshooah committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    791b4e9 View commit details
    Browse the repository at this point in the history

  14. Add pairs method to cask depends_on stubs

    @jawshooah
    jawshooah committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    ff8ce4e View commit details
    Browse the repository at this point in the history