pdk 2.4.0 → 2.5.0

data/lib/pdk/validate/metadata/metadata_json_lint_validator.rb

@@ -1,86 +1,86 @@
-require 'pdk'
-
-module PDK
-  module Validate
-    module Metadata
-      class MetadataJSONLintValidator < ExternalCommandValidator
-        # Validate each metadata file separately, as metadata-json-lint does not
-        # support multiple targets.
-        def invoke_style
-          :per_target
-        end
-
-        def name
-          'metadata-json-lint'
-        end
-
-        def cmd
-          'metadata-json-lint'
-        end
-
-        def spinner_text_for_targets(targets)
-          _('Checking module metadata style (%{targets}).') % {
-            targets: PDK::Util.targets_relative_to_pwd(targets.flatten).join(' '),
-          }
-        end
-
-        def pattern
-          contextual_pattern('metadata.json')
-        end
-
-        def parse_options(targets)
-          cmd_options = ['--format', 'json']
-          cmd_options << '--strict-dependencies'
-
-          cmd_options.concat(targets)
-        end
-
-        def parse_output(report, result, targets)
-          raise ArgumentError, _('More than 1 target provided to PDK::Validate::MetadataJSONLintValidator.') if targets.count > 1
-
-          if result[:stdout].strip.empty?
-            # metadata-json-lint will print nothing if there are no problems with
-            # the file being linted. This should be handled separately to
-            # metadata-json-lint generating output that can not be parsed as JSON
-            # (unhandled exception in metadata-json-lint).
-            json_data = {}
-          else
-            begin
-              json_data = JSON.parse(result[:stdout])
-            rescue JSON::ParserError
-              raise PDK::Validate::ParseOutputError, result[:stdout]
-            end
-          end
-
-          if json_data.empty?
-            report.add_event(
-              file:     targets.first,
-              source:   name,
-              state:    :passed,
-              severity: :ok,
-            )
-          else
-            json_data.delete('result')
-            json_data.keys.each do |type|
-              json_data[type].each do |offense|
-                # metadata-json-lint groups the offenses by type, so the type ends
-                # up being `warnings` or `errors`. We want to convert that to the
-                # singular noun for the event.
-                event_type = type[%r{\A(.+?)s?\Z}, 1]
-
-                report.add_event(
-                  file:     targets.first,
-                  source:   name,
-                  message:  offense['msg'],
-                  test:     offense['check'],
-                  severity: event_type,
-                  state:    :failure,
-                )
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+require 'pdk'
+
+module PDK
+  module Validate
+    module Metadata
+      class MetadataJSONLintValidator < ExternalCommandValidator
+        # Validate each metadata file separately, as metadata-json-lint does not
+        # support multiple targets.
+        def invoke_style
+          :per_target
+        end
+
+        def name
+          'metadata-json-lint'
+        end
+
+        def cmd
+          'metadata-json-lint'
+        end
+
+        def spinner_text_for_targets(targets)
+          _('Checking module metadata style (%{targets}).') % {
+            targets: PDK::Util.targets_relative_to_pwd(targets.flatten).join(' '),
+          }
+        end
+
+        def pattern
+          contextual_pattern('metadata.json')
+        end
+
+        def parse_options(targets)
+          cmd_options = ['--format', 'json']
+          cmd_options << '--strict-dependencies'
+
+          cmd_options.concat(targets)
+        end
+
+        def parse_output(report, result, targets)
+          raise ArgumentError, _('More than 1 target provided to PDK::Validate::MetadataJSONLintValidator.') if targets.count > 1
+
+          if result[:stdout].strip.empty?
+            # metadata-json-lint will print nothing if there are no problems with
+            # the file being linted. This should be handled separately to
+            # metadata-json-lint generating output that can not be parsed as JSON
+            # (unhandled exception in metadata-json-lint).
+            json_data = {}
+          else
+            begin
+              json_data = JSON.parse(result[:stdout])
+            rescue JSON::ParserError
+              raise PDK::Validate::ParseOutputError, result[:stdout]
+            end
+          end
+
+          if json_data.empty?
+            report.add_event(
+              file:     targets.first,
+              source:   name,
+              state:    :passed,
+              severity: :ok,
+            )
+          else
+            json_data.delete('result')
+            json_data.keys.each do |type|
+              json_data[type].each do |offense|
+                # metadata-json-lint groups the offenses by type, so the type ends
+                # up being `warnings` or `errors`. We want to convert that to the
+                # singular noun for the event.
+                event_type = type[%r{\A(.+?)s?\Z}, 1]
+
+                report.add_event(
+                  file:     targets.first,
+                  source:   name,
+                  message:  offense['msg'],
+                  test:     offense['check'],
+                  severity: event_type,
+                  state:    :failure,
+                )
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pdk/validate/metadata/metadata_syntax_validator.rb

@@ -1,78 +1,78 @@
-require 'pdk'
-
-module PDK
-  module Validate
-    module Metadata
-      class MetadataSyntaxValidator < InternalRubyValidator
-        def name
-          'metadata-syntax'
-        end
-
-        def pattern
-          contextual_pattern(['metadata.json', 'tasks/*.json'])
-        end
-
-        def spinner_text
-          _('Checking metadata syntax (%{patterns}).') % {
-            patterns: pattern.join(' '),
-          }
-        end
-
-        def invoke(report)
-          super
-        ensure
-          JSON.parser = JSON::Ext::Parser if defined?(JSON::Ext::Parser)
-        end
-
-        def before_validation
-          # The pure ruby JSON parser gives much nicer parse error messages than
-          # the C extension at the cost of slightly slower parsing. We require it
-          # here and restore the C extension at the end of the method (if it was
-          # being used).
-          require 'json/pure'
-          JSON.parser = JSON::Pure::Parser
-        end
-
-        def validate_target(report, target)
-          unless PDK::Util::Filesystem.readable?(target)
-            report.add_event(
-              file: target,
-              source: name,
-              state: :failure,
-              severity: 'error',
-              message: _('Could not be read.'),
-            )
-            return 1
-          end
-
-          begin
-            JSON.parse(PDK::Util::Filesystem.read_file(target))
-
-            report.add_event(
-              file:     target,
-              source:   name,
-              state:    :passed,
-              severity: 'ok',
-            )
-            return 0
-          rescue JSON::ParserError => e
-            # Because the message contains a raw segment of the file, we use
-            # String#dump here to unescape any escape characters like newlines.
-            # We then strip out the surrounding quotes and the exclaimation
-            # point that json_pure likes to put in exception messages.
-            sane_message = e.message.dump[%r{\A"(.+?)!?"\Z}, 1]
-
-            report.add_event(
-              file:     target,
-              source:   name,
-              state:    :failure,
-              severity: 'error',
-              message:  sane_message,
-            )
-            return 1
-          end
-        end
-      end
-    end
-  end
-end
+require 'pdk'
+
+module PDK
+  module Validate
+    module Metadata
+      class MetadataSyntaxValidator < InternalRubyValidator
+        def name
+          'metadata-syntax'
+        end
+
+        def pattern
+          contextual_pattern(['metadata.json', 'tasks/*.json'])
+        end
+
+        def spinner_text
+          _('Checking metadata syntax (%{patterns}).') % {
+            patterns: pattern.join(' '),
+          }
+        end
+
+        def invoke(report)
+          super
+        ensure
+          JSON.parser = JSON::Ext::Parser if defined?(JSON::Ext::Parser)
+        end
+
+        def before_validation
+          # The pure ruby JSON parser gives much nicer parse error messages than
+          # the C extension at the cost of slightly slower parsing. We require it
+          # here and restore the C extension at the end of the method (if it was
+          # being used).
+          require 'json/pure'
+          JSON.parser = JSON::Pure::Parser
+        end
+
+        def validate_target(report, target)
+          unless PDK::Util::Filesystem.readable?(target)
+            report.add_event(
+              file: target,
+              source: name,
+              state: :failure,
+              severity: 'error',
+              message: _('Could not be read.'),
+            )
+            return 1
+          end
+
+          begin
+            JSON.parse(PDK::Util::Filesystem.read_file(target))
+
+            report.add_event(
+              file:     target,
+              source:   name,
+              state:    :passed,
+              severity: 'ok',
+            )
+            return 0
+          rescue JSON::ParserError => e
+            # Because the message contains a raw segment of the file, we use
+            # String#dump here to unescape any escape characters like newlines.
+            # We then strip out the surrounding quotes and the exclaimation
+            # point that json_pure likes to put in exception messages.
+            sane_message = e.message.dump[%r{\A"(.+?)!?"\Z}, 1]
+
+            report.add_event(
+              file:     target,
+              source:   name,
+              state:    :failure,
+              severity: 'error',
+              message:  sane_message,
+            )
+            return 1
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pdk/validate/metadata/metadata_validator_group.rb

@@ -1,20 +1,20 @@
-require 'pdk'
-
-module PDK
-  module Validate
-    module Metadata
-      class MetadataValidatorGroup < ValidatorGroup
-        def name
-          'metadata'
-        end
-
-        def validators
-          [
-            MetadataSyntaxValidator,
-            MetadataJSONLintValidator,
-          ].freeze
-        end
-      end
-    end
-  end
-end
+require 'pdk'
+
+module PDK
+  module Validate
+    module Metadata
+      class MetadataValidatorGroup < ValidatorGroup
+        def name
+          'metadata'
+        end
+
+        def validators
+          [
+            MetadataSyntaxValidator,
+            MetadataJSONLintValidator,
+          ].freeze
+        end
+      end
+    end
+  end
+end

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

@@ -1,133 +1,133 @@
-require 'pdk'
-
-module PDK
-  module Validate
-    module Puppet
-      class PuppetEPPValidator < ExternalCommandValidator
-        # In Puppet >= 5.3.4, the error context formatting was changed to facilitate localization
-        ERROR_CONTEXT = %r{(?:file:\s(?<file>.+?)|line:\s(?<line>.+?)|column:\s(?<column>.+?))}
-        # In Puppet < 5.3.3, the error context was formatted in these variations:
-        #   - "at file_path:line_num:col_num"
-        #   - "at file_path:line_num"
-        #   - "at line line_num"
-        #   - "in file_path"
-        ERROR_CONTEXT_LEGACY = %r{(?:at\sline\s(?<line>\d+)|at\s(?<file>.+?):(?<line>\d+):(?<column>\d+)|at\s(?<file>.+?):(?<line>\d+)|in\s(?<file>.+?))}
-
-        PUPPET_LOGGER_PREFIX = %r{^(debug|info|notice|warning|error|alert|critical):\s.+?$}i
-        PUPPET_SYNTAX_PATTERN = %r{^
-          (?<severity>.+?):\s
-          (?<message>.+?)
-          (?:
-            \s\(#{ERROR_CONTEXT}(,\s#{ERROR_CONTEXT})*\)| # attempt to match the new localisation friendly location
-            \s#{ERROR_CONTEXT_LEGACY}| # attempt to match the old " at file:line:column" location
-            $                                               # handle cases where the output has no location
-          )
-        $}x
-
-        def name
-          'puppet-epp'
-        end
-
-        def cmd
-          'puppet'
-        end
-
-        def pattern
-          contextual_pattern('**/*.epp')
-        end
-
-        def spinner_text_for_targets(_targets)
-          _('Checking Puppet EPP syntax (%{pattern}).') % { pattern: pattern.join(' ') }
-        end
-
-        def parse_options(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.
-          ['epp', 'validate', '--config', null_file, '--modulepath', validate_tmpdir].concat(targets)
-        end
-
-        def invoke(report)
-          super
-        ensure
-          remove_validate_tmpdir
-        end
-
-        def validate_tmpdir
-          require 'tmpdir'
-
-          @validate_tmpdir ||= Dir.mktmpdir('puppet-epp-validate')
-        end
-
-        def remove_validate_tmpdir
-          return unless @validate_tmpdir
-          return unless PDK::Util::Filesystem.directory?(@validate_tmpdir)
-
-          PDK::Util::Filesystem.remove_entry_secure(@validate_tmpdir)
-          @validate_tmpdir = nil
-        end
-
-        def null_file
-          Gem.win_platform? ? 'NUL' : '/dev/null'
-        end
-
-        def parse_output(report, result, targets)
-          # Due to PUP-7504, we will have to programmatically construct the json
-          # object from the text output for now.
-          output = result[:stderr].split(%r{\r?\n}).reject { |entry| entry.empty? }
-
-          results_data = []
-          output.each do |offense|
-            offense_data = parse_offense(offense)
-            results_data << offense_data
-          end
-
-          # puppet parser validate does not include files without problems in its
-          # output, so we need to go through the list of targets and add passing
-          # events to the report for any target not listed in the output.
-          targets.reject { |target| results_data.any? { |j| j[:file] =~ %r{#{target}} } }.each do |target|
-            report.add_event(
-              file:     target,
-              source:   name,
-              severity: :ok,
-              state:    :passed,
-            )
-          end
-
-          results_data.each do |offense|
-            report.add_event(offense)
-          end
-        end
-
-        def parse_offense(offense)
-          sanitize_console_output(offense)
-
-          offense_data = {
-            source:  name,
-            state:  :failure,
-          }
-
-          if offense.match(PUPPET_LOGGER_PREFIX)
-            attributes = offense.match(PUPPET_SYNTAX_PATTERN)
-
-            unless attributes.nil?
-              attributes.names.each do |name|
-                offense_data[name.to_sym] = attributes[name] unless attributes[name].nil?
-              end
-            end
-          else
-            offense_data[:message] = offense
-          end
-
-          offense_data
-        end
-
-        def sanitize_console_output(line)
-          line.gsub!(%r{\e\[([;\d]+)?m}, '')
-        end
-      end
-    end
-  end
-end
+require 'pdk'
+
+module PDK
+  module Validate
+    module Puppet
+      class PuppetEPPValidator < ExternalCommandValidator
+        # In Puppet >= 5.3.4, the error context formatting was changed to facilitate localization
+        ERROR_CONTEXT = %r{(?:file:\s(?<file>.+?)|line:\s(?<line>.+?)|column:\s(?<column>.+?))}
+        # In Puppet < 5.3.3, the error context was formatted in these variations:
+        #   - "at file_path:line_num:col_num"
+        #   - "at file_path:line_num"
+        #   - "at line line_num"
+        #   - "in file_path"
+        ERROR_CONTEXT_LEGACY = %r{(?:at\sline\s(?<line>\d+)|at\s(?<file>.+?):(?<line>\d+):(?<column>\d+)|at\s(?<file>.+?):(?<line>\d+)|in\s(?<file>.+?))}
+
+        PUPPET_LOGGER_PREFIX = %r{^(debug|info|notice|warning|error|alert|critical):\s.+?$}i
+        PUPPET_SYNTAX_PATTERN = %r{^
+          (?<severity>.+?):\s
+          (?<message>.+?)
+          (?:
+            \s\(#{ERROR_CONTEXT}(,\s#{ERROR_CONTEXT})*\)| # attempt to match the new localisation friendly location
+            \s#{ERROR_CONTEXT_LEGACY}| # attempt to match the old " at file:line:column" location
+            $                                               # handle cases where the output has no location
+          )
+        $}x
+
+        def name
+          'puppet-epp'
+        end
+
+        def cmd
+          'puppet'
+        end
+
+        def pattern
+          contextual_pattern('**/*.epp')
+        end
+
+        def spinner_text_for_targets(_targets)
+          _('Checking Puppet EPP syntax (%{pattern}).') % { pattern: pattern.join(' ') }
+        end
+
+        def parse_options(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.
+          ['epp', 'validate', '--config', null_file, '--modulepath', validate_tmpdir].concat(targets)
+        end
+
+        def invoke(report)
+          super
+        ensure
+          remove_validate_tmpdir
+        end
+
+        def validate_tmpdir
+          require 'tmpdir'
+
+          @validate_tmpdir ||= Dir.mktmpdir('puppet-epp-validate')
+        end
+
+        def remove_validate_tmpdir
+          return unless @validate_tmpdir
+          return unless PDK::Util::Filesystem.directory?(@validate_tmpdir)
+
+          PDK::Util::Filesystem.remove_entry_secure(@validate_tmpdir)
+          @validate_tmpdir = nil
+        end
+
+        def null_file
+          Gem.win_platform? ? 'NUL' : '/dev/null'
+        end
+
+        def parse_output(report, result, targets)
+          # Due to PUP-7504, we will have to programmatically construct the json
+          # object from the text output for now.
+          output = result[:stderr].split(%r{\r?\n}).reject { |entry| entry.empty? }
+
+          results_data = []
+          output.each do |offense|
+            offense_data = parse_offense(offense)
+            results_data << offense_data
+          end
+
+          # puppet parser validate does not include files without problems in its
+          # output, so we need to go through the list of targets and add passing
+          # events to the report for any target not listed in the output.
+          targets.reject { |target| results_data.any? { |j| j[:file] =~ %r{#{target}} } }.each do |target|
+            report.add_event(
+              file:     target,
+              source:   name,
+              severity: :ok,
+              state:    :passed,
+            )
+          end
+
+          results_data.each do |offense|
+            report.add_event(offense)
+          end
+        end
+
+        def parse_offense(offense)
+          sanitize_console_output(offense)
+
+          offense_data = {
+            source:  name,
+            state:  :failure,
+          }
+
+          if offense.match(PUPPET_LOGGER_PREFIX)
+            attributes = offense.match(PUPPET_SYNTAX_PATTERN)
+
+            unless attributes.nil?
+              attributes.names.each do |name|
+                offense_data[name.to_sym] = attributes[name] unless attributes[name].nil?
+              end
+            end
+          else
+            offense_data[:message] = offense
+          end
+
+          offense_data
+        end
+
+        def sanitize_console_output(line)
+          line.gsub!(%r{\e\[([;\d]+)?m}, '')
+        end
+      end
+    end
+  end
+end