Merge pull request #401 from puppetlabs/pdksync_simplecov

(MODULES-10120) enable simplecov; update to PDK 1.14.1; minor cleanups

.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

.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>puppetlabs-java</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>

.sync.yml

@@ -1,17 +1,11 @@
 ---
-.gitignore:
+".gitlab-ci.yml":
-  required:
+  delete: true
-    - ---.project
+".travis.yml":
-
-.gitlab-ci.yml:
-  unmanaged: true
-
-.travis.yml:
   branches:
   - release
   includes:
-    -
+  - bundler_args: 
-      bundler_args:
     dist: trusty
     env: PLATFORMS=deb_puppet5
     rvm: 2.5.1
@@ -25,8 +19,7 @@
     services: docker
     sudo: required
     stage: acceptance
-    -
+  - bundler_args: 
-      bundler_args:
     dist: trusty
     env: PLATFORMS=deb_puppet6
     rvm: 2.5.1
@@ -38,8 +31,7 @@
     script:
     - bundle exec rake litmus:acceptance:parallel
     services: docker
-    -
+  - bundler_args: 
-      bundler_args:
     dist: trusty
     env: PLATFORMS=el_puppet5
     rvm: 2.5.1
@@ -52,8 +44,7 @@
     services: docker
     sudo: required
     stage: acceptance
-    -
+  - bundler_args: 
-      bundler_args:
     dist: trusty
     env: PLATFORMS=el_puppet6
     rvm: 2.5.1
@@ -66,18 +57,16 @@
     services: docker
     sudo: required
     stage: acceptance
-
+  simplecov: true
 appveyor.yml:
   delete: true
-
 Gemfile:
   optional:
-    ':development':
+    ":development":
-      - gem: 'github_changelog_generator'
+    - gem: github_changelog_generator
-        git: 'https://github.com/skywinder/github-changelog-generator'
+      git: https://github.com/skywinder/github-changelog-generator
-        ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
+      ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
-        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
+      condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
-
 spec/spec_helper.rb:
-  mock_with: ':rspec'
+  mock_with: ":rspec"
   coverage_report: true

.travis.yml

@@ -9,7 +9,7 @@ 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
@@ -34,9 +34,6 @@ matrix:
       env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
       rvm: 2.5.3
       stage: spec
-    -
-      env: DEPLOY_TO_FORGE=yes
-      stage: deploy
     -
       before_script: ["bundle exec rake 'litmus:provision_list[travis_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: 
@@ -75,6 +72,9 @@ matrix:
       services: docker
       stage: acceptance
       sudo: required
+    -
+      env: DEPLOY_TO_FORGE=yes
+      stage: deploy
 branches:
   only:
     - master

Gemfile

@@ -1,5 +1,4 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
-gem 'pdk', git: 'https://github.com/puppetlabs/pdk.git', branch: 'master'
 
 def location_for(place_or_version, fake_version = nil)
   git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}

metadata.json

@@ -79,7 +79,7 @@
       "version_requirement": ">= 5.5.10 < 7.0.0"
     }
   ],
-  "template-url": "https://github.com/puppetlabs/pdk-templates/#master",
+  "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "1.14.1-0-g0b5b39b",
+  "template-ref": "heads/master-0-gfaf9e8b",
-  "pdk-version": "1.14.0"
+  "pdk-version": "1.14.1"
 }