RubyGems - pdk - Versions diffs - 1.18.1 → 2.2.0 - Mend

pdk 1.18.1 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (39) hide show

checksums.yaml +5 -5
data/CHANGELOG.md +81 -11
data/README.md +1 -1
data/lib/pdk/cli.rb +5 -1
data/lib/pdk/cli/env.rb +52 -0
data/lib/pdk/cli/exec/command.rb +11 -1
data/lib/pdk/cli/new.rb +2 -0
data/lib/pdk/cli/new/fact.rb +29 -0
data/lib/pdk/cli/new/function.rb +29 -0
data/lib/pdk/cli/release.rb +3 -1
data/lib/pdk/cli/release/publish.rb +11 -1
data/lib/pdk/cli/util/option_validator.rb +6 -0
data/lib/pdk/config.rb +6 -0
data/lib/pdk/generate.rb +0 -1
data/lib/pdk/generate/fact.rb +25 -0
data/lib/pdk/generate/function.rb +48 -0
data/lib/pdk/generate/provider.rb +1 -1
data/lib/pdk/generate/transport.rb +1 -1
data/lib/pdk/module.rb +1 -0
data/lib/pdk/module/metadata.rb +6 -2
data/lib/pdk/module/release.rb +7 -1
data/lib/pdk/module/update.rb +1 -1
data/lib/pdk/report.rb +3 -3
data/lib/pdk/report/event.rb +8 -2
data/lib/pdk/tests/unit.rb +3 -1
data/lib/pdk/util/bundler.rb +1 -1
data/lib/pdk/util/changelog_generator.rb +20 -3
data/lib/pdk/util/json_finder.rb +1 -0
data/lib/pdk/util/puppet_version.rb +2 -2
data/lib/pdk/util/ruby_version.rb +5 -1
data/lib/pdk/util/template_uri.rb +5 -5
data/lib/pdk/util/vendored_file.rb +1 -2
data/lib/pdk/validate/invokable_validator.rb +14 -1
data/lib/pdk/validate/tasks/tasks_metadata_lint_validator.rb +1 -1
data/lib/pdk/validate/yaml/yaml_syntax_validator.rb +2 -2
data/lib/pdk/version.rb +1 -1
data/lib/pdk/version.rb.orig +9 -0
metadata +38 -20
data/lib/pdk/generate/resource_api_object.rb +0 -55

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7096c03ba45a582325f9d2d466da61571697d474ae04387511d18579e886ee65
-  data.tar.gz: 3df00dfaec659bcd94bf66970feb400990be1b84327ec9fbfd76ea0c0ddbff0b
+SHA1:
+  metadata.gz: 8e2609c042f89068710f065fadda48fe3ae5f32b
+  data.tar.gz: 40acaf2ef749d5e369387bf345f2ed2cb4588078
 SHA512:
-  metadata.gz: ec2e4ee1a30f249b481c3282eecf5af1f6bfbe8497afde98b3f2c271beac0ab0b0d92ab78129e4cf564a7b48368f3cadfd9800d1cb5fb66b36816d93dea84882
-  data.tar.gz: 396091be92ce00e9b5816171e0782276e53de8b513ce9e50f14a1fe7b264042f2d4149182ba37cd7b7adaef7bb941ae395ffe703c721bd05f1fbdf778dd1f841
+  metadata.gz: 774972368cefed1e1100d3ddd3804e216cbf13fbebd5b8af63c93862972e4d2339336aa5e0b48ea7ee7b09dd176eb98f2355dc0fc7b270ac92e0e8a1c6eac271
+  data.tar.gz: e966d37fdcf70b2a90227e3e5eebfc6a611950db8da230930a309f5d57a1a3407c4ee1fb23d1c322c7aaa7b57eaa392b48538ad48991b6de5a8a9e7e2e7550ec

data/CHANGELOG.md CHANGED Viewed

@@ -3,8 +3,76 @@
 All changes to this repo will be documented in this file.
 See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) for a high-level summary.
+## [v2.2.0](https://github.com/puppetlabs/pdk/tree/v2.2.0) (2021-08-02)
-## [v1.18.1](https://github.com/puppetlabs/pdk/tree/v1.18.1) (2020-07-16)
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v2.1.1...v2.2.0)
+**Implemented enhancements:**
+- \(GH-1118\) Add ability to skip validating files [\#1114](https://github.com/puppetlabs/pdk/pull/1114) ([jpogran](https://github.com/jpogran))
+**Fixed bugs:**
+- \(GH-1113\) \(GH-917\) Fix forge-token handling [\#1121](https://github.com/puppetlabs/pdk/pull/1121) ([sanfrancrisko](https://github.com/sanfrancrisko))
+## [v2.1.1](https://github.com/puppetlabs/pdk/tree/v2.1.1) (2021-06-22)
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v2.1.0...v2.1.1)
+**Fixed bugs:**
+- \(PDK-1085\) Fail gracefully when no unit tests available [\#1096](https://github.com/puppetlabs/pdk/pull/1096) ([sanfrancrisko](https://github.com/sanfrancrisko))
+- \(GH-1090\) Verify the changelog top most version matches the metadata version [\#1088](https://github.com/puppetlabs/pdk/pull/1088) ([carabasdaniel](https://github.com/carabasdaniel))
+- \(GH-1083\) Bump childprocess to '~\> 4.0.0'; Disable @process.leader [\#1084](https://github.com/puppetlabs/pdk/pull/1084) ([sanfrancrisko](https://github.com/sanfrancrisko))
+**Merged pull requests:**
+- \(PDK-1041\) Use diff-lcs 1.4.4 [\#1091](https://github.com/puppetlabs/pdk/pull/1091) ([da-ar](https://github.com/da-ar))
+- Update CODEOWNERS [\#1082](https://github.com/puppetlabs/pdk/pull/1082) ([jpogran](https://github.com/jpogran))
+## [v2.1.0](https://github.com/puppetlabs/pdk/tree/v2.1.0) (2021-04-06)
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v2.0.0...v2.1.0)
+**Merged pull requests:**
+- \(maint\) Mark stale issues [\#1028](https://github.com/puppetlabs/pdk/pull/1028) ([jpogran](https://github.com/jpogran))
+- \(PF-2332\) Add `pdk env` subcommand [\#957](https://github.com/puppetlabs/pdk/pull/957) ([nkanderson](https://github.com/nkanderson))
+- Docs: Install on macOS with brew [\#954](https://github.com/puppetlabs/pdk/pull/954) ([rwaffen](https://github.com/rwaffen))
+- \(MAINT\) Bump version to 2.1.0.pre [\#952](https://github.com/puppetlabs/pdk/pull/952) ([scotje](https://github.com/scotje))
+- \(MAINT\) Fixup some superfluous entries in the 2.0.0 release notes [\#951](https://github.com/puppetlabs/pdk/pull/951) ([scotje](https://github.com/scotje))
+- \(Docs\) Update version number in welcome page [\#950](https://github.com/puppetlabs/pdk/pull/950) ([hestonhoffman](https://github.com/hestonhoffman))
+- \(Docs\) Release notes edits [\#949](https://github.com/puppetlabs/pdk/pull/949) ([hestonhoffman](https://github.com/hestonhoffman))
+## [v2.0.0](https://github.com/puppetlabs/pdk/tree/v2.0.0) (2021-02-24)
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.18.1...v2.0.0)
+**Implemented enhancements:**
+- Provide more context when forge upload fails [\#905](https://github.com/puppetlabs/pdk/issues/905)
+- \(IAC-1438\) - Removal of Inappropriate Terminology [\#945](https://github.com/puppetlabs/pdk/pull/945) ([david22swan](https://github.com/david22swan))
+- Remove pre-condition checks for RSAPI objects [\#943](https://github.com/puppetlabs/pdk/pull/943) ([DavidS](https://github.com/DavidS))
+- Update lower puppet requirements bound when creating new modules [\#942](https://github.com/puppetlabs/pdk/pull/942) ([DavidS](https://github.com/DavidS))
+- Allow Facter4 to be co-installed with PDK [\#941](https://github.com/puppetlabs/pdk/pull/941) ([GabrielNagy](https://github.com/GabrielNagy))
+- Add ability to generate functions [\#932](https://github.com/puppetlabs/pdk/pull/932) ([logicminds](https://github.com/logicminds))
+- \(GH-905\) Ensure release failure includes error message [\#929](https://github.com/puppetlabs/pdk/pull/929) ([michaeltlombardi](https://github.com/michaeltlombardi))
+- Adds AIX support when creating a new module [\#927](https://github.com/puppetlabs/pdk/pull/927) ([logicminds](https://github.com/logicminds))
+- Add ability to generate new facts [\#921](https://github.com/puppetlabs/pdk/pull/921) ([logicminds](https://github.com/logicminds))
+- Add forge token env [\#913](https://github.com/puppetlabs/pdk/pull/913) ([scotje](https://github.com/scotje))
+- \(FORGE-339\) Omit .DS\_Store files from module builds [\#910](https://github.com/puppetlabs/pdk/pull/910) ([binford2k](https://github.com/binford2k))
+- \(\#876\) Refactor text report output when validators are skipped [\#904](https://github.com/puppetlabs/pdk/pull/904) ([scotje](https://github.com/scotje))
+**Fixed bugs:**
+- puppet 7 dependency problems [\#931](https://github.com/puppetlabs/pdk/issues/931)
+- PDK download fails with 404 for macOS [\#928](https://github.com/puppetlabs/pdk/issues/928)
+- PDK does not support ruby 2.7 [\#914](https://github.com/puppetlabs/pdk/issues/914)
+- The `pdk release prep` command cannot find the github\_changelog\_generator gem [\#902](https://github.com/puppetlabs/pdk/issues/902)
+- \(PDK-1655\) pdk test unit fails when compiling spec tests on puppet 6.17 due to removal of default\_env [\#890](https://github.com/puppetlabs/pdk/issues/890)
+- Unit tests fail with can't modify frozen String \(RuntimeError\) [\#886](https://github.com/puppetlabs/pdk/issues/886)
+- `pdk validate` is missing a newline at the end, resulting in the shell prompt being printed on the same line [\#876](https://github.com/puppetlabs/pdk/issues/876)
+## [v1.18.1](https://github.com/puppetlabs/pdk/tree/v1.18.1) (2020-07-17)
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.18.0...v1.18.1)
@@ -29,7 +97,6 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 - Warning from libhoney when running unit test with PDK 1.17 [\#875](https://github.com/puppetlabs/pdk/issues/875)
 - 'pdk convert' of a module that's inside a control repo adds boilerplate to the control repo [\#874](https://github.com/puppetlabs/pdk/issues/874)
 - GemNotFound error for public\_suffix-3.1.1 when using --add-tests [\#869](https://github.com/puppetlabs/pdk/issues/869)
-- Scrollback of failed rspec tests in VS code is extremely limited [\#829](https://github.com/puppetlabs/pdk/issues/829)
 - Running individual rspec tests on Windows requires escaping the path [\#828](https://github.com/puppetlabs/pdk/issues/828)
 - Generated descriptions for certain test comparisons break JUnit output [\#821](https://github.com/puppetlabs/pdk/issues/821)
 - Fix PDK release command module validation [\#880](https://github.com/puppetlabs/pdk/pull/880) ([carabasdaniel](https://github.com/carabasdaniel))
@@ -54,6 +121,7 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 - \(PDK-1615\) Add Ini File configuration support [\#856](https://github.com/puppetlabs/pdk/pull/856) ([glennsarti](https://github.com/glennsarti))
 - \(PDK-1612\) Add PDK::Context and context detection [\#853](https://github.com/puppetlabs/pdk/pull/853) ([glennsarti](https://github.com/glennsarti))
 - \(PDK-1607\)\(PDK-1608\) Implement system-level settings for PDK configuration [\#841](https://github.com/puppetlabs/pdk/pull/841) ([glennsarti](https://github.com/glennsarti))
+- \(PDK-1557\) Detect Control Repositories [\#826](https://github.com/puppetlabs/pdk/pull/826) ([glennsarti](https://github.com/glennsarti))
 **Fixed bugs:**
@@ -77,8 +145,8 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 - \(PDK-1545\) Include template-ref in module generation output [\#840](https://github.com/puppetlabs/pdk/pull/840) ([rodjek](https://github.com/rodjek))
 - \(PDK-1587\) Reject paths with non-ASCII characters when building [\#832](https://github.com/puppetlabs/pdk/pull/832) ([rodjek](https://github.com/rodjek))
 - \(PDK-1588\) Increase granularity of `pdk bundle` analytics [\#827](https://github.com/puppetlabs/pdk/pull/827) ([rodjek](https://github.com/rodjek))
-- \(PDK-1557\) Detect Control Repositories [\#826](https://github.com/puppetlabs/pdk/pull/826) ([glennsarti](https://github.com/glennsarti))
 - \(PDK-1556\) Use the module root when generating objects [\#824](https://github.com/puppetlabs/pdk/pull/824) ([glennsarti](https://github.com/glennsarti))
+- \(PDK-1487\) Add --default-template flag to pdk convert [\#814](https://github.com/puppetlabs/pdk/pull/814) ([rodjek](https://github.com/rodjek))
 **Fixed bugs:**
@@ -100,7 +168,6 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 **Implemented enhancements:**
 - \(PDK-1488\) Inform user if updating a pinned module [\#816](https://github.com/puppetlabs/pdk/pull/816) ([rodjek](https://github.com/rodjek))
-- \(PDK-1487\) Add --default-template flag to pdk convert [\#814](https://github.com/puppetlabs/pdk/pull/814) ([rodjek](https://github.com/rodjek))
 - \(GH-808\) Implement pdk release prep and publish subcommands [\#813](https://github.com/puppetlabs/pdk/pull/813) ([glennsarti](https://github.com/glennsarti))
 - \(GH-808\) Implement pdk release subcommand [\#809](https://github.com/puppetlabs/pdk/pull/809) ([glennsarti](https://github.com/glennsarti))
 - \(PDK-1364\) Allow non-git template directories to be used [\#803](https://github.com/puppetlabs/pdk/pull/803) ([glennsarti](https://github.com/glennsarti))
@@ -244,7 +311,6 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 - \(maint\) Update beaker in package tests [\#695](https://github.com/puppetlabs/pdk/pull/695) ([rodjek](https://github.com/rodjek))
 - Revert "Merge pull request \#666 from DavidS/fm-8081-pdk-new-transport" [\#693](https://github.com/puppetlabs/pdk/pull/693) ([DavidS](https://github.com/DavidS))
 - \(maint\) Message and string fixes [\#676](https://github.com/puppetlabs/pdk/pull/676) ([DavidS](https://github.com/DavidS))
-- \(PDK-1333\) command\_spec rake task [\#644](https://github.com/puppetlabs/pdk/pull/644) ([rodjek](https://github.com/rodjek))
 ## [v1.11.1](https://github.com/puppetlabs/pdk/tree/v1.11.1) (2019-07-01)
@@ -309,7 +375,7 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 - \(PDK-1335\) Add development note when on Windows [\#649](https://github.com/puppetlabs/pdk/pull/649) ([glennsarti](https://github.com/glennsarti))
 - \(maint\) Allow developers to add additional gems [\#648](https://github.com/puppetlabs/pdk/pull/648) ([glennsarti](https://github.com/glennsarti))
 - \(PDK-1167\) Validator should honor case sensitive of the file system [\#646](https://github.com/puppetlabs/pdk/pull/646) ([glennsarti](https://github.com/glennsarti))
-- \(PDK-1193\) Saves packaged template-url in metadata as a keyword [\#639](https://github.com/puppetlabs/pdk/pull/639) ([bmjen](https://github.com/bmjen))
+- \(PDK-1333\) command\_spec rake task [\#644](https://github.com/puppetlabs/pdk/pull/644) ([rodjek](https://github.com/rodjek))
 ## [v1.10.0](https://github.com/puppetlabs/pdk/tree/v1.10.0) (2019-04-02)
@@ -321,6 +387,10 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 - \(PDK-1308\) Ensure PDK-written non-templated files have trailing newline [\#640](https://github.com/puppetlabs/pdk/pull/640) ([scotje](https://github.com/scotje))
 - \(PDK-718\) Add --template-ref argument for upstream template repo tags [\#434](https://github.com/puppetlabs/pdk/pull/434) ([hunner](https://github.com/hunner))
+**Fixed bugs:**
+- \(PDK-1266\) Clear modulepath value when validating manifest syntax [\#629](https://github.com/puppetlabs/pdk/pull/629) ([rodjek](https://github.com/rodjek))
 **Closed issues:**
 - `pdk update` is not idempotent for deletion of CI config files [\#593](https://github.com/puppetlabs/pdk/issues/593)
@@ -333,6 +403,7 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 - \(PDK-1324\) Release 1.10.0 [\#650](https://github.com/puppetlabs/pdk/pull/650) ([rodjek](https://github.com/rodjek))
 - \(maint\) Fix package specs for template-ref changes [\#647](https://github.com/puppetlabs/pdk/pull/647) ([rodjek](https://github.com/rodjek))
 - \(maint\) Enforce LF line endings in Rubocop [\#645](https://github.com/puppetlabs/pdk/pull/645) ([glennsarti](https://github.com/glennsarti))
+- \(PDK-1193\) Saves packaged template-url in metadata as a keyword [\#639](https://github.com/puppetlabs/pdk/pull/639) ([bmjen](https://github.com/bmjen))
 - \(FM-7579, PDK-1236\) bump the version of CRI used [\#638](https://github.com/puppetlabs/pdk/pull/638) ([tphoney](https://github.com/tphoney))
 - \(PDK-1294\) Update version post-release [\#637](https://github.com/puppetlabs/pdk/pull/637) ([bmjen](https://github.com/bmjen))
 - \(PDK-1298\) acceptance:local test suite optimisation [\#633](https://github.com/puppetlabs/pdk/pull/633) ([rodjek](https://github.com/rodjek))
@@ -344,16 +415,15 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 **Fixed bugs:**
 - \(IMAGES-1037\) Make sure our paths are used [\#630](https://github.com/puppetlabs/pdk/pull/630) ([mihaibuzgau](https://github.com/mihaibuzgau))
-- \(PDK-1266\) Clear modulepath value when validating manifest syntax [\#629](https://github.com/puppetlabs/pdk/pull/629) ([rodjek](https://github.com/rodjek))
-- \(PDK-1272\) Convert user/module module names to user-module [\#626](https://github.com/puppetlabs/pdk/pull/626) ([rodjek](https://github.com/rodjek))
 - \(PDK-1276\) Skip non-file YAML validator targets [\#625](https://github.com/puppetlabs/pdk/pull/625) ([rodjek](https://github.com/rodjek))
-- \(PDK-1273\) Whitelist Ruby symbols in YAML validator [\#624](https://github.com/puppetlabs/pdk/pull/624) ([rodjek](https://github.com/rodjek))
+- \(PDK-1273\) Allowlist Ruby symbols in YAML validator [\#624](https://github.com/puppetlabs/pdk/pull/624) ([rodjek](https://github.com/rodjek))
 **Merged pull requests:**
 - \(PDK-1289\) Release 1.9.1 [\#632](https://github.com/puppetlabs/pdk/pull/632) ([bmjen](https://github.com/bmjen))
 - \(maint\) Pin parallel gem to 1.13.0 [\#631](https://github.com/puppetlabs/pdk/pull/631) ([rodjek](https://github.com/rodjek))
 - \(PDK-1260\) Bump to 1.10.0.pre for new dev work [\#621](https://github.com/puppetlabs/pdk/pull/621) ([bmjen](https://github.com/bmjen))
+- \(maint\) Fix package tests to remove hardcoding [\#613](https://github.com/puppetlabs/pdk/pull/613) ([bmjen](https://github.com/bmjen))
 ## [v1.9.0](https://github.com/puppetlabs/pdk/tree/v1.9.0) (2019-01-29)
@@ -365,6 +435,7 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 **Fixed bugs:**
+- \(PDK-1272\) Convert user/module module names to user-module [\#626](https://github.com/puppetlabs/pdk/pull/626) ([rodjek](https://github.com/rodjek))
 - \(PDK-914\) Adjust default\_template\_url validation to accept local dirs [\#606](https://github.com/puppetlabs/pdk/pull/606) ([rodjek](https://github.com/rodjek))
 - \(PDK-1204\) pdk bundle execs in the context of the pwd [\#603](https://github.com/puppetlabs/pdk/pull/603) ([rodjek](https://github.com/rodjek))
@@ -380,7 +451,6 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 - \(maint\) Update hitimes pin to 1.3.0 for r2.1 compat [\#617](https://github.com/puppetlabs/pdk/pull/617) ([bmjen](https://github.com/bmjen))
 - Release 1.9.0 [\#616](https://github.com/puppetlabs/pdk/pull/616) ([bmjen](https://github.com/bmjen))
 - \(MAINT\) Configure Slack notifications for Travis [\#614](https://github.com/puppetlabs/pdk/pull/614) ([scotje](https://github.com/scotje))
-- \(maint\) Fix package tests to remove hardcoding [\#613](https://github.com/puppetlabs/pdk/pull/613) ([bmjen](https://github.com/bmjen))
 - \(MAINT\) Fix package acceptance tests to pass with any Ruby 2.4.x [\#611](https://github.com/puppetlabs/pdk/pull/611) ([scotje](https://github.com/scotje))
 - \(MAINT\) Bump default packaged ruby version to 2.4.5 [\#608](https://github.com/puppetlabs/pdk/pull/608) ([scotje](https://github.com/scotje))
 - \(PDK-1202\) Pass TemplateDir object through to TemplateFile [\#605](https://github.com/puppetlabs/pdk/pull/605) ([rodjek](https://github.com/rodjek))
@@ -999,6 +1069,7 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 - Validate fails on existing module [\#158](https://github.com/puppetlabs/pdk/issues/158)
 - \(\#158\) \(\#166\) Resolve issue loading bundler from gem installs [\#170](https://github.com/puppetlabs/pdk/pull/170) ([scotje](https://github.com/scotje))
 - \(SDK-319\) force usage of our ruby [\#168](https://github.com/puppetlabs/pdk/pull/168) ([DavidS](https://github.com/DavidS))
+- \(FIXUP\) Add missing newlines in new module interview prompts [\#161](https://github.com/puppetlabs/pdk/pull/161) ([scotje](https://github.com/scotje))
 **Closed issues:**
@@ -1031,7 +1102,6 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 **Fixed bugs:**
 - Can't create module if new module fails to get login [\#157](https://github.com/puppetlabs/pdk/issues/157)
-- \(FIXUP\) Add missing newlines in new module interview prompts [\#161](https://github.com/puppetlabs/pdk/pull/161) ([scotje](https://github.com/scotje))
 - Use default username when Etc.getlogin fails [\#160](https://github.com/puppetlabs/pdk/pull/160) ([austb](https://github.com/austb))
 **Merged pull requests:**

data/README.md CHANGED Viewed

@@ -1,4 +1,4 @@
-# pdk [![Build Status](https://travis-ci.org/puppetlabs/pdk.svg?branch=master)](https://travis-ci.org/puppetlabs/pdk) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/x70e2fqllbaootpd?svg=true)](https://ci.appveyor.com/project/puppetlabs/pdk) [![Coverage Status](https://coveralls.io/repos/github/puppetlabs/pdk/badge.svg?branch=master)](https://coveralls.io/github/puppetlabs/pdk?branch=master)
+# pdk [![Build Status](https://travis-ci.org/puppetlabs/pdk.svg?branch=main)](https://travis-ci.org/puppetlabs/pdk) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/x70e2fqllbaootpd?svg=true)](https://ci.appveyor.com/project/puppetlabs/pdk) [![Coverage Status](https://coveralls.io/repos/github/puppetlabs/pdk/badge.svg?branch=main)](https://coveralls.io/github/puppetlabs/pdk?branch=main)
 * [Installation](#installation)
 * [Basic usage](#basic-usage)

data/lib/pdk/cli.rb CHANGED Viewed

@@ -5,7 +5,10 @@ require 'pdk/cli/errors'
 module TTY
   autoload :Prompt, 'tty/prompt'
-  autoload :TestPrompt, 'tty/test_prompt'
+  class Prompt
+    autoload :Test, 'tty/prompt/test'
+  end
 end
 class Cri::Command::CriExitException
@@ -156,6 +159,7 @@ module PDK::CLI
   require 'pdk/cli/build'
   require 'pdk/cli/config'
   require 'pdk/cli/convert'
+  require 'pdk/cli/env'
   require 'pdk/cli/get'
   require 'pdk/cli/new'
   require 'pdk/cli/set'

data/lib/pdk/cli/env.rb ADDED Viewed

@@ -0,0 +1,52 @@
+module PDK::CLI
+  @env_cmd = @base_cmd.define_command do
+    name 'env'
+    usage _('env')
+    summary _('(Experimental) Output environment variables for specific Puppet context')
+    description _(<<-EOF
+[experimental] Aids in setting a CLI context for a specified version of Puppet by outputting export commands for necessary environment variables.
+EOF
+                 )
+    PDK::CLI.puppet_version_options(self)
+    PDK::CLI.puppet_dev_option(self)
+    run do |opts, _args, _cmd|
+      require 'pdk/util'
+      require 'pdk/util/ruby_version'
+      PDK::CLI::Util.validate_puppet_version_opts(opts)
+      PDK::CLI::Util.analytics_screen_view('env')
+      # Ensure that the correct Ruby is activated before running command.
+      puppet_env = PDK::CLI::Util.puppet_from_opts_or_env(opts)
+      PDK::Util::RubyVersion.use(puppet_env[:ruby_version])
+      resolved_env = {
+        'PDK_RESOLVED_PUPPET_VERSION' => puppet_env[:gemset][:puppet],
+        'PDK_RESOLVED_RUBY_VERSION' => puppet_env[:ruby_version],
+      }
+      resolved_env['GEM_HOME'] = PDK::Util::RubyVersion.gem_home
+      gem_path = PDK::Util::RubyVersion.gem_path
+      resolved_env['GEM_PATH'] = gem_path.empty? ? resolved_env['GEM_HOME'] : gem_path
+      # Make sure invocation of Ruby prefers our private installation.
+      package_binpath = PDK::Util.package_install? ? File.join(PDK::Util.pdk_package_basedir, 'bin') : nil
+      resolved_env['PATH'] = [
+        PDK::Util::RubyVersion.bin_path,
+        File.join(resolved_env['GEM_HOME'], 'bin'),
+        PDK::Util::RubyVersion.gem_paths_raw.map { |gem_path_raw| File.join(gem_path_raw, 'bin') },
+        package_binpath,
+        PDK::Util::Env['PATH'],
+      ].compact.flatten.join(File::PATH_SEPARATOR)
+      resolved_env.each do |var, val|
+        puts "export #{var}=\"#{val}\""
+      end
+      exit 0
+    end
+  end
+end

data/lib/pdk/cli/exec/command.rb CHANGED Viewed

@@ -27,7 +27,17 @@ module PDK
           @argv = argv
           @process = ChildProcess.build(*@argv)
-          @process.leader = true
+          # https://github.com/puppetlabs/pdk/issues/1083:
+          # When @process.leader is set, childprocess will set the CREATE_BREAKAWAY_FROM_JOB
+          # and JOB_OBJECT_LIMIT_BREAKAWAY_OK flags in the Win32 API calls. This will cause
+          # issues on systems > Windows 7 / Server 2008, if the JOB_OBJECT_LIMIT_BREAKAWAY_OK
+          # flag is set and the Task Scheduler is trying to kick off a job, it can sometimes
+          # result in ACCESS_DENIED being returned by the Win32 API, depending on the permission
+          # levels / user account this user.
+          # The resolution for pdk/issues/1083 is to ensure @process.leader is not set.
+          # This will potentially cause issues on older Windows systems, in which case we may
+          # need to revisit and conditionally set this param depending on what OS we're on
+          # @process.leader = true
           @stdout = Tempfile.new('stdout', mode: TEMPFILE_MODE).tap { |io| io.sync = true }
           @stderr = Tempfile.new('stderr', mode: TEMPFILE_MODE).tap { |io| io.sync = true }

data/lib/pdk/cli/new.rb CHANGED Viewed

@@ -17,3 +17,5 @@ require 'pdk/cli/new/provider'
 require 'pdk/cli/new/task'
 require 'pdk/cli/new/test'
 require 'pdk/cli/new/transport'
+require 'pdk/cli/new/fact'
+require 'pdk/cli/new/function'

data/lib/pdk/cli/new/fact.rb ADDED Viewed

@@ -0,0 +1,29 @@
+module PDK::CLI
+  @new_fact_cmd = @new_cmd.define_command do
+    name 'fact'
+    usage _('fact [options] <name>')
+    summary _('Create a new custom fact named <name> using given options')
+    run do |opts, args, _cmd|
+      PDK::CLI::Util.ensure_in_module!
+      fact_name = args[0]
+      if fact_name.nil? || fact_name.empty?
+        puts command.help
+        exit 1
+      end
+      unless Util::OptionValidator.valid_fact_name?(fact_name)
+        raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid fact name") % { name: fact_name }
+      end
+      PDK::CLI::Util.analytics_screen_view('new_fact', opts)
+      require 'pdk/generate/fact'
+      updates = PDK::Generate::Fact.new(PDK.context, fact_name, opts).run
+      PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
+    end
+  end
+end

data/lib/pdk/cli/new/function.rb ADDED Viewed

@@ -0,0 +1,29 @@
+module PDK::CLI
+  @new_function_cmd = @new_cmd.define_command do
+    name 'function'
+    usage _('function [options] <name>')
+    summary _('Create a new function named <name> using given options')
+    option :t, :type, _('The function type, (native or v4)'), argument: :required, default: 'native'
+    run do |opts, args, _cmd|
+      PDK::CLI::Util.ensure_in_module!
+      function_name = args[0]
+      if function_name.nil? || function_name.empty?
+        puts command.help
+        exit 1
+      end
+      unless Util::OptionValidator.valid_function_name?(function_name)
+        raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid function name") % { name: function_name }
+      end
+      PDK::CLI::Util.analytics_screen_view('new_function', opts)
+      require 'pdk/generate/function'
+      updates = PDK::Generate::Function.new(PDK.context, function_name, opts).run
+      PDK::CLI::Util::UpdateManagerPrinter.print_summary(updates, tense: :past)
+    end
+  end
+end

data/lib/pdk/cli/release.rb CHANGED Viewed

@@ -22,7 +22,8 @@ module PDK::CLI
     option nil, :'forge-upload-url', _('Set forge upload url path.'),
            argument: :required, default: 'https://forgeapi.puppetlabs.com/v3/releases'
-    option nil, :'forge-token', _('Set Forge API token.'), argument: :required, default: nil
+    option nil, :'forge-token', _('Set Forge API token.'),
+           argument: :optional
     option nil, :version, _('Update the module to the specified version prior to release. When not specified, the new version will be computed from the Changelog where possible.'),
            argument: :required
@@ -145,6 +146,7 @@ module PDK::CLI
         opts[:'skip-changelog'] = !answers['changelog']
         opts[:'skip-dependency'] = !answers['dependency']
         opts[:'skip-documentation'] = !answers['documentation']
+        opts[:'skip-publish'] = !answers['publish']
         prepare_version_interview(prompt, opts) if answers['setversion']

data/lib/pdk/cli/release/publish.rb CHANGED Viewed

@@ -11,7 +11,7 @@ module PDK::CLI
     option nil, :'forge-upload-url', _('Set forge upload url path.'),
            argument: :required, default: 'https://forgeapi.puppetlabs.com/v3/releases'
-    option nil, :'forge-token', _('Set Forge API token.'), argument: :required, default: nil
+    option nil, :'forge-token', _('Set Forge API token (you may also set via environment variable PDK_FORGE_TOKEN)'), argument: :required
     run do |opts, _args, cmd|
       # Make sure build is being run in a valid module directory with a metadata.json
@@ -27,6 +27,16 @@ module PDK::CLI
       opts[:'skip-build'] = true
       opts[:'skip-versionset'] = true
       opts[:force] = true unless PDK::CLI::Util.interactive?
+      opts[:'forge-token'] ||= PDK::Util::Env['PDK_FORGE_TOKEN']
+      if opts[:'forge-token'].nil? || opts[:'forge-token'].empty?
+        PDK.logger.error _(
+          'You must supply a Forge API token either via `--forge-token` option ' \
+          'or PDK_FORGE_TOKEN environment variable.',
+        )
+        exit 1
+      end
       Release.prepare_publish_interview(TTY::Prompt.new(help_color: :cyan), opts) unless opts[:force]

data/lib/pdk/cli/util/option_validator.rb CHANGED Viewed

@@ -8,6 +8,11 @@ module PDK
           (list =~ %r{^[\w\-]+(?:,[\w\-]+)+$}) ? true : false
         end
+        # @return [Boolean] true if the fact name is valid
+        def self.valid_fact_name?(name)
+          name.length > 1
+        end
         def self.enum(val, valid_entries, _options = {})
           vals = val.is_a?(Array) ? val : [val]
           invalid_entries = vals.reject { |e| valid_entries.include?(e) }
@@ -41,6 +46,7 @@ module PDK
           !(string =~ %r{\A([a-z][a-z0-9_]*)(::[a-z][a-z0-9_]*)*\Z}).nil?
         end
+        singleton_class.send(:alias_method, :valid_function_name?, :valid_namespace?)
         singleton_class.send(:alias_method, :valid_class_name?, :valid_namespace?)
         singleton_class.send(:alias_method, :valid_defined_type_name?, :valid_namespace?)

data/lib/pdk/config.rb CHANGED Viewed

@@ -94,6 +94,12 @@ module PDK
         if context.is_a?(PDK::Context::ControlRepo)
           mount :environment, PDK::ControlRepo.environment_conf_as_config(File.join(context.root_path, 'environment.conf'))
         end
+        mount :validate, PDK::Config::YAML.new('validate', file: File.join(context.root_path, 'pdk.yaml'), persistent_defaults: true) do
+          setting 'ignore' do
+            default_to { [] }
+          end
+        end
       end
     end

data/lib/pdk/generate.rb CHANGED Viewed

@@ -7,7 +7,6 @@ module PDK
     autoload :Provider, 'pdk/generate/provider'
     autoload :PuppetClass, 'pdk/generate/puppet_class'
     autoload :PuppetObject, 'pdk/generate/puppet_object'
-    autoload :ResourceAPIObject, 'pdk/generate/resource_api_object'
     autoload :Task, 'pdk/generate/task'
     autoload :Transport, 'pdk/generate/transport'

data/lib/pdk/generate/fact.rb ADDED Viewed

@@ -0,0 +1,25 @@
+require 'pdk'
+module PDK
+  module Generate
+    class Fact < PuppetObject
+      def friendly_name
+        'Custom Fact'.freeze
+      end
+      def template_files
+        files = {
+          'fact_spec.erb' => File.join('spec', 'unit', 'facter', object_name) + '_spec.rb',
+        }
+        return files if spec_only?
+        files.merge(
+          'fact.erb' => File.join('lib', 'facter', object_name) + '.rb',
+        )
+      end
+      def template_data
+        { name: object_name }
+      end
+    end
+  end
+end

data/lib/pdk/generate/function.rb ADDED Viewed

@@ -0,0 +1,48 @@
+require 'pdk'
+module PDK
+  module Generate
+    class Function < PuppetObject
+      def initialize(*_args)
+        super
+        object_name_parts = @object_name.split('::')
+        @object_name = if object_name_parts.first == module_name
+                         object_name
+                       else
+                         [module_name, object_name].join('::')
+                       end
+      end
+      def friendly_name
+        'Function'.freeze
+      end
+      def template_files
+        # Calculate the function tests name
+        func_name_parts = object_name.split('::')
+        # Drop the module name if the object name contains multiple parts
+        func_name_parts.delete_at(0) if func_name_parts.length > 1
+        files = {
+          File.join('functions', 'function_spec.erb') => File.join('spec', 'functions', *func_name_parts) + '_spec.rb',
+        }
+        return files if spec_only?
+        func_name_parts = object_name.split('::')[1..-1]
+        template_file = File.join('functions', "#{options[:type]}_function.erb")
+        files[template_file] = if options[:type].eql?('v4')
+                                 File.join('lib', 'puppet', 'functions', module_name, *func_name_parts) + '.rb'
+                               else
+                                 File.join('functions', *func_name_parts) + '.pp'
+                               end
+        files
+      end
+      def template_data
+        func_name = object_name.split('::').last
+        namespace = object_name.split('::')[0...-1].join('::')
+        { name: object_name, func_name: func_name, namespace: namespace }
+      end
+    end
+  end
+end

data/lib/pdk/generate/provider.rb CHANGED Viewed

@@ -2,7 +2,7 @@ require 'pdk'
 module PDK
   module Generate
-    class Provider < ResourceAPIObject
+    class Provider < PuppetObject
       def friendly_name
         'Resource API Provider'.freeze
       end

data/lib/pdk/generate/transport.rb CHANGED Viewed

@@ -2,7 +2,7 @@ require 'pdk'
 module PDK
   module Generate
-    class Transport < ResourceAPIObject
+    class Transport < PuppetObject
       def friendly_name
         'Resource API Transport'.freeze
       end

data/lib/pdk/module.rb CHANGED Viewed

@@ -15,6 +15,7 @@ module PDK
       '/REVISION',
       '/spec/fixtures/modules/',
       '/vendor/',
+      '.DS_Store',
     ].freeze
     def default_ignored_pathspec(ignore_dotfiles = true)

data/lib/pdk/module/metadata.rb CHANGED Viewed

@@ -27,7 +27,7 @@ module PDK
         'Debian based Linux' => [
           {
             'operatingsystem'        => 'Debian',
-            'operatingsystemrelease' => ['9'],
+            'operatingsystemrelease' => ['10'],
           },
           {
             'operatingsystem'        => 'Ubuntu',
@@ -54,6 +54,10 @@ module PDK
           'operatingsystem'        => 'windows',
           'operatingsystemrelease' => %w[2019 10],
         },
+        'AIX' => {
+          'operatingsystem'        => 'AIX',
+          'operatingsystemrelease' => %w[6.1 7.1 7.2],
+        },
       }.freeze
       DEFAULT_OPERATING_SYSTEMS = [
@@ -77,7 +81,7 @@ module PDK
           OPERATING_SYSTEMS[os_name]
         }.flatten,
         'requirements' => [
-          { 'name' => 'puppet', 'version_requirement' => '>= 4.10.0 < 7.0.0' },
+          { 'name' => 'puppet', 'version_requirement' => '>= 6.21.0 < 8.0.0' },
         ],
       }.freeze

data/lib/pdk/module/release.rb CHANGED Viewed

@@ -65,6 +65,12 @@ module PDK
           # Update the changelog with the correct version
           PDK::Util::ChangelogGenerator.generate_changelog unless skip_changelog?
+          # Check if the versions match
+          latest_version = PDK::Util::ChangelogGenerator.latest_version
+          unless latest_version
+            raise PDK::CLI::ExitWithError, _('%{new_version} does not match %{latest_version}') % { new_version: new_version, latest_version: latest_version } if new_version != latest_version
+          end
         end
         run_documentation(options) unless skip_documentation?
@@ -163,7 +169,7 @@ module PDK
           http.request(request)
         end
-        raise PDK::CLI::ExitWithError, _('Error uploading to Puppet Forge: %{result}') % { result: response } unless response.is_a?(Net::HTTPSuccess)
+        raise PDK::CLI::ExitWithError, _('Error uploading to Puppet Forge: %{result}') % { result: response.body } unless response.is_a?(Net::HTTPSuccess)
         PDK.logger.info _('Publish to Forge was successful')
       end

data/lib/pdk/module/update.rb CHANGED Viewed

@@ -85,7 +85,7 @@ module PDK
       private
       def latest_template?
-        [PDK::TEMPLATE_REF, 'master'].include?(template_uri.uri_fragment)
+        [PDK::TEMPLATE_REF, 'master', 'main'].include?(template_uri.uri_fragment)
       end
       def current_template_version

data/lib/pdk/report.rb CHANGED Viewed

@@ -104,7 +104,7 @@ module PDK
           if event.rspec_puppet_coverage?
             coverage_report = event.to_text
           else
-            report << event.to_text unless event.pass?
+            report << event.to_text unless event.pass? || event.skipped?
           end
         end
       end
@@ -113,8 +113,8 @@ module PDK
       if target.is_a?(String)
         PDK::Util::Filesystem.write_file(target, report.join("\n"))
-      else
-        target << report.join("\n")
+      elsif !report.empty?
+        target << report.join("\n") << "\n"
       end
     end
   end

data/lib/pdk/report/event.rb CHANGED Viewed

@@ -111,8 +111,8 @@ module PDK
         location = nil if location.empty?
         # TODO: maybe add trace
-        header = [severity, source, location, message].compact.join(': ')
         if source == 'rspec'
+          header = [severity, source, location, message].compact.join(': ')
           result = [header, "  #{test}"]
           context = context_lines
           unless context.nil?
@@ -123,7 +123,13 @@ module PDK
           result.compact.join("\n")
         else
-          header
+          output = ['pdk']
+          output << "(#{severity.upcase}):" unless severity.nil?
+          output << "#{source}:" unless source.nil?
+          output << message unless message.nil?
+          output << "(#{location})" unless location.nil?
+          output.join(' ')
         end
       end

data/lib/pdk/tests/unit.rb CHANGED Viewed

@@ -139,7 +139,7 @@ module PDK
         example_results = {
           # Only possibilities are passed, failed, pending:
-          # https://github.com/rspec/rspec-core/blob/master/lib/rspec/core/example.rb#L548
+          # https://github.com/rspec/rspec-core/blob/main/lib/rspec/core/example.rb#L548
           'passed' => [],
           'failed' => [],
           'pending' => [],
@@ -183,6 +183,8 @@ module PDK
       end
       def self.merge_json_results(json_data)
+        require 'set'
         merged_json_result = {}
         # Merge messages

data/lib/pdk/util/bundler.rb CHANGED Viewed

@@ -44,7 +44,7 @@ module PDK
         # If there are missing dependencies after updating the lockfile, let `bundle install`
         # go out and get them. If the specified puppet gem version points to a remote location
         # or local filepath, then run bundle install as well.
-        if !bundle.installed? || (gem_overrides[:puppet] && gem_overrides[:puppet].start_with?('file://', 'git://', 'https://'))
+        if !bundle.installed?(gem_overrides) || (gem_overrides[:puppet] && gem_overrides[:puppet].start_with?('file://', 'git://', 'https://'))
           bundle.install!(gem_overrides)
         end

data/lib/pdk/util/changelog_generator.rb CHANGED Viewed

@@ -9,11 +9,15 @@ module PDK
       # Raises if the github_changelog_generator is not available
       def self.github_changelog_generator_available!
-        require 'bundler'
-        return if ::Bundler.rubygems.find_name(GEM).any?
+        check_command = PDK::CLI::Exec::InteractiveCommand.new(PDK::CLI::Exec.bundle_bin, 'show', 'github_changelog_generator')
+        check_command.context = :module
+        result = check_command.execute!
+        return if result[:exit_code].zero?
         raise PDK::CLI::ExitWithError, _(
-          'Unable to generate the changelog as the %{gem} gem is not installed',
+          'Unable to generate the changelog as the %{gem} gem is not included in this module\'s Gemfile',
         ) % { gem: GEM }
       end
@@ -106,6 +110,19 @@ module PDK
         version.join('.')
       end
+      # Returns the top most version from the CHANGELOG file
+      def self.latest_version
+        latest = nil
+        changelog_content.each_line do |line|
+          line.strip!
+          if line.start_with?('## [')
+            latest = line[line.index('[') + 1..line.index(']') - 1].delete('v')
+            break # stops after the top version is extracted
+          end
+        end
+        latest
+      end
       def self.changelog_file
         # Default Changelog file is CHANGELOG.md, but also search for the .MD prefix as well.
         @changelog_file ||= ['CHANGELOG.md', 'CHANGELOG.MD'].map { |file| PDK::Util::Filesystem.expand_path(file) }.find { |path| PDK::Util::Filesystem.file?(path) }

data/lib/pdk/util/json_finder.rb CHANGED Viewed

@@ -39,6 +39,7 @@ module PDK
                                end
         end
+        return [] if @objects.nil?
         @objects = @objects.compact
       end

data/lib/pdk/util/puppet_version.rb CHANGED Viewed

@@ -17,7 +17,7 @@ module PDK
       PE_VERSIONS_URL = 'https://forgeapi.puppet.com/private/versions/pe'.freeze
       DEFAULT_PUPPET_DEV_URL = 'https://github.com/puppetlabs/puppet'.freeze
-      DEFAULT_PUPPET_DEV_BRANCH = 'master'.freeze
+      DEFAULT_PUPPET_DEV_BRANCH = 'main'.freeze
       def puppet_dev_env
         require 'pdk/util/ruby_version'
@@ -80,7 +80,7 @@ module PDK
         end
         # Reset local repo to latest
-        reset_result = PDK::Util::Git.git('-C', puppet_dev_path, 'reset', '--hard', 'origin/master')
+        reset_result = PDK::Util::Git.git('-C', puppet_dev_path, 'reset', '--hard', "origin/#{DEFAULT_PUPPET_DEV_BRANCH}")
         @puppet_dev_fetched = true
         return if reset_result[:exit_code].zero?

data/lib/pdk/util/ruby_version.rb CHANGED Viewed

@@ -60,7 +60,11 @@ module PDK
                                       #
                                       # PDK::Util::PuppetVersion.find_gem_for('5.5.10')[:ruby_version]
                                       #
-                                      PDK::Util::PuppetVersion.latest_available[:ruby_version]
+                                      # For using the latest puppet gem:
+                                      # PDK::Util::PuppetVersion.latest_available[:ruby_version]
+                                      #
+                                      # Temporarily lock to Ruby 2.5.x as default until 2.7.x ecosystem is sorted
+                                      versions.keys.detect { |v| v =~ %r{^2\.5} }
                                     else
                                       # TODO: may not be a safe assumption that highest available version should be default
                                       # WARNING Do NOT use PDK::Util::PuppetVersion.*** methods as it can recurse into this

data/lib/pdk/util/template_uri.rb CHANGED Viewed

@@ -26,13 +26,13 @@ module PDK
       #
       # file:///c:/foo (git clone location)
       # c:/foo (shell paths)
-      # file:///c:/foo#master (only for metadata)
-      # c:/foo#master (only for metadata)
+      # file:///c:/foo#main (only for metadata)
+      # c:/foo#main (only for metadata)
       #
       # non output formats:
       #
       # /c:/foo (internal use only)
-      # /c:/foo#master (internal use only)
+      # /c:/foo#main (internal use only)
       #
       def initialize(opts_or_uri)
         require 'addressable'
@@ -241,11 +241,11 @@ module PDK
         require 'pdk/util'
         require 'pdk/version'
-        return 'master' if PDK::Util.development_mode?
+        return 'main' if PDK::Util.development_mode?
         return PDK::TEMPLATE_REF if uri.nil?
         uri = new(uri) unless uri.is_a?(self)
-        uri.default? ? PDK::TEMPLATE_REF : 'master'
+        uri.default? ? PDK::TEMPLATE_REF : 'main'
       end
       # @returns Addressable::URI

data/lib/pdk/util/vendored_file.rb CHANGED Viewed

@@ -55,8 +55,7 @@ module PDK
         uri = URI.parse(url)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
-        # TODO: Get rid of this, possible workaround:
-        # https://github.com/glennsarti/dev-tools/blob/master/RubyCerts.ps1
+        # TODO: Get rid of this
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE if Gem.win_platform?
         request = Net::HTTP::Get.new(uri.request_uri)
         response = http.request(request)

data/lib/pdk/validate/invokable_validator.rb CHANGED Viewed

@@ -86,7 +86,12 @@ module PDK
               ignore_list = ignore_pathspec
               target_list = target_list.reject { |file| ignore_list.match(file) }
-              skipped << target if target_list.flatten.empty?
+              if target_list.flatten.empty?
+                PDK.logger.info(_('Validator \'%{validator}\' skipped for \'%{target}\'. No files matching \'%{pattern}\' found to validate.') % { validator: name, target: target, pattern: pattern })
+                skipped << target
+              end
               target_list
             elsif PDK::Util::Filesystem.file?(target)
               if Array(pattern).include? target
@@ -208,6 +213,14 @@ module PDK
           end
         end
+        # block will always be [] because it is intialized in config
+        ignore_files = PDK.config.get_within_scopes('validate.ignore')
+        unless ignore_files.nil? || ignore_files.empty?
+          Array(ignore_files).each do |pattern|
+            ignore_pathspec.add(pattern)
+          end
+        end
         ignore_pathspec
       end
     end

data/lib/pdk/validate/tasks/tasks_metadata_lint_validator.rb CHANGED Viewed

@@ -49,7 +49,7 @@ module PDK
             # Need to set the JSON Parser and State Generator to the Native one to be
             # compatible with the multi_json adapter.
             JSON.parser = JSON::Ext::Parser if defined?(JSON::Ext::Parser)
-            JSON.generator = JSON::Ext::Generator
+            JSON.generator = JSON::Ext::Generator if defined?(JSON::Ext::Generator)
             begin
               errors = JSON::Validator.fully_validate(schema_file, PDK::Util::Filesystem.read_file(target)) || []

data/lib/pdk/validate/yaml/yaml_syntax_validator.rb CHANGED Viewed

@@ -4,7 +4,7 @@ module PDK
   module Validate
     module YAML
       class YAMLSyntaxValidator < InternalRubyValidator
-        YAML_WHITELISTED_CLASSES = [Symbol].freeze
+        YAML_ALLOWLISTED_CLASSES = [Symbol].freeze
         def ignore_dotfiles
           false
@@ -53,7 +53,7 @@ module PDK
           end
           begin
-            ::YAML.safe_load(PDK::Util::Filesystem.read_file(target), YAML_WHITELISTED_CLASSES, [], true)
+            ::YAML.safe_load(PDK::Util::Filesystem.read_file(target), YAML_ALLOWLISTED_CLASSES, [], true)
             report.add_event(
               file:     target,

data/lib/pdk/version.rb CHANGED Viewed

@@ -1,4 +1,4 @@
 module PDK
-  VERSION = '1.18.1'.freeze
+  VERSION = '2.2.0'.freeze
   TEMPLATE_REF = VERSION
 end

data/lib/pdk/version.rb.orig ADDED Viewed

@@ -0,0 +1,9 @@
+module PDK
+<<<<<<< HEAD
+  VERSION = '2.2.0.pre2'.freeze
+  TEMPLATE_REF = '2.1.1'.freeze
+=======
+  VERSION = '2.2.0'.freeze
+  TEMPLATE_REF = VERSION
+>>>>>>> 8ef8eb2 ((MAINT) Release prep for 2.2.0)
+end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdk
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Puppet, Inc.
-autorequire:
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: cri
   requirement: !ruby/object:Gem::Requirement
@@ -62,16 +62,22 @@ dependencies:
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.4.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.4
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +118,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -182,14 +188,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
@@ -236,16 +242,22 @@ dependencies:
   name: facter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -300,6 +312,7 @@ files:
 - lib/pdk/cli/config/get.rb
 - lib/pdk/cli/console.rb
 - lib/pdk/cli/convert.rb
+- lib/pdk/cli/env.rb
 - lib/pdk/cli/errors.rb
 - lib/pdk/cli/exec.rb
 - lib/pdk/cli/exec/command.rb
@@ -313,6 +326,8 @@ files:
 - lib/pdk/cli/new.rb
 - lib/pdk/cli/new/class.rb
 - lib/pdk/cli/new/defined_type.rb
+- lib/pdk/cli/new/fact.rb
+- lib/pdk/cli/new/function.rb
 - lib/pdk/cli/new/module.rb
 - lib/pdk/cli/new/provider.rb
 - lib/pdk/cli/new/task.rb
@@ -357,11 +372,12 @@ files:
 - lib/pdk/control_repo.rb
 - lib/pdk/generate.rb
 - lib/pdk/generate/defined_type.rb
+- lib/pdk/generate/fact.rb
+- lib/pdk/generate/function.rb
 - lib/pdk/generate/module.rb
 - lib/pdk/generate/provider.rb
 - lib/pdk/generate/puppet_class.rb
 - lib/pdk/generate/puppet_object.rb
-- lib/pdk/generate/resource_api_object.rb
 - lib/pdk/generate/task.rb
 - lib/pdk/generate/transport.rb
 - lib/pdk/i18n.rb
@@ -427,12 +443,13 @@ files:
 - lib/pdk/validate/yaml/yaml_syntax_validator.rb
 - lib/pdk/validate/yaml/yaml_validator_group.rb
 - lib/pdk/version.rb
+- lib/pdk/version.rb.orig
 - locales/config.yaml
 - locales/pdk.pot
 homepage: https://github.com/puppetlabs/pdk
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -440,15 +457,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.9
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubyforge_project:
+rubygems_version: 2.6.14.4
+signing_key:
 specification_version: 4
 summary: A key part of the Puppet Development Kit, the shortest path to better modules
 test_files: []

data/lib/pdk/generate/resource_api_object.rb DELETED Viewed

@@ -1,55 +0,0 @@
-require 'pdk'
-module PDK
-  module Generate
-    # An abstract class for generated objects that require the Puppet Resource API Gem
-    #
-    # @abstract
-    class ResourceAPIObject < PuppetObject
-      #:nocov: This is tested in spec/acceptance/new_transport_spec.rb
-      # @see PDK::Generate::PuppetObject.check_preconditions
-      def check_preconditions
-        super
-        # Note that these preconditions are only applicable to the current (V1) template rendering layout and will need to be changed
-        # when additional template renderers are introduced.
-        #
-        # These preconditions can be removed once the pdk-templates are carrying the puppet-resource_api gem by default, and have switched
-        # the default mock_with value.
-        sync_path = PDK::Util.find_upwards('.sync.yml')
-        if sync_path.nil?
-          raise_precondition_error(_('.sync.yml not found'))
-        end
-        sync = YAML.load_file(sync_path)
-        if !sync.is_a? Hash
-          raise_precondition_error(_('.sync.yml contents is not a Hash'))
-        elsif !sync.key? 'Gemfile'
-          raise_precondition_error(_('Gemfile configuration not found'))
-        elsif !sync['Gemfile'].key? 'optional'
-          raise_precondition_error(_('Gemfile.optional configuration not found'))
-        elsif !sync['Gemfile']['optional'].key? ':development'
-          raise_precondition_error(_('Gemfile.optional.:development configuration not found'))
-        elsif sync['Gemfile']['optional'][':development'].none? { |g| g['gem'] == 'puppet-resource_api' }
-          raise_precondition_error(_('puppet-resource_api not found in the Gemfile config'))
-        elsif !sync.key? 'spec/spec_helper.rb'
-          raise_precondition_error(_('spec/spec_helper.rb configuration not found'))
-        elsif !sync['spec/spec_helper.rb'].key? 'mock_with'
-          raise_precondition_error(_('spec/spec_helper.rb.mock_with configuration not found'))
-        elsif !sync['spec/spec_helper.rb']['mock_with'] == ':rspec'
-          raise_precondition_error(_('spec/spec_helper.rb.mock_with not set to \':rspec\''))
-        end
-      end
-      # Helper method to raise an error if the Resource API is not available
-      #
-      # @api private
-      def raise_precondition_error(error)
-        raise PDK::CLI::ExitWithError, _('%{error}: Creating a %{thing_name} needs some local configuration in your module.' \
-          ' Please follow the docs at https://puppet.com/docs/puppet/latest/create_types_and_providers_resource_api.html') % {
-            thing_name: friendly_name,
-            error: error,
-          }
-      end
-      #:nocov:
-    end
-  end
-end