.fixtures.yml

@@ -1,8 +1,8 @@
 ---
 fixtures:
   repositories:
-    facts: 'git://github.com/puppetlabs/puppetlabs-facts.git'
-    puppet_agent: 'git://github.com/puppetlabs/puppetlabs-puppet_agent.git'
-    provision: 'git://github.com/puppetlabs/provision.git'
+    facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
+    puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
+    provision: 'https://github.com/puppetlabs/provision.git'
   symlinks:
     service: "#{source_dir}"

.gitignore

@@ -22,5 +22,6 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.project
 .envrc
 /inventory.yaml

.pdkignore

@@ -22,6 +22,7 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.project
 .envrc
 /inventory.yaml
 /appveyor.yml

.rubocop.yml

@@ -27,6 +27,7 @@ GetText/DecorateString:
   Description: We don't want to decorate test output.
   Exclude:
   - spec/**/*
+  Enabled: false
 RSpec/BeforeAfterAll:
   Description: Beware of using after(:all) as it may cause state to leak between tests.
     A necessary evil in acceptance testing.
@@ -88,6 +89,12 @@ Style/MethodCalledOnDoEndBlock:
   Enabled: true
 Style/StringMethods:
   Enabled: true
+GetText/DecorateFunctionMessage:
+  Enabled: false
+GetText/DecorateStringFormattingUsingInterpolation:
+  Enabled: false
+GetText/DecorateStringFormattingUsingPercent:
+  Enabled: false
 Layout/EndOfLine:
   Enabled: false
 Layout/IndentHeredoc:

.sync.yml

@@ -1,29 +1,87 @@
 ---
-.gitignore:
-  required:
-    - ---.project
-
+".gitlab-ci.yml":
+  delete: true
+".travis.yml":
+  deploy_to_forge:
+    enabled: false
+  user: puppet
+  secure: ''
+  branches:
+  - release
+  includes:
+  - bundler_args:
+    env: PLATFORMS=deb_puppet5
+    rvm: 2.5.1
+    before_script:
+    - bundle exec rake 'litmus:provision_list[waffle_deb]'
+    - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
+    - bundle exec rake 'litmus:install_agent[puppet5]'
+    - bundle exec rake litmus:install_module
+    script:
+    - bundle exec rake litmus:acceptance:serial
+    services: docker
+    sudo: required
+    stage: acceptance
+  - bundler_args:
+    env: PLATFORMS=deb_puppet6
+    rvm: 2.5.1
+    before_script:
+    - bundle exec rake 'litmus:provision_list[waffle_deb]'
+    - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
+    - bundle exec rake 'litmus:install_agent[puppet6]'
+    - bundle exec rake litmus:install_module
+    script:
+    - bundle exec rake litmus:acceptance:serial
+    services: docker
+    sudo: required
+    stage: acceptance
+  - bundler_args:
+    env: PLATFORMS=el_puppet5
+    rvm: 2.5.1
+    before_script:
+    - bundle exec rake 'litmus:provision_list[waffle_el]'
+    - bundle exec rake 'litmus:install_agent[puppet5]'
+    - bundle exec rake litmus:install_module
+    script:
+    - bundle exec rake litmus:acceptance:serial
+    services: docker
+    sudo: required
+    stage: acceptance
+  - bundler_args:
+    env: PLATFORMS=el_puppet6
+    rvm: 2.5.1
+    before_script:
+    - bundle exec rake 'litmus:provision_list[waffle_el]'
+    - bundle exec rake 'litmus:install_agent[puppet6]'
+    - bundle exec rake litmus:install_module
+    script:
+    - bundle exec rake litmus:acceptance:serial
+    services: docker
+    sudo: required
+    stage: acceptance
+  simplecov: true
 appveyor.yml:
-  unmanaged: true
-
-.gitlab-ci.yml:
-  unmanaged: true
-
-.travis.yml:
-  unmanaged: true
-
+  use_litmus: true
+  matrix_extras:
+  - RUBY_VERSION: 25-x64
+    ACCEPTANCE: true
+    TARGET_HOST: localhost
+  - RUBY_VERSION: 25-x64
+    ACCEPTANCE: true
+    TARGET_HOST: localhost
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  simplecov: true
 Gemfile:
+  use_litmus: true
   optional:
-    ':development':
-      - gem: 'github_changelog_generator'
-        git: 'https://github.com/skywinder/github-changelog-generator'
-        ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
-        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
-
+    ":development":
+    - gem: github_changelog_generator
+      git: https://github.com/skywinder/github-changelog-generator
+      ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
+      condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 Rakefile:
   requires:
-    - puppet_pot_generator/rake_tasks
-
+  - puppet_pot_generator/rake_tasks
 spec/spec_helper.rb:
-  mock_with: ':rspec'
+  mock_with: ":rspec"
   coverage_report: true

.travis.yml

@@ -1,5 +1,5 @@
 ---
-dist: trusty
+dist: xenial
 language: ruby
 cache: bundler
 before_install:
@@ -9,74 +9,64 @@ before_install:
   - gem --version
   - bundle -v
 script:
-  - 'bundle exec rake $CHECK'
+  - 'SIMPLECOV=yes bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
   - 2.5.3
-env:
-  global:
-    - PUPPET_GEM_VERSION="~> 6.0"
+stages:
+  - static
+  - spec
+  - acceptance
 matrix:
   fast_finish: true
   include:
     -
-      bundler_args:
-      dist: trusty
+      env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
+      stage: static
+    -
+      env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
+      rvm: 2.4.5
+      stage: spec
+    -
+      env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
+      rvm: 2.5.3
+      stage: spec
+    -
+      before_script: ["bundle exec rake 'litmus:provision_list[waffle_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
+      bundler_args: 
       env: PLATFORMS=deb_puppet5
       rvm: 2.5.1
-      before_script:
-      - bundle exec rake 'litmus:provision_list[waffle_deb]'
-      - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
-      - bundle exec rake 'litmus:install_agent[puppet5]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:serial
+      script: ["bundle exec rake litmus:acceptance:serial"]
       services: docker
+      stage: acceptance
       sudo: required
     -
-      bundler_args:
-      dist: trusty
+      before_script: ["bundle exec rake 'litmus:provision_list[waffle_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+      bundler_args: 
       env: PLATFORMS=deb_puppet6
       rvm: 2.5.1
-      before_script:
-      - bundle exec rake 'litmus:provision_list[waffle_deb]'
-      - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
-      - bundle exec rake 'litmus:install_agent[puppet6]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:serial
+      script: ["bundle exec rake litmus:acceptance:serial"]
       services: docker
+      stage: acceptance
       sudo: required
     -
-      bundler_args:
-      dist: trusty
+      before_script: ["bundle exec rake 'litmus:provision_list[waffle_el]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
+      bundler_args: 
       env: PLATFORMS=el_puppet5
       rvm: 2.5.1
-      before_script:
-      - bundle exec rake 'litmus:provision_list[waffle_el]'
-      - bundle exec rake 'litmus:install_agent[puppet5]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:serial
+      script: ["bundle exec rake litmus:acceptance:serial"]
       services: docker
+      stage: acceptance
       sudo: required
     -
-      bundler_args:
-      dist: trusty
+      before_script: ["bundle exec rake 'litmus:provision_list[waffle_el]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+      bundler_args: 
       env: PLATFORMS=el_puppet6
       rvm: 2.5.1
-      before_script:
-      - bundle exec rake 'litmus:provision_list[waffle_el]'
-      - bundle exec rake 'litmus:install_agent[puppet6]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:serial
+      script: ["bundle exec rake litmus:acceptance:serial"]
       services: docker
+      stage: acceptance
       sudo: required
-    -
-      env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
-    -
-      env: CHECK=parallel_spec
 branches:
   only:
     - master

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v1.2.0](https://github.com/puppetlabs/puppetlabs-service/tree/v1.2.0) (2019-12-12)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-service/compare/v1.1.0...v1.2.0)
+
+### Added
+
+- \(FM-8695\) - Addition of Support for CentOS 8 [\#124](https://github.com/puppetlabs/puppetlabs-service/pull/124) ([david22swan](https://github.com/david22swan))
+
+### Fixed
+
+- \(MAINT\) Fix Case Statement Logic [\#117](https://github.com/puppetlabs/puppetlabs-service/pull/117) ([RandomNoun7](https://github.com/RandomNoun7))
+- \(MODULES-9979\) Fix empty return values in Linux task [\#116](https://github.com/puppetlabs/puppetlabs-service/pull/116) ([michaeltlombardi](https://github.com/michaeltlombardi))
+
 ## [v1.1.0](https://github.com/puppetlabs/puppetlabs-service/tree/v1.1.0) (2019-09-20)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-service/compare/1.0.0...v1.1.0)

Gemfile

@@ -25,9 +25,9 @@ group :development do
   gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "rb-readline", '= 0.5.5',                                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3',     require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4',     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}", '~> 0.3',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 end
 

Rakefile

@@ -16,8 +16,17 @@ end
 
 def changelog_project
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = nil || JSON.load(File.read('metadata.json'))['source'].match(%r{.*/([^/]*)})[1]
-  raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil?
+
+  returnVal = nil
+  returnVal ||= begin
+    metadata_source = JSON.load(File.read('metadata.json'))['source']
+    metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z})
+
+    metadata_source_match && metadata_source_match[1]
+  end
+
+  raise "unable to find the changelog_project in .sync.yml or calculate it from the source in metadata.json" if returnVal.nil?
+
   puts "GitHubChangelogGenerator project:#{returnVal}"
   returnVal
 end