pdk 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4d97af3b41bc901757039fbba252933d45bc0d8df7ee4394b4de179d737bc3e
-  data.tar.gz: b09c44a9520f79fa28aaa6732d2080f170268603948fdf5522162e255c0d30aa
+  metadata.gz: edecbd822f5fb1747d2359fbc1ead30020a1ba942b87fd603367ba3427181d68
+  data.tar.gz: 817cfc7f902167ef9937059de7b98510e6e4ee64d83610f5fb7c9e5b7def41a8
 SHA512:
-  metadata.gz: 4ef5ecbf55d7418bada352cf728913bba313cf63011d9fa19315ff65dd8247ee0a5e3dd1bb364a28ddc5dac4d4657eabc5d29556126fefed2b591f0f0e63806e
-  data.tar.gz: 3b836af5778a24a8dbe1d990e9dd7615011764000bdcbd81fab34ebc755c4b9c7dfebd66e82b07c7751db350fb3f16c86f6e5fb072efcd773c43ab7753132085
+  metadata.gz: 7008ffd3d22a6810c2ce7b45f1444b0313c59092656754a20a253137a514e88d03b9a8ce2d5545dc97a0d412a33cc7b110a7dd78138758215401928439f1f796
+  data.tar.gz: 3a3a737010f5a24013f3dd2e51066a614a09813c9ce3fcf827b9daa6f9ff0029e1e7dd9cec412ef726a90700271624f634eb939e54dc362e842d14fe6e986770

data/CHANGELOG.md

@@ -3,20 +3,25 @@
 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.1.0](https://github.com/puppetlabs/pdk/tree/v2.1.0) (2021-03-31)
 
-[Full Changelog](https://github.com/puppetlabs/pdk/compare/v2.0.0...v2.1.0)
+## [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:**
 
-- Documentation issue for brew installs on Mac [\#963](https://github.com/puppetlabs/pdk/issues/963)
-- PDK output scrollback in VS Code is extremely limited [\#829](https://github.com/puppetlabs/pdk/issues/829)
-- --verbose option broken for `pdk new defined_type` [\#679](https://github.com/puppetlabs/pdk/issues/679)
-- getting error with "$ pdk validate" after upgraded to 1.5.0 \(private/ruby/2.4.4/lib/ruby/gems/2.4.0/gems/pdk-1.5.0/lib/pdk/validate/puppet/puppet\_syntax.rb:88:in `parse_offense': undefined method` names' for nil:NilClass \(NoMethodError\)\) [\#518](https://github.com/puppetlabs/pdk/issues/518)
+- \(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))
 
-**Closed issues:**
+**Merged pull requests:**
 
-- \[Feature Request\] Validate CD4PE Yaml files [\#970](https://github.com/puppetlabs/pdk/issues/970)
+- \(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:**
 

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

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

@@ -22,7 +22,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.'), default: nil
 
     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

data/lib/pdk/module/release.rb

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

data/lib/pdk/util/changelog_generator.rb

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

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

data/lib/pdk/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdk
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-06-22 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
@@ -457,7 +463,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project:
+rubygems_version: 2.7.6.2
 signing_key:
 specification_version: 4
 summary: A key part of the Puppet Development Kit, the shortest path to better modules