Merge pull request #143 from ghoneycutt/support_puppet_v430

Support puppet v430

.fixtures.yml

@@ -1,13 +1,13 @@
 fixtures:
   repositories:
     stdlib:
-      repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
+      repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
       ref: '4.6.0'
     common:
-      repo: 'git://github.com/ghoneycutt/puppet-module-common.git'
+      repo: 'https://github.com/ghoneycutt/puppet-module-common.git'
-      ref: 'v1.3.0'
+      ref: 'v1.4.1'
     firewall:
-      repo: 'git://github.com/puppetlabs/puppetlabs-firewall.git'
+      repo: 'https://github.com/puppetlabs/puppetlabs-firewall.git'
       ref: '0.2.1'
   symlinks:
     ssh: "#{source_dir}"

.travis.yml

@@ -17,11 +17,13 @@ env:
     - PUPPET_GEM_VERSION="~> 3.6.0"
     - PUPPET_GEM_VERSION="~> 3.7.0"
     - PUPPET_GEM_VERSION="~> 3.8.0"
-    - PUPPET_GEM_VERSION="~> 3" PARSER="future"
+    - PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
     - PUPPET_GEM_VERSION="~> 4.0.0"
     - PUPPET_GEM_VERSION="~> 4.1.0"
     - PUPPET_GEM_VERSION="~> 4.2.0"
+    - PUPPET_GEM_VERSION="~> 4.3.0"
     - PUPPET_GEM_VERSION="~> 4"
+    - PUPPET_GEM_VERSION="~> 4" STRICT_VARIABLES="yes"
 
 sudo: false
 
@@ -46,8 +48,12 @@ matrix:
       env: PUPPET_GEM_VERSION="~> 4.1.0"
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4.2.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.3.0"
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4" STRICT_VARIABLES="yes"
 
 notifications:
   email: false

Gemfile

@@ -11,6 +11,18 @@ gem 'puppetlabs_spec_helper', '>= 0.1.0'
 gem 'puppet-lint', '>= 1.0.0'
 gem 'facter', '>= 1.7.0'
 gem 'rspec-puppet', '~> 2.0'
+gem 'puppet-lint-absolute_classname-check'
+gem 'puppet-lint-alias-check'
+gem 'puppet-lint-empty_string-check'
+gem 'puppet-lint-file_ensure-check'
+gem 'puppet-lint-file_source_rights-check'
+gem 'puppet-lint-fileserver-check'
+gem 'puppet-lint-leading_zero-check'
+gem 'puppet-lint-spaceship_operator_without_tag-check'
+gem 'puppet-lint-trailing_comma-check'
+gem 'puppet-lint-undef_in_function-check'
+gem 'puppet-lint-unquoted_string-check'
+gem 'puppet-lint-variable_contains_upcase'
 
 # rspec must be v2 for ruby 1.8.7
 if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'

manifests/init.pp

@@ -689,7 +689,7 @@ class ssh (
 
   if $manage_root_ssh_config_real == true {
 
-    include common
+    include ::common
 
     common::mkdir_p { "${::root_home}/.ssh": }
 

metadata.json

@@ -88,7 +88,7 @@
   "description": "Manage SSH",
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"},
-    {"name":"ghoneycutt/common","version_requirement":">= 1.3.0 < 2.0.0"},
+    {"name":"ghoneycutt/common","version_requirement":">= 1.4.1 < 2.0.0"},
     {"name":"puppetlabs/firewall","version_requirement":">= 0.2.1 < 2.0.0"}
   ]
 }

spec/classes/init_spec.rb

@@ -6,7 +6,7 @@ describe 'ssh' do
       context "release #{release}" do
         let(:facts) do
           { :fqdn              => 'monkey.example.com',
-            :lsbmajdistrelease => :release,
+            :lsbmajdistrelease => release,
             :osfamily          => 'RedHat',
             :sshrsakey         => 'AAAAB3NzaC1yc2EAAAABIwAAAQEArGElx46pD6NNnlxVaTbp0ZJMgBKCmbTCT3RaeCk0ZUJtQ8wkcwTtqIXmmiuFsynUT0DFSd8UIodnBOPqitimmooAVAiAi30TtJVzADfPScMiUnBJKZajIBkEMkwUcqsfh630jyBvLPE/kyQcxbEeGtbu1DG3monkeymanOBW1AKc5o+cJLXcInLnbowMG7NXzujT3BRYn/9s5vtT1V9cuZJs4XLRXQ50NluxJI7sVfRPVvQI9EMbTS4AFBXUej3yfgaLSV+nPZC/lmJ2gR4t/tKvMFF9m16f8IcZKK7o0rK7v81G/tREbOT5YhcKLK+0wBfR6RsmHzwy4EddZloyLQ==',
           }

spec/spec_helper.rb

@@ -9,7 +9,5 @@ RSpec.configure do |config|
     # Facter.collection.loader.load(:ipaddress)
     Facter.clear
     Facter.clear_messages
-
-    Puppet[:parser] = 'future' if ENV['FUTURE_PARSER'] == 'yes'
   end
 end

tests/init.pp

@@ -1 +1 @@
-include ssh
+include ::ssh