This repository has been archived by the owner on Feb 18, 2022. It is now read-only.
Update to newest modulesync_configs [3610af2] #31
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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,5 @@ | ||
#This file is generated by ModuleSync, do not edit. | ||
*.rb eol=lf | ||
*.erb eol=lf | ||
*.pp eol=lf | ||
*.sh eol=lf |
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,11 @@ | ||
#This file is generated by ModuleSync, do not edit. | ||
pkg/ | ||
Gemfile.lock | ||
vendor/ | ||
spec/fixtures/ | ||
.vagrant/ | ||
.bundle/ | ||
coverage/ | ||
log/ | ||
.idea/ | ||
*.iml |
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,2 @@ | ||
--color | ||
--format documentation |
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 |
---|---|---|
@@ -1,17 +1,35 @@ | ||
#This file is generated by ModuleSync, do not edit. | ||
--- | ||
sudo: false | ||
language: ruby | ||
bundler_args: --without system_tests | ||
script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'" | ||
cache: bundler | ||
script: "bundle exec rake validate lint spec" | ||
matrix: | ||
fast_finish: true | ||
include: | ||
- rvm: 1.8.7 | ||
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" | ||
- rvm: 1.8.7 | ||
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" | ||
- rvm: 1.9.3 | ||
- rvm: 2.1.6 | ||
dist: trusty | ||
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 | ||
script: bundle exec rake beaker | ||
services: docker | ||
sudo: required | ||
- rvm: 2.1.6 | ||
dist: trusty | ||
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 | ||
script: bundle exec rake beaker | ||
services: docker | ||
sudo: required | ||
- rvm: 2.1.6 | ||
bundler_args: --without system_tests | ||
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes" | ||
- rvm: 2.1.5 | ||
bundler_args: --without system_tests | ||
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" | ||
- rvm: 2.1.5 | ||
bundler_args: --without system_tests | ||
env: PUPPET_GEM_VERSION="~> 3.0" | ||
- rvm: 2.0.0 | ||
- rvm: 1.9.3 | ||
bundler_args: --without system_tests | ||
env: PUPPET_GEM_VERSION="~> 3.0" | ||
notifications: | ||
email: false |
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,220 @@ | ||
Checklist (and a short version for the impatient) | ||
================================================= | ||
|
||
* Commits: | ||
|
||
- Make commits of logical units. | ||
|
||
- Check for unnecessary whitespace with "git diff --check" before | ||
committing. | ||
|
||
- Commit using Unix line endings (check the settings around "crlf" in | ||
git-config(1)). | ||
|
||
- Do not check in commented out code or unneeded files. | ||
|
||
- The first line of the commit message should be a short | ||
description (50 characters is the soft limit, excluding ticket | ||
number(s)), and should skip the full stop. | ||
|
||
- Associate the issue in the message. The first line should include | ||
the issue number in the form "(#XXXX) Rest of message". | ||
|
||
- The body should provide a meaningful commit message, which: | ||
|
||
- uses the imperative, present tense: "change", not "changed" or | ||
"changes". | ||
|
||
- includes motivation for the change, and contrasts its | ||
implementation with the previous behavior. | ||
|
||
- Make sure that you have tests for the bug you are fixing, or | ||
feature you are adding. | ||
|
||
- Make sure the test suites passes after your commit: | ||
`bundle exec rspec spec/acceptance` More information on [testing](#Testing) below | ||
|
||
- When introducing a new feature, make sure it is properly | ||
documented in the README.md | ||
|
||
* Submission: | ||
|
||
* Pre-requisites: | ||
|
||
- Make sure you have a [GitHub account](https://github.com/join) | ||
|
||
- [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for. | ||
|
||
* Preferred method: | ||
|
||
- Fork the repository on GitHub. | ||
|
||
- Push your changes to a topic branch in your fork of the | ||
repository. (the format ticket/1234-short_description_of_change is | ||
usually preferred for this project). | ||
|
||
- Submit a pull request to the repository in the puppetlabs | ||
organization. | ||
|
||
The long version | ||
================ | ||
|
||
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](http://help.github.com/send-pull-requests/). | ||
|
||
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 GitHub issue. | ||
|
||
If there is a GitHub 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 | ||
--------------- | ||
|
||
Our puppet modules provide [`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, then use it to install all dependencies needed for this project, | ||
by running | ||
|
||
```shell | ||
% bundle install | ||
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 | ||
``` | ||
|
||
With all dependencies in place and up-to-date we can now run the tests: | ||
|
||
```shell | ||
% bundle exec rake spec | ||
``` | ||
|
||
This will execute all the [rspec tests](http://rspec-puppet.com/) tests | ||
under [spec/defines](./spec/defines), [spec/classes](./spec/classes), | ||
and so on. rspec tests may have the same kind of dependencies as the | ||
module they are testing. While the module defines in its [Modulefile](./Modulefile), | ||
rspec tests define them in [.fixtures.yml](./fixtures.yml). | ||
|
||
Some puppet modules also come with [beaker](https://github.com/puppetlabs/beaker) | ||
tests. These tests spin up a virtual machine under | ||
[VirtualBox](https://www.virtualbox.org/)) with, controlling it with | ||
[Vagrant](http://www.vagrantup.com/) to actually simulate scripted test | ||
scenarios. In order to run these, you will need both of those tools | ||
installed on your system. | ||
|
||
You can run them by issuing the following command | ||
|
||
```shell | ||
% bundle exec rake spec_clean | ||
% bundle exec rspec spec/acceptance | ||
``` | ||
|
||
This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml), | ||
install puppet, copy this module and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb) | ||
and then run all the tests under [spec/acceptance](./spec/acceptance). | ||
|
||
Writing Tests | ||
------------- | ||
|
||
XXX getting started writing tests. | ||
|
||
If you have commit access to the repository | ||
=========================================== | ||
|
||
Even if you have commit access to the repository, you will still need to | ||
go through the process above, and have someone else review and merge | ||
in your changes. The rule is that all changes must be reviewed by a | ||
developer on the project (that did not write the code) to ensure that | ||
all changes go through a code review process. | ||
|
||
Having someone other than the author of the topic branch recorded as | ||
performing the merge is the record that they performed the code | ||
review. | ||
|
||
|
||
Additional Resources | ||
==================== | ||
|
||
* [Getting additional help](http://puppetlabs.com/community/get-help) | ||
|
||
* [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests) | ||
|
||
* [Patchwork](https://patchwork.puppetlabs.com) | ||
|
||
* [General GitHub documentation](http://help.github.com/) | ||
|
||
* [GitHub pull request documentation](http://help.github.com/send-pull-requests/) | ||
|
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 |
---|---|---|
@@ -1,30 +1,39 @@ | ||
#This file is generated by ModuleSync, do not edit. | ||
|
||
source ENV['GEM_SOURCE'] || "https://rubygems.org" | ||
|
||
group :development, :unit_tests do | ||
gem 'rake', :require => false | ||
gem 'rspec-puppet', :require => false | ||
gem 'puppetlabs_spec_helper', :require => false | ||
gem 'puppet-lint', :require => false | ||
gem 'simplecov', :require => false | ||
gem 'puppet_facts', :require => false | ||
gem 'json', :require => false | ||
def location_for(place, version = nil) | ||
if place =~ /^(git[:@][^#]*)#(.*)/ | ||
[version, { :git => $1, :branch => $2, :require => false}].compact | ||
elsif place =~ /^file:\/\/(.*)/ | ||
['>= 0', { :path => File.expand_path($1), :require => false}] | ||
else | ||
[place, version, { :require => false}].compact | ||
end | ||
end | ||
|
||
group :development, :unit_tests do | ||
gem 'json', :require => false | ||
gem 'metadata-json-lint', :require => false | ||
gem 'puppet_facts', :require => false | ||
gem 'puppet-blacksmith', :require => false | ||
gem 'puppetlabs_spec_helper', :require => false | ||
gem 'rspec-puppet', '>= 2.3.2', :require => false | ||
gem 'simplecov', :require => false | ||
end | ||
group :system_tests do | ||
gem 'beaker-rspec', :require => false | ||
gem 'serverspec', :require => false | ||
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4') | ||
gem 'beaker', *location_for(ENV['BEAKER_VERSION']) | ||
gem 'serverspec', :require => false | ||
gem 'beaker-puppet_install_helper', :require => false | ||
gem 'master_manipulator', :require => false | ||
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION']) | ||
end | ||
|
||
if facterversion = ENV['FACTER_GEM_VERSION'] | ||
gem 'facter', facterversion, :require => false | ||
else | ||
gem 'facter', :require => false | ||
end | ||
gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) | ||
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION']) | ||
|
||
if puppetversion = ENV['PUPPET_GEM_VERSION'] | ||
gem 'puppet', puppetversion, :require => false | ||
else | ||
gem 'puppet', :require => false | ||
end | ||
|
||
# vim:ft=ruby | ||
if File.exists? "#{__FILE__}.local" | ||
eval(File.read("#{__FILE__}.local"), binding) | ||
end |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we source this location_for ? Its something we could use thats cool.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's coming from modulesync_configs; there is no real libraries for Gemfiles: Catch-22
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Coolio