pdk 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: edecbd822f5fb1747d2359fbc1ead30020a1ba942b87fd603367ba3427181d68
-  data.tar.gz: 817cfc7f902167ef9937059de7b98510e6e4ee64d83610f5fb7c9e5b7def41a8
+SHA1:
+  metadata.gz: 8e2609c042f89068710f065fadda48fe3ae5f32b
+  data.tar.gz: 40acaf2ef749d5e369387bf345f2ed2cb4588078
 SHA512:
-  metadata.gz: 7008ffd3d22a6810c2ce7b45f1444b0313c59092656754a20a253137a514e88d03b9a8ce2d5545dc97a0d412a33cc7b110a7dd78138758215401928439f1f796
-  data.tar.gz: 3a3a737010f5a24013f3dd2e51066a614a09813c9ce3fcf827b9daa6f9ff0029e1e7dd9cec412ef726a90700271624f634eb939e54dc362e842d14fe6e986770
+  metadata.gz: 774972368cefed1e1100d3ddd3804e216cbf13fbebd5b8af63c93862972e4d2339336aa5e0b48ea7ee7b09dd176eb98f2355dc0fc7b270ac92e0e8a1c6eac271
+  data.tar.gz: e966d37fdcf70b2a90227e3e5eebfc6a611950db8da230930a309f5d57a1a3407c4ee1fb23d1c322c7aaa7b57eaa392b48538ad48991b6de5a8a9e7e2e7550ec

data/CHANGELOG.md

@@ -3,6 +3,17 @@
 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)
+
+[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)
 

data/lib/pdk/cli/release.rb

@@ -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.'), 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/config.rb

@@ -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/validate/invokable_validator.rb

@@ -213,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/version.rb

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

data/lib/pdk/version.rb.orig

@@ -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

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdk
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -443,6 +443,7 @@ 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
@@ -464,7 +465,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.6.2
+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