pdk 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39407f42f251787224ba10cb588fe376e2e99b5f
-  data.tar.gz: 430e0c03b853a1efbd6f2186559017694511ebe8
+  metadata.gz: 27fc827b1a70d71d9cce1b0c392f75b8e90f2732
+  data.tar.gz: ad2eab7e2e51368f1407ba9828b9646369e472ee
 SHA512:
-  metadata.gz: 364a943cce4e41ae087c06653761329495ac21826b658b9172280f574b53bd6ebbf5a77439f5f2f29ea7b507876c2c25a153095a3e3d99919a3894a46b9d1f87
-  data.tar.gz: 5e7a3d759fc50064b5a0e28806fb7ea8aae447f90396f968baad45b27ac7b72a17f2c3ec9d5d77f5c089195cc8e730f9ab58bdf1392d3232fb0951207cb9ceff
+  metadata.gz: 35f7aaff79bd0600fe54706aa1ddd8509e33dc328df96f3d24bde51b2321fa885ef4e4d5438ed9dfd4129966ae3ea864746a07dab7a58ea4d4db0f08f8568548
+  data.tar.gz: 922b5d8512cf3a2954de87f95c3cc03a67980901ff8a82ab909be9589d550f4ba8400460a63232da54fcba11757f7acaeada7afb53d32c21cf92af6140bfb410

data/CHANGELOG.md

@@ -4,7 +4,23 @@ 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.
 
 
-## [v1.9.0](https://github.com/puppetlabs/pdk/tree/v1.9.0) (2019-01-25)
+## [v1.9.1](https://github.com/puppetlabs/pdk/tree/v1.9.1) (2019-03-01)
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.9.0...v1.9.1)
+
+**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))
+
+**Merged pull requests:**
+
+- \(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))
+
+## [v1.9.0](https://github.com/puppetlabs/pdk/tree/v1.9.0) (2019-01-29)
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.8.0...v1.9.0)
 
 **Implemented enhancements:**
@@ -23,6 +39,10 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 
 **Merged pull requests:**
 
+- \(maint\) Fix pin for nokogiri in package tests [\#620](https://github.com/puppetlabs/pdk/pull/620) ([bmjen](https://github.com/bmjen))
+- \(PDK-1240\) Update nokogiri to minimum of 1.8.5 [\#619](https://github.com/puppetlabs/pdk/pull/619) ([bmjen](https://github.com/bmjen))
+- \(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))

data/lib/pdk/cli/exec.rb

@@ -143,8 +143,8 @@ module PDK
               File.join(@process.environment['GEM_HOME'], 'bin'),
               PDK::Util::RubyVersion.gem_paths_raw.map { |gem_path| File.join(gem_path, 'bin') },
               package_binpath,
-              ENV['PATH'],
               PDK::Util.package_install? ? PDK::Util::Git.git_paths : nil,
+              ENV['PATH'],
             ].compact.flatten.join(File::PATH_SEPARATOR)
 
             mod_root = PDK::Util.module_root

data/lib/pdk/module/metadata.rb

@@ -163,7 +163,8 @@ module PDK
       # Do basic validation and parsing of the name parameter.
       def process_name(data)
         validate_name(data['name'])
-        author, _modname = data['name'].split(%r{[-/]}, 2)
+        author, modname = data['name'].split(%r{[-/]}, 2)
+        data['name'] = [author, modname].join('-')
 
         data['author'] ||= author if @data['author'] == DEFAULTS['author']
       end

data/lib/pdk/validate/puppet/puppet_syntax.rb

@@ -1,6 +1,8 @@
 require 'pdk'
 require 'pdk/cli/exec'
 require 'pdk/validate/base_validator'
+require 'fileutils'
+require 'tmpdir'
 
 module PDK
   module Validate
@@ -46,7 +48,30 @@ module PDK
       end
 
       def self.parse_options(_options, targets)
-        ['parser', 'validate', '--config', null_file].concat(targets)
+        # Due to PDK-1266 we need to run `puppet parser validate` with an empty
+        # modulepath. On *nix, Ruby treats `/dev/null` as an empty directory
+        # however it doesn't do so with `NUL` on Windows. The workaround for
+        # this to ensure consistent behaviour is to create an empty temporary
+        # directory and use that as the modulepath.
+        ['parser', 'validate', '--config', null_file, '--modulepath', validate_tmpdir].concat(targets)
+      end
+
+      def self.invoke(report, options)
+        super
+      ensure
+        remove_validate_tmpdir
+      end
+
+      def self.validate_tmpdir
+        @validate_tmpdir ||= Dir.mktmpdir('puppet-parser-validate')
+      end
+
+      def self.remove_validate_tmpdir
+        return unless @validate_tmpdir
+        return unless File.directory?(@validate_tmpdir)
+
+        FileUtils.remove_entry_secure(@validate_tmpdir)
+        @validate_tmpdir = nil
       end
 
       def self.null_file

data/lib/pdk/validate/yaml/syntax.rb

@@ -9,6 +9,7 @@ module PDK
     class YAML
       class Syntax < BaseValidator
         IGNORE_DOTFILES = false
+        YAML_WHITELISTED_CLASSES = [Symbol].freeze
 
         def self.name
           'yaml-syntax'
@@ -62,6 +63,8 @@ module PDK
           create_spinner(targets, options)
 
           targets.each do |target|
+            next unless File.file?(target)
+
             unless File.readable?(target)
               report.add_event(
                 file:     target,
@@ -75,7 +78,7 @@ module PDK
             end
 
             begin
-              ::YAML.safe_load(File.read(target), [], [], true)
+              ::YAML.safe_load(File.read(target), YAML_WHITELISTED_CLASSES, [], true)
 
               report.add_event(
                 file:     target,
@@ -97,6 +100,17 @@ module PDK
                 },
               )
               return_val = 1
+            rescue Psych::DisallowedClass => e
+              report.add_event(
+                file:     target,
+                source:   name,
+                state:    :failure,
+                severity: 'error',
+                message:  _('Unsupported class: %{message}') % {
+                  message: e.message,
+                },
+              )
+              return_val = 1
             end
           end
 

data/lib/pdk/version.rb

@@ -1,4 +1,4 @@
 module PDK
-  VERSION = '1.9.0'.freeze
+  VERSION = '1.9.1'.freeze
   TEMPLATE_REF = VERSION
 end

data/locales/pdk.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: puppet development kit v1.8.0-22-g7b2950bc5f\n"
+"Project-Id-Version: puppet development kit v1.9.0-15-g264d3c07ab\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
-"POT-Creation-Date: 2019-01-25 16:10-0700\n"
-"PO-Revision-Date: 2019-01-25 16:10-0700\n"
+"POT-Creation-Date: 2019-03-01 11:43-0700\n"
+"PO-Revision-Date: 2019-03-01 11:43-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -695,11 +695,11 @@ msgid "If there is a public issue tracker for this module, enter its URL here."
 msgstr ""
 
 #: ../lib/pdk/generate/module.rb:258
-msgid "create"
+msgid "update"
 msgstr ""
 
 #: ../lib/pdk/generate/module.rb:258
-msgid "update"
+msgid "create"
 msgstr ""
 
 #: ../lib/pdk/generate/module.rb:259
@@ -878,23 +878,23 @@ msgstr ""
 msgid "The \"puppet\" requirement in module metadata does not specify a \"version_requirement\"."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:180
+#: ../lib/pdk/module/metadata.rb:181
 msgid "Field must be a dash-separated user name and module name."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:182
+#: ../lib/pdk/module/metadata.rb:183
 msgid "Module name must contain only alphanumeric or underscore characters."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:184
+#: ../lib/pdk/module/metadata.rb:185
 msgid "Module name must begin with a letter."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:186
+#: ../lib/pdk/module/metadata.rb:187
 msgid "Namespace must contain only alphanumeric characters."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:189
+#: ../lib/pdk/module/metadata.rb:190
 msgid "Invalid 'name' field in metadata.json: %{err}"
 msgstr ""
 
@@ -1246,7 +1246,7 @@ msgstr ""
 msgid "Checking metadata syntax (%{targets})."
 msgstr ""
 
-#: ../lib/pdk/validate/metadata/metadata_syntax.rb:69 ../lib/pdk/validate/tasks/metadata_lint.rb:77 ../lib/pdk/validate/yaml/syntax.rb:71
+#: ../lib/pdk/validate/metadata/metadata_syntax.rb:69 ../lib/pdk/validate/tasks/metadata_lint.rb:77 ../lib/pdk/validate/yaml/syntax.rb:74
 msgid "Could not be read."
 msgstr ""
 
@@ -1254,7 +1254,7 @@ msgstr ""
 msgid "Checking Puppet manifest style (%{pattern})."
 msgstr ""
 
-#: ../lib/pdk/validate/puppet/puppet_syntax.rb:45
+#: ../lib/pdk/validate/puppet/puppet_syntax.rb:47
 msgid "Checking Puppet manifest syntax (%{pattern})."
 msgstr ""
 
@@ -1282,10 +1282,14 @@ msgstr ""
 msgid "Checking task names (%{targets})."
 msgstr ""
 
-#: ../lib/pdk/validate/yaml/syntax.rb:27
+#: ../lib/pdk/validate/yaml/syntax.rb:28
 msgid "Checking YAML syntax (%{targets})."
 msgstr ""
 
-#: ../lib/pdk/validate/yaml/syntax.rb:94
+#: ../lib/pdk/validate/yaml/syntax.rb:97
 msgid "%{problem} %{context}"
 msgstr ""
+
+#: ../lib/pdk/validate/yaml/syntax.rb:109
+msgid "Unsupported class: %{message}"
+msgstr ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdk
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler