pdk 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93cc8f9f706dd2ce506fe5cba80f8dc1b850be29
-  data.tar.gz: f8132274481cb6f6cdcb60241829d32de7e33118
+  metadata.gz: 27c6740e4512862534ffb7115a59480b99262894
+  data.tar.gz: 65fc2bd610787535d368cb6c2b36fefcf3aef761
 SHA512:
-  metadata.gz: ae5eeee330f86efe4d4fcc728aea7260fa0a066da55e21f120e0cf983750d5f12bc1c72422b58e435e1d46be94de9e07dfd071f37eebcf0482705186a879ba9f
-  data.tar.gz: 11a7de86e1765630c50d0adff32af9131262eaa4fb6e17a0ad86cd6f2218834f04e79f75a549f38ecfd8db95444a8d8a8d8201f20c8d4aa20cb2b22e7a929d80
+  metadata.gz: 9b9849bee4bf285549e04176801b38a9aa3495b3caa9a70c39117fd62f31b831776b9c246e978aa58b6a576756360c8e7f414d803aa88dfd61f47dec501b0c3a
+  data.tar.gz: 5563dca3dc8a84721c04430cd337d3b221874e2cf7d007e25285a068b79419f143458d97e7d10ccb257c750daa0a119b474d7997c32adb3bf70203875dc14bcb

data/CHANGELOG.md

@@ -4,6 +4,42 @@ 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.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)
+
+**Implemented enhancements:**
+
+- \(PDK-949\) Add a default knockout\_prefix for options [\#517](https://github.com/puppetlabs/pdk/pull/517) ([jarretlavallee](https://github.com/jarretlavallee))
+- \(PDK-636\) Make fixture cleaning optional [\#515](https://github.com/puppetlabs/pdk/pull/515) ([rodjek](https://github.com/rodjek))
+- \(PDK-809\) Exit early if the module is not PDK compatible [\#506](https://github.com/puppetlabs/pdk/pull/506) ([rodjek](https://github.com/rodjek))
+
+**Fixed bugs:**
+
+- pdk \(FATAL\): Could not locate Gemfile [\#505](https://github.com/puppetlabs/pdk/issues/505)
+- pdk convert ignoring .sync.yml `delete` values [\#444](https://github.com/puppetlabs/pdk/issues/444)
+- \(PDK-979\) Set path to Gemfile when invoking `bundle lock` [\#513](https://github.com/puppetlabs/pdk/pull/513) ([scotje](https://github.com/scotje))
+- \(PDK-985\) Split validation targets into chunks of 1000 [\#509](https://github.com/puppetlabs/pdk/pull/509) ([rodjek](https://github.com/rodjek))
+- \(PDK-926\) Read rspec event context relative to module root [\#508](https://github.com/puppetlabs/pdk/pull/508) ([rodjek](https://github.com/rodjek))
+- Change Metadata.from\_file to reliably raise [\#503](https://github.com/puppetlabs/pdk/pull/503) ([DavidS](https://github.com/DavidS))
+- \(PDK-475\) Set BUNDLE\_IGNORE\_CONFIG for all commands [\#502](https://github.com/puppetlabs/pdk/pull/502) ([rodjek](https://github.com/rodjek))
+- \(MAINT\) Fixup error in log output when parsing invalid .sync.yml [\#498](https://github.com/puppetlabs/pdk/pull/498) ([scotje](https://github.com/scotje))
+- Add yaml header to make yamllint happy [\#496](https://github.com/puppetlabs/pdk/pull/496) ([wmuizelaar](https://github.com/wmuizelaar))
+- \(PDK-802\) Work around OpenSSL multi-threading errors when needed [\#494](https://github.com/puppetlabs/pdk/pull/494) ([scotje](https://github.com/scotje))
+
+**Closed issues:**
+
+- Creating packages from this repo [\#519](https://github.com/puppetlabs/pdk/issues/519)
+- PDK fails to checkout template from git repo on CentOS 7 [\#490](https://github.com/puppetlabs/pdk/issues/490)
+
+**Merged pull requests:**
+
+- \(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))
+- \(MAINT\) Bump beaker and beaker-hostgenerator for new platforms [\#499](https://github.com/puppetlabs/pdk/pull/499) ([scotje](https://github.com/scotje))
+- \(maint\) Bumps version for 1.6.0 dev cycle. [\#497](https://github.com/puppetlabs/pdk/pull/497) ([bmjen](https://github.com/bmjen))
+- Convert package acceptance tests over to beaker-rspec & serverspec [\#495](https://github.com/puppetlabs/pdk/pull/495) ([rodjek](https://github.com/rodjek))
+
 ## [v1.5.0](https://github.com/puppetlabs/pdk/tree/v1.5.0) (2018-04-30)
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.4.1...v1.5.0)
 
@@ -34,9 +70,11 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 - Installing PDK from .deb causes unmet dependencies on Ubuntu 17.10 Artful [\#370](https://github.com/puppetlabs/pdk/issues/370)
 - Repo Configs Contain Invalid URLs [\#319](https://github.com/puppetlabs/pdk/issues/319)
 - Gems not found in pre-release [\#254](https://github.com/puppetlabs/pdk/issues/254)
+- Running PDK behind a corporate proxy fails [\#227](https://github.com/puppetlabs/pdk/issues/227)
 
 **Merged pull requests:**
 
+- Release 1.5.0 [\#493](https://github.com/puppetlabs/pdk/pull/493) ([bmjen](https://github.com/bmjen))
 - \(FIXUP\) Fix issue where PDK was invoking wrong Ruby on Windows [\#492](https://github.com/puppetlabs/pdk/pull/492) ([scotje](https://github.com/scotje))
 - \(maint\) Update package testing for ruby 2.4.4. [\#488](https://github.com/puppetlabs/pdk/pull/488) ([bmjen](https://github.com/bmjen))
 - \(MAINT\) Fix package tests for version selection and airgapped usage [\#485](https://github.com/puppetlabs/pdk/pull/485) ([scotje](https://github.com/scotje))
@@ -125,6 +163,7 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 
 - "pdk convert" and "pdk new module" fails on OSX Sierra [\#396](https://github.com/puppetlabs/pdk/issues/396)
 - Update shipped ruby [\#395](https://github.com/puppetlabs/pdk/issues/395)
+- Puppet and PDK T-Shirts [\#381](https://github.com/puppetlabs/pdk/issues/381)
 
 **Merged pull requests:**
 

data/lib/pdk/cli/exec.rb

@@ -130,6 +130,8 @@ module PDK
             @process.environment[k] = v
           end
 
+          @process.environment['BUNDLE_IGNORE_CONFIG'] = '1'
+
           if context == :module
             @process.environment['GEM_HOME'] = PDK::Util::RubyVersion.gem_home
             @process.environment['GEM_PATH'] = PDK::Util::RubyVersion.gem_path

data/lib/pdk/cli/exec_group.rb

@@ -6,44 +6,58 @@ require 'pdk/util'
 module PDK
   module CLI
     class ExecGroup
-      attr_reader :commands
-
       def initialize(message, opts = {})
         @options = opts.merge(PDK::CLI::Util.spinner_opts_for_platform)
 
         if PDK::CLI::Util.interactive?
-          @multi_spinner = TTY::Spinner::Multi.new("[:spinner] #{message}", @options)
-          @multi_spinner.auto_spin
+          @spinner = if parallel?
+                       TTY::Spinner::Multi.new("[:spinner] #{message}", @options)
+                     else
+                       TTY::Spinner.new("[:spinner] #{message}", @options)
+                     end
+          @spinner.auto_spin
         end
 
-        @threads = []
+        @threads_or_procs = []
         @exit_codes = []
       end
 
-      def register
+      def parallel?
+        @options[:parallel].nil? ? true : @options[:parallel]
+      end
+
+      def register(&block)
         raise PDK::CLI::FatalError, 'No block registered' unless block_given?
 
-        @threads << Thread.new do
-          GettextSetup.initialize(File.absolute_path('../../../locales', File.dirname(__FILE__)))
-          GettextSetup.negotiate_locale!(GettextSetup.candidate_locales)
-          @exit_codes << yield
-        end
+        @threads_or_procs << if parallel?
+                               Thread.new do
+                                 GettextSetup.initialize(File.absolute_path('../../../locales', File.dirname(__FILE__)))
+                                 GettextSetup.negotiate_locale!(GettextSetup.candidate_locales)
+                                 @exit_codes << yield
+                               end
+                             else
+                               block
+                             end
       end
 
       def add_spinner(message, opts = {})
         return unless PDK::CLI::Util.interactive?
-        @multi_spinner.register("[:spinner] #{message}", @options.merge(opts).merge(PDK::CLI::Util.spinner_opts_for_platform))
+        @spinner.register("[:spinner] #{message}", @options.merge(opts).merge(PDK::CLI::Util.spinner_opts_for_platform))
       end
 
       def exit_code
-        @threads.each(&:join)
+        if parallel?
+          @threads_or_procs.each(&:join)
+        else
+          @exit_codes = @threads_or_procs.map(&:call)
+        end
 
         exit_code = @exit_codes.max
 
-        if exit_code.zero? && @multi_spinner
-          @multi_spinner.success
-        elsif @multi_spinner
-          @multi_spinner.error
+        if exit_code.zero? && @spinner
+          @spinner.success
+        elsif @spinner
+          @spinner.error
         end
 
         exit_code

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

@@ -11,6 +11,7 @@ module PDK::CLI
     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 :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|
       PDK::CLI::Util::OptionValidator.comma_separated_list?(values)

data/lib/pdk/cli/util.rb

@@ -62,12 +62,12 @@ module PDK
 
         # This means the module does not have a pdk-version tag in the metadata.json
         # and will require a pdk convert.
-        if module_pdk_ver.nil?
-          PDK.logger.warn _('This module is not PDK compatible. Run `pdk convert` to make it compatible with your version of PDK.')
+        raise PDK::CLI::ExitWithError, _('This module is not PDK compatible. Run `pdk convert` to make it compatible with your version of PDK.') if module_pdk_ver.nil?
+
         # This checks that the version of pdk in the module's metadata is older
         # than 1.3.1, which means the module will need to run pdk convert to the
         # new templates.
-        elsif Gem::Version.new(module_pdk_ver) < Gem::Version.new('1.3.1')
+        if Gem::Version.new(module_pdk_ver) < Gem::Version.new('1.3.1')
           PDK.logger.warn _('This module template is out of date. Run `pdk convert` to make it compatible with your version of PDK.')
         # This checks if the version of the installed PDK is older than the
         # version in the module's metadata, and advises the user to upgrade to

data/lib/pdk/module/build.rb

@@ -3,6 +3,7 @@ require 'minitar'
 require 'zlib'
 require 'pathspec'
 require 'find'
+require 'pdk/tests/unit'
 
 module PDK
   module Module
@@ -36,6 +37,7 @@ module PDK
       #
       # @return [String] The path to the built package file.
       def build
+        cleanup_module
         create_build_dir
 
         stage_module_in_build_dir
@@ -81,6 +83,14 @@ module PDK
         FileUtils.rm_rf(build_dir, secure: true)
       end
 
+      # Clean up any files created during use of the PDK that shouldn't be part
+      # of the built module (e.g. test fixtures).
+      #
+      # @return nil
+      def cleanup_module
+        PDK::Test::Unit.tear_down
+      end
+
       # Combine the module name and version into a Forge-compatible dash
       # separated string.
       #

data/lib/pdk/module/convert.rb

@@ -183,6 +183,7 @@ module PDK
           update_manager.changes[:modified].each do |_, diff|
             f.write("\n\n\n" + diff)
           end
+          f.write("\n")
         end
         PDK::Report.default_target.puts(_("\nYou can find a report of differences in %{path}.\n\n") % { path: path })
       end

data/lib/pdk/module/metadata.rb

@@ -45,6 +45,10 @@ module PDK
       end
 
       def self.from_file(metadata_json_path)
+        if metadata_json_path.nil?
+          raise ArgumentError, _('Cannot read metadata from file: no path to file was given.')
+        end
+
         unless File.file?(metadata_json_path)
           raise ArgumentError, _("'%{file}' does not exist or is not a file.") % { file: metadata_json_path }
         end

data/lib/pdk/module/templatedir.rb

@@ -245,7 +245,7 @@ module PDK
           conf_defaults = read_config(config_path)
           sync_config = read_config(sync_config_path) unless sync_config_path.nil?
           @config = conf_defaults
-          @config.deep_merge!(sync_config) unless sync_config.nil?
+          @config.deep_merge!(sync_config, knockout_prefix: '---') unless sync_config.nil?
         end
         file_config = @config.fetch(:global, {})
         file_config['module_metadata'] = @module_metadata
@@ -268,7 +268,7 @@ module PDK
           begin
             YAML.safe_load(File.read(loc), [], [], true)
           rescue StandardError => e
-            PDK.logger.warn(_("'%{file}' is not a valid YAML file: %{message}") % { file: config_path, message: e.message })
+            PDK.logger.warn(_("'%{file}' is not a valid YAML file: %{message}") % { file: loc, message: e.message })
             {}
           end
         else

data/lib/pdk/report/event.rb

@@ -326,7 +326,10 @@ module PDK
       def context_lines(max_num_lines = 5)
         return if file.nil? || line.nil?
 
-        file_content = File.read(file).split("\n")
+        file_path = [file, File.join(PDK::Util.module_root, file)].find { |r| File.file?(r) }
+        return if file_path.nil?
+
+        file_content = File.read(file_path).split("\n")
         delta = (max_num_lines - 1) / 2
         min = [0, (line - 1) - delta].max
         max = [(line - 1) + delta, file_content.length].min

data/lib/pdk/tests/unit.rb

@@ -7,7 +7,7 @@ module PDK
   module Test
     class Unit
       def self.cmd(tests, opts = {})
-        rake_args = opts.key?(:parallel) ? 'parallel_spec' : 'spec'
+        rake_args = opts.key?(:parallel) ? 'parallel_spec_standalone' : 'spec_standalone'
         rake_args += "[#{tests}]" unless tests.nil?
         rake_args
       end
@@ -57,6 +57,8 @@ module PDK
 
         return if result[:exit_code].zero?
 
+        tear_down
+
         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
@@ -89,7 +91,7 @@ module PDK
 
         result[:exit_code]
       ensure
-        tear_down
+        tear_down if options[:'clean-fixtures']
       end
 
       def self.parse_output(report, json_data)

data/lib/pdk/util/bundler.rb

@@ -156,7 +156,7 @@ module PDK
         def update_lock!(options = {})
           PDK.logger.debug(_('Updating Gemfile dependencies.'))
 
-          argv = ['lock', '--update']
+          argv = ['lock', "--lockfile=#{gemfile_lock}", '--update']
 
           overrides = nil
 
@@ -174,6 +174,7 @@ module PDK
           argv << '--conservative' if options && options[:conservative]
 
           cmd = bundle_command(*argv).tap do |c|
+            c.update_environment('BUNDLE_GEMFILE' => gemfile)
             c.update_environment(gemfile_env(overrides)) if overrides
           end
 
@@ -188,7 +189,8 @@ module PDK
         end
 
         def install!(gem_overrides = {})
-          argv = ['install', "--gemfile=#{gemfile}", '-j4']
+          argv = ['install', "--gemfile=#{gemfile}"]
+          argv << '-j4' unless Gem.win_platform? && Gem::Version.new(PDK::Util::RubyVersion.active_ruby_version) < Gem::Version.new('2.3.5')
           argv << "--path=#{bundle_cachedir}" unless PDK::Util.package_install?
 
           cmd = bundle_command(*argv).tap do |c|

data/lib/pdk/util/puppet_version.rb

@@ -83,7 +83,17 @@ module PDK
       end
 
       def from_module_metadata(metadata = nil)
-        metadata ||= PDK::Module::Metadata.from_file(PDK::Util.find_upwards('metadata.json'))
+        if metadata.nil?
+          metadata_file = PDK::Util.find_upwards('metadata.json')
+
+          unless metadata_file
+            PDK.logger.warn _('Unable to determine Puppet version for module: no metadata.json present in module.')
+            return nil
+          end
+
+          metadata = PDK::Module::Metadata.from_file(metadata_file)
+        end
+
         metadata.validate_puppet_version_requirement!
         metadata_requirement = metadata.puppet_requirement
 

data/lib/pdk/validate/base_validator.rb

@@ -115,7 +115,14 @@ module PDK
         # targets array in another array. This is so we can loop through the
         # invokes with the same logic, regardless of which invoke style is
         # needed.
-        targets = (self::INVOKE_STYLE == :per_target) ? targets.combination(1).to_a : Array[targets]
+        #
+        if self::INVOKE_STYLE == :per_target
+          targets = targets.combination(1).to_a
+        else
+          targets = targets.each_slice(1000).to_a
+          options[:split_exec] = PDK::CLI::ExecGroup.new(spinner_text(targets), parallel: false)
+        end
+
         exit_codes = []
 
         targets.each do |invokation_targets|
@@ -124,22 +131,32 @@ module PDK
 
           command = PDK::CLI::Exec::Command.new(*cmd_argv).tap do |c|
             c.context = :module
-            exec_group = options[:exec_group]
-            if exec_group
-              sub_spinner = exec_group.add_spinner(spinner_text(invokation_targets))
-              c.register_spinner(sub_spinner)
-            else
-              c.add_spinner(spinner_text(invokation_targets))
+            unless options[:split_exec]
+              exec_group = options[:exec_group]
+              if exec_group
+                sub_spinner = exec_group.add_spinner(spinner_text(invokation_targets))
+                c.register_spinner(sub_spinner)
+              else
+                c.add_spinner(spinner_text(invokation_targets))
+              end
             end
           end
 
-          result = command.execute!
-          exit_codes << result[:exit_code]
+          if options[:split_exec]
+            options[:split_exec].register do
+              result = command.execute!
+              parse_output(report, result, invokation_targets)
+              result[:exit_code]
+            end
+          else
+            result = command.execute!
+            exit_codes << result[:exit_code]
 
-          parse_output(report, result, invokation_targets)
+            parse_output(report, result, invokation_targets)
+          end
         end
 
-        exit_codes.max
+        options.key?(:split_exec) ? options[:split_exec].exit_code : exit_codes.max
       end
     end
   end

data/lib/pdk/version.rb

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

data/locales/pdk.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: puppet development kit v1.4.1-78-g3268a07\n"
+"Project-Id-Version: puppet development kit v1.5.0-43-ga5c5c15\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
-"POT-Creation-Date: 2018-04-30 11:41-0700\n"
-"PO-Revision-Date: 2018-04-30 11:41-0700\n"
+"POT-Creation-Date: 2018-06-20 21:35-0700\n"
+"PO-Revision-Date: 2018-06-20 21:35-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -219,23 +219,23 @@ msgstr ""
 msgid "Expected execution context to be :system or :module but got '%{context}'."
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:153
+#: ../lib/pdk/cli/exec.rb:155
 msgid "Current working directory is not part of a module. (No metadata.json was found.)"
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:208
+#: ../lib/pdk/cli/exec.rb:210
 msgid "Executing '%{command}'"
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:211
+#: ../lib/pdk/cli/exec.rb:213
 msgid "Command environment:"
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:222
+#: ../lib/pdk/cli/exec.rb:224
 msgid "Failed to execute '%{command}': %{message}"
 msgstr ""
 
-#: ../lib/pdk/cli/exec.rb:238
+#: ../lib/pdk/cli/exec.rb:240
 msgid "Execution of '%{command}' complete (duration: %{duration_in_seconds}s; exit code: %{exit_code})"
 msgstr ""
 
@@ -395,23 +395,27 @@ msgstr ""
 msgid "More verbose output. Displays examples in each unit test file."
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:15
+#: ../lib/pdk/cli/test/unit.rb:14
+msgid "Clean up downloaded fixtures after the test run."
+msgstr ""
+
+#: ../lib/pdk/cli/test/unit.rb:16
 msgid "Specify a comma-separated list of unit test files to run."
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:28
+#: ../lib/pdk/cli/test/unit.rb:29
 msgid "Unit tests can only be run from inside a valid module directory."
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:39
+#: ../lib/pdk/cli/test/unit.rb:40
 msgid "No unit test files with examples were found."
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:41
+#: ../lib/pdk/cli/test/unit.rb:42
 msgid "Unit Test Files:"
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:50
+#: ../lib/pdk/cli/test/unit.rb:51
 msgid "\t%{id}\t%{description}"
 msgstr ""
 
@@ -451,7 +455,7 @@ msgstr ""
 msgid "Answer \"Y\" to continue or \"n\" to cancel."
 msgstr ""
 
-#: ../lib/pdk/cli/util.rb:66
+#: ../lib/pdk/cli/util.rb:65
 msgid "This module is not PDK compatible. Run `pdk convert` to make it compatible with your version of PDK."
 msgstr ""
 
@@ -675,11 +679,11 @@ msgid "If there is a public issue tracker for this module, enter its URL here."
 msgstr ""
 
 #: ../lib/pdk/generate/module.rb:302
-msgid "create"
+msgid "update"
 msgstr ""
 
 #: ../lib/pdk/generate/module.rb:302
-msgid "update"
+msgid "create"
 msgstr ""
 
 #: ../lib/pdk/generate/module.rb:303
@@ -782,7 +786,7 @@ msgstr ""
 msgid "A task named '%{name}' already exists in this module; defined in %{file}"
 msgstr ""
 
-#: ../lib/pdk/module/build.rb:147
+#: ../lib/pdk/module/build.rb:157
 msgid "Symlinks in modules are not supported and will not be included in the package. Please investigate symlink %{from} -> %{to}."
 msgstr ""
 
@@ -823,7 +827,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:187
+#: ../lib/pdk/module/convert.rb:188
 msgid ""
 "\n"
 "You can find a report of differences in %{path}.\n"
@@ -831,46 +835,50 @@ msgid ""
 msgstr ""
 
 #: ../lib/pdk/module/metadata.rb:49
-msgid "'%{file}' does not exist or is not a file."
+msgid "Cannot read metadata from file: no path to file was given."
 msgstr ""
 
 #: ../lib/pdk/module/metadata.rb:53
+msgid "'%{file}' does not exist or is not a file."
+msgstr ""
+
+#: ../lib/pdk/module/metadata.rb:57
 msgid "Unable to open '%{file}' for reading."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:59
+#: ../lib/pdk/module/metadata.rb:63
 msgid "Invalid JSON in metadata.json: %{msg}"
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:92
+#: ../lib/pdk/module/metadata.rb:96
 msgid "Module metadata does not contain any requirements."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:93
+#: ../lib/pdk/module/metadata.rb:97
 msgid "Module metadata does not contain a \"puppet\" requirement."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:94
+#: ../lib/pdk/module/metadata.rb:98
 msgid "The \"puppet\" requirement in module metadata does not specify a \"version_requirement\"."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:133
+#: ../lib/pdk/module/metadata.rb:137
 msgid "Field must be a dash-separated user name and module name."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:135
+#: ../lib/pdk/module/metadata.rb:139
 msgid "Module name must contain only alphanumeric or underscore characters."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:137
+#: ../lib/pdk/module/metadata.rb:141
 msgid "Module name must begin with a letter."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:139
+#: ../lib/pdk/module/metadata.rb:143
 msgid "Namespace must contain only alphanumeric characters."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:142
+#: ../lib/pdk/module/metadata.rb:146
 msgid "Invalid 'name' field in metadata.json: %{err}"
 msgstr ""
 
@@ -916,6 +924,10 @@ msgstr ""
 msgid "Unable to clone git repository at '%{repo}' into '%{dest}'."
 msgstr ""
 
+#: ../lib/pdk/module/update.rb:12
+msgid "This module is already up to date with version %{version} of the template."
+msgstr ""
+
 #: ../lib/pdk/module/update.rb:97
 msgid "Updating %{module_name} using the default template, from %{current_version} to %{new_version}"
 msgstr ""
@@ -1012,35 +1024,35 @@ msgstr ""
 msgid "Preparing to run the unit tests."
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:60
+#: ../lib/pdk/tests/unit.rb:62
 msgid "The spec_prep rake task failed with the following error(s):"
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:61
+#: ../lib/pdk/tests/unit.rb:63
 msgid "Failed to prepare to run the unit tests."
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:70
-msgid "Running unit tests in parallel."
+#: ../lib/pdk/tests/unit.rb:72
+msgid "Running unit tests."
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:70
-msgid "Running unit tests."
+#: ../lib/pdk/tests/unit.rb:72
+msgid "Running unit tests in parallel."
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:84
+#: ../lib/pdk/tests/unit.rb:86
 msgid "Unit test output did not contain a valid JSON result: %{output}"
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:136
+#: ../lib/pdk/tests/unit.rb:138
 msgid "Evaluated %{total} tests in %{duration} seconds: %{failures} failures, %{pending} pending."
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:193
+#: ../lib/pdk/tests/unit.rb:195
 msgid "Failed to find valid JSON in output from rspec: %{output}"
 msgstr ""
 
-#: ../lib/pdk/tests/unit.rb:198
+#: ../lib/pdk/tests/unit.rb:200
 msgid "Unable to enumerate examples. rspec reported: %{message}"
 msgstr ""
 
@@ -1088,25 +1100,25 @@ msgstr ""
 msgid "Updating Gemfile dependencies."
 msgstr ""
 
-#: ../lib/pdk/util/bundler.rb:184
+#: ../lib/pdk/util/bundler.rb:185
 msgid "Unable to resolve Gemfile dependencies."
 msgstr ""
 
-#: ../lib/pdk/util/bundler.rb:195
+#: ../lib/pdk/util/bundler.rb:197
 msgid "Installing missing Gemfile dependencies."
 msgstr ""
 
-#: ../lib/pdk/util/bundler.rb:203
+#: ../lib/pdk/util/bundler.rb:205
 msgid "Unable to install missing Gemfile dependencies."
 msgstr ""
 
-#: ../lib/pdk/util/bundler.rb:217
+#: ../lib/pdk/util/bundler.rb:219
 msgid ""
 "Failed to generate binstubs for '%{gems}':\n"
 "%{output}"
 msgstr ""
 
-#: ../lib/pdk/util/bundler.rb:218
+#: ../lib/pdk/util/bundler.rb:220
 msgid "Unable to install requested binstubs."
 msgstr ""
 
@@ -1134,11 +1146,15 @@ msgstr ""
 msgid "Puppet Enterprise %{pe_version} maps to Puppet %{puppet_version}."
 msgstr ""
 
-#: ../lib/pdk/util/puppet_version.rb:106
+#: ../lib/pdk/util/puppet_version.rb:90
+msgid "Unable to determine Puppet version for module: no metadata.json present in module."
+msgstr ""
+
+#: ../lib/pdk/util/puppet_version.rb:116
 msgid "%{version} is not a valid version number."
 msgstr ""
 
-#: ../lib/pdk/util/puppet_version.rb:140
+#: ../lib/pdk/util/puppet_version.rb:150
 msgid "Failed to parse Puppet Enterprise version map file."
 msgstr ""
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdk
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler