Merge branch 'release/3.1.0'

Author: razorsedge

.fixtures.yml

@@ -1,14 +1,26 @@
 fixtures:
  repositories:
  stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
- mysql: "https://github.com/puppetlabs/puppetlabs-mysql.git"
- postgresql: "https://github.com/puppetlabs/puppet-postgresql.git"
- concat: "https://github.com/puppetlabs/puppetlabs-concat.git"
+ mysql:
+ repo: "https://github.com/puppetlabs/puppetlabs-mysql.git"
+ ref: "3.11.0"
+ postgresql:
+ repo: "https://github.com/puppetlabs/puppet-postgresql.git"
+ ref: "4.9.0"
+ concat:
+ repo: "https://github.com/puppetlabs/puppetlabs-concat.git"
+ ref: "1.2.1"
  staging: "https://github.com/nanliu/puppet-staging.git"
- epel: "https://github.com/stahnma/puppet-module-epel.git"
+ epel:
+ repo: "https://github.com/stahnma/puppet-module-epel.git"
+ ref: "1.2.2"
  java_ks: "https://github.com/puppetlabs/puppetlabs-java_ks.git"
- zypprepo: "https://github.com/deadpoint/puppet-zypprepo.git"
- apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
+ zypprepo:
+ repo: "https://github.com/deadpoint/puppet-zypprepo.git"
+ ref: "v1.0.2"
+ apt:
+ repo: "https://github.com/puppetlabs/puppetlabs-apt.git"
+ ref: "1.8.0"
  augeasproviders_core: "https://github.com/hercules-team/augeasproviders_core.git"
  augeasproviders_sysctl: "https://github.com/hercules-team/augeasproviders_sysctl.git"
  symlinks:

.gitignore

@@ -7,3 +7,4 @@ spec/fixtures/
 coverage/
 *.swp
 .vendor/
+.vendor

.project

@@ -3,12 +3,17 @@
 <name>cloudera</name>
 <comment></comment>
 <projects>
+<project>apt</project>
+<project>augeasproviders_core</project>
+<project>augeasproviders_sysctl</project>
+<project>concat</project>
 <project>epel</project>
 <project>java_ks</project>
 <project>mysql</project>
 <project>postgresql</project>
 <project>staging</project>
 <project>stdlib</project>
+<project>zypprepo</project>
 </projects>
 <buildSpec>
 <buildCommand>
@@ -45,5 +50,14 @@
 <arguments>1.0-projectRelativePath-matches-false-false-spec/fixtures/modules</arguments>
 </matcher>
 </filter>
+<filter>
+<id>1428386119416</id>
+<name></name>
+<type>10</type>
+<matcher>
+<id>org.eclipse.ui.ide.multiFilter</id>
+<arguments>1.0-projectRelativePath-matches-false-false-.vendor</arguments>
+</matcher>
+</filter>
 </filteredResources>
 </projectDescription>

.puppet-lint.rc

@@ -1,6 +1,6 @@
 --fail-on-warnings
 --relative
---no-80chars-check
+--no-140chars-check
 --no-class_inherits_from_params_class-check
 --no-documentation-check
 --no-single_quote_string_with_variables-check

.sync.yml

@@ -0,0 +1,7 @@
+---
+.travis.yml:
+ extras:
+ - 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"

.travis.yml

@@ -14,10 +14,6 @@ script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake
 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.8.7
  env: PUPPET_GEM_VERSION="~> 3.0"
  - rvm: 1.9.3
@@ -26,9 +22,17 @@ matrix:
  env: PUPPET_GEM_VERSION="~> 3.0"
  - rvm: 2.0.0
  env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+ - rvm: 2.1.9
+ env: PUPPET_GEM_VERSION="~> 4.0"
+ - rvm: 2.4.1
+ env: PUPPET_GEM_VERSION="~> 5.0"
+ - 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"
  allow_failures:
- - rvm: 2.0.0
- env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+ - rvm: 2.4.1
+ env: PUPPET_GEM_VERSION="~> 5.0"
 notifications:
  email:
  - github@razorsedge.org

DEVELOP.md renamed to CONTRIBUTING.md

@@ -3,26 +3,45 @@ Contributing
 
 normal
 
- 1. [Fork](http://help.github.com/forking/) puppet-cloudera
- 2. Create a topic branch against the develop branch `git checkout develop; git checkout -b my_branch`
- 3. Push to your branch `git push origin my_branch`
- 4. Create a [Pull Request](http://help.github.com/pull-requests/) from your branch against the develop branch
+ 1. [Fork](http://help.github.com/forking/) puppet-cloudera.
+ 2. Create a topic branch against the develop branch. `git checkout develop; git checkout -b my_branch`
+ 3. Make your change.
+ 4. Add a test for your change. Only refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, please add a test.
+ 5. Run the tests. We only take pull requests with passing tests. `bundle exec rake spec SPEC_OPTS='--format documentation'`
+ 6. Add or update documentation.
+ 7. Squash your commits down into logical components. Make sure to rebase against the current `develop` branch. `git pull --rebase upstream develop`
+ 8. Push to your branch. `git push origin my_branch`
+ 9. Create a [Pull Request](http://help.github.com/pull-requests/) from your branch against the develop branch.
 
 [git-flow](https://github.com/nvie/gitflow)
 
- 1. [Fork](http://help.github.com/forking/) puppet-cloudera
- 2. Create a feature `git flow feature start my-feature`
- 3. Publish your featue `git flow feature publish my-feature`
- 4. Create a [Pull Request](http://help.github.com/pull-requests/) from your branch against the develop branch
+ 1. [Fork](http://help.github.com/forking/) puppet-cloudera.
+ 2. Create a feature. `git flow feature start my-feature`
+ 3. Make your change.
+ 4. Add a test for your change. Only refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, please add a test.
+ 5. Run the tests. We only take pull requests with passing tests. `bundle exec rake spec SPEC_OPTS='--format documentation'`
+ 6. Add or update documentation.
+ 7. Squash your commits down into logical components. Make sure to rebase against the current `develop` branch. `git pull --rebase upstream develop`
+ 8. Publish your featue. `git flow feature publish my-feature`
+ 9. Create a [Pull Request](http://help.github.com/pull-requests/) from your branch against the develop branch.
 
 Testing
 -------
 
 Tests are written with [rspec-puppet](http://rspec-puppet.com/). CI is covered by [Travis CI](http://about.travis-ci.org/) and the current status is visible [here](http://travis-ci.org/razorsedge/puppet-cloudera).
 
+To install the test system, pick one of the following:
+
+ PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" bundle install --path=.vendor --without system_tests
+ PUPPET_GEM_VERSION="~> 3.0" bundle install --path=.vendor --without system_tests
+ PUPPET_GEM_VERSION="~> 4.0" bundle install --path=.vendor --without system_tests
+
 To run all tests:
 
- rake spec
+ bundle exec rake validate && \
+ bundle exec rake lint && \
+ bundle exec rake metadata_lint && \
+ bundle exec rake spec SPEC_OPTS='--format documentation' FUTURE_PARSER="yes" STRICT_VARIABLES="no"
 
 Branching
 ---------

Gemfile

@@ -1,27 +1,26 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :unit_tests do
- gem 'rake', :require => false
- gem 'rspec', '~> 2.0', :require => false
- gem 'rspec-puppet', '~> 2.0', :require => false
- gem 'puppetlabs_spec_helper', :require => false
- gem 'puppet-lint', '>= 1.1.0', :require => false
- gem 'simplecov', :require => false
- gem 'puppet_facts', :require => false
- gem 'json', :require => false
- gem 'metadata-json-lint', '>= 0.0.4', :require => false
+ gem 'rake', '10.5.0', :require => false
+ gem 'rspec', '~> 2.0', :require => false
+ gem 'rspec-puppet', '>= 2.1.0', :require => false
+ gem 'puppetlabs_spec_helper', '~> 1.2', :require => false
+ gem 'puppet-lint', '~> 2.0', :require => false
+ gem 'json', '~> 1.8', :require => false if RUBY_VERSION =~ /^1\./
+ gem 'json', :require => false if RUBY_VERSION =~ /^2\./
+ gem 'json_pure', '~> 1.8', :require => false if RUBY_VERSION =~ /^1\.8/
+ gem 'json_pure', '<= 2.0.1', :require => false if RUBY_VERSION =~ /^1\.9/
+ gem 'json_pure', :require => false if RUBY_VERSION =~ /^2\./
+ gem 'metadata-json-lint', '< 1.2.0', :require => false if RUBY_VERSION =~ /^1\./
+ gem 'metadata-json-lint', :require => false if RUBY_VERSION =~ /^2\./
+ gem 'semantic_puppet', '0.1.3', :require => false if RUBY_VERSION =~ /^1\./
+ gem 'semantic_puppet', :require => false if RUBY_VERSION =~ /^2\./
+ gem 'puppet-lint-unquoted_string-check', :require => false
+ gem 'puppet-lint-empty_string-check', :require => false
+ gem 'puppet-lint-leading_zero-check', :require => false
 end
 
-if facterversion = ENV['FACTER_GEM_VERSION']
- gem 'facter', facterversion, :require => false
-else
- gem 'facter', :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
- gem 'puppet', puppetversion, :require => false
-else
- gem 'puppet', :require => false
-end
+gem 'puppet', ENV['PUPPET_GEM_VERSION'], :require => false
+gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false
 
 # vim:ft=ruby