Merge pull request #893 from puppetlabs/pdksync_simplecov

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

diff --git a/.gitignore b/.gitignore
index 3f4e2e84942fa912f14261ac2fcb152f1f1c130a..2767022cd600dd0eb9d85289e0af0fda19b3b2e6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,6 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.project
 .envrc
 /inventory.yaml

diff --git a/.pdkignore b/.pdkignore
index 54d2cda3ab0c538a2ec753012adb017765ced20a..e6215cd0cbfdfab41b9bb612a4d27a343b109f60 100644 (file)
--- a/.pdkignore
+++ b/.pdkignore
@@ -22,6 +22,7 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.project
 .envrc
 /inventory.yaml
 /appveyor.yml

diff --git a/.project b/.project
deleted file mode 100644 (file)
index 102070e..0000000
--- a/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>puppetlabs-apt</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>

diff --git a/.sync.yml b/.sync.yml
index d27eb555f1b3bbf212b2d5efc6ff21f173c47952..2bf4a39adb83e8f29fe7fad7451cdecdb3cbdb4c 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,69 +1,58 @@
 ---
-.gitignore:
-  required:
-    - ---.project
-
-.gitlab-ci.yml:
-  unmanaged: true
-
-.rubocop.yml:
-   default_configs:
-    inherit_from: .rubocop_todo.yml
+".gitlab-ci.yml":
+  delete: true
+".rubocop.yml":
+  default_configs:
+    inherit_from: ".rubocop_todo.yml"
     require:
-      - rubocop-i18n
-      - rubocop-rspec
-
-.travis.yml:
+    - rubocop-i18n
+    - rubocop-rspec
+".travis.yml":
   branches:
-    - release
+  - release
   includes:
-    -
-      bundler_args:
-      dist: trusty
-      env: PLATFORMS=deb_puppet5
-      rvm: 2.5.3
-      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
-      script:
-        - bundle exec rake litmus:acceptance:parallel
-      services: docker
-      stage: acceptance
-      sudo: required
-    -
-      bundler_args:
-      dist: trusty
-      env: PLATFORM=deb_puppet6
-      rvm: 2.5.3
-      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[puppet6]'
-        - bundle exec rake litmus:install_module
-      script:
-        - bundle exec rake litmus:acceptance:parallel
-      services: docker
-      sudo: required
-      stage: acceptance
-
+  - bundler_args: 
+    dist: trusty
+    env: PLATFORMS=deb_puppet5
+    rvm: 2.5.3
+    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
+    script:
+    - bundle exec rake litmus:acceptance:parallel
+    services: docker
+    stage: acceptance
+    sudo: required
+  - bundler_args: 
+    dist: trusty
+    env: PLATFORM=deb_puppet6
+    rvm: 2.5.3
+    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[puppet6]'
+    - bundle exec rake litmus:install_module
+    script:
+    - bundle exec rake litmus:acceptance:parallel
+    services: docker
+    sudo: required
+    stage: acceptance
+  simplecov: true
 appveyor.yml:
   delete: true
-
 Gemfile:
   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')"
-      - gem: puppet-lint-i18n
-
+    ":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')
+    - gem: puppet-lint-i18n
 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

diff --git a/.travis.yml b/.travis.yml
index 0bd7c1f1aeec43dc20be2f01f5cbdad2f8dd5686..922d081117bec2b4527f0747405bb5d80b3f7696 100644 (file)
--- a/.travis.yml
+++ b/.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: 
@@ -57,6 +54,9 @@ matrix:
       services: docker
       stage: acceptance
       sudo: required
+    -
+      env: DEPLOY_TO_FORGE=yes
+      stage: deploy
 branches:
   only:
     - master

diff --git a/Gemfile b/Gemfile
index a2edc2ff6ce44dc75c9b76ea16743a6ee64a8703..61d5e692838fb8fa5a21b5e8e28af4c38d9a05a6 100644 (file)
--- a/Gemfile
+++ b/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>.*))?}

diff --git a/metadata.json b/metadata.json
index df1cdf0eba50e6957cf7058fa493ccdc4e5dd698..bb1234950f7f29c72978071787cd9e1eefabcb93 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -40,7 +40,7 @@
       "version_requirement": ">= 5.5.10 < 7.0.0"
     }
   ],
-  "template-url": "https://github.com/puppetlabs/pdk-templates/#master",
-  "template-ref": "1.14.1-0-g0b5b39b",
-  "pdk-version": "1.14.0"
+  "template-url": "https://github.com/puppetlabs/pdk-templates#master",
+  "template-ref": "heads/master-0-gfaf9e8b",
+  "pdk-version": "1.14.1"
 }