Sync our fork with deric/puppet-zookeeper (+ some new stuff)

.gitattributes

@@ -0,0 +1 @@
+*.pp linguist-language=Puppet

.gitignore

@@ -1,8 +1,11 @@
 *.log
 *~
 .DS_Store
-spec/fixtures/*
 *.tmp
 .librarian
 pkg/*
-
+Gemfile.lock
+spec/fixtures/modules/*
+.vagrant
+Puppetfile.lock
+README.html

.pmtignore

@@ -0,0 +1,4 @@
+junit/
+log/
+spec/fixtures/modules/
+pkg/

.puppet-lint.rc

@@ -0,0 +1,3 @@
+--no-80chars-check
+--no-documentation-check
+--no-class_inherits_from_params_class-check

.rspec

@@ -2,3 +2,4 @@
 --color
 --pattern "spec/*/*_spec.rb"
 #--backtrace
+#--fail-fast

.travis.yml

@@ -1,27 +1,34 @@
-before_install:
-  - gem update --system 2.1.11
-  - gem --version
+# linter: http://lint.travis-ci.org/
+language: ruby
+sudo: false
+bundler_args: --without development
+cache:
+  bundler: true
+  directories:
+    - $HOME/librarian-puppet
+script:
+  - RAKE_ENV=ci bundle exec puppet --version
+  - RAKE_ENV=ci bundle exec rake validate
+  - RAKE_ENV=ci bundle exec rake spec
+  - RAKE_ENV=ci bundle exec rake lint
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
-script: 'bundle exec rake spec'
+  - 2.1.6
 env:
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.0.0"
-  - PUPPET_VERSION="~> 3.1.0"
-  - PUPPET_VERSION="~> 3.2.0"
-  - PUPPET_VERSION="~> 3.3.0"
-  - PUPPET_VERSION="~> 3.4.0"
+  global:
+    - LIBRARIAN_PUPPET_TMP="$HOME/librarian-puppet"
+  matrix:
+    - PUPPET_VERSION="~> 2.7.0"
+    - PUPPET_VERSION="~> 3.4.0"
+    - PUPPET_VERSION="~> 3.5.0" STRICT_VARIABLES=yes
+    - PUPPET_VERSION="~> 3.6.0" STRICT_VARIABLES=yes
+    - PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=yes FUTURE_PARSER=yes
+    - PUPPET_VERSION="~> 3.8.0" STRICT_VARIABLES=yes FUTURE_PARSER=yes
+    - PUPPET_VERSION="~> 4.3.0" STRICT_VARIABLES=yes
 matrix:
   exclude:
-    # No support for Ruby 1.9 before Puppet 2.7
-    - rvm: 1.9.3
-      env: PUPPET_VERSION=2.6.0
-    # No support for Ruby 2.0 before Puppet 3.2
     - rvm: 2.0.0
       env: PUPPET_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_VERSION="~> 3.0.0"
-    - rvm: 2.0.0
-      env: PUPPET_VERSION="~> 3.1.0"
+    - rvm: 2.1.6
+      env: PUPPET_VERSION="~> 2.7.0"

Gemfile

@@ -1,13 +1,20 @@
 source 'https://rubygems.org'
 
-gem 'puppet',  '>= 2.7.0'
-gem 'puppet-lint', '>=0.3.2'
-gem 'puppetlabs_spec_helper', '>=0.2.0'
-gem 'rake',         '>=0.9.2.2'
-gem 'librarian-puppet', '>=0.9.10'
-gem 'rspec-system-puppet',     :require => false
-gem 'serverspec',              :require => false
-gem 'rspec-system-serverspec', :require => false
-gem 'hiera-puppet-helper', :git => 'https://github.com/mmz-srf/hiera-puppet-helper.git'
-gem 'puppet-blacksmith',  :git => 'https://github.com/maestrodev/puppet-blacksmith.git'
-gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git'
+puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : ['>= 2.7.0','< 5.0']
+gem 'puppet', puppetversion
+gem 'puppet-lint'
+gem 'puppetlabs_spec_helper'
+gem 'rake'
+gem 'librarian-puppet', '>= 2.0'
+gem 'highline'
+gem 'rspec-puppet-facts'
+# coverage reports will be in release 2.0
+gem 'rspec', '>= 3.0.0'
+gem 'rspec-puppet', '>= 2.3.0'
+gem 'metadata-json-lint', :require => false
+
+group :development do
+  gem 'puppet-blacksmith'
+  gem 'beaker'
+  gem 'beaker-rspec', :require => false
+end

Puppetfile

@@ -1,4 +1,4 @@
-forge 'http://forge.puppetlabs.com'
+forge 'https://forgeapi.puppetlabs.com'
 
-mod 'puppetlabs/stdlib', '>=0.1.6'
-mod 'richardc/datacat'
+mod 'puppetlabs-stdlib', '>= 2.3.3 < 5.0.0'
+mod 'puppet/archive', '>= 0.5.0'