pdk 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27c6740e4512862534ffb7115a59480b99262894
-  data.tar.gz: 65fc2bd610787535d368cb6c2b36fefcf3aef761
+  metadata.gz: c70ec79ec06dd3379aa08d51a34733b3794e5b41
+  data.tar.gz: f8c3a460c65a788e9ec44332530fc2a815060bee
 SHA512:
-  metadata.gz: 9b9849bee4bf285549e04176801b38a9aa3495b3caa9a70c39117fd62f31b831776b9c246e978aa58b6a576756360c8e7f414d803aa88dfd61f47dec501b0c3a
-  data.tar.gz: 5563dca3dc8a84721c04430cd337d3b221874e2cf7d007e25285a068b79419f143458d97e7d10ccb257c750daa0a119b474d7997c32adb3bf70203875dc14bcb
+  metadata.gz: 6e7376cf631ca56e6058619b772bd3a0f08b31aa356842cce3d90c56570fb8d65357217913cf63c6c5d873d0f153bc8f149449a19333570ca77ec8295e79821a
+  data.tar.gz: 56afeb93fa8928de3e9a2305f9b29937ecdc0c17323d7b1a8a55fdb64838c302f6ab24cad0be3bf5c5932ddf6c5618924b9238bb102c3d39fc424341fb18cddc

data/CHANGELOG.md

@@ -4,6 +4,43 @@ 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.6.1](https://github.com/puppetlabs/pdk/tree/v1.6.1) (2018-07-25)
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.6.0...v1.6.1)
+
+**Implemented enhancements:**
+
+- PDK `test unit` should cache downloaded modules [\#339](https://github.com/puppetlabs/pdk/issues/339)
+
+**Fixed bugs:**
+
+- acceptance tests message bundler: command not found: rspec [\#535](https://github.com/puppetlabs/pdk/issues/535)
+- PDK 1.6.0: parallel\_spec causes Puppet coverage reports to change badly [\#531](https://github.com/puppetlabs/pdk/issues/531)
+- Support for deep directory structure in templates [\#445](https://github.com/puppetlabs/pdk/issues/445)
+- \(PDK-1046\) Improve handling of unexpected errors from puppet parser. [\#541](https://github.com/puppetlabs/pdk/pull/541) ([bmjen](https://github.com/bmjen))
+- Correct template path filter logic to only include regular files [\#524](https://github.com/puppetlabs/pdk/pull/524) ([nabertrand](https://github.com/nabertrand))
+
+**Closed issues:**
+
+- r10k puppetfile install return r10k/cli \(LoadError\) [\#534](https://github.com/puppetlabs/pdk/issues/534)
+- PDK 1.6.0: c.hiera\_config double quotes creates rubocop warning [\#530](https://github.com/puppetlabs/pdk/issues/530)
+- PDK should support integration testing [\#481](https://github.com/puppetlabs/pdk/issues/481)
+
+**Merged pull requests:**
+
+- \(PDK-1088\) Remove unnecessary file enumeration loop during PDK build [\#553](https://github.com/puppetlabs/pdk/pull/553) ([scotje](https://github.com/scotje))
+- \(PDK-1076\) Change version to 1.6.1.pre [\#552](https://github.com/puppetlabs/pdk/pull/552) ([rodjek](https://github.com/rodjek))
+- \(PDK-1073\) Fix gem bin paths for CLI::Exec managed subprocesses [\#551](https://github.com/puppetlabs/pdk/pull/551) ([scotje](https://github.com/scotje))
+- Set up issues templates for bug reports and feature requests [\#550](https://github.com/puppetlabs/pdk/pull/550) ([scotje](https://github.com/scotje))
+- \(PDK-1045\) Send validation targets as relative file paths [\#549](https://github.com/puppetlabs/pdk/pull/549) ([bmjen](https://github.com/bmjen))
+- \(PDK-1067\) Ensure rspec-core binstubs are created for `pdk test unit` [\#546](https://github.com/puppetlabs/pdk/pull/546) ([scotje](https://github.com/scotje))
+- \(PDK-1041\) Improve handling of errors from PDK::Module::TemplateDir [\#545](https://github.com/puppetlabs/pdk/pull/545) ([rodjek](https://github.com/rodjek))
+- \(PDK-1053\) Print validator output on parse\_output failure [\#543](https://github.com/puppetlabs/pdk/pull/543) ([rodjek](https://github.com/rodjek))
+- \(PDK-1051\) Expose rspec-puppet coverage results to PDK [\#539](https://github.com/puppetlabs/pdk/pull/539) ([rodjek](https://github.com/rodjek))
+- \(PDK-1048\) Improve docs for `pdk test unit --verbose` [\#537](https://github.com/puppetlabs/pdk/pull/537) ([rodjek](https://github.com/rodjek))
+- \(PDK-1061\) Ensure rake binstub when building module [\#536](https://github.com/puppetlabs/pdk/pull/536) ([rodjek](https://github.com/rodjek))
+- \(PDK-925\) Exclude files in spec/fixtures from globbed validation targets [\#532](https://github.com/puppetlabs/pdk/pull/532) ([rodjek](https://github.com/rodjek))
+- \(maint\) Bump version for next dev cycle [\#529](https://github.com/puppetlabs/pdk/pull/529) ([bmjen](https://github.com/bmjen))
+
 ## [v1.6.0](https://github.com/puppetlabs/pdk/tree/v1.6.0) (2018-06-20)
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.5.0...v1.6.0)
 
@@ -33,6 +70,8 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 
 **Merged pull requests:**
 
+- \(maint\) Handle tagged template-refs [\#527](https://github.com/puppetlabs/pdk/pull/527) ([rodjek](https://github.com/rodjek))
+- Release 1.6.0 [\#526](https://github.com/puppetlabs/pdk/pull/526) ([bmjen](https://github.com/bmjen))
 - \(maint\) Switch package-testing to install from build\_data\_url. [\#522](https://github.com/puppetlabs/pdk/pull/522) ([bmjen](https://github.com/bmjen))
 - CI cleanups [\#507](https://github.com/puppetlabs/pdk/pull/507) ([DavidS](https://github.com/DavidS))
 - Ensure that the report.txt ends with a newline [\#501](https://github.com/puppetlabs/pdk/pull/501) ([DavidS](https://github.com/DavidS))
@@ -708,4 +747,4 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/lib/pdk/cli/exec.rb

@@ -141,7 +141,7 @@ module PDK
             @process.environment['PATH'] = [
               PDK::Util::RubyVersion.bin_path,
               File.join(@process.environment['GEM_HOME'], 'bin'),
-              File.join(@process.environment['GEM_PATH'], '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,

data/lib/pdk/cli/test/unit.rb

@@ -10,7 +10,7 @@ module PDK::CLI
     PDK::CLI.puppet_version_options(self)
     flag nil, :list, _('List all available unit test files.')
     flag nil, :parallel, _('Run unit tests in parallel.')
-    flag :v, :verbose, _('More verbose output. Displays examples in each unit test file.')
+    flag :v, :verbose, _('More verbose --list output. Displays a list of examples in each unit test file.')
     flag :c, 'clean-fixtures', _('Clean up downloaded fixtures after the test run.')
 
     option nil, :tests, _('Specify a comma-separated list of unit test files to run.'), argument: :required, default: '' do |values|
@@ -53,6 +53,8 @@ module PDK::CLI
           end
         end
       else
+        PDK.logger.info _('--verbose has no effect when not used with --list') if opts[:verbose]
+
         report = PDK::Report.new
         report_formats = if opts[:format]
                            PDK::CLI::Util::OptionNormalizer.report_formats(opts[:format])

data/lib/pdk/generate/module.rb

@@ -54,18 +54,22 @@ module PDK
 
         template_url = opts.fetch(:'template-url', PDK::Util.default_template_url)
 
-        PDK::Module::TemplateDir.new(template_url, metadata.data, true) do |templates|
-          templates.render do |file_path, file_content|
-            file = Pathname.new(temp_target_dir) + file_path
-            file.dirname.mkpath
-            file.write(file_content)
-          end
+        begin
+          PDK::Module::TemplateDir.new(template_url, metadata.data, true) do |templates|
+            templates.render do |file_path, file_content|
+              file = Pathname.new(temp_target_dir) + file_path
+              file.dirname.mkpath
+              file.write(file_content)
+            end
 
-          # Add information about the template used to generate the module to the
-          # metadata (for a future update command).
-          metadata.update!(templates.metadata)
+            # Add information about the template used to generate the module to the
+            # metadata (for a future update command).
+            metadata.update!(templates.metadata)
 
-          metadata.write!(File.join(temp_target_dir, 'metadata.json'))
+            metadata.write!(File.join(temp_target_dir, 'metadata.json'))
+          end
+        rescue ArgumentError => e
+          raise PDK::CLI::ExitWithError, e
         end
 
         if template_url == PDK::Util.puppetlabs_template_url

data/lib/pdk/generate/puppet_object.rb

@@ -224,6 +224,8 @@ module PDK
             end
           end
         end
+      rescue ArgumentError => e
+        raise PDK::CLI::ExitWithError, e
       end
 
       # Provides the possible template directory locations in the order in

data/lib/pdk/module/build.rb

@@ -88,6 +88,9 @@ module PDK
       #
       # @return nil
       def cleanup_module
+        PDK::Util::Bundler.ensure_bundle!
+        PDK::Util::Bundler.ensure_binstubs!('rake')
+
         PDK::Test::Unit.tear_down
       end
 
@@ -196,22 +199,24 @@ module PDK
       #
       # @return [PathSpec] The populated ignore path matcher.
       def ignored_files
-        @ignored_files ||= if ignore_file.nil?
-                             PathSpec.new
-                           else
-                             fd = File.open(ignore_file, 'rb:UTF-8')
-                             data = fd.read
-                             fd.close
-
-                             PathSpec.new(data)
-                           end
-
-        # Also ignore the target directory if it is in the module dir and not already ignored
-        if Find.find(@module_dir).include?(target_dir) && !@ignored_files.match(File.basename(target_dir) + '/')
-          @ignored_files = @ignored_files.add("\/#{File.basename(target_dir)}\/")
-        end
-
-        @ignored_files
+        @ignored_files ||=
+          begin
+            ignored = if ignore_file.nil?
+                        PathSpec.new
+                      else
+                        fd = File.open(ignore_file, 'rb:UTF-8')
+                        data = fd.read
+                        fd.close
+
+                        PathSpec.new(data)
+                      end
+
+            if File.realdirpath(target_dir).start_with?(File.realdirpath(module_dir))
+              ignored = ignored.add("\/#{File.basename(target_dir)}\/")
+            end
+
+            ignored
+          end
       end
     end
   end

data/lib/pdk/module/convert.rb

@@ -94,6 +94,8 @@ module PDK
             end
           end
         end
+      rescue ArgumentError => e
+        raise PDK::CLI::ExitWithError, e
       end
 
       def update_manager

data/lib/pdk/module/templatedir.rb

@@ -185,18 +185,23 @@ module PDK
       #
       # @api private
       def validate_module_template!
+        # rubocop:disable Style/GuardClause
         unless File.directory?(@path)
-          raise ArgumentError, _("The specified template '%{path}' is not a directory.") % { path: @path }
+          if PDK::Util.package_install? && File.fnmatch?(File.join(PDK::Util.package_cachedir, '*'), @path)
+            raise ArgumentError, _('The built-in template has substantially changed. Please run "pdk convert" on your module to continue.')
+          else
+            raise ArgumentError, _("The specified template '%{path}' is not a directory.") % { path: @path }
+          end
         end
 
         unless File.directory?(@moduleroot_dir)
           raise ArgumentError, _("The template at '%{path}' does not contain a 'moduleroot/' directory.") % { path: @path }
         end
 
-        unless File.directory?(@moduleroot_init) # rubocop:disable Style/GuardClause
+        unless File.directory?(@moduleroot_init)
           # rubocop:disable Metrics/LineLength
           raise ArgumentError, _("The template at '%{path}' does not contain a 'moduleroot_init/' directory, which indicates you are using an older style of template. Before continuing please use the --template-url flag when running the pdk new commands to pass a new style template.") % { path: @path }
-          # rubocop:enable Metrics/LineLength
+          # rubocop:enable Metrics/LineLength Style/GuardClause
         end
       end
 
@@ -212,18 +217,15 @@ module PDK
         dirs.each do |dir|
           raise ArgumentError, _("The directory '%{dir}' doesn't exist") % { dir: dir } unless Dir.exist?(dir)
           temp_paths += Dir.glob(File.join(dir, '**', '*'), File::FNM_DOTMATCH).select do |template_path|
-            File.file?(template_path) && !File.symlink?(template_path)
-            dirlocs << dir
+            if File.file?(template_path) && !File.symlink?(template_path)
+              dirlocs << dir
+            end
           end
           temp_paths.map do |template_path|
             template_path.sub!(%r{\A#{Regexp.escape(dir)}#{Regexp.escape(File::SEPARATOR)}}, '')
           end
         end
-        template_paths = Hash[temp_paths.zip dirlocs]
-        template_paths.delete('.')
-        template_paths.delete('spec')
-        template_paths.delete('spec/.')
-        template_paths
+        Hash[temp_paths.zip dirlocs]
       end
 
       # Generate a hash of data to be used when rendering the specified

data/lib/pdk/report.rb

@@ -93,13 +93,19 @@ module PDK
     def write_text(target = self.class.default_target)
       # Open a File Object for IO if target is a string containing a filename or path
       target = File.open(target, 'w') if target.is_a? String
+      coverage_report = nil
 
       events.each do |_tool, tool_events|
         tool_events.each do |event|
-          target.puts(event.to_text) unless event.pass?
+          if event.rspec_puppet_coverage?
+            coverage_report = event.to_text
+          else
+            target.puts(event.to_text) unless event.pass?
+          end
         end
       end
     ensure
+      target.puts "\n#{coverage_report}" if coverage_report
       target.close if target.is_a? File
     end
   end

data/lib/pdk/report/event.rb

@@ -88,10 +88,26 @@ module PDK
         state == :skipped
       end
 
+      # Checks if the event stores the result of an rspec-puppet coverage
+      # check.
+      #
+      # Due to the implementation details of this check, the `file` value for
+      # this event will always point to the coverage.rb file in rspec-puppet,
+      # making it easy to filter out.
+      #
+      # @return [Boolean] true if the event contains rspec-puppet coverage
+      #   results.
+      def rspec_puppet_coverage?
+        @rspec_puppet_coverage_pattern ||= File.join('**', 'lib', 'rspec-puppet', 'coverage.rb')
+        source == 'rspec' && File.fnmatch?(@rspec_puppet_coverage_pattern, File.expand_path(file))
+      end
+
       # Renders the event in a clang style text format.
       #
       # @return [String] The rendered event.
       def to_text
+        return message if rspec_puppet_coverage?
+
         location = [file, line, column].compact.join(':')
         location = nil if location.empty?
 

data/lib/pdk/tests/unit.rb

@@ -64,7 +64,7 @@ module PDK
       end
 
       def self.invoke(report, options = {})
-        PDK::Util::Bundler.ensure_binstubs!('rake')
+        PDK::Util::Bundler.ensure_binstubs!('rake', 'rspec-core')
 
         setup
 

data/lib/pdk/util/ruby_version.rb

@@ -6,7 +6,7 @@ module PDK
       class << self
         extend Forwardable
 
-        def_delegators :instance, :gem_path, :gem_home, :available_puppet_versions, :bin_path
+        def_delegators :instance, :gem_path, :gem_paths_raw, :gem_home, :available_puppet_versions, :bin_path
 
         attr_reader :instance
 
@@ -72,7 +72,7 @@ module PDK
         end
       end
 
-      def gem_path
+      def gem_paths_raw
         if PDK::Util.package_install?
           # Subprocesses use their own set of gems which are managed by pdk or
           # installed with the package. We also include the separate gem path
@@ -81,16 +81,20 @@ module PDK
             File.join(PDK::Util.pdk_package_basedir, 'private', 'ruby', ruby_version, 'lib', 'ruby', 'gems', versions[ruby_version]),
             File.join(PDK::Util.package_cachedir, 'ruby', versions[ruby_version]),
             File.join(PDK::Util.pdk_package_basedir, 'private', 'puppet', 'ruby', versions[ruby_version]),
-          ].join(File::PATH_SEPARATOR)
+          ]
         else
           # This allows the subprocess to find the 'bundler' gem, which isn't
           # in GEM_HOME for gem installs.
           # TODO: There must be a better way to do this than shelling out to
           # gem... Perhaps can be replaced with "Gem.path"?
-          File.absolute_path(File.join(`gem which bundler`, '..', '..', '..', '..'))
+          [File.absolute_path(File.join(`gem which bundler`, '..', '..', '..', '..'))]
         end
       end
 
+      def gem_path
+        gem_paths_raw.join(File::PATH_SEPARATOR)
+      end
+
       def gem_home
         # `bundle install --path` ignores all "system" installed gems and
         # causes unnecessary package installs. `bundle install` (without

data/lib/pdk/validate.rb

@@ -7,5 +7,7 @@ module PDK
     def self.validators
       @validators ||= [MetadataValidator, PuppetValidator, RubyValidator].freeze
     end
+
+    class ParseOutputError < StandardError; end
   end
 end

data/lib/pdk/validate/base_validator.rb

@@ -36,14 +36,23 @@ module PDK
                     options[:targets]
                   end
 
+        fixtures_pattern = File.join('**', 'spec', 'fixtures', '**', '*')
         targets.map! { |r| r.gsub(File::ALT_SEPARATOR, File::SEPARATOR) } if File::ALT_SEPARATOR
         skipped = []
         invalid = []
         matched = targets.map { |target|
           if respond_to?(:pattern)
             if File.directory?(target)
-              pattern_glob = Array(pattern).map { |p| Dir.glob(File.join(PDK::Util.module_root, p)) }
-              target_list = pattern_glob.flatten.select { |file| File.fnmatch(File.join(File.expand_path(target), '*'), file) }
+              target_root = PDK::Util.module_root
+              pattern_glob = Array(pattern).map { |p| Dir.glob(File.join(target_root, p)) }
+              pattern_glob = pattern_glob.flatten.reject { |file| File.fnmatch(fixtures_pattern, file) }
+
+              target_list = pattern_glob.map do |file|
+                if File.fnmatch(File.join(File.expand_path(target), '*'), file)
+                  Pathname.new(file).relative_path_from(Pathname.new(PDK::Util.module_root)).to_s
+                end
+              end
+
               skipped << target if target_list.flatten.empty?
               target_list
             elsif File.file?(target)
@@ -126,7 +135,7 @@ module PDK
         exit_codes = []
 
         targets.each do |invokation_targets|
-          cmd_argv = parse_options(options, invokation_targets).unshift(cmd_path)
+          cmd_argv = parse_options(options, invokation_targets).unshift(cmd_path).compact
           cmd_argv.unshift(File.join(PDK::Util::RubyVersion.bin_path, 'ruby.exe'), '-W0') if Gem.win_platform?
 
           command = PDK::CLI::Exec::Command.new(*cmd_argv).tap do |c|
@@ -145,14 +154,23 @@ module PDK
           if options[:split_exec]
             options[:split_exec].register do
               result = command.execute!
-              parse_output(report, result, invokation_targets)
+
+              begin
+                parse_output(report, result, invokation_targets.compact)
+              rescue PDK::Validate::ParseOutputError => e
+                $stderr.puts e.message
+              end
               result[:exit_code]
             end
           else
             result = command.execute!
             exit_codes << result[:exit_code]
 
-            parse_output(report, result, invokation_targets)
+            begin
+              parse_output(report, result, invokation_targets.compact)
+            rescue PDK::Validate::ParseOutputError => e
+              $stderr.puts e.message
+            end
           end
         end
 

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

@@ -49,14 +49,7 @@ module PDK
           begin
             json_data = JSON.parse(result[:stdout])
           rescue JSON::ParserError
-            report.add_event(
-              file:     targets.first,
-              source:   name,
-              state:    :error,
-              severity: :error,
-              message:  result[:stdout],
-            )
-            return
+            raise PDK::Validate::ParseOutputError, result[:stdout]
           end
         end
 

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

@@ -34,7 +34,7 @@ module PDK
         begin
           json_data = JSON.parse(result[:stdout]).flatten
         rescue JSON::ParserError
-          json_data = []
+          raise PDK::Validate::ParseOutputError, result[:stdout]
         end
 
         # puppet-lint does not include files without problems in its JSON

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

@@ -14,6 +14,7 @@ module PDK
       #   - "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>.+?)
@@ -62,7 +63,7 @@ module PDK
         # 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] == target } }.each do |target|
+        targets.reject { |target| results_data.any? { |j| j[:file] =~ %r{#{target}} } }.each do |target|
           report.add_event(
             file:     target,
             source:   name,
@@ -84,10 +85,16 @@ module PDK
           state:  :failure,
         }
 
-        attributes = offense.match(PUPPET_SYNTAX_PATTERN)
+        if offense.match(PUPPET_LOGGER_PREFIX)
+          attributes = offense.match(PUPPET_SYNTAX_PATTERN)
 
-        attributes.names.each do |name|
-          offense_data[name.to_sym] = attributes[name] unless attributes[name].nil?
+          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

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

@@ -40,7 +40,7 @@ module PDK
         begin
           json_data = JSON.parse(result[:stdout])
         rescue JSON::ParserError
-          json_data = {}
+          raise PDK::Validate::ParseOutputError, result[:stdout]
         end
 
         return unless json_data.key?('files')

data/lib/pdk/version.rb

@@ -1,4 +1,4 @@
 module PDK
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.1'.freeze
   TEMPLATE_REF = VERSION
 end

data/locales/pdk.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: puppet development kit v1.5.0-43-ga5c5c15\n"
+"Project-Id-Version: puppet development kit v1.6.0-37-g9a9b458\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
-"POT-Creation-Date: 2018-06-20 21:35-0700\n"
-"PO-Revision-Date: 2018-06-20 21:35-0700\n"
+"POT-Creation-Date: 2018-07-25 13:54+1000\n"
+"PO-Revision-Date: 2018-07-25 13:54+1000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -392,7 +392,7 @@ msgid "Run unit tests in parallel."
 msgstr ""
 
 #: ../lib/pdk/cli/test/unit.rb:13
-msgid "More verbose output. Displays examples in each unit test file."
+msgid "More verbose --list output. Displays a list of examples in each unit test file."
 msgstr ""
 
 #: ../lib/pdk/cli/test/unit.rb:14
@@ -419,6 +419,10 @@ msgstr ""
 msgid "\t%{id}\t%{description}"
 msgstr ""
 
+#: ../lib/pdk/cli/test/unit.rb:56
+msgid "--verbose has no effect when not used with --list"
+msgstr ""
+
 #: ../lib/pdk/cli/update.rb:7
 msgid "update [options]"
 msgstr ""
@@ -570,123 +574,123 @@ msgstr ""
 msgid "You do not have permission to write to '%{parent_dir}'"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:83
+#: ../lib/pdk/generate/module.rb:87
 msgid "Module '%{name}' generated at path '%{path}', from template '%{template_url}'."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:84
+#: ../lib/pdk/generate/module.rb:88
 msgid "In your module directory, add classes with the 'pdk new class' command."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:87
+#: ../lib/pdk/generate/module.rb:91
 msgid "Failed to move '%{source}' to '%{target}': %{message}"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:101
+#: ../lib/pdk/generate/module.rb:105
 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/generate/module.rb:142
+#: ../lib/pdk/generate/module.rb:146
 msgid "Unable to create directory '%{dir}': %{message}"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:154
+#: ../lib/pdk/generate/module.rb:158
 msgid "If you have a name for your module, add it here."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:155
+#: ../lib/pdk/generate/module.rb:159
 msgid "This is the name that will be associated with your module, it should be relevant to the modules content."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:158
+#: ../lib/pdk/generate/module.rb:162
 msgid "Module names must begin with a lowercase letter and can only include lowercase letters, numbers, and underscores."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:162
+#: ../lib/pdk/generate/module.rb:166
 msgid "If you have a Puppet Forge username, add it here."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:163
+#: ../lib/pdk/generate/module.rb:167
 msgid "We can use this to upload your module to the Forge when it's complete."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:166
+#: ../lib/pdk/generate/module.rb:170
 msgid "Forge usernames can only contain lowercase letters and numbers"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:171
+#: ../lib/pdk/generate/module.rb:175
 msgid "What version is this module?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:172
+#: ../lib/pdk/generate/module.rb:176
 msgid "Puppet uses Semantic Versioning (semver.org) to version modules."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:175
+#: ../lib/pdk/generate/module.rb:179
 msgid "Semantic Version numbers must be in the form MAJOR.MINOR.PATCH"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:181
+#: ../lib/pdk/generate/module.rb:185
 msgid "Who wrote this module?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:182
+#: ../lib/pdk/generate/module.rb:186
 msgid "This is used to credit the module's author."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:188
+#: ../lib/pdk/generate/module.rb:192
 msgid "What license does this module code fall under?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:189
+#: ../lib/pdk/generate/module.rb:193
 msgid "This should be an identifier from https://spdx.org/licenses/. Common values are \"Apache-2.0\", \"MIT\", or \"proprietary\"."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:195
+#: ../lib/pdk/generate/module.rb:199
 msgid "What operating systems does this module support?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:196
+#: ../lib/pdk/generate/module.rb:200
 msgid "Use the up and down keys to move between the choices, space to select and enter to continue."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:252
+#: ../lib/pdk/generate/module.rb:256
 msgid "Summarize the purpose of this module in a single sentence."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:253
+#: ../lib/pdk/generate/module.rb:257
 msgid "This helps other Puppet users understand what the module does."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:260
+#: ../lib/pdk/generate/module.rb:264
 msgid "If there is a source code repository for this module, enter the URL here."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:261
+#: ../lib/pdk/generate/module.rb:265
 msgid "Skip this if no repository exists yet. You can update this later in the metadata.json."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:268
+#: ../lib/pdk/generate/module.rb:272
 msgid "If there is a URL where others can learn more about this module, enter it here."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:269 ../lib/pdk/generate/module.rb:276
+#: ../lib/pdk/generate/module.rb:273 ../lib/pdk/generate/module.rb:280
 msgid "Optional. You can update this later in the metadata.json."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:275
+#: ../lib/pdk/generate/module.rb:279
 msgid "If there is a public issue tracker for this module, enter its URL here."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:302
+#: ../lib/pdk/generate/module.rb:306
 msgid "update"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:302
+#: ../lib/pdk/generate/module.rb:306
 msgid "create"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:303
+#: ../lib/pdk/generate/module.rb:307
 msgid ""
 "\n"
 "We need to %{action} the metadata.json file for this module, so we\\'re going to ask you %{count} questions.\n"
@@ -694,19 +698,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:317
+#: ../lib/pdk/generate/module.rb:321
 msgid "No answers given, interview cancelled."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:341
+#: ../lib/pdk/generate/module.rb:345
 msgid "Metadata will be generated based on this information, continue?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:343
+#: ../lib/pdk/generate/module.rb:347
 msgid "Interview cancelled; exiting."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:347
+#: ../lib/pdk/generate/module.rb:351
 msgid "Process cancelled; exiting."
 msgstr ""
 
@@ -778,7 +782,7 @@ msgstr ""
 msgid "Unable to find the %{type} template in %{url}."
 msgstr ""
 
-#: ../lib/pdk/generate/puppet_object.rb:280
+#: ../lib/pdk/generate/puppet_object.rb:282
 msgid "'%{dir}' does not contain valid Puppet module metadata: %{msg}"
 msgstr ""
 
@@ -786,7 +790,7 @@ msgstr ""
 msgid "A task named '%{name}' already exists in this module; defined in %{file}"
 msgstr ""
 
-#: ../lib/pdk/module/build.rb:157
+#: ../lib/pdk/module/build.rb:160
 msgid "Symlinks in modules are not supported and will not be included in the package. Please investigate symlink %{from} -> %{to}."
 msgstr ""
 
@@ -806,28 +810,28 @@ msgstr ""
 msgid "skipping '%{path}'"
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:118
+#: ../lib/pdk/module/convert.rb:120
 msgid "Unable to update module metadata; %{path} exists but it is not readable."
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:123
+#: ../lib/pdk/module/convert.rb:125
 msgid "Unable to update module metadata; %{path} exists but it is not a file."
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:166 ../lib/pdk/module/convert.rb:171 ../lib/pdk/module/convert.rb:175
+#: ../lib/pdk/module/convert.rb:168 ../lib/pdk/module/convert.rb:173 ../lib/pdk/module/convert.rb:177
 msgid ""
 "\n"
 "%{banner}"
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:177
+#: ../lib/pdk/module/convert.rb:179
 msgid ""
 "\n"
 "%{summary}\n"
 "\n"
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:188
+#: ../lib/pdk/module/convert.rb:190
 msgid ""
 "\n"
 "You can find a report of differences in %{path}.\n"
@@ -896,31 +900,35 @@ msgid ""
 "%{exception}: %{message}"
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:189
-msgid "The specified template '%{path}' is not a directory."
+#: ../lib/pdk/module/templatedir.rb:191
+msgid "The built-in template has substantially changed. Please run \"pdk convert\" on your module to continue."
 msgstr ""
 
 #: ../lib/pdk/module/templatedir.rb:193
-msgid "The template at '%{path}' does not contain a 'moduleroot/' directory."
+msgid "The specified template '%{path}' is not a directory."
 msgstr ""
 
 #: ../lib/pdk/module/templatedir.rb:198
+msgid "The template at '%{path}' does not contain a 'moduleroot/' directory."
+msgstr ""
+
+#: ../lib/pdk/module/templatedir.rb:203
 msgid "The template at '%{path}' does not contain a 'moduleroot_init/' directory, which indicates you are using an older style of template. Before continuing please use the --template-url flag when running the pdk new commands to pass a new style template."
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:213
+#: ../lib/pdk/module/templatedir.rb:218
 msgid "The directory '%{dir}' doesn't exist"
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:271
+#: ../lib/pdk/module/templatedir.rb:273
 msgid "'%{file}' is not a valid YAML file: %{message}"
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:299
+#: ../lib/pdk/module/templatedir.rb:301
 msgid "Unable to set HEAD of git repository at '%{repo}' to ref:'%{ref}'."
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:304
+#: ../lib/pdk/module/templatedir.rb:306
 msgid "Unable to clone git repository at '%{repo}' into '%{dest}'."
 msgstr ""
 
@@ -960,47 +968,47 @@ msgstr ""
 msgid "You do not have permission to write to '%{path}'"
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:175
+#: ../lib/pdk/report/event.rb:191
 msgid "File not specified."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:179
+#: ../lib/pdk/report/event.rb:195
 msgid "File must be a String."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:212
+#: ../lib/pdk/report/event.rb:228
 msgid "State not specified."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:217
+#: ../lib/pdk/report/event.rb:233
 msgid "State must be a Symbol, not %{type}"
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:222
+#: ../lib/pdk/report/event.rb:238
 msgid "Invalid state %{state}. Valid states are: %{valid}."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:241
+#: ../lib/pdk/report/event.rb:257
 msgid "Source not specified."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:262
+#: ../lib/pdk/report/event.rb:278
 msgid "Line must be an Integer or a String representation of an Integer."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:266
+#: ../lib/pdk/report/event.rb:282
 msgid "The line number can contain only the digits 0-9."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:287
+#: ../lib/pdk/report/event.rb:303
 msgid "Column must be an Integer or a String representation of an Integer."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:291
+#: ../lib/pdk/report/event.rb:307
 msgid "The column number can contain only the digits 0-9."
 msgstr ""
 
-#: ../lib/pdk/report/event.rb:309
+#: ../lib/pdk/report/event.rb:325
 msgid "Trace must be an Array of stack trace lines."
 msgstr ""
 
@@ -1033,11 +1041,11 @@ msgid "Failed to prepare to run the unit tests."
 msgstr ""
 
 #: ../lib/pdk/tests/unit.rb:72
-msgid "Running unit tests."
+msgid "Running unit tests in parallel."
 msgstr ""
 
 #: ../lib/pdk/tests/unit.rb:72
-msgid "Running unit tests in parallel."
+msgid "Running unit tests."
 msgstr ""
 
 #: ../lib/pdk/tests/unit.rb:86
@@ -1174,23 +1182,23 @@ msgstr ""
 msgid "Unable to download %{url}. Check internet connectivity and try again. %{error}"
 msgstr ""
 
-#: ../lib/pdk/validate/base_validator.rb:74
+#: ../lib/pdk/validate/base_validator.rb:83
 msgid "Invoking %{cmd}"
 msgstr ""
 
-#: ../lib/pdk/validate/base_validator.rb:79
+#: ../lib/pdk/validate/base_validator.rb:88
 msgid "%{validator}: Skipped '%{target}'. Target does not contain any files to validate (%{pattern})."
 msgstr ""
 
-#: ../lib/pdk/validate/base_validator.rb:83
+#: ../lib/pdk/validate/base_validator.rb:92
 msgid "Target does not contain any files to validate (%{pattern})."
 msgstr ""
 
-#: ../lib/pdk/validate/base_validator.rb:92
+#: ../lib/pdk/validate/base_validator.rb:101
 msgid "%{validator}: Skipped '%{target}'. Target file not found."
 msgstr ""
 
-#: ../lib/pdk/validate/base_validator.rb:96
+#: ../lib/pdk/validate/base_validator.rb:105
 msgid "File does not exist."
 msgstr ""
 
@@ -1226,7 +1234,7 @@ msgstr ""
 msgid "Checking Puppet manifest style (%{pattern})."
 msgstr ""
 
-#: ../lib/pdk/validate/puppet/puppet_syntax.rb:40
+#: ../lib/pdk/validate/puppet/puppet_syntax.rb:41
 msgid "Checking Puppet manifest syntax (%{pattern})."
 msgstr ""
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdk
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: A key part of the Puppet Development Kit, the shortest path to better modules