-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
17ba2d9
commit b86a150
Showing
5 changed files
with
482 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
# Contributor Covenant Code of Conduct | ||
|
||
## Our Pledge | ||
|
||
In the interest of fostering an open and welcoming environment, we as | ||
contributors and maintainers pledge to making participation in our project and | ||
our community a harassment-free experience for everyone, regardless of age, body | ||
size, disability, ethnicity, sex characteristics, gender identity and expression, | ||
level of experience, education, socio-economic status, nationality, personal | ||
appearance, race, religion, or sexual identity and orientation. | ||
|
||
## Our Standards | ||
|
||
Examples of behavior that contributes to creating a positive environment | ||
include: | ||
|
||
* Using welcoming and inclusive language | ||
* Being respectful of differing viewpoints and experiences | ||
* Gracefully accepting constructive criticism | ||
* Focusing on what is best for the community | ||
* Showing empathy towards other community members | ||
|
||
Examples of unacceptable behavior by participants include: | ||
|
||
* The use of sexualized language or imagery and unwelcome sexual attention or | ||
advances | ||
* Trolling, insulting/derogatory comments, and personal or political attacks | ||
* Public or private harassment | ||
* Publishing others' private information, such as a physical or electronic | ||
address, without explicit permission | ||
* Other conduct which could reasonably be considered inappropriate in a | ||
professional setting | ||
|
||
## Our Responsibilities | ||
|
||
Project maintainers are responsible for clarifying the standards of acceptable | ||
behavior and are expected to take appropriate and fair corrective action in | ||
response to any instances of unacceptable behavior. | ||
|
||
Project maintainers have the right and responsibility to remove, edit, or | ||
reject comments, commits, code, wiki edits, issues, and other contributions | ||
that are not aligned to this Code of Conduct, or to ban temporarily or | ||
permanently any contributor for other behaviors that they deem inappropriate, | ||
threatening, offensive, or harmful. | ||
|
||
## Scope | ||
|
||
This Code of Conduct applies both within project spaces and in public spaces | ||
when an individual is representing the project or its community. Examples of | ||
representing a project or community include using an official project e-mail | ||
address, posting via an official social media account, or acting as an appointed | ||
representative at an online or offline event. Representation of a project may be | ||
further defined and clarified by project maintainers. | ||
|
||
## Enforcement | ||
|
||
Instances of abusive, harassing, or otherwise unacceptable behavior may be | ||
reported by contacting the project team at [email protected]. All | ||
complaints will be reviewed and investigated and will result in a response that | ||
is deemed necessary and appropriate to the circumstances. The project team is | ||
obligated to maintain confidentiality with regard to the reporter of an incident. | ||
Further details of specific enforcement policies may be posted separately. | ||
|
||
Project maintainers who do not follow or enforce the Code of Conduct in good | ||
faith may face temporary or permanent repercussions as determined by other | ||
members of the project's leadership. | ||
|
||
## Attribution | ||
|
||
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, | ||
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html | ||
|
||
[homepage]: https://www.contributor-covenant.org | ||
|
||
For answers to common questions about this code of conduct, see | ||
https://www.contributor-covenant.org/faq |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,201 @@ | ||
# Contributing to os_patching | ||
|
||
:+1::tada: Welcome and thanks for considering contributing to the os_patching module :tada::+1: | ||
|
||
Below are some instructions to get you started doing that very thing while setting expectations around code quality as well as a few tips for making the process as easy as possible. | ||
|
||
### Table of Contents | ||
|
||
1. [Getting Started](#getting-started) | ||
1. [Commit Checklist](#commit-checklist) | ||
1. [Submission](#submission) | ||
1. [More about commits](#more-about-commits) | ||
1. [Testing](#testing) | ||
- [Running Tests](#running-tests) | ||
1. [Get Help](#get-help) | ||
|
||
## Getting Started | ||
|
||
- Fork the module repository on GitHub and clone to your workspace | ||
|
||
- Create a branch for your changes | ||
|
||
- Make your changes! | ||
|
||
## Commit Checklist | ||
|
||
### The Basics | ||
|
||
- [x] my commit is a single logical unit of work | ||
|
||
- [x] I have checked for unnecessary whitespace with "git diff --check" | ||
|
||
- [x] my commit does not include commented out code or unneeded files | ||
|
||
### The Content | ||
|
||
- [x] my commit includes tests for the bug I fixed or feature I added | ||
|
||
- [x] my commit includes appropriate documentation changes if it is introducing a new feature or changing existing functionality | ||
|
||
- [x] my code passes existing test suites | ||
|
||
### The Commit Message | ||
|
||
- [x] the first line of my commit message includes: | ||
|
||
- [x] an issue number (if applicable), e.g. "(MODULES-xxxx) This is the first line" | ||
|
||
- [x] a short description (50 characters is the soft limit, excluding ticket number(s)) | ||
|
||
- [x] the body of my commit message: | ||
|
||
- [x] is meaningful | ||
|
||
- [x] uses the imperative, present tense: "change", not "changed" or "changes" | ||
|
||
- [x] includes motivation for the change, and contrasts its implementation with the previous behavior | ||
|
||
## Submission | ||
|
||
### Pre-requisites | ||
|
||
- Make sure you have a [GitHub account](https://github.com/join) | ||
|
||
- [Create a ticket](https://github.com/albatrossflavour/puppet_os_patching/issues/new/choose) if one [does not already exist](https://github.com/albatrossflavour/puppet_os_patching/issues). | ||
|
||
### Push and PR | ||
|
||
- Push your changes to your fork | ||
|
||
- [Open a Pull Request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) against the repository | ||
|
||
## More about commits | ||
|
||
1. Make separate commits for logically separate changes. | ||
|
||
Please break your commits down into logically consistent units | ||
which include new or changed tests relevant to the rest of the | ||
change. The goal of doing this is to make the diff easier to | ||
read for whoever is reviewing your code. In general, the easier | ||
your diff is to read, the more likely someone will be happy to | ||
review it and get it into the code base. | ||
|
||
If you are going to refactor a piece of code, please do so as a | ||
separate commit from your feature or bug fix changes. | ||
|
||
We also really appreciate changes that include tests to make | ||
sure the bug is not re-introduced, and that the feature is not | ||
accidentally broken. | ||
|
||
Describe the technical detail of the change(s). If your | ||
description starts to get too long, that is a good sign that you | ||
probably need to split up your commit into more finely grained | ||
pieces. | ||
|
||
Commits which plainly describe the things which help | ||
reviewers check the patch and future developers understand the | ||
code are much more likely to be merged in with a minimum of | ||
bike-shedding or requested changes. Ideally, the commit message | ||
would include information, and be in a form suitable for | ||
inclusion in the release notes for the version of Puppet that | ||
includes them. | ||
|
||
Please also check that you are not introducing any trailing | ||
whitespace or other "whitespace errors". You can do this by | ||
running "git diff --check" on your changes before you commit. | ||
|
||
2. Sending your patches | ||
|
||
To submit your changes via a GitHub pull request, we _highly_ | ||
recommend that you have them on a topic branch, instead of | ||
directly on "master". | ||
It makes things much easier to keep track of, especially if | ||
you decide to work on another thing before your first change | ||
is merged in. | ||
|
||
GitHub has some pretty good | ||
[general documentation](http://help.github.com/) on using | ||
their site. They also have documentation on | ||
[creating pull requests](https://help.github.com/articles/creating-a-pull-request-from-a-fork/). | ||
|
||
In general, after pushing your topic branch up to your | ||
repository on GitHub, you can switch to the branch in the | ||
GitHub UI and click "Pull Request" towards the top of the page | ||
in order to open a pull request. | ||
|
||
3. Update the related issue. | ||
|
||
If there is an issue associated with the change you | ||
submitted, then you should update the ticket to include the | ||
location of your branch, along with any other commentary you | ||
may wish to make. | ||
|
||
# Testing | ||
|
||
## Getting Started | ||
|
||
The os_patching module provides [`Gemfile`](./Gemfile)s, which can tell a Ruby package manager such as [bundler](http://bundler.io/) what Ruby packages, or Gems, are required to build, develop, and test this software. | ||
|
||
Please make sure you have [bundler installed](http://bundler.io/#getting-started) on your system, and then use it to install all dependencies needed for this project in the project root by running | ||
|
||
```shell | ||
% bundle install --path .bundle/gems | ||
Fetching gem metadata from https://rubygems.org/........ | ||
Fetching gem metadata from https://rubygems.org/.. | ||
Using rake (10.1.0) | ||
Using builder (3.2.2) | ||
-- 8><-- many more --><8 -- | ||
Using rspec-system-puppet (2.2.0) | ||
Using serverspec (0.6.3) | ||
Using rspec-system-serverspec (1.0.0) | ||
Using bundler (1.3.5) | ||
Your bundle is complete! | ||
Use `bundle show [gemname]` to see where a bundled gem is installed. | ||
``` | ||
|
||
NOTE: some systems may require you to run this command with sudo. | ||
|
||
If you already have those gems installed, make sure they are up-to-date: | ||
|
||
```shell | ||
% bundle update | ||
``` | ||
|
||
## Running Tests | ||
|
||
With all dependencies in place and up-to-date, run the tests: | ||
|
||
### Validation Tests | ||
|
||
```shell | ||
% make validate | ||
``` | ||
|
||
The validation tests will ensure the metadata and code are syntactically correct and that they meet the [style guide](https://puppet.com/docs/puppet/latest/style_guide.html). This includes the YAML, JSON, EPP, ERB and ruby files. | ||
|
||
### Unit Tests | ||
|
||
```shell | ||
% make unit | ||
``` | ||
|
||
This executes all the [rspec tests](http://rspec-puppet.com/) defined in spec/classes. The tests compile catalogs using sample fact sets for each OS listed in the `metadata.json` file, providing the catalog compiles, it then validates that the resources you've defined are present in the catalog. | ||
|
||
rspec tests may have the same kind of dependencies as the module they are testing. Although the module defines these dependencies in its [metadata.json](./metadata.json), rspec tests define them in [.fixtures.yml](./fixtures.yml). | ||
|
||
### Acceptance Tests | ||
|
||
```shell | ||
% make acceptance | ||
``` | ||
|
||
The module also has acceptance tests, which use [litmus](https://github.com/puppetlabs/puppet_litmus). Litmus uses docker to stand up a range of environments, installs the puppet agent, applies the module and then validates that the desired results have been achieved in a single run. | ||
|
||
|
||
# Get Help | ||
|
||
* [Puppet community slack](https://slack.puppet.com) - look for `@albatrossflavour` | ||
* [Writing tests](https://puppet.com/docs/puppet/latest/bgtm.html#testing-your-module) | ||
* [General GitHub documentation](http://help.github.com/) | ||
* [GitHub pull request documentation](https://help.github.com/en/articles/creating-a-pull-request) |
Oops, something went wrong.