.fixtures.yml

@@ -1,6 +1,8 @@
 fixtures:
   repositories:
-    stdlib:  "git://github.com/puppetlabs/puppetlabs-stdlib.git"
+    stdlib:
+      repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
+      ref:  "3.2.1"
     ruby:    "git://github.com/puppetlabs/puppetlabs-ruby.git"
     gcc:     "git://github.com/puppetlabs/puppetlabs-gcc.git"
     pe_gem:  "git://github.com/puppetlabs/puppetlabs-pe_gem.git"

.travis.yml

@@ -1,4 +1,5 @@
 ---
+sudo: false
 branches:
   only:
   - master
@@ -23,6 +24,8 @@ env:
   - PUPPET_VERSION="~> 3.4.0"
   - PUPPET_VERSION="~> 3.5.1"
   - PUPPET_VERSION="~> 3.6.0"
+  - PUPPET_VERSION="~> 3.7.0"
+
 global:
     - PUBLISHER_LOGIN=acidprime
 matrix:

CHANGELOG

@@ -1,4 +1,6 @@
-2.6.0 - Gary Larizza
+2.6.2 - harrytford
+  * Webhook new installs fix #132
+2.6.1 - Gary Larizza
   * Fix "local" non mcollective hook tiggers to add '-p'
   * See #125 , this will cause any current users to default to turning this on 
 2.6.0 - Eli Young & Ranjit Viswakumar

Gemfile

@@ -2,20 +2,17 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test do
   gem 'rake',                    :require => false
-  gem 'rspec-puppet', '~> 1.0',  :require => false
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
-  gem 'rspec-system',            :require => false
-  gem 'rspec-system-puppet',     :require => false
-  gem 'rspec-system-serverspec', :require => false
+  gem 'rspec-core', '2.99.2',    :require => false
+  gem 'rspec-puppet', '~> 1.0',  :require => false
   gem 'puppet-lint',             :require => false
   gem 'puppet-syntax',           :require => false
 end
 
-group :system_tests do
-  gem 'beaker-rspec',  :require => false
-  gem 'serverspec',    :require => false
-end
+#group :system_tests do
+#  gem 'beaker-rspec',  :require => false
+#  gem 'serverspec',    :require => false
+#end
 
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion, :require => false

Modulefile

@@ -1,5 +1,5 @@
 name    'zack-r10k'
-version '2.6.1'
+version '2.6.2'
 source 'https://github.com/acidprime/r10k'
 author 'zack'
 license 'Apache License, Version 2.0'

Rakefile

@@ -14,6 +14,7 @@ PuppetLint.configuration.send("disable_80chars")
 PuppetLint.configuration.send('disable_class_parameter_defaults')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.ignore_paths = exclude_paths
+PuppetLint.configuration.relative = true
 PuppetSyntax.exclude_paths = exclude_paths
 
 #task :default => [:test]

manifests/webhook.pp

@@ -69,6 +69,7 @@
         group   => 'peadmin',
         mode    => '0644',
         content => file('/etc/puppetlabs/puppet/ssl/certs/pe-internal-peadmin-mcollective-client.pem'),
+        before  => File['webhook_init_script'],
     }
   }
 }

metadata.json

@@ -8,7 +8,7 @@
   "source": "https://github.com/acidprime/r10k",
   "summary": "Module for setting up dynamic environments using r10k",
   "tags": ["git", "pe", "environment", "mcollective"],
-  "version": "2.6.1",
+  "version": "2.6.2",
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",

spec/classes/params_spec.rb

@@ -12,7 +12,7 @@
     it { should contain_r10k__params }
 
     it "Should not contain any resources" do
-      expect(subject.resources.size).to eq(5) 
+      expect(subject.resources.size).to eq(4) 
     end
   end
 end