pdk 1.0.1 → 1.1.0

data/lib/pdk/report/event.rb

@@ -96,7 +96,20 @@ module PDK
         location = nil if location.empty?
 
         # TODO: maybe add trace
-        [severity, source, location, message].compact.join(': ')
+        header = [severity, source, location, message].compact.join(': ')
+        if source == 'rspec'
+          result = [header, "  #{test}"]
+          context = context_lines
+          unless context.nil?
+            result << '  Failure/Error:'
+            result.concat(context)
+            result << "\n"
+          end
+
+          result.compact.join("\n")
+        else
+          header
+        end
       end
 
       # Renders the event as a JUnit XML testcase.
@@ -159,11 +172,11 @@ module PDK
       #   a String.
       def sanitise_file(value)
         if value.nil? || (value.is_a?(String) && value.empty?)
-          raise ArgumentError, _('file not specified')
+          raise ArgumentError, _('File not specified.')
         end
 
         unless value.is_a?(String)
-          raise ArgumentError, _('file must be a String')
+          raise ArgumentError, _('File must be a String.')
         end
 
         path = Pathname.new(value)
@@ -196,17 +209,17 @@ module PDK
       #   a String or Symbol representation of a valid state.
       def sanitise_state(value)
         if value.nil? || (value.is_a?(String) && value.empty?)
-          raise ArgumentError, _('state not specified')
+          raise ArgumentError, _('State not specified.')
         end
 
         value = value.to_sym if value.is_a?(String)
         unless value.is_a?(Symbol)
-          raise ArgumentError, _('state must be a Symbol, not %{type}') % { type: value.class }
+          raise ArgumentError, _('State must be a Symbol, not %{type}') % { type: value.class }
         end
 
         valid_states = [:passed, :error, :failure, :skipped]
         unless valid_states.include?(value)
-          raise ArgumentError, _('Invalid state %{state}, valid states are: %{valid}') % {
+          raise ArgumentError, _('Invalid state %{state}. Valid states are: %{valid}.') % {
             state: value.inspect,
             valid: valid_states.map(&:inspect).join(', '),
           }
@@ -225,7 +238,7 @@ module PDK
       # @raise [ArgumentError] if the value is nil or an empty String.
       def sanitise_source(value)
         if value.nil? || (value.is_a?(String) && value.empty?)
-          raise ArgumentError, _('source not specified')
+          raise ArgumentError, _('Source not specified.')
         end
 
         value.to_s
@@ -246,11 +259,11 @@ module PDK
         end
 
         unless valid_types.include?(value.class)
-          raise ArgumentError, _('line must be an Integer or a String representation of an Integer')
+          raise ArgumentError, _('Line must be an Integer or a String representation of an Integer.')
         end
 
         if value.is_a?(String) && value !~ %r{\A[0-9]+\Z}
-          raise ArgumentError, _('the line number can only contain the digits 0-9')
+          raise ArgumentError, _('The line number can contain only the digits 0-9.')
         end
 
         value.to_i
@@ -271,11 +284,11 @@ module PDK
         end
 
         unless valid_types.include?(value.class)
-          raise ArgumentError, _('column must be an Integer or a String representation of an Integer')
+          raise ArgumentError, _('Column must be an Integer or a String representation of an Integer.')
         end
 
         if value.is_a?(String) && value !~ %r{\A[0-9]+\Z}
-          raise ArgumentError, _('the column number can only contain the digits 0-9')
+          raise ArgumentError, _('The column number can contain only the digits 0-9.')
         end
 
         value.to_i
@@ -293,7 +306,7 @@ module PDK
         valid_types = [Array]
 
         unless valid_types.include?(value.class)
-          raise ArgumentError, _('trace must be an Array of stack trace lines')
+          raise ArgumentError, _('Trace must be an Array of stack trace lines.')
         end
 
         # Drop any stacktrace lines that include '/gems/' in the path or
@@ -302,6 +315,24 @@ module PDK
           (line =~ %r{/gems/}) || (line =~ %r{bin/rspec:})
         end
       end
+
+      # Extract contextual information for the event from the file that it
+      # references.
+      #
+      # @param max_num_lines [Integer] The maximum number of lines to return.
+      #
+      # @return [Array] Array of lines from the file, centred on the line
+      #   number of the event.
+      def context_lines(max_num_lines = 5)
+        return if file.nil? || line.nil?
+
+        file_content = File.read(file).split("\n")
+        delta = (max_num_lines - 1) / 2
+        min = [0, (line - 1) - delta].max
+        max = [(line - 1) + delta, file_content.length].min
+
+        file_content[min..max].map { |r| "  #{r}" }
+      end
     end
   end
 end

data/lib/pdk/tests/unit.rb

@@ -8,8 +8,24 @@ module PDK
     class Unit
       def self.cmd(_tests, opts = {})
         # TODO: test selection
-        rake_task = opts.key?(:parallel) ? 'parallel_spec' : 'spec'
-        [File.join(PDK::Util.module_root, 'bin', 'rake'), rake_task]
+        opts.key?(:parallel) ? 'parallel_spec' : 'spec'
+      end
+
+      def self.rake_bin
+        @rake ||= File.join(PDK::Util.module_root, 'bin', 'rake')
+      end
+
+      def self.rake(task, spinner_text, environment = {})
+        argv = [rake_bin, task]
+        argv.unshift('ruby') if Gem.win_platform?
+
+        command = PDK::CLI::Exec::Command.new(*argv).tap do |c|
+          c.context = :module
+          c.add_spinner(spinner_text)
+          c.environment = environment
+        end
+
+        command.execute!
       end
 
       def self.parallel_with_no_tests?(ran_in_parallel, json_result, result)
@@ -18,25 +34,41 @@ module PDK
           result[:stderr].strip =~ %r{Pass files or folders to run$}
       end
 
-      def self.invoke(report, options = {})
-        PDK::Util::Bundler.ensure_bundle!
-        PDK::Util::Bundler.ensure_binstubs!('rake')
+      def self.print_failure(result, exception)
+        $stderr.puts ''
+        result[:stdout].each_line { |line| $stderr.puts line.rstrip } unless result[:stdout].nil?
+        result[:stderr].each_line { |line| $stderr.puts line.rstrip } unless result[:stderr].nil?
+        $stderr.puts ''
+        raise PDK::CLI::FatalError, exception
+      end
 
-        tests = options.fetch(:tests)
+      def self.tear_down
+        result = rake('spec_clean', _('Cleaning up after running unit tests.'))
 
-        cmd_argv = cmd(tests, options)
-        cmd_argv.unshift('ruby') if Gem.win_platform?
+        return if result[:exit_code].zero?
 
-        command = PDK::CLI::Exec::Command.new(*cmd_argv).tap do |c|
-          c.context = :module
-          spinner_msg = options.key?(:parallel) ? _('Running unit tests in parallel') : _('Running unit tests')
-          c.add_spinner(spinner_msg)
-          c.environment['CI_SPEC_OPTIONS'] = '--format j'
-        end
+        PDK.logger.error(_('The spec_clean rake task failed with the following error(s):'))
+        print_failure(result, _('Failed to clean up after running unit tests'))
+      end
+
+      def self.setup
+        result = rake('spec_prep', _('Preparing to run the unit tests.'))
+
+        return if result[:exit_code].zero?
+
+        PDK.logger.error(_('The spec_prep rake task failed with the following error(s):'))
+        print_failure(result, _('Failed to prepare to run the unit tests.'))
+      end
+
+      def self.invoke(report, options = {})
+        PDK::Util::Bundler.ensure_bundle!
+        PDK::Util::Bundler.ensure_binstubs!('rake')
 
-        PDK.logger.debug(_('Running %{cmd}') % { cmd: command.argv.join(' ') })
+        setup
 
-        result = command.execute!
+        tests = options.fetch(:tests)
+        spinner_msg = options.key?(:parallel) ? _('Running unit tests in parallel.') : _('Running unit tests.')
+        result = rake(cmd(tests, options), spinner_msg, 'CI_SPEC_OPTIONS' => '--format j')
 
         json_result = if options.key?(:parallel)
                         PDK::Util.find_all_json_in(result[:stdout])
@@ -56,6 +88,8 @@ module PDK
         parse_output(report, json_result)
 
         result[:exit_code]
+      ensure
+        tear_down
       end
 
       def self.parse_output(report, json_data)
@@ -99,7 +133,7 @@ module PDK
         return unless json_data['summary']
 
         # TODO: standardize summary output
-        $stderr.puts '  ' << _('Evaluated %{total} tests in %{duration} seconds: %{failures} failures, %{pending} pending') % {
+        $stderr.puts '  ' << _('Evaluated %{total} tests in %{duration} seconds: %{failures} failures, %{pending} pending.') % {
           total: json_data['summary']['example_count'],
           duration: json_data['summary']['duration'],
           failures: json_data['summary']['failure_count'],

data/lib/pdk/util.rb

@@ -1,8 +1,8 @@
 require 'tmpdir'
 require 'tempfile'
-require 'puppet/util/windows'
 
 require 'pdk/util/version'
+require 'pdk/util/windows'
 
 module PDK
   module Util
@@ -44,7 +44,7 @@ module PDK
     def canonical_path(path)
       if Gem.win_platform?
         unless File.exist?(path)
-          raise PDK::CLI::FatalError, _("Cannot resolve a full path to '%{path}' as it does not currently exist") % { path: path }
+          raise PDK::CLI::FatalError, _("Cannot resolve a full path to '%{path}', as it does not currently exist.") % { path: path }
         end
         Puppet::Util::Windows::File.get_long_pathname(path)
       else
@@ -64,7 +64,7 @@ module PDK
     module_function :gem_install?
 
     def pdk_package_basedir
-      raise PDK::CLI::FatalError, _('Package basedir requested for non-package install') unless package_install?
+      raise PDK::CLI::FatalError, _('Package basedir requested for non-package install.') unless package_install?
 
       File.dirname(PDK::Util::Version.version_file)
     end

data/lib/pdk/util/bundler.rb

@@ -12,12 +12,12 @@ module PDK
         bundle = BundleHelper.new
 
         if already_bundled?(bundle.gemfile)
-          PDK.logger.debug(_('Bundle has already been installed, skipping run'))
+          PDK.logger.debug(_('Bundle has already been installed. Skipping run.'))
           return
         end
 
         unless bundle.gemfile?
-          PDK.logger.debug(_("No Gemfile found in '%{cwd}', skipping bundler management") % { cwd: Dir.pwd })
+          PDK.logger.debug(_("No Gemfile found in '%{cwd}'. Skipping bundler management.") % { cwd: Dir.pwd })
           return
         end
 
@@ -28,7 +28,7 @@ module PDK
             vendored_gemfile_lock = File.join(PDK::Util.package_cachedir, 'Gemfile.lock')
 
             if File.exist?(vendored_gemfile_lock)
-              PDK.logger.debug(_("No Gemfile.lock found in module, using vendored Gemfile.lock from '%{source}'") % { source: vendored_gemfile_lock })
+              PDK.logger.debug(_("No Gemfile.lock found in module. Using vendored Gemfile.lock from '%{source}'.") % { source: vendored_gemfile_lock })
               FileUtils.cp(vendored_gemfile_lock, File.join(PDK::Util.module_root, 'Gemfile.lock'))
             end
           else
@@ -90,7 +90,7 @@ module PDK
 
         def lock!
           command = bundle_command('lock').tap do |c|
-            c.add_spinner(_('Resolving Gemfile dependencies'))
+            c.add_spinner(_('Resolving Gemfile dependencies.'))
           end
 
           result = command.execute!
@@ -107,7 +107,7 @@ module PDK
           argv << "--path=#{bundle_cachedir}" if PDK::Util.gem_install?
 
           command = bundle_command(*argv).tap do |c|
-            c.add_spinner(_('Installing missing Gemfile dependencies'))
+            c.add_spinner(_('Installing missing Gemfile dependencies.'))
           end
 
           result = command.execute!

data/lib/pdk/util/version.rb

@@ -23,9 +23,12 @@ module PDK
       end
 
       def self.git_ref
-        ref_result = PDK::CLI::Exec.git('--git-dir', File.join(File.expand_path('../../..', File.dirname(__FILE__)), '.git'), 'describe', '--all', '--long')
+        source_git_dir = File.join(File.expand_path('../../..', File.dirname(__FILE__)), '.git')
 
-        ref_result[:stdout].strip if ref_result[:exit_code].zero?
+        return nil unless File.directory?(source_git_dir)
+
+        ref_result = PDK::CLI::Exec.git('--git-dir', source_git_dir, 'describe', '--all', '--long')
+        return ref_result[:stdout].strip if ref_result[:exit_code].zero?
       end
 
       def self.version_file

data/lib/pdk/util/windows.rb

@@ -0,0 +1,6 @@
+module Puppet
+  module Util
+  end
+end
+
+require 'puppet/util/windows'

data/lib/pdk/validators/base_validator.rb

@@ -91,7 +91,7 @@ module PDK
           report.add_event(
             file:     invalid_target,
             source:   name,
-            message:  'File does not exist.',
+            message:  _('File does not exist.'),
             severity: :error,
             state:    :error,
           )

data/lib/pdk/validators/metadata/metadata_json_lint.rb

@@ -20,7 +20,7 @@ module PDK
       end
 
       def self.spinner_text(targets = [])
-        _('Checking metadata style (%{targets})') % {
+        _('Checking metadata style (%{targets}).') % {
           targets: PDK::Util.targets_relative_to_pwd(targets).join(' '),
         }
       end
@@ -37,7 +37,7 @@ module PDK
       end
 
       def self.parse_output(report, result, targets)
-        raise ArgumentError, 'More than 1 target provided to PDK::Validate::MetadataJSONLint' if targets.count > 1
+        raise ArgumentError, _('More than 1 target provided to PDK::Validate::MetadataJSONLint.') if targets.count > 1
 
         if result[:stdout].strip.empty?
           # metadata-json-lint will print nothing if there are no problems with

data/lib/pdk/validators/metadata/metadata_syntax.rb

@@ -15,7 +15,7 @@ module PDK
       end
 
       def self.spinner_text(targets = [])
-        _('Checking metadata syntax (%{targets})') % {
+        _('Checking metadata syntax (%{targets}).') % {
           targets: PDK::Util.targets_relative_to_pwd(targets).join(' '),
         }
       end
@@ -66,7 +66,7 @@ module PDK
               source: name,
               state: :failure,
               severity: 'error',
-              message: _('could not be read'),
+              message: _('Could not be read.'),
             )
             return_val = 1
             next

data/lib/pdk/validators/puppet/puppet_lint.rb

@@ -19,7 +19,7 @@ module PDK
       end
 
       def self.spinner_text(_targets = nil)
-        _('Checking Puppet manifest style (%{pattern})') % { pattern: pattern }
+        _('Checking Puppet manifest style (%{pattern}).') % { pattern: pattern }
       end
 
       def self.parse_options(options, targets)

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

@@ -18,7 +18,7 @@ module PDK
       end
 
       def self.spinner_text(_targets = nil)
-        _('Checking Puppet manifest syntax (%{pattern})') % { pattern: pattern }
+        _('Checking Puppet manifest syntax (%{pattern}).') % { pattern: pattern }
       end
 
       def self.parse_options(_options, targets)

data/lib/pdk/validators/ruby/rubocop.rb

@@ -21,7 +21,7 @@ module PDK
       end
 
       def self.spinner_text(_targets = nil)
-        _('Checking Ruby code style (%{pattern})') % { pattern: pattern }
+        _('Checking Ruby code style (%{pattern}).') % { pattern: pattern }
       end
 
       def self.parse_options(options, targets)

data/lib/pdk/version.rb

@@ -1,3 +1,3 @@
 module PDK
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/puppet/util/windows/api_types.rb

@@ -53,17 +53,21 @@ module Puppet::Util::Windows::APITypes
     alias_method :read_word,  :read_uint16
     alias_method :read_array_of_wchar, :read_array_of_uint16
 
-    def read_wide_string(char_length, dst_encoding = Encoding::UTF_8)
+    def read_wide_string(char_length, dst_encoding = Encoding::UTF_8, encode_options = {})
       # char_length is number of wide chars (typically excluding NULLs), *not* bytes
       str = get_bytes(0, char_length * 2).force_encoding('UTF-16LE')
-      str.encode(dst_encoding)
+      str.encode(dst_encoding, str.encoding, encode_options)
+    rescue Exception => e
+      Puppet.debug "Unable to convert value #{str.dump} to encoding #{dst_encoding} due to #{e.inspect}"
+      raise
     end
 
     # @param max_char_length [Integer] Maximum number of wide chars to return (typically excluding NULLs), *not* bytes
     # @param null_terminator [Symbol] Number of number of null wchar characters, *not* bytes, that determine the end of the string
     #   null_terminator = :single_null, then the terminating sequence is two bytes of zero.   This is UNIT16 = 0
     #   null_terminator = :double_null, then the terminating sequence is four bytes of zero.  This is UNIT32 = 0
-    def read_arbitrary_wide_string_up_to(max_char_length = 512, null_terminator = :single_null)
+    # @param encode_options [Hash] Accepts the same option hash that may be passed to String#encode in Ruby
+    def read_arbitrary_wide_string_up_to(max_char_length = 512, null_terminator = :single_null, encode_options = {})
       if null_terminator != :single_null && null_terminator != :double_null
         raise _("Unable to read wide strings with %{null_terminator} terminal nulls") % { null_terminator: null_terminator }
       end
@@ -73,11 +77,11 @@ module Puppet::Util::Windows::APITypes
 
       # Look for a null terminating characters; if found, read up to that null (exclusive)
       (0...max_char_length - terminator_width).each do |i|
-        return read_wide_string(i) if send(reader_method, (i * 2)) == 0
+        return read_wide_string(i, Encoding::UTF_8, encode_options) if send(reader_method, (i * 2)) == 0
       end
 
       # String is longer than the max; read just to the max
-      read_wide_string(max_char_length)
+      read_wide_string(max_char_length, Encoding::UTF_8, encode_options)
     end
 
     def read_win32_local_pointer(&block)

data/locales/pdk.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: puppet development kit v0.5.0-90-g4f429f1\n"
+"Project-Id-Version: puppet development kit v1.0.1-51-g1a5f668\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
-"POT-Creation-Date: 2017-08-07 15:19+0100\n"
-"PO-Revision-Date: 2017-08-07 15:19+0100\n"
+"POT-Creation-Date: 2017-09-13 10:09-0700\n"
+"PO-Revision-Date: 2017-09-13 10:09-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -20,10 +20,10 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ../lib/pdk/answer_file.rb:56
-msgid "Answer file can only be updated with a Hash"
+msgid "Answer file can be updated only with a Hash"
 msgstr ""
 
-#: ../lib/pdk/answer_file.rb:83 ../lib/pdk/module/metadata.rb:50
+#: ../lib/pdk/answer_file.rb:83
 msgid "Unable to open '%{file}' for reading"
 msgstr ""
 
@@ -39,40 +39,44 @@ msgstr ""
 msgid "Unable to write '%{file}': %{msg}"
 msgstr ""
 
-#: ../lib/pdk/cli.rb:35
-msgid "Specifies the URL to the template to use when creating new modules, and other parts."
+#: ../lib/pdk/cli.rb:41
+msgid "Specifies the URL to the template to use when creating new modules or classes."
+msgstr ""
+
+#: ../lib/pdk/cli.rb:45
+msgid "When specified, skips interactive querying of metadata."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:40
+#: ../lib/pdk/cli.rb:50
 msgid "pdk command [options]"
 msgstr ""
 
-#: ../lib/pdk/cli.rb:41
+#: ../lib/pdk/cli.rb:51
 msgid "Puppet Development Kit"
 msgstr ""
 
-#: ../lib/pdk/cli.rb:42
+#: ../lib/pdk/cli.rb:52
 msgid "The shortest path to better modules."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:45
-msgid "show version of pdk"
+#: ../lib/pdk/cli.rb:55
+msgid "Show version of pdk."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:50
-msgid "show help for this command"
+#: ../lib/pdk/cli.rb:60
+msgid "Show help for this command."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:55
-msgid "Specify desired output format. Valid formats are '%{available_formats}'. You may also specify a file to which the formatted output will be directed, for example: '--format=junit:report.xml'. This option may be specified multiple times as long as each option specifies a distinct target file."
+#: ../lib/pdk/cli.rb:65
+msgid "Specify desired output format. Valid formats are '%{available_formats}'. You may also specify a file to which the formatted output is sent, for example: '--format=junit:report.xml'. This option may be specified multiple times if each option specifies a distinct target file."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:66
+#: ../lib/pdk/cli.rb:76
 msgid "Enable debug output."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:70
-msgid "Path to an answer file"
+#: ../lib/pdk/cli.rb:80
+msgid "Path to an answer file."
 msgstr ""
 
 #: ../lib/pdk/cli/bundle.rb:5
@@ -80,45 +84,85 @@ msgid "bundle -- [bundler_options]"
 msgstr ""
 
 #: ../lib/pdk/cli/bundle.rb:6
-msgid "escape hatch to bundler"
+msgid "(Experimental) Command pass-through to bundler"
 msgstr ""
 
 #: ../lib/pdk/cli/bundle.rb:7
-msgid "[experimental] For advanced users, this allows to run arbitrary commands in the bundler environment that the pdk manages. Careless use of this command can lead to errors later which can't be recovered by the pdk itself."
+msgid "[experimental] For advanced users, pdk bundle runs arbitrary commands in the bundler environment that pdk manages.Careless use of this command can lead to errors that pdk can't help recover from."
 msgstr ""
 
 #: ../lib/pdk/cli/errors.rb:6
-msgid "An unexpected error has occurred, try running the command again with --debug"
+msgid "An unexpected error has occurred. Try running the command again with --debug"
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:16
+#: ../lib/pdk/cli/exec.rb:17
 msgid "Unable to find `%{name}`. Check that it is installed and try again."
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:55
-msgid "PDK package installation not found, trying '%{fallback}' from the system PATH instead"
+#: ../lib/pdk/cli/exec.rb:56
+msgid "PDK package installation not found. Trying '%{fallback}' from the system PATH instead."
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:60
-msgid "Using '%{vendored_bin_path}' from PDK package"
+#: ../lib/pdk/cli/exec.rb:61
+msgid "Using '%{vendored_bin_path}' from PDK package."
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:63
-msgid "Could not find '%{vendored_bin_path}' in PDK package, trying '%{fallback}' from the system PATH instead"
+#: ../lib/pdk/cli/exec.rb:64
+msgid "Could not find '%{vendored_bin_path}' in PDK package. Trying '%{fallback}' from the system PATH instead."
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:97
-msgid "Expected execution context to be :system or :module but got '%{context}'"
+#: ../lib/pdk/cli/exec.rb:102
+msgid "Expected execution context to be :system or :module but got '%{context}'."
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:186
+#: ../lib/pdk/cli/exec.rb:166
+msgid "Current working directory is not part of a module. (No metadata.json was found.)"
+msgstr ""
+
+#: ../lib/pdk/cli/exec.rb:220
 msgid "Executing '%{command}'"
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:191
+#: ../lib/pdk/cli/exec.rb:222
+msgid "Command environment: GEM_HOME is '%{gem_home}' and GEM_PATH is '%{gem_path}'"
+msgstr ""
+
+#: ../lib/pdk/cli/exec.rb:229
 msgid "Failed to execute '%{command}': %{message}"
 msgstr ""
 
+#: ../lib/pdk/cli/exec.rb:243
+msgid "Execution of '%{command}' complete (duration: %{duration_in_seconds}s; exit code: %{exit_code})"
+msgstr ""
+
+#: ../lib/pdk/cli/module.rb:4
+msgid "module [options]"
+msgstr ""
+
+#: ../lib/pdk/cli/module.rb:5
+msgid "Perform administrative tasks on your module."
+msgstr ""
+
+#: ../lib/pdk/cli/module.rb:6
+msgid "Perform tasks on the module project."
+msgstr ""
+
+#: ../lib/pdk/cli/module/generate.rb:6
+msgid "generate [options] <module_name>"
+msgstr ""
+
+#: ../lib/pdk/cli/module/generate.rb:7
+msgid "This command is now 'pdk new module'."
+msgstr ""
+
+#: ../lib/pdk/cli/module/generate.rb:23
+msgid "New modules are created using the ‘pdk new module’ command."
+msgstr ""
+
+#: ../lib/pdk/cli/module/generate.rb:33 ../lib/pdk/cli/new/module.rb:27
+msgid "Creating new module: %{modname}"
+msgstr ""
+
 #: ../lib/pdk/cli/new.rb:5
 msgid "new <type> [options]"
 msgstr ""
@@ -128,11 +172,11 @@ msgid "create a new module, etc."
 msgstr ""
 
 #: ../lib/pdk/cli/new.rb:7
-msgid "Creates a new instance of <type> using the options relevant to that type of thing"
+msgid "Creates a new instance of <type> using relevant options."
 msgstr ""
 
 #: ../lib/pdk/cli/new/class.rb:4
-msgid "class [options] <class_name> [parameter[:type]] [parameter[:type]] ..."
+msgid "class [options] <class_name>"
 msgstr ""
 
 #: ../lib/pdk/cli/new/class.rb:5
@@ -143,30 +187,28 @@ msgstr ""
 msgid "'%{name}' is not a valid class name"
 msgstr ""
 
-#: ../lib/pdk/cli/new/module.rb:5
-msgid "module [options] <module_name> [target_dir]"
+#: ../lib/pdk/cli/new/defined_type.rb:4
+msgid "defined_type [options] <name>"
 msgstr ""
 
-#: ../lib/pdk/cli/new/module.rb:6
-msgid "Create a new module named <module_name> using given options"
+#: ../lib/pdk/cli/new/defined_type.rb:5
+msgid "Create a new defined type named <name> using given options"
 msgstr ""
 
-#: ../lib/pdk/cli/new/module.rb:10
-msgid "Specifies the license this module is written under. This should be a identifier from https://spdx.org/licenses/. Common values are 'Apache-2.0', 'MIT', or 'proprietary'."
+#: ../lib/pdk/cli/new/defined_type.rb:21
+msgid "'%{name}' is not a valid defined type name"
 msgstr ""
 
-#: ../lib/pdk/cli/new/module.rb:13
-msgid "When specified, skips interactive querying of metadata."
+#: ../lib/pdk/cli/new/module.rb:4
+msgid "module [options] <module_name> [target_dir]"
 msgstr ""
 
-#: ../lib/pdk/cli/new/module.rb:27
-msgid ""
-"'%{module_name}' is not a valid module name.\n"
-"Module names must begin with a lowercase letter and can only include lowercase letters, digits, and underscores."
+#: ../lib/pdk/cli/new/module.rb:5
+msgid "Create a new module named <module_name> using given options"
 msgstr ""
 
-#: ../lib/pdk/cli/new/module.rb:37
-msgid "Creating new module: %{modname}"
+#: ../lib/pdk/cli/new/module.rb:10
+msgid "Specifies the license this module is written under. This should be a identifier from https://spdx.org/licenses/. Common values are 'Apache-2.0', 'MIT', or 'proprietary'."
 msgstr ""
 
 #: ../lib/pdk/cli/test.rb:5
@@ -210,14 +252,18 @@ msgid "%{id}\t%{description}"
 msgstr ""
 
 #: ../lib/pdk/cli/util.rb:9
-msgid "This command must be run from inside a module (no metadata.json found)"
+msgid "This command must be run from inside a valid module (no metadata.json found)."
+msgstr ""
+
+#: ../lib/pdk/cli/util/command_redirector.rb:18
+msgid "Did you mean '%{command}'?"
 msgstr ""
 
 #: ../lib/pdk/cli/util/interview.rb:30
 msgid "[Q %{current_number}/%{questions_total}]"
 msgstr ""
 
-#: ../lib/pdk/cli/util/interview.rb:33
+#: ../lib/pdk/cli/util/interview.rb:34 ../lib/pdk/cli/util/interview.rb:43
 msgid "-->"
 msgstr ""
 
@@ -245,165 +291,191 @@ msgstr ""
 msgid "Non-standard data type '%{type}', make sure the type is available in your code, or dependencies"
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:7
+#: ../lib/pdk/cli/validate.rb:6
 msgid "validate [validators] [options] [targets]"
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:8
+#: ../lib/pdk/cli/validate.rb:7
 msgid "Run static analysis tests."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:9
+#: ../lib/pdk/cli/validate.rb:8
 msgid ""
-"Run metadata, puppet, or ruby validation.\n"
+"Run metadata, Puppet, or Ruby validation.\n"
 "\n"
-"[validators] is an optional comma separated list of validators to use. If not specified, all validators will be used.\n"
+"[validators] is an optional comma-separated list of validators to use. If not specified, all validators are used.\n"
 "\n"
-"[targets] is an optional space separated list of files or directories to be validated. If not specified, the validators will be run against all applicable files in the module."
+"[targets] is an optional space-separated list of files or directories to be validated. If not specified, validators are run against all applicable files in the module."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:17
-msgid "list all available validators"
+#: ../lib/pdk/cli/validate.rb:16
+msgid "List all available validators."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:18
-msgid "automatically correct problems (where possible)"
+#: ../lib/pdk/cli/validate.rb:17
+msgid "Automatically correct problems where possible."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:19
-msgid "run validations in parallel"
+#: ../lib/pdk/cli/validate.rb:18
+msgid "Run validations in parallel."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:32
+#: ../lib/pdk/cli/validate.rb:31
 msgid "Available validators: %{validator_names}"
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:48
-msgid "Unknown validator '%{v}'. Available validators: %{validators}"
+#: ../lib/pdk/cli/validate.rb:47
+msgid "Unknown validator '%{v}'. Available validators: %{validators}."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:58 ../lib/pdk/cli/validate.rb:62
+#: ../lib/pdk/cli/validate.rb:57 ../lib/pdk/cli/validate.rb:61
 msgid "Running all available validators..."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:24
+#: ../lib/pdk/cli/validate.rb:85
+msgid "Validating module using %{num_of_threads} threads"
+msgstr ""
+
+#: ../lib/pdk/generators/module.rb:37
+msgid ""
+"'%{module_name}' is not a valid module name.\n"
+"Module names must begin with a lowercase letter and can only include lowercase letters, digits, and underscores."
+msgstr ""
+
+#: ../lib/pdk/generators/module.rb:46
 msgid "The destination directory '%{dir}' already exists"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:34
+#: ../lib/pdk/generators/module.rb:60
 msgid "You do not have permission to write to '%{parent_dir}'"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:68
+#: ../lib/pdk/generators/module.rb:101
+msgid "Module '%{name}' generated at path '%{path}'."
+msgstr ""
+
+#: ../lib/pdk/generators/module.rb:102
+msgid "In your module directory, add classes with the 'pdk new class' command."
+msgstr ""
+
+#: ../lib/pdk/generators/module.rb:105
 msgid "Failed to move '%{source}' to '%{target}': %{message}"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:82
-msgid "Your username is not a valid Forge username, proceeding with the username %{username}. You can fix this afterwards in metadata.json."
+#: ../lib/pdk/generators/module.rb:119
+msgid "Your username is not a valid Forge username. Proceeding with the username %{username}. You can fix this later in metadata.json."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:121
+#: ../lib/pdk/generators/module.rb:159
 msgid "Unable to create directory '%{dir}': %{message}"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:133
-msgid "What is your Puppet Forge username?"
+#: ../lib/pdk/generators/module.rb:171
+msgid "If you have a Puppet Forge username, add it here."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:134
-msgid "This will be used when uploading your module to the Forge. You can opt out of this at any time."
+#: ../lib/pdk/generators/module.rb:172
+msgid "We can use this to upload your module to the Forge when it's complete."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:137
+#: ../lib/pdk/generators/module.rb:175
 msgid "Forge usernames can only contain lowercase letters and numbers"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:142
+#: ../lib/pdk/generators/module.rb:180
 msgid "What version is this module?"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:143
+#: ../lib/pdk/generators/module.rb:181
 msgid "Puppet uses Semantic Versioning (semver.org) to version modules."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:146
+#: ../lib/pdk/generators/module.rb:184
 msgid "Semantic Version numbers must be in the form MAJOR.MINOR.PATCH"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:151
+#: ../lib/pdk/generators/module.rb:189
 msgid "Who wrote this module?"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:152
-msgid "The person who gets credit for creating the module. "
+#: ../lib/pdk/generators/module.rb:190
+msgid "This is used to credit the module's author."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:158
+#: ../lib/pdk/generators/module.rb:196
 msgid "What license does this module code fall under?"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:159
+#: ../lib/pdk/generators/module.rb:197
 msgid "This should be an identifier from https://spdk.org/licenses/. Common values are \"Apache-2.0\", \"MIT\", or \"proprietary\"."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:165
-msgid "How would you describe this module in a single sentence?"
+#: ../lib/pdk/generators/module.rb:203
+msgid "What operating systems does this module support?"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:166
-msgid "To help other Puppet users understand what the module does."
+#: ../lib/pdk/generators/module.rb:204
+msgid "Use the up and down keys to move between the choices, space to select and enter to continue."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:172
-msgid "Where is this modules's source code repository?"
+#: ../lib/pdk/generators/module.rb:260
+msgid "Summarize the purpose of this module in a single sentence."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:173
-msgid "Usually a GitHub URL"
+#: ../lib/pdk/generators/module.rb:261
+msgid "This helps other Puppet users understand what the module does."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:179
-msgid "Where can others go to learn more about this module?"
+#: ../lib/pdk/generators/module.rb:267
+msgid "If there is a source code repository for this module, enter the URL here."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:180
-msgid "A web site that offers full information about your module."
+#: ../lib/pdk/generators/module.rb:268
+msgid "Skip this if no repository exists yet. You can update this later in the metadata.json."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:185
-msgid "Where can others go to file issues about this module?"
+#: ../lib/pdk/generators/module.rb:274
+msgid "If there is a URL where others can learn more about this module, enter it here."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:186
-msgid "A web site with a public bug tracker for your module."
+#: ../lib/pdk/generators/module.rb:275 ../lib/pdk/generators/module.rb:281
+msgid "Optional. You can update this later in the metadata.json."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:199
+#: ../lib/pdk/generators/module.rb:280
+msgid "If there is a public issue tracker for this module, enter its URL here."
+msgstr ""
+
+#: ../lib/pdk/generators/module.rb:294
 msgid ""
 "\n"
-"We need to create a metadata.json file for this module, so we're going to ask you %{count} quick questions.\n"
-"If the question is not applicable to this module, just leave the answer blank.\n"
+"We need to create a metadata.json file for this module, so we're going to ask you %{count} questions.\n"
+"If the question is not applicable to this module, accept the default option shown after each question. You can modify any answers at any time by manually updating the metadata.json file.\n"
 "\n"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:207
-msgid "Interview cancelled, not generating the module."
+#: ../lib/pdk/generators/module.rb:305 ../lib/pdk/generators/module.rb:327
+msgid "Interview cancelled; not generating the module."
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:217
+#: ../lib/pdk/generators/module.rb:316
 msgid "SUMMARY"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:223
+#: ../lib/pdk/generators/module.rb:323
 msgid "About to generate this module; continue?"
 msgstr ""
 
-#: ../lib/pdk/generators/module.rb:224
+#: ../lib/pdk/generators/module.rb:324
+msgid "Answer \"Y\" to continue or \"n\" to cancel."
+msgstr ""
+
+#: ../lib/pdk/generators/module.rb:332
 msgid "Module not generated."
 msgstr ""
 
 #: ../lib/pdk/generators/puppet_object.rb:88
-msgid "Unable to generate class, '%{file}' already exists."
+msgid "Unable to generate %{object_type}; '%{file}' already exists."
 msgstr ""
 
 #: ../lib/pdk/generators/puppet_object.rb:118
@@ -423,7 +495,7 @@ msgid "No %{dir_type} template specified; trying next template directory."
 msgstr ""
 
 #: ../lib/pdk/generators/puppet_object.rb:168
-msgid "Unable to find a %{type} template in %{url}, trying next template directory"
+msgid "Unable to find a %{type} template in %{url}; trying next template directory."
 msgstr ""
 
 #: ../lib/pdk/generators/puppet_object.rb:170
@@ -434,134 +506,178 @@ msgstr ""
 msgid "'%{dir}' does not contain valid Puppet module metadata: %{msg}"
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:46
-msgid "'%{file}' does not exist or is not a file"
+#: ../lib/pdk/module/metadata.rb:47
+msgid "'%{file}' does not exist or is not a file."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:56
+#: ../lib/pdk/module/metadata.rb:51
+msgid "Unable to open '%{file}' for reading."
+msgstr ""
+
+#: ../lib/pdk/module/metadata.rb:57
 msgid "Invalid JSON in metadata.json: %{msg}"
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:53
-msgid "Unable to clone git repository '%{repo}' to '%{dest}'"
+#: ../lib/pdk/module/metadata.rb:93
+msgid "Field must be a dash-separated user name and module name."
+msgstr ""
+
+#: ../lib/pdk/module/metadata.rb:95
+msgid "Module name must contain only alphanumeric or underscore characters."
+msgstr ""
+
+#: ../lib/pdk/module/metadata.rb:97
+msgid "Module name must begin with a letter."
+msgstr ""
+
+#: ../lib/pdk/module/metadata.rb:99
+msgid "Namespace must contain only alphanumeric characters."
+msgstr ""
+
+#: ../lib/pdk/module/metadata.rb:102
+msgid "Invalid 'name' field in metadata.json: %{err}"
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:107
+#: ../lib/pdk/module/templatedir.rb:55
+msgid "Unable to clone git repository '%{repo}' to '%{dest}'."
+msgstr ""
+
+#: ../lib/pdk/module/templatedir.rb:111
 msgid "Rendering '%{template}'..."
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:113
+#: ../lib/pdk/module/templatedir.rb:117
 msgid ""
 "Failed to render template '%{template}'\n"
 "%{exception}: %{message}"
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:177
-msgid "The specified template '%{path}' is not a directory"
+#: ../lib/pdk/module/templatedir.rb:181
+msgid "The specified template '%{path}' is not a directory."
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:181
-msgid "The template at '%{path}' does not contain a moduleroot directory"
+#: ../lib/pdk/module/templatedir.rb:185
+msgid "The template at '%{path}' does not contain a 'moduleroot/' directory."
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:225
+#: ../lib/pdk/module/templatedir.rb:229
 msgid "'%{file}' is not a valid YAML file: %{message}"
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:162
-msgid "file not specified"
+#: ../lib/pdk/report/event.rb:175
+msgid "File not specified."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:166
-msgid "file must be a String"
+#: ../lib/pdk/report/event.rb:179
+msgid "File must be a String."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:197
-msgid "state not specified"
+#: ../lib/pdk/report/event.rb:212
+msgid "State not specified."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:202
-msgid "state must be a Symbol, not %{type}"
+#: ../lib/pdk/report/event.rb:217
+msgid "State must be a Symbol, not %{type}"
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:207
-msgid "Invalid state %{state}, valid states are: %{valid}"
+#: ../lib/pdk/report/event.rb:222
+msgid "Invalid state %{state}. Valid states are: %{valid}."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:226
-msgid "source not specified"
+#: ../lib/pdk/report/event.rb:241
+msgid "Source not specified."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:247
-msgid "line must be an Integer or a String representation of an Integer"
+#: ../lib/pdk/report/event.rb:262
+msgid "Line must be an Integer or a String representation of an Integer."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:251
-msgid "the line number can only contain the digits 0-9"
+#: ../lib/pdk/report/event.rb:266
+msgid "The line number can contain only the digits 0-9."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:272
-msgid "column must be an Integer or a String representation of an Integer"
+#: ../lib/pdk/report/event.rb:287
+msgid "Column must be an Integer or a String representation of an Integer."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:276
-msgid "the column number can only contain the digits 0-9"
+#: ../lib/pdk/report/event.rb:291
+msgid "The column number can contain only the digits 0-9."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:294
-msgid "trace must be an Array of stack trace lines"
+#: ../lib/pdk/report/event.rb:309
+msgid "Trace must be an Array of stack trace lines."
 msgstr ""
 
 #: ../lib/pdk/template_file.rb:62
 msgid "'%{template}' is not a readable file"
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:32
-msgid "Running unit tests in parallel"
+#: ../lib/pdk/tests/unit.rb:46
+msgid "Cleaning up after running unit tests."
+msgstr ""
+
+#: ../lib/pdk/tests/unit.rb:50
+msgid "The spec_clean rake task failed with the following error(s):"
+msgstr ""
+
+#: ../lib/pdk/tests/unit.rb:51
+msgid "Failed to clean up after running unit tests"
+msgstr ""
+
+#: ../lib/pdk/tests/unit.rb:55
+msgid "Preparing to run the unit tests."
+msgstr ""
+
+#: ../lib/pdk/tests/unit.rb:59
+msgid "The spec_prep rake task failed with the following error(s):"
+msgstr ""
+
+#: ../lib/pdk/tests/unit.rb:60
+msgid "Failed to prepare to run the unit tests."
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:32
-msgid "Running unit tests"
+#: ../lib/pdk/tests/unit.rb:70
+msgid "Running unit tests in parallel."
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:37
-msgid "Running %{cmd}"
+#: ../lib/pdk/tests/unit.rb:70
+msgid "Running unit tests."
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:52
+#: ../lib/pdk/tests/unit.rb:84
 msgid "Unit test output did not contain a valid JSON result: %{output}"
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:102
-msgid "Evaluated %{total} tests in %{duration} seconds: %{failures} failures, %{pending} pending"
+#: ../lib/pdk/tests/unit.rb:136
+msgid "Evaluated %{total} tests in %{duration} seconds: %{failures} failures, %{pending} pending."
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:159
+#: ../lib/pdk/tests/unit.rb:193
 msgid "Failed to find valid JSON in output from rspec: %{output}"
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:164
+#: ../lib/pdk/tests/unit.rb:198
 msgid "Unable to enumerate examples. rspec reported: %{message}"
 msgstr ""
 
 #: ../lib/pdk/util.rb:47
-msgid "Cannot resolve a full path to '%{path}' as it does not currently exist"
+msgid "Cannot resolve a full path to '%{path}', as it does not currently exist."
 msgstr ""
 
 #: ../lib/pdk/util.rb:67
-msgid "Package basedir requested for non-package install"
+msgid "Package basedir requested for non-package install."
 msgstr ""
 
 #: ../lib/pdk/util/bundler.rb:15
-msgid "Bundle has already been installed, skipping run"
+msgid "Bundle has already been installed. Skipping run."
 msgstr ""
 
 #: ../lib/pdk/util/bundler.rb:20
-msgid "No Gemfile found in '%{cwd}', skipping bundler management"
+msgid "No Gemfile found in '%{cwd}'. Skipping bundler management."
 msgstr ""
 
 #: ../lib/pdk/util/bundler.rb:31
-msgid "No Gemfile.lock found in module, using vendored Gemfile.lock from '%{source}'"
+msgid "No Gemfile.lock found in module. Using vendored Gemfile.lock from '%{source}'."
 msgstr ""
 
 #: ../lib/pdk/util/bundler.rb:37
@@ -580,48 +696,66 @@ msgstr ""
 msgid "Checking for missing Gemfile dependencies."
 msgstr ""
 
-#: ../lib/pdk/util/bundler.rb:94
-msgid "Resolving Gemfile dependencies"
+#: ../lib/pdk/util/bundler.rb:93
+msgid "Resolving Gemfile dependencies."
 msgstr ""
 
-#: ../lib/pdk/util/bundler.rb:112
-msgid "Installing missing Gemfile dependencies"
+#: ../lib/pdk/util/bundler.rb:110
+msgid "Installing missing Gemfile dependencies."
 msgstr ""
 
-#: ../lib/pdk/util/bundler.rb:134
-msgid "Failed to generate binstubs for %{gems}"
+#: ../lib/pdk/util/bundler.rb:131
+msgid ""
+"Failed to generate binstubs for '%{gems}':\n"
+"%{output}"
 msgstr ""
 
-#: ../lib/pdk/validators/base_validator.rb:46
+#: ../lib/pdk/validators/base_validator.rb:72
 msgid "Invoking %{cmd}"
 msgstr ""
 
+#: ../lib/pdk/validators/base_validator.rb:77
+msgid "%{validator}: Skipped '%{target}'. Target does not contain any files to validate (%{pattern})."
+msgstr ""
+
+#: ../lib/pdk/validators/base_validator.rb:81
+msgid "Target does not contain any files to validate (%{pattern})."
+msgstr ""
+
+#: ../lib/pdk/validators/base_validator.rb:90
+msgid "%{validator}: Skipped '%{target}'. Target file not found."
+msgstr ""
+
+#: ../lib/pdk/validators/base_validator.rb:94
+msgid "File does not exist."
+msgstr ""
+
 #: ../lib/pdk/validators/metadata/metadata_json_lint.rb:23
-msgid "Checking metadata style (%{targets})"
+msgid "Checking metadata style (%{targets})."
 msgstr ""
 
-#: ../lib/pdk/validators/metadata/metadata_syntax.rb:18
-msgid "Checking metadata syntax (%{targets})"
+#: ../lib/pdk/validators/metadata/metadata_json_lint.rb:40
+msgid "More than 1 target provided to PDK::Validate::MetadataJSONLint."
 msgstr ""
 
-#: ../lib/pdk/validators/metadata/metadata_syntax.rb:65
-msgid "not a file"
+#: ../lib/pdk/validators/metadata/metadata_syntax.rb:18
+msgid "Checking metadata syntax (%{targets})."
 msgstr ""
 
-#: ../lib/pdk/validators/metadata/metadata_syntax.rb:77
-msgid "could not be read"
+#: ../lib/pdk/validators/metadata/metadata_syntax.rb:69
+msgid "Could not be read."
 msgstr ""
 
 #: ../lib/pdk/validators/puppet/puppet_lint.rb:22
-msgid "Checking Puppet manifest style"
+msgid "Checking Puppet manifest style (%{pattern})."
 msgstr ""
 
 #: ../lib/pdk/validators/puppet/puppet_syntax.rb:21
-msgid "Checking Puppet manifest syntax"
+msgid "Checking Puppet manifest syntax (%{pattern})."
 msgstr ""
 
-#: ../lib/pdk/validators/ruby/rubocop.rb:20
-msgid "Checking Ruby code style"
+#: ../lib/pdk/validators/ruby/rubocop.rb:24
+msgid "Checking Ruby code style (%{pattern})."
 msgstr ""
 
 #: ../lib/puppet/util/windows/api_types.rb:68