Merge "Switch puppet-zookeper to deric/puppet-zookeeper"

Puppetfile

@@ -267,6 +267,6 @@ mod 'xinetd',
   :git => 'https://github.com/puppetlabs/puppetlabs-xinetd.git'
 
 mod 'zookeeper',
-  :commit => 'bb1b864d4cad552ba5a38207504fd7878eed9fa7',
-  :git => 'https://github.com/miguno/puppet-zookeeper.git'
+  :commit => 'b1912045ac65f13e53d60f73515ad08fff4f4f25',
+  :git => 'https://github.com/deric/puppet-zookeeper.git'
 

zookeeper/.fixtures.yml

@@ -1,8 +1,3 @@
 fixtures:
-  repositories:
-    stdlib:
-      repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
-      ref: '4.1.0'
-    supervisor: 'https://github.com/miguno/puppet-supervisor'
   symlinks:
-    zookeeper: "#{source_dir}"
+    zookeeper: "#{source_dir}"

zookeeper/.gitignore

@@ -1,5 +1,8 @@
-.*.sw?
-pkg
-spec/fixtures
-.rspec_system
-.vagrant
+*.log
+*~
+.DS_Store
+*.tmp
+.librarian
+pkg/*
+Gemfile.lock
+spec/fixtures/modules/*

zookeeper/.puppet-lint.rc

@@ -0,0 +1,2 @@
+--no-80chars-check
+--no-documentation-check

zookeeper/.rspec

@@ -1,2 +1,5 @@
 --format documentation
 --color
+--pattern "spec/*/*_spec.rb"
+#--backtrace
+#--fail-fast

zookeeper/.travis.yml

@@ -1,26 +1,25 @@
----
-language: ruby
 bundler_args: --without development
-before_install:
-  - rm Gemfile.lock || true
-  # Fixes a rubygems bug that causes failures on Travis CI
-  # See https://github.com/bundler/bundler/issues/2784
-  - gem update --system 2.2.1
-  - gem --version
+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 test"
+  - 2.1.5
 env:
-  - PUPPET_VERSION="~> 3.0.1"
-  - PUPPET_VERSION="~> 3.1.0"
-  - PUPPET_VERSION="~> 3.2.0"
-  - PUPPET_VERSION="~> 3.3.0"
+  - 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
+  - PUPPET_VERSION="~> 3.8.0" STRICT_VARIABLES=yes
+  #- PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=yes FUTURE_PARSER=yes
 matrix:
   exclude:
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 3.0.1"
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 3.1.0"
+    - rvm: 2.0.0
+      env: PUPPET_VERSION="~> 2.7.0"
+    - rvm: 2.1.5
+      env: PUPPET_VERSION="~> 2.7.0"

zookeeper/Gemfile

@@ -1,27 +1,24 @@
 source 'https://rubygems.org'
 
-group :test do
-  # Pin rspec to < 3.0.0 because of a known compatibility issue of rspec 3.x with rspec-puppet
-  # See https://github.com/rodjek/rspec-puppet/issues/198
-  rspecversion = ENV.key?('RSPEC_VERSION') ? "= #{ENV['RSPEC_VERSION']}" : ['>= 2.9 ', '< 3.0.0']
-  gem 'rspec', rspecversion
-
-  # Rake 10.2.0+ requires Ruby >= 1.9
-  gem 'rake', '< 10.2.0' if RUBY_VERSION < '1.9.0'
-  gem 'puppet', ENV['PUPPET_VERSION'] || '~> 3.0.1'
-  gem 'puppet-lint'
-  gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git'
-  gem 'puppet-syntax'
-  gem 'puppetlabs_spec_helper'
-end
+puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : ['>= 2.7.0','< 4.0']
+gem 'puppet', puppetversion
+gem 'puppet-lint'
+gem 'puppetlabs_spec_helper'
+gem 'rake'
+# librarian 2 does not support ruby 1.8.7
+gem 'librarian-puppet', '< 2.0'
+gem 'highline', '< 1.7' # 1.7 is not compatible with ruby 1.8.7
+gem 'rspec-system-puppet',     :require => false
+gem 'serverspec',              :require => false
+gem 'rspec-system-serverspec', :require => false
+# coverage reports will be in release 2.0
+gem 'rspec-puppet', '> 2.0'
+gem 'rspec', '~> 2.13'
 
+# blacksmith > 3.0 does not support ruby 1.8.7
 group :development do
-  gem 'travis'
-  gem 'travis-lint'
+  gem 'puppet-blacksmith',  '~> 3.0'
+  gem 'metadata-json-lint',      :require => false
   gem 'beaker'
-  gem 'beaker-rspec'
-  gem 'vagrant-wrapper'
-  gem 'puppet-blacksmith'
-  gem 'guard-rake'
-  gem 'serverspec'
-end
+  gem 'beaker-rspec', :require => false
+end