Merge pull request #11 from rehanone/develop/updated-pdk

- Updated `pdk` templates.

.gitignore

@@ -19,4 +19,5 @@
 /tmp/
 /vendor/
 /convert_report.txt
+/update_report.txt
 .DS_Store

.pdkignore

@@ -19,4 +19,5 @@
 /tmp/
 /vendor/
 /convert_report.txt
+/update_report.txt
 .DS_Store

.rubocop.yml

@@ -63,6 +63,8 @@ Style/TrailingCommaInLiteral:
 Style/SymbolArray:
   Description: Using percent style obscures symbolic intent of array's contents.
   EnforcedStyle: brackets
+Style/UnneededPercentQ:
+  Enabled: false
 RSpec/MessageSpies:
   EnforcedStyle: receive
 Style/CollectionMethods:

.sync.yml

@@ -10,11 +10,21 @@ appveyor.yml:
     - RUBY_VERSION: 24-x64
       CHECK: rubocop
 
+.rubocop.yml:
+  selected_profile: strict
+  default_configs: &default_configs
+    Style/UnneededPercentQ:
+      Enabled: false
+
 .gitlab-ci.yml:
   delete: true
 
+.rubocop_todo.yml:
+  delete: true
+
 .travis.yml:
   bundler_args: ""
+  branches: {}
 
   script: "\"bundle exec rake release_checks\""
   docker_sets:
@@ -52,35 +62,13 @@ Gemfile:
         from_env: BEAKER_HOSTGENERATOR_VERSION
       - gem: beaker-rspec
         from_env: BEAKER_RSPEC_VERSION
-    ':development':
-      - gem: puppet-blacksmith
-        version: '~> 3.4'
-
-Rakefile:
-  requires:
-    - puppet_blacksmith/rake_tasks
-
-LICENSE:
-  license_type: 'apache2' # Available options 'puppetpe' and 'apache2' (default is apache2)
-
-MAINTAINERS.md:
-  maintainers:
-    - "Puppet Forge Modules Team `forge-modules |at| puppet |dot| com`"
-
-# Apache 2 NOTICE file generation.  Please mark unmanaged:true if using puppetpe license type
-NOTICE:
-  copyright_holders:
-    - name: 'Puppet, Inc.'
-      begin: 'latest'
-    # - name: '<name of holder>' (required)
-    #   begin: <year or 'latest'> (optional) (latest is the year when modsync is run)
-    #   end:   <year or 'latest'> (optional) (latest is the year when modsync is run)
-
-CONTRIBUTING.md:
 
 spec/spec.opts:
   delete: true
 
+spec/spec_helper_local.rb:
+  delete: true
+
 .project:
   delete: true
 

.travis.yml

@@ -5,7 +5,7 @@ language: ruby
 cache: bundler
 before_install:
   - bundle -v
-  - rm Gemfile.lock || true
+  - rm -f Gemfile.lock
   - gem update --system
   - gem update bundler
   - gem --version
@@ -54,6 +54,8 @@ matrix:
       env: CHECK="syntax lint"
     -
       env: CHECK=metadata_lint
+    -
+      env: CHECK=release_checks
     -
       env: CHECK=spec
     -

Gemfile

@@ -28,11 +28,12 @@ group :development do
   gem "fast_gettext",                                  require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
   gem "json_pure", '<= 2.0.1',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
   gem "json", '= 1.8.1',                               require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
+  gem "json", '<= 2.0.4',                              require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4')
   gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
   gem "puppet-module-posix-dev-r#{minor_version}",     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}",       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-blacksmith", '~> 3.4',                   require: false
+  gem "puppet-blacksmith", '~> 3.4',                   require: false, platforms: [:ruby]
 end
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}",                            require: false, platforms: [:ruby]
@@ -49,73 +50,24 @@ puppet_type = gem_type(puppet_version)
 facter_version = ENV['FACTER_GEM_VERSION']
 hiera_version = ENV['HIERA_GEM_VERSION']
 
-def puppet_older_than?(version)
-  puppet_version = ENV['PUPPET_GEM_VERSION']
-  !puppet_version.nil? &&
-    Gem::Version.correct?(puppet_version) &&
-    Gem::Requirement.new("< #{version}").satisfied_by?(Gem::Version.new(puppet_version.dup))
-end
-
 gems = {}
 
 gems['puppet'] = location_for(puppet_version)
 
 # If facter or hiera versions have been specified via the environment
-# variables, use those versions. If not, and if the puppet version is < 3.5.0,
-# use known good versions of both for puppet < 3.5.0.
-if facter_version
-  gems['facter'] = location_for(facter_version)
-elsif puppet_type == :gem && puppet_older_than?('3.5.0')
-  gems['facter'] = ['>= 1.6.11', '<= 1.7.5', require: false]
-end
-
-if hiera_version
-  gems['hiera'] = location_for(ENV['HIERA_GEM_VERSION'])
-elsif puppet_type == :gem && puppet_older_than?('3.5.0')
-  gems['hiera'] = ['>= 1.0.0', '<= 1.3.0', require: false]
-end
+# variables
 
-if Gem.win_platform? && (puppet_type != :gem || puppet_older_than?('3.5.0'))
-  # For Puppet gems < 3.5.0 (tested as far back as 3.0.0) on Windows
-  if puppet_type == :gem
-    gems['ffi'] =            ['1.9.0',                require: false]
-    gems['minitar'] =        ['0.5.4',                require: false]
-    gems['win32-eventlog'] = ['0.5.3',    '<= 0.6.5', require: false]
-    gems['win32-process'] =  ['0.6.5',    '<= 0.7.5', require: false]
-    gems['win32-security'] = ['~> 0.1.2', '<= 0.2.5', require: false]
-    gems['win32-service'] =  ['0.7.2',    '<= 0.8.8', require: false]
-  else
-    gems['ffi'] =            ['~> 1.9.0',             require: false]
-    gems['minitar'] =        ['~> 0.5.4',             require: false]
-    gems['win32-eventlog'] = ['~> 0.5',   '<= 0.6.5', require: false]
-    gems['win32-process'] =  ['~> 0.6',   '<= 0.7.5', require: false]
-    gems['win32-security'] = ['~> 0.1',   '<= 0.2.5', require: false]
-    gems['win32-service'] =  ['~> 0.7',   '<= 0.8.8', require: false]
-  end
-
-  gems['win32-dir'] = ['~> 0.3', '<= 0.4.9', require: false]
-
-  if RUBY_VERSION.start_with?('1.')
-    gems['win32console'] = ['1.3.2', require: false]
-    # sys-admin was removed in Puppet 3.7.0 and doesn't compile under Ruby 2.x
-    gems['sys-admin'] =    ['1.5.6', require: false]
-  end
+gems['facter'] = location_for(facter_version) if facter_version
+gems['hiera'] = location_for(hiera_version) if hiera_version
 
-  # Puppet < 3.7.0 requires these.
-  # Puppet >= 3.5.0 gem includes these as requirements.
-  # The following versions are tested to work with 3.0.0 <= puppet < 3.7.0.
-  gems['win32-api'] =           ['1.4.8', require: false]
-  gems['win32-taskscheduler'] = ['0.2.2', require: false]
-  gems['windows-api'] =         ['0.4.3', require: false]
-  gems['windows-pr'] =          ['1.2.3', require: false]
-elsif Gem.win_platform?
+if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
   # If we're using a Puppet gem on Windows which handles its own win32-xxx gem
   # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
   gems['win32-dir'] =      ['<= 0.4.9', require: false]
   gems['win32-eventlog'] = ['<= 0.6.5', require: false]
   gems['win32-process'] =  ['<= 0.7.5', require: false]
   gems['win32-security'] = ['<= 0.2.5', require: false]
-  gems['win32-service'] =  ['<= 0.8.8', require: false]
+  gems['win32-service'] =  ['0.8.8', require: false]
 end
 
 gems.each do |gem_name, gem_params|

Rakefile

@@ -1,3 +1,5 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
-require 'puppet_blacksmith/rake_tasks'
+require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
+
+PuppetLint.configuration.send('relative')

metadata.json

@@ -10,11 +10,11 @@
   "dependencies": [
     {
       "name": "puppetlabs-stdlib",
-      "version_requirement": ">= 3.2.0 < 5.0.0"
+      "version_requirement": ">= 4.0.0 < 5.0.0"
     },
     {
       "name": "puppetlabs-apt",
-      "version_requirement": ">= 3.0.0 < 5.0.0"
+      "version_requirement": ">= 4.0.0 < 5.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -56,7 +56,8 @@
         "16.04",
         "16.10",
         "17.04",
-        "17.10"
+        "17.10",
+        "18.04"
       ]
     },
     {
@@ -66,15 +67,15 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.7.0 < 6.0.0"
+      "version_requirement": ">= 4.10.0 < 6.0.0"
     }
   ],
   "tags": [
     "Webserver",
     "nginx",
     "reserse proxy"
   ],
-  "pdk-version": "1.4.1",
+  "pdk-version": "1.5.0",
   "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git",
-  "template-ref": "1.4.1-0-g52adbbb"
+  "template-ref": "1.5.0-0-gd1b3eca"
 }

spec/acceptance/class_spec.rb

@@ -16,7 +16,7 @@
   end
 
   context 'repo_manage => present:' do
-    it 'runs successfully' do
+    it 'runs successfully to ensure package is installed from custom repo' do
       pp = "class { 'nginx': repo_manage => true }"
 
       apply_manifest(pp, catch_failures: true) do |r|
@@ -25,8 +25,18 @@
     end
   end
 
+  context 'package_ensure => present:' do
+    it 'runs successfully to ensure package is installed' do
+      pp = "class { 'nginx': package_ensure => present }"
+
+      apply_manifest(pp, catch_failures: true) do |r|
+        expect(r.stderr).not_to match(%r{error}i)
+      end
+    end
+  end
+
   context 'service_ensure => running:' do
-    it 'runs successfully' do
+    it 'starts the service successfully' do
       pp = "class { 'nginx': service_ensure => running }"
 
       apply_manifest(pp, catch_failures: true) do |r|
@@ -36,7 +46,7 @@
   end
 
   context 'service_ensure => stopped:' do
-    it 'runs successfully' do
+    it 'stops the service successfully' do
       pp = "class { 'nginx': service_ensure => stopped }"
 
       apply_manifest(pp, catch_failures: true) do |r|
@@ -54,4 +64,14 @@
       end
     end
   end
+
+  context 'package_ensure => absent:' do
+    it 'runs successfully to ensure package is uninstalled' do
+      pp = "class { 'nginx': package_ensure => absent, service_manage => false }"
+
+      apply_manifest(pp, catch_failures: true) do |r|
+        expect(r.stderr).not_to match(%r{error}i)
+      end
+    end
+  end
 end

spec/spec_helper.rb

@@ -1,3 +1,4 @@
+
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
 
@@ -27,4 +28,9 @@
 
 RSpec.configure do |c|
   c.default_facts = default_facts
+  c.before :each do
+    # set to strictest setting for testing
+    # by default Puppet runs at warning level
+    Puppet.settings[:strict] = :warning
+  end
 end