From 32c633f5a5576483b1f9c96b14fe41e8ae93edea Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Tue, 15 Dec 2015 16:10:04 -0500 Subject: [PATCH 1/3] Use community puppet-lint plugins and conform code to them --- Gemfile | 12 ++++++++++++ manifests/init.pp | 2 +- tests/init.pp | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 42f4f66..d25efe1 100644 --- a/Gemfile +++ b/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' diff --git a/manifests/init.pp b/manifests/init.pp index 2e382ba..b06219f 100644 --- a/manifests/init.pp +++ b/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": } diff --git a/tests/init.pp b/tests/init.pp index 13a4638..ea1c831 100644 --- a/tests/init.pp +++ b/tests/init.pp @@ -1 +1 @@ -include ssh +include ::ssh From c487d6d8a8c72b6e0ece06fbf3e5a73ed24e3c0a Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Tue, 15 Dec 2015 16:10:32 -0500 Subject: [PATCH 2/3] Use https for spec fixtures for easier access through firewalls --- .fixtures.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 739ef34..282e5b4 100644 --- a/.fixtures.yml +++ b/.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' 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}" From a8a939a4d9cb10df6286cd7728e77d3e6aa9a66c Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Tue, 15 Dec 2015 16:11:11 -0500 Subject: [PATCH 3/3] Support Puppet v4.3.0 Requires upgrade to ghoneycutt/common v1.4.1 --- .fixtures.yml | 2 +- .travis.yml | 8 +++++++- metadata.json | 2 +- spec/classes/init_spec.rb | 2 +- spec/spec_helper.rb | 2 -- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 282e5b4..dd0851a 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -5,7 +5,7 @@ fixtures: ref: '4.6.0' common: repo: 'https://github.com/ghoneycutt/puppet-module-common.git' - ref: 'v1.3.0' + ref: 'v1.4.1' firewall: repo: 'https://github.com/puppetlabs/puppetlabs-firewall.git' ref: '0.2.1' diff --git a/.travis.yml b/.travis.yml index e2bc100..32a7ab4 100644 --- a/.travis.yml +++ b/.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 diff --git a/metadata.json b/metadata.json index c2c55a1..c5d8d82 100644 --- a/metadata.json +++ b/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"} ] } diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index c3e9b9a..b523bd1 100644 --- a/spec/classes/init_spec.rb +++ b/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==', } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 05afdb2..ee4c2b3 100644 --- a/spec/spec_helper.rb +++ b/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