pdk 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c70ec79ec06dd3379aa08d51a34733b3794e5b41
-  data.tar.gz: f8c3a460c65a788e9ec44332530fc2a815060bee
+  metadata.gz: 67003e5136efb1f7b88aad41126a684fdf905fea
+  data.tar.gz: 53cf697acf1097eef065e18235c71a2e82c6adfc
 SHA512:
-  metadata.gz: 6e7376cf631ca56e6058619b772bd3a0f08b31aa356842cce3d90c56570fb8d65357217913cf63c6c5d873d0f153bc8f149449a19333570ca77ec8295e79821a
-  data.tar.gz: 56afeb93fa8928de3e9a2305f9b29937ecdc0c17323d7b1a8a55fdb64838c302f6ab24cad0be3bf5c5932ddf6c5618924b9238bb102c3d39fc424341fb18cddc
+  metadata.gz: 292950f888d8e292e246b251f8a5df637b6f9c20e0ea7cd2c53a92e5ca5303196638b797742e8de7c37445c6e00f3740f06ea945c9fef0c38d064af414029970
+  data.tar.gz: 282a942a3866dcd3c99b86ae3837095507c677ccb93652cd6f526868dbfea25b8f32cf764117c17e3608719651d10ce02fa82714955e96417703de3223a95ea6

data/CHANGELOG.md

@@ -4,6 +4,23 @@ All changes to this repo will be documented in this file.
 See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) for a high-level summary.
 
 
+## [v1.7.0](https://github.com/puppetlabs/pdk/tree/v1.7.0) (2018-08-14)
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.6.1...v1.7.0)
+
+**Implemented enhancements:**
+
+- \(PDK-1096, PDK-1097, PDK-1098\) Add puppet-dev flag to validate and test unit [\#559](https://github.com/puppetlabs/pdk/pull/559) ([bmjen](https://github.com/bmjen))
+
+**Fixed bugs:**
+
+- \(PDK-585\) Unify metadata defaults with/without interview [\#558](https://github.com/puppetlabs/pdk/pull/558) ([rodjek](https://github.com/rodjek))
+
+**Merged pull requests:**
+
+- \(maint\) Fix package tests [\#562](https://github.com/puppetlabs/pdk/pull/562) ([bmjen](https://github.com/bmjen))
+- \(PDK-1083\) Bump PDK version to 1.7.0.pre [\#556](https://github.com/puppetlabs/pdk/pull/556) ([rodjek](https://github.com/rodjek))
+- \(PDK-1077\) Expand the package acceptance test suite [\#554](https://github.com/puppetlabs/pdk/pull/554) ([rodjek](https://github.com/rodjek))
+
 ## [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)
 
@@ -27,6 +44,7 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 
 **Merged pull requests:**
 
+- \(PDK-1078\) Prepare 1.6.1 release [\#555](https://github.com/puppetlabs/pdk/pull/555) ([rodjek](https://github.com/rodjek))
 - \(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))
@@ -41,7 +59,7 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 - \(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)
+## [v1.6.0](https://github.com/puppetlabs/pdk/tree/v1.6.0) (2018-06-21)
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.5.0...v1.6.0)
 
 **Implemented enhancements:**
@@ -747,4 +765,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/test/unit.rb

@@ -8,6 +8,7 @@ module PDK::CLI
     summary _('Run unit tests.')
 
     PDK::CLI.puppet_version_options(self)
+    PDK::CLI.puppet_dev_option(self)
     flag nil, :list, _('List all available unit test files.')
     flag nil, :parallel, _('Run unit tests in parallel.')
     flag :v, :verbose, _('More verbose --list output. Displays a list of examples in each unit test file.')
@@ -67,6 +68,7 @@ module PDK::CLI
 
         # Ensure that the bundled gems are up to date and correct Ruby is activated before running tests.
         puppet_env = PDK::CLI::Util.puppet_from_opts_or_env(opts)
+        PDK::Util::PuppetVersion.fetch_puppet_dev if opts.key?(:'puppet-dev')
         PDK::Util::RubyVersion.use(puppet_env[:ruby_version])
         PDK::Util::Bundler.ensure_bundle!(puppet_env[:gemset])
 

data/lib/pdk/cli/util.rb

@@ -83,12 +83,15 @@ module PDK
       module_function :module_version_check
 
       def puppet_from_opts_or_env(opts)
+        use_puppet_dev = (opts || {})[:'puppet-dev'] || ENV['PDK_PUPPET_DEV']
         desired_puppet_version = (opts || {})[:'puppet-version'] || ENV['PDK_PUPPET_VERSION']
         desired_pe_version = (opts || {})[:'pe-version'] || ENV['PDK_PE_VERSION']
 
         begin
           puppet_env =
-            if desired_puppet_version
+            if use_puppet_dev
+              PDK::Util::PuppetVersion.puppet_dev_env
+            elsif desired_puppet_version
               PDK::Util::PuppetVersion.find_gem_for(desired_puppet_version)
             elsif desired_pe_version
               PDK::Util::PuppetVersion.from_pe_version(desired_pe_version)
@@ -132,6 +135,21 @@ module PDK
         pe_ver_specs << '--pe-version option' if opts[:'pe-version']
         pe_ver_specs << 'PDK_PE_VERSION environment variable' if ENV['PDK_PE_VERSION'] && !ENV['PDK_PE_VERSION'].empty?
 
+        puppet_dev_specs = []
+        puppet_dev_specs << '--puppet-dev flag' if opts[:'puppet-dev']
+        puppet_dev_specs << 'PDK_PUPPET_DEV environment variable' if ENV['PDK_PUPPET_DEV'] && !ENV['PDK_PUPPET_DEV'].empty?
+
+        puppet_dev_specs.each do |pup_dev_spec|
+          [puppet_ver_specs, pe_ver_specs].each do |offending|
+            next if offending.empty?
+
+            raise PDK::CLI::ExitWithError, _('You cannot specify a %{first} and %{second} at the same time') % {
+              first: pup_dev_spec,
+              second: offending.first,
+            }
+          end
+        end
+
         puppet_ver_specs.each do |pup_ver_spec|
           next if pe_ver_specs.empty?
 
@@ -143,7 +161,15 @@ module PDK
           }
         end
 
-        if puppet_ver_specs.size == 2
+        if puppet_dev_specs.size == 2
+          warning_str = 'Puppet dev flag from command line: "--puppet-dev" '
+          warning_str += 'overrides value from environment: "PDK_PUPPET_DEV=true". You should not specify both.'
+
+          PDK.logger.warn(_(warning_str) % {
+            pup_ver_opt: opts[:'puppet-dev'],
+            pup_ver_env: ENV['PDK_PUPPET_DEV'],
+          })
+        elsif puppet_ver_specs.size == 2
           warning_str = 'Puppet version option from command line: "--puppet-version=%{pup_ver_opt}" '
           warning_str += 'overrides value from environment: "PDK_PUPPET_VERSION=%{pup_ver_env}". You should not specify both.'
 

data/lib/pdk/cli/validate.rb

@@ -14,6 +14,7 @@ module PDK::CLI
     )
 
     PDK::CLI.puppet_version_options(self)
+    PDK::CLI.puppet_dev_option(self)
     flag nil, :list, _('List all available validators.')
     flag :a, 'auto-correct', _('Automatically correct problems where possible.')
     flag nil, :parallel, _('Run validations in parallel.')
@@ -87,6 +88,7 @@ module PDK::CLI
 
       # Ensure that the bundled gems are up to date and correct Ruby is activated before running any validations.
       puppet_env = PDK::CLI::Util.puppet_from_opts_or_env(opts)
+      PDK::Util::PuppetVersion.fetch_puppet_dev if opts.key?(:'puppet-dev')
       PDK::Util::RubyVersion.use(puppet_env[:ruby_version])
       PDK::Util::Bundler.ensure_bundle!(puppet_env[:gemset])
 

data/lib/pdk/cli.rb

@@ -55,6 +55,12 @@ module PDK::CLI
     dsl.option nil, 'pe-version', _('Puppet Enterprise version to run tests or validations against.'), argument: :required
   end
 
+  def self.puppet_dev_option(dsl)
+    dsl.option nil,
+               'puppet-dev',
+               _('When specified, PDK will validate or test against the current Puppet source from github.com. To use this option, you must have network access to https://github.com.')
+  end
+
   @base_cmd = Cri::Command.define do
     name 'pdk'
     usage _('pdk command [options]')

data/lib/pdk/generate/module.rb

@@ -113,13 +113,7 @@ module PDK
       def self.prepare_metadata(opts = {})
         opts[:username] = (opts[:username] || PDK.answers['forge_username'] || username_from_login).downcase
 
-        defaults = {
-          'version'      => '0.1.0',
-          'dependencies' => [],
-          'requirements' => [
-            { 'name' => 'puppet', 'version_requirement' => '>= 4.7.0 < 6.0.0' },
-          ],
-        }
+        defaults = PDK::Module::Metadata::DEFAULTS.dup
 
         defaults['name'] = "#{opts[:username]}-#{opts[:module_name]}" unless opts[:module_name].nil?
         defaults['author'] = PDK.answers['author'] unless PDK.answers['author'].nil?
@@ -199,57 +193,11 @@ module PDK
             question: _('What operating systems does this module support?'),
             help:     _('Use the up and down keys to move between the choices, space to select and enter to continue.'),
             required: true,
-            choices:  {
-              'RedHat based Linux' => [
-                {
-                  'operatingsystem'        => 'CentOS',
-                  'operatingsystemrelease' => ['7'],
-                },
-                {
-                  'operatingsystem'        => 'OracleLinux',
-                  'operatingsystemrelease' => ['7'],
-                },
-                {
-                  'operatingsystem'        => 'RedHat',
-                  'operatingsystemrelease' => ['7'],
-                },
-                {
-                  'operatingsystem'        => 'Scientific',
-                  'operatingsystemrelease' => ['7'],
-                },
-              ],
-              'Debian based Linux' => [
-                {
-                  'operatingsystem'        => 'Debian',
-                  'operatingsystemrelease' => ['8'],
-                },
-                {
-                  'operatingsystem'        => 'Ubuntu',
-                  'operatingsystemrelease' => ['16.04'],
-                },
-              ],
-              'Fedora' => {
-                'operatingsystem'        => 'Fedora',
-                'operatingsystemrelease' => ['25'],
-              },
-              'OSX' => {
-                'operatingsystem'        => 'Darwin',
-                'operatingsystemrelease' => ['16'],
-              },
-              'SLES' => {
-                'operatingsystem'        => 'SLES',
-                'operatingsystemrelease' => ['12'],
-              },
-              'Solaris' => {
-                'operatingsystem'        => 'Solaris',
-                'operatingsystemrelease' => ['11'],
-              },
-              'Windows' => {
-                'operatingsystem'        => 'windows',
-                'operatingsystemrelease' => ['2008 R2', '2012 R2', '10'],
-              },
-            },
-            default: [1, 2, 7],
+            choices:  PDK::Module::Metadata::OPERATING_SYSTEMS,
+            default:  PDK::Module::Metadata::DEFAULT_OPERATING_SYSTEMS.map do |os_name|
+              # tty-prompt uses a 1-index
+              PDK::Module::Metadata::OPERATING_SYSTEMS.keys.index(os_name) + 1
+            end,
           },
           {
             name:       'summary',

data/lib/pdk/module/metadata.rb

@@ -5,6 +5,63 @@ module PDK
     class Metadata
       attr_accessor :data
 
+      OPERATING_SYSTEMS = {
+        'RedHat based Linux' => [
+          {
+            'operatingsystem'        => 'CentOS',
+            'operatingsystemrelease' => ['7'],
+          },
+          {
+            'operatingsystem'        => 'OracleLinux',
+            'operatingsystemrelease' => ['7'],
+          },
+          {
+            'operatingsystem'        => 'RedHat',
+            'operatingsystemrelease' => ['7'],
+          },
+          {
+            'operatingsystem'        => 'Scientific',
+            'operatingsystemrelease' => ['7'],
+          },
+        ],
+        'Debian based Linux' => [
+          {
+            'operatingsystem'        => 'Debian',
+            'operatingsystemrelease' => ['8'],
+          },
+          {
+            'operatingsystem'        => 'Ubuntu',
+            'operatingsystemrelease' => ['16.04'],
+          },
+        ],
+        'Fedora' => {
+          'operatingsystem'        => 'Fedora',
+          'operatingsystemrelease' => ['25'],
+        },
+        'OSX' => {
+          'operatingsystem'        => 'Darwin',
+          'operatingsystemrelease' => ['16'],
+        },
+        'SLES' => {
+          'operatingsystem'        => 'SLES',
+          'operatingsystemrelease' => ['12'],
+        },
+        'Solaris' => {
+          'operatingsystem'        => 'Solaris',
+          'operatingsystemrelease' => ['11'],
+        },
+        'Windows' => {
+          'operatingsystem'        => 'windows',
+          'operatingsystemrelease' => ['2008 R2', '2012 R2', '10'],
+        },
+      }.freeze
+
+      DEFAULT_OPERATING_SYSTEMS = [
+        'RedHat based Linux',
+        'Debian based Linux',
+        'Windows',
+      ].freeze
+
       DEFAULTS = {
         'name'          => nil,
         'version'       => '0.1.0',
@@ -16,24 +73,9 @@ module PDK
         'issues_url'    => nil,
         'dependencies'  => [],
         'data_provider' => nil,
-        'operatingsystem_support' => [
-          {
-            'operatingsystem' => 'Debian',
-            'operatingsystemrelease' => ['8'],
-          },
-          {
-            'operatingsystem' => 'RedHat',
-            'operatingsystemrelease' => ['7.0'],
-          },
-          {
-            'operatingsystem' => 'Ubuntu',
-            'operatingsystemrelease' => ['16.04'],
-          },
-          {
-            'operatingsystem' => 'windows',
-            'operatingsystemrelease' => ['2012 R2'],
-          },
-        ],
+        'operatingsystem_support' => DEFAULT_OPERATING_SYSTEMS.map { |os_name|
+          OPERATING_SYSTEMS[os_name]
+        }.flatten,
         'requirements' => [
           { 'name' => 'puppet', 'version_requirement' => '>= 4.7.0 < 6.0.0' },
         ],

data/lib/pdk/util/puppet_version.rb

@@ -1,4 +1,5 @@
 require 'pdk/util'
+require 'pdk/util/git'
 
 module PDK
   module Util
@@ -6,7 +7,7 @@ module PDK
       class << self
         extend Forwardable
 
-        def_delegators :instance, :find_gem_for, :from_pe_version, :from_module_metadata, :latest_available
+        def_delegators :instance, :puppet_dev_env, :puppet_dev_path, :fetch_puppet_dev, :find_gem_for, :from_pe_version, :from_module_metadata, :latest_available
 
         attr_writer :instance
 
@@ -16,6 +17,19 @@ module PDK
       end
 
       PE_VERSIONS_URL = 'https://forgeapi.puppet.com/private/versions/pe'.freeze
+      DEFAULT_PUPPET_DEV_URL = 'https://github.com/puppetlabs/puppet'.freeze
+      DEFAULT_PUPPET_DEV_BRANCH = 'master'.freeze
+
+      def puppet_dev_env
+        {
+          gem_version: 'file://%{path}' % { path: puppet_dev_path },
+          ruby_version: PDK::Util::RubyVersion.default_ruby_version,
+        }
+      end
+
+      def puppet_dev_path
+        File.join(PDK::Util.cachedir, 'src', 'puppet')
+      end
 
       def latest_available
         latest = find_gem(Gem::Requirement.create('>= 0'))
@@ -27,6 +41,25 @@ module PDK
         latest
       end
 
+      def fetch_puppet_dev
+        unless PDK::Util::Git.remote_repo? puppet_dev_path
+          FileUtils.mkdir_p puppet_dev_path
+          clone_result = PDK::Util::Git.git('clone', DEFAULT_PUPPET_DEV_URL, puppet_dev_path)
+          return if clone_result[:exit_code].zero?
+
+          PDK.logger.error clone_result[:stdout]
+          PDK.logger.error clone_result[:stderr]
+          raise PDK::CLI::FatalError, _("Unable to clone git repository at '%{repo}'.") % { repo: DEFAULT_PUPPET_DEV_URL }
+        end
+
+        fetch_result = PDK::Util::Git.git('--git-dir', File.join(puppet_dev_path, '.git'), 'pull', '--ff-only')
+        return if fetch_result[:exit_code].zero?
+
+        PDK.logger.error fetch_result[:stdout]
+        PDK.logger.error fetch_result[:stderr]
+        raise PDK::CLI::FatalError, _("Unable to pull updates for git repository at '%{cachedir}'.") % { repo: puppet_dev_path }
+      end
+
       def find_gem_for(version_str)
         version = parse_specified_version(version_str)
 

data/lib/pdk/version.rb

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

data/locales/pdk.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: puppet development kit v1.6.0-37-g9a9b458\n"
+"Project-Id-Version: puppet development kit v1.6.1-11-g2632a3b30\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
-"POT-Creation-Date: 2018-07-25 13:54+1000\n"
-"PO-Revision-Date: 2018-07-25 13:54+1000\n"
+"POT-Creation-Date: 2018-08-14 16:41-0700\n"
+"PO-Revision-Date: 2018-08-14 16:41-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -59,35 +59,39 @@ msgstr ""
 msgid "Puppet Enterprise version to run tests or validations against."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:60
+#: ../lib/pdk/cli.rb:61
+msgid "When specified, PDK will validate or test against the current Puppet source from github.com. To use this option, you must have network access to https://github.com."
+msgstr ""
+
+#: ../lib/pdk/cli.rb:66
 msgid "pdk command [options]"
 msgstr ""
 
-#: ../lib/pdk/cli.rb:61
+#: ../lib/pdk/cli.rb:67
 msgid "Puppet Development Kit"
 msgstr ""
 
-#: ../lib/pdk/cli.rb:62
+#: ../lib/pdk/cli.rb:68
 msgid "The shortest path to better modules."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:65
+#: ../lib/pdk/cli.rb:71
 msgid "Show version of pdk."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:70
+#: ../lib/pdk/cli.rb:76
 msgid "Show help for this command."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:75
+#: ../lib/pdk/cli.rb:81
 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:86
+#: ../lib/pdk/cli.rb:92
 msgid "Enable debug output."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:90
+#: ../lib/pdk/cli.rb:96
 msgid "Path to an answer file."
 msgstr ""
 
@@ -383,43 +387,43 @@ msgstr ""
 msgid "Run unit tests."
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:11
+#: ../lib/pdk/cli/test/unit.rb:12
 msgid "List all available unit test files."
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:12
+#: ../lib/pdk/cli/test/unit.rb:13
 msgid "Run unit tests in parallel."
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:13
+#: ../lib/pdk/cli/test/unit.rb:14
 msgid "More verbose --list output. Displays a list of examples in each unit test file."
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:14
+#: ../lib/pdk/cli/test/unit.rb:15
 msgid "Clean up downloaded fixtures after the test run."
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:16
+#: ../lib/pdk/cli/test/unit.rb:17
 msgid "Specify a comma-separated list of unit test files to run."
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:29
+#: ../lib/pdk/cli/test/unit.rb:30
 msgid "Unit tests can only be run from inside a valid module directory."
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:40
+#: ../lib/pdk/cli/test/unit.rb:41
 msgid "No unit test files with examples were found."
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:42
+#: ../lib/pdk/cli/test/unit.rb:43
 msgid "Unit Test Files:"
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:51
+#: ../lib/pdk/cli/test/unit.rb:52
 msgid "\t%{id}\t%{description}"
 msgstr ""
 
-#: ../lib/pdk/cli/test/unit.rb:56
+#: ../lib/pdk/cli/test/unit.rb:57
 msgid "--verbose has no effect when not used with --list"
 msgstr ""
 
@@ -475,15 +479,19 @@ msgstr ""
 msgid "This module is compatible with an older version of PDK. Run `pdk update` to update it to your version of PDK."
 msgstr ""
 
-#: ../lib/pdk/cli/util.rb:103
+#: ../lib/pdk/cli/util.rb:106
 msgid "Using Ruby %{version}"
 msgstr ""
 
-#: ../lib/pdk/cli/util.rb:113
+#: ../lib/pdk/cli/util.rb:116
 msgid "Using %{gem} %{version}"
 msgstr ""
 
-#: ../lib/pdk/cli/util.rb:140
+#: ../lib/pdk/cli/util.rb:146
+msgid "You cannot specify a %{first} and %{second} at the same time"
+msgstr ""
+
+#: ../lib/pdk/cli/util.rb:158
 msgid "You cannot specify a %{first} and %{second} at the same time."
 msgstr ""
 
@@ -528,35 +536,35 @@ msgid ""
 "[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
+#: ../lib/pdk/cli/validate.rb:18
 msgid "List all available validators."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:18
+#: ../lib/pdk/cli/validate.rb:19
 msgid "Automatically correct problems where possible."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:19
+#: ../lib/pdk/cli/validate.rb:20
 msgid "Run validations in parallel."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:32
+#: ../lib/pdk/cli/validate.rb:33
 msgid "Available validators: %{validator_names}"
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:39
+#: ../lib/pdk/cli/validate.rb:40
 msgid "Code validation can only be run from inside a valid module directory"
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:55
+#: ../lib/pdk/cli/validate.rb:56
 msgid "Unknown validator '%{v}'. Available validators: %{validators}."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:65 ../lib/pdk/cli/validate.rb:69
+#: ../lib/pdk/cli/validate.rb:66 ../lib/pdk/cli/validate.rb:70
 msgid "Running all available validators..."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:95
+#: ../lib/pdk/cli/validate.rb:97
 msgid "Validating module using %{num_of_threads} threads"
 msgstr ""
 
@@ -590,107 +598,107 @@ msgstr ""
 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:146
+#: ../lib/pdk/generate/module.rb:140
 msgid "Unable to create directory '%{dir}': %{message}"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:158
+#: ../lib/pdk/generate/module.rb:152
 msgid "If you have a name for your module, add it here."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:159
+#: ../lib/pdk/generate/module.rb:153
 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:162
+#: ../lib/pdk/generate/module.rb:156
 msgid "Module names must begin with a lowercase letter and can only include lowercase letters, numbers, and underscores."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:166
+#: ../lib/pdk/generate/module.rb:160
 msgid "If you have a Puppet Forge username, add it here."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:167
+#: ../lib/pdk/generate/module.rb:161
 msgid "We can use this to upload your module to the Forge when it's complete."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:170
+#: ../lib/pdk/generate/module.rb:164
 msgid "Forge usernames can only contain lowercase letters and numbers"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:175
+#: ../lib/pdk/generate/module.rb:169
 msgid "What version is this module?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:176
+#: ../lib/pdk/generate/module.rb:170
 msgid "Puppet uses Semantic Versioning (semver.org) to version modules."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:179
+#: ../lib/pdk/generate/module.rb:173
 msgid "Semantic Version numbers must be in the form MAJOR.MINOR.PATCH"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:185
+#: ../lib/pdk/generate/module.rb:179
 msgid "Who wrote this module?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:186
+#: ../lib/pdk/generate/module.rb:180
 msgid "This is used to credit the module's author."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:192
+#: ../lib/pdk/generate/module.rb:186
 msgid "What license does this module code fall under?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:193
+#: ../lib/pdk/generate/module.rb:187
 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:199
+#: ../lib/pdk/generate/module.rb:193
 msgid "What operating systems does this module support?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:200
+#: ../lib/pdk/generate/module.rb:194
 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:256
+#: ../lib/pdk/generate/module.rb:204
 msgid "Summarize the purpose of this module in a single sentence."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:257
+#: ../lib/pdk/generate/module.rb:205
 msgid "This helps other Puppet users understand what the module does."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:264
+#: ../lib/pdk/generate/module.rb:212
 msgid "If there is a source code repository for this module, enter the URL here."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:265
+#: ../lib/pdk/generate/module.rb:213
 msgid "Skip this if no repository exists yet. You can update this later in the metadata.json."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:272
+#: ../lib/pdk/generate/module.rb:220
 msgid "If there is a URL where others can learn more about this module, enter it here."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:273 ../lib/pdk/generate/module.rb:280
+#: ../lib/pdk/generate/module.rb:221 ../lib/pdk/generate/module.rb:228
 msgid "Optional. You can update this later in the metadata.json."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:279
+#: ../lib/pdk/generate/module.rb:227
 msgid "If there is a public issue tracker for this module, enter its URL here."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:306
-msgid "update"
+#: ../lib/pdk/generate/module.rb:254
+msgid "create"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:306
-msgid "create"
+#: ../lib/pdk/generate/module.rb:254
+msgid "update"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:307
+#: ../lib/pdk/generate/module.rb:255
 msgid ""
 "\n"
 "We need to %{action} the metadata.json file for this module, so we\\'re going to ask you %{count} questions.\n"
@@ -698,19 +706,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:321
+#: ../lib/pdk/generate/module.rb:269
 msgid "No answers given, interview cancelled."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:345
+#: ../lib/pdk/generate/module.rb:293
 msgid "Metadata will be generated based on this information, continue?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:347
+#: ../lib/pdk/generate/module.rb:295
 msgid "Interview cancelled; exiting."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:351
+#: ../lib/pdk/generate/module.rb:299
 msgid "Process cancelled; exiting."
 msgstr ""
 
@@ -838,51 +846,51 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:49
+#: ../lib/pdk/module/metadata.rb:91
 msgid "Cannot read metadata from file: no path to file was given."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:53
+#: ../lib/pdk/module/metadata.rb:95
 msgid "'%{file}' does not exist or is not a file."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:57
+#: ../lib/pdk/module/metadata.rb:99
 msgid "Unable to open '%{file}' for reading."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:63
+#: ../lib/pdk/module/metadata.rb:105
 msgid "Invalid JSON in metadata.json: %{msg}"
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:96
+#: ../lib/pdk/module/metadata.rb:138
 msgid "Module metadata does not contain any requirements."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:97
+#: ../lib/pdk/module/metadata.rb:139
 msgid "Module metadata does not contain a \"puppet\" requirement."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:98
+#: ../lib/pdk/module/metadata.rb:140
 msgid "The \"puppet\" requirement in module metadata does not specify a \"version_requirement\"."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:137
+#: ../lib/pdk/module/metadata.rb:179
 msgid "Field must be a dash-separated user name and module name."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:139
+#: ../lib/pdk/module/metadata.rb:181
 msgid "Module name must contain only alphanumeric or underscore characters."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:141
+#: ../lib/pdk/module/metadata.rb:183
 msgid "Module name must begin with a letter."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:143
+#: ../lib/pdk/module/metadata.rb:185
 msgid "Namespace must contain only alphanumeric characters."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:146
+#: ../lib/pdk/module/metadata.rb:188
 msgid "Invalid 'name' field in metadata.json: %{err}"
 msgstr ""
 
@@ -1041,11 +1049,11 @@ msgid "Failed to prepare to run the unit tests."
 msgstr ""
 
 #: ../lib/pdk/tests/unit.rb:72
-msgid "Running unit tests in parallel."
+msgid "Running 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:86
@@ -1134,35 +1142,43 @@ msgstr ""
 msgid "Unable to access the template repository \"%{repository}\""
 msgstr ""
 
-#: ../lib/pdk/util/puppet_version.rb:24
+#: ../lib/pdk/util/puppet_version.rb:38
 msgid "Unable to find a Puppet gem in current Ruby environment or from Rubygems.org."
 msgstr ""
 
-#: ../lib/pdk/util/puppet_version.rb:48
+#: ../lib/pdk/util/puppet_version.rb:52
+msgid "Unable to clone git repository at '%{repo}'."
+msgstr ""
+
+#: ../lib/pdk/util/puppet_version.rb:60
+msgid "Unable to pull updates for git repository at '%{cachedir}'."
+msgstr ""
+
+#: ../lib/pdk/util/puppet_version.rb:81
 msgid "Unable to find a Puppet gem matching %{requirement}."
 msgstr ""
 
-#: ../lib/pdk/util/puppet_version.rb:55
+#: ../lib/pdk/util/puppet_version.rb:88
 msgid "Puppet %{requested_version} is not available, activating %{found_version} instead."
 msgstr ""
 
-#: ../lib/pdk/util/puppet_version.rb:72
+#: ../lib/pdk/util/puppet_version.rb:105
 msgid "Unable to map Puppet Enterprise version %{pe_version} to a Puppet version."
 msgstr ""
 
-#: ../lib/pdk/util/puppet_version.rb:77
+#: ../lib/pdk/util/puppet_version.rb:110
 msgid "Puppet Enterprise %{pe_version} maps to Puppet %{puppet_version}."
 msgstr ""
 
-#: ../lib/pdk/util/puppet_version.rb:90
+#: ../lib/pdk/util/puppet_version.rb:123
 msgid "Unable to determine Puppet version for module: no metadata.json present in module."
 msgstr ""
 
-#: ../lib/pdk/util/puppet_version.rb:116
+#: ../lib/pdk/util/puppet_version.rb:149
 msgid "%{version} is not a valid version number."
 msgstr ""
 
-#: ../lib/pdk/util/puppet_version.rb:150
+#: ../lib/pdk/util/puppet_version.rb:183
 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.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-25 00:00:00.000000000 Z
+date: 2018-08-20 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.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A key part of the Puppet Development Kit, the shortest path to better modules