From 971b91c0ea507235c949459eee78761735c8496b Mon Sep 17 00:00:00 2001 From: Noah Botimer Date: Tue, 14 Aug 2018 17:31:47 -0400 Subject: [PATCH] Update docs to match templates - Resolve #166; Update contributing guidelines --- CONTRIBUTING.md | 42 ++++++++++++++++++++++-------------------- README.md | 33 ++++++++++++++++++++++++++++++--- SUPPORT.md | 6 ++++++ 3 files changed, 58 insertions(+), 23 deletions(-) create mode 100644 SUPPORT.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ee18c56b..df6e14d2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,21 +1,24 @@ # How to Contribute -We want your help to make Project Hydra great. -There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things. +We want your help to make the Samvera community great. There are a few guidelines +that we need contributors to follow so that we can have a chance of +keeping on top of things. ## Code of Conduct -The Hydra community is dedicated to providing a welcoming and positive experience for all its -members, whether they are at a formal gathering, in a social setting, or taking part in activities -online. Please see our [Code of Conduct](https://wiki.duraspace.org/display/hydra/Code+of+Conduct) -for more information. +The Samvera Community is dedicated to providing a welcoming and positive +experience for all its members, whether they are at a formal gathering, in +a social setting, or taking part in activities online. Please see our +[Code of Conduct](CODE_OF_CONDUCT.md) for more information. -## Hydra Project Intellectual Property Licensing and Ownership +## Samvera Community Intellectual Property Licensing and Ownership -All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group. -If the contributor works for an institution, the institution must have a Corporate Contributor License Agreement (cCLA) on file. +All code contributors must have an Individual Contributor License Agreement +(iCLA) on file with the Samvera Steering Group. If the contributor works for +an institution, the institution must have a Corporate Contributor License +Agreement (cCLA) on file. -https://wiki.duraspace.org/display/hydra/Hydra+Project+Intellectual+Property+Licensing+and+Ownership +https://wiki.duraspace.org/display/samvera/Samvera+Community+Intellectual+Property+Licensing+and+Ownership You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project. @@ -48,7 +51,7 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr * Please avoid working directly on the `master` branch. * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful * Make sure you have added sufficient tests and documentation for your changes. - * Test functionality with RSpec; est features / UI with Capybara. + * Test functionality with RSpec; Test features / UI with Capybara. * Run _all_ the tests to assure nothing else was accidentally broken. ### Documenting Code @@ -60,15 +63,11 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr * If you don't know exactly what a bit of code does, it is extra likely that it needs to be documented. Take a stab at it and ask for feedback in your pull request. You can use the 'blame' button on GitHub to identify the original developer of the code and @mention them in your comment. * This work greatly increases the usability of the code base and supports the on-ramping of new committers. * We will all be understanding of one another's time constraints in this area. -* YARD examples: - * [Hydra::Works::RemoveGenericFile](https://github.com/projecthydra/hydra-works/blob/master/lib/hydra/works/services/generic_work/remove_generic_file.rb) - * [ActiveTriples::LocalName::Minter](https://github.com/ActiveTriples/active_triples-local_name/blob/master/lib/active_triples/local_name/minter.rb) * [Getting started with YARD](http://www.rubydoc.info/gems/yard/file/docs/GettingStarted.md) ### Committing changes * Make commits of logical units. - * Your commit should include a high level description of your work in HISTORY.textile * Check for unnecessary whitespace with `git diff --check` before committing. * Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). * If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages) @@ -103,6 +102,10 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr long to fit in 72 characters ``` +* Make sure you have added the necessary tests for your changes. +* Run _all_ the tests to assure nothing else was accidentally broken. +* When you are ready to submit a pull request + ### Submitting Changes * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub. @@ -125,9 +128,7 @@ We adopted [Github's Pull Request Review](https://help.github.com/articles/about Common checks that may occur in our repositories: 1. Travis CI - where our automated tests are running -2. Hound CI - where we check for style violations -3. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve. -4. CodeClimate - is our code remaining healthy (at least according to static code analysis) +2. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve. If one or more of the required checks failed (or are incomplete), the code should not be merged (and the UI will not allow it). If all of the checks have passed, then anyone on the project (including the pull request submitter) may merge the code. @@ -144,16 +145,17 @@ First, the person contributing the code is putting themselves out there. Be mind This is your chance for a mentoring moment of another developer. Take time to give an honest and thorough review of what has changed. Things to consider: * Does the commit message explain what is going on? - * Does the code changes have tests? _Not all changes need new tests, some changes are refactors_ + * Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_ * Do new or changed methods, modules, and classes have documentation? * Does the commit contain more than it should? Are two separate concerns being addressed in one commit? * Does the description of the new/changed specs match your understanding of what the spec is doing? + * Did the Travis tests complete successfully? If you are uncertain, bring other contributors into the conversation by assigning them as a reviewer. # Additional Resources * [General GitHub documentation](http://help.github.com/) -* [GitHub pull request documentation](http://help.github.com/send-pull-requests/) +* [GitHub pull request documentation](https://help.github.com/articles/about-pull-requests/) * [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git. * [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/) diff --git a/README.md b/README.md index 0c78eb9b..80216560 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,16 @@ # Questioning Authority -[![Build Status](https://travis-ci.org/samvera/questioning_authority.png?branch=master)](https://travis-ci.org/samvera/questioning_authority) [![Gem Version](https://badge.fury.io/rb/qa.png)](http://badge.fury.io/rb/qa) +Code: +[![Gem Version](https://badge.fury.io/rb/qa.png)](http://badge.fury.io/rb/qa) +[![Build Status](https://travis-ci.org/samvera/questioning_authority.png?branch=master)](https://travis-ci.org/samvera/questioning_authority) [![Coverage Status](https://coveralls.io/repos/github/samvera/questioning_authority/badge.svg?branch=master)](https://coveralls.io/github/samvera/questioning_authority?branch=master) +Docs: +[![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md) +[![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE) + +Jump In: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samvera.org/) + You should question your authorities. ---- @@ -29,10 +37,12 @@ You should question your authorities. * [Add javascript to support autocomplete](#add-javascript-to-support-autocomplete) * [Developer Notes](#developer-notes) * [Compatibility](#compatibility) + * [Product Owner & Maintenance](#product-owner--maintenance) + * [Product Owner](#product-owner) * [Help](#help) + * [Acknowledgments](#acknowledgments) ---- - ## What does this do? Provides a set of uniform RESTful routes to query any controlled vocabulary or set of authority terms. @@ -639,9 +649,26 @@ Commit your features into a new branch and submit a pull request. * Ruby 2.4 or the latest 2.3 version is recommended. Later versions may also work. * Rails 5 is required. We recommend the latest Rails 5.0 release. +## Product Owner & Maintenance + +Questioning Authority is a Core Component of the Samvera community. The documentation for +what this means can be found +[here](http://samvera.github.io/core_components.html#requirements-for-a-core-component). + +### Product Owner + +[elrayle](https://github.com/elrayle) + # Help -For help with Questioning Authority, contact . +The Samvera community is here to help. Please see our [support guide](./SUPPORT.md). + +# Acknowledgments + +This software has been developed by and is brought to you by the Samvera community. Learn more at the +[Samvera website](http://samvera.org/). + +![Samvera Logo](https://wiki.duraspace.org/download/thumbnails/87459292/samvera-fall-font2-200w.png?version=1&modificationDate=1498550535816&api=v2) ### Special thanks to... diff --git a/SUPPORT.md b/SUPPORT.md new file mode 100644 index 00000000..e07972d9 --- /dev/null +++ b/SUPPORT.md @@ -0,0 +1,6 @@ +If you would like to report an issue, first search [the list of issues](https://github.com/samvera/questioning_authority/issues/) to see if someone else has already reported it, and then feel free to [create a new issue](https://github.com/samvera/questioning_authority/issues/new). + +If you have questions or need help, please email [the Samvera community tech list](https://groups.google.com/forum/#!forum/samvera-tech) or stop by the #dev channel in [the Samvera community Slack team](https://wiki.duraspace.org/pages/viewpage.action?pageId=87460391#Getintouch!-Slack). + +You can learn more about the various Samvera communication channels on the [Get in touch!](https://wiki.duraspace.org/pages/viewpage.action?pageId=87460391) wiki page. +