.fixtures.yml

@@ -1,8 +1,8 @@
 fixtures:
   repositories:
-    "stdlib":
-      repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-      ref: "3.2.0"
-    "nsswitch": "git://github.com/ghoneycutt/puppet-module-nsswitch.git"
+    'stdlib':
+      repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
+      ref: '3.2.0'
+    'nsswitch': 'git://github.com/ghoneycutt/puppet-module-nsswitch.git'
   symlinks:
-    "pam": "#{source_dir}"
+    pam: "#{source_dir}"

.travis.yml

@@ -1,16 +1,19 @@
 ---
 env:
-- PUPPET_VERSION=2.7.22
 - PUPPET_VERSION=3.3.2
+- PUPPET_VERSION=3.4.2
 notifications:
 email: false
 rvm:
-- 1.9.3
 - 1.8.7
+- 1.9.3
+- 2.0.0
 matrix:
+  fast_finish: true
   allow_failures:
-  - env: PUPPET_VERSION=2.7.22
   - rvm: 1.9.3
+  - rvm: 2.0.0
+  - env: PUPPET_VERSION=3.4.2
 language: ruby
 before_script: "gem install --no-ri --no-rdoc bundler"
 script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'

Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
+puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 3.3']
 gem 'puppet', puppetversion
 gem 'puppetlabs_spec_helper', '>= 0.1.0'
 gem 'puppet-lint', '>= 0.3.2'

Modulefile

@@ -1,5 +1,5 @@
 name    'ghoneycutt-pam'
-version '2.4.0'
+version '2.4.1'
 source 'git://github.com/ghoneycutt/puppet-module-pam.git'
 author 'ghoneycutt'
 license 'Apache License, Version 2.0'
@@ -8,4 +8,4 @@ description 'Manages PAM, including specifying users and groups in access.conf,
 project_page 'https://github.com/ghoneycutt/puppet-module-pam'
 
 dependency 'ghoneycutt/nsswitch', '>= 0.0.1'
-dependency 'puppetlabs/stdlib',   '3.2.x'
+dependency 'puppetlabs/stdlib',   '>= 3.2.0'

Rakefile

@@ -6,11 +6,11 @@ PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
 
 desc "Run puppet in noop mode and check for syntax errors."
 task :validate do
-  Dir['manifests/**/*.pp'].each do |path|
-    sh "puppet parser validate --noop #{path}"
+  Dir['manifests/**/*.pp'].each do |manifest|
+    sh "puppet parser validate --noop #{manifest}"
   end
-  Dir['spec/**/*.rb','lib/**/*.rb'].each do |spec_path|
-    sh "ruby -c #{spec_path}" unless spec_path =~ /spec\/fixtures/
+  Dir['spec/**/*.rb','lib/**/*.rb'].each do |ruby_file|
+    sh "ruby -c #{ruby_file}" unless ruby_file =~ /spec\/fixtures/
   end
   Dir['templates/**/*.erb'].each do |template|
     sh "erb -P -x -T '-' #{template} | ruby -c"

spec/classes/init_spec.rb

@@ -69,7 +69,7 @@
 
       it 'should fail' do
         expect {
-          should include_class('pam')
+          should contain_class('pam')
         }.to raise_error(Puppet::Error,/Pam is only supported on Solaris 10 and 11. Your kernelrelease is identified as <5.9>./)
       end
     end

templates/common-account-pc.erb

@@ -1,5 +1,5 @@
 # This file is being maintained by Puppet.
 # DO NOT EDIT
-<% my_pam_account_lines.each do |account_line| -%>
+<% @my_pam_account_lines.each do |account_line| -%>
 <%= account_line %>
 <% end -%>

templates/common-auth-pc.erb

@@ -1,5 +1,5 @@
 # This file is being maintained by Puppet.
 # DO NOT EDIT
-<% my_pam_auth_lines.each do |auth_line| -%>
+<% @my_pam_auth_lines.each do |auth_line| -%>
 <%= auth_line %>
 <% end -%>

templates/common-password-pc.erb

@@ -1,5 +1,5 @@
 # This file is being maintained by Puppet.
 # DO NOT EDIT
-<% my_pam_password_lines.each do |password_line| -%>
+<% @my_pam_password_lines.each do |password_line| -%>
 <%= password_line %>
 <% end -%>

templates/common-session-pc.erb

@@ -1,5 +1,5 @@
 # This file is being maintained by Puppet.
 # DO NOT EDIT
-<% my_pam_session_lines.each do |session_line| -%>
+<% @my_pam_session_lines.each do |session_line| -%>
 <%= session_line %>
 <% end -%>

templates/pam.conf.erb

@@ -1,21 +1,21 @@
 # This file is being maintained by Puppet.
 # DO NOT EDIT
 # Auth
-<% my_pam_auth_lines.each do |auth_line| -%>
+<% @my_pam_auth_lines.each do |auth_line| -%>
 <%= auth_line %>
 <% end -%>
 
 # Account
-<% my_pam_account_lines.each do |account_line| -%>
+<% @my_pam_account_lines.each do |account_line| -%>
 <%= account_line %>
 <% end -%>
 
 # Password
-<% my_pam_password_lines.each do |password_line| -%>
+<% @my_pam_password_lines.each do |password_line| -%>
 <%= password_line %>
 <% end -%>
 
 # Session
-<% my_pam_session_lines.each do |session_line| -%>
+<% @my_pam_session_lines.each do |session_line| -%>
 <%= session_line %>
 <% end -%>

templates/system-auth-ac.erb

@@ -1,21 +1,21 @@
 # This file is being maintained by Puppet.
 # DO NOT EDIT
 # Auth
-<% my_pam_auth_lines.each do |auth_line| -%>
+<% @my_pam_auth_lines.each do |auth_line| -%>
 <%= auth_line %>
 <% end -%>
 
 # Account
-<% my_pam_account_lines.each do |account_line| -%>
+<% @my_pam_account_lines.each do |account_line| -%>
 <%= account_line %>
 <% end -%>
 
 # Password
-<% my_pam_password_lines.each do |password_line| -%>
+<% @my_pam_password_lines.each do |password_line| -%>
 <%= password_line %>
 <% end -%>
 
 # Session
-<% my_pam_session_lines.each do |session_line| -%>
+<% @my_pam_session_lines.each do |session_line| -%>
 <%= session_line %>
 <% end -%>