pdk 1.3.2 → 1.4.1

data/lib/pdk/module/metadata.rb

@@ -79,8 +79,21 @@ module PDK
         end
       end
 
+      def forge_ready?
+        missing_fields.empty?
+      end
+
+      def interview_for_forge!
+        PDK::Generate::Module.module_interview(self, only_ask: missing_fields)
+      end
+
       private
 
+      def missing_fields
+        fields = DEFAULTS.keys - %w[data_provider requirements dependencies]
+        fields.select { |key| @data[key].nil? || @data[key].empty? }
+      end
+
       # Do basic validation and parsing of the name parameter.
       def process_name(data)
         validate_name(data['name'])

data/lib/pdk/module/templatedir.rb

@@ -48,7 +48,7 @@ module PDK
           # template repo in `%AppData%` or `$XDG_CACHE_DIR` and update before
           # use.
           temp_dir = PDK::Util.make_tmpdir_name('pdk-templates')
-          git_ref = PDK::Util.default_template_ref
+          git_ref = (path_or_url == PDK::Util.default_template_url) ? PDK::Util.default_template_ref : 'origin/master'
 
           clone_result = PDK::Util::Git.git('clone', path_or_url, temp_dir)
 
@@ -97,14 +97,16 @@ module PDK
       #
       # @api public
       def metadata
-        return {} unless @repo
+        result = {
+          'pdk-version' => PDK::Util::Version.version_string,
+        }
+
+        result['template-url'] = @repo ? @repo : @path
 
         ref_result = PDK::Util::Git.git('--git-dir', File.join(@path, '.git'), 'describe', '--all', '--long', '--always')
-        if ref_result[:exit_code].zero?
-          { 'template-url' => @repo, 'template-ref' => ref_result[:stdout].strip }
-        else
-          {}
-        end
+        result['template-ref'] = ref_result[:stdout].strip if ref_result[:exit_code].zero?
+
+        result
       end
 
       # Loop through the files in the template, yielding each rendered file to
@@ -153,10 +155,12 @@ module PDK
       # @api public
       def object_template_for(object_type)
         object_path = File.join(@object_dir, "#{object_type}.erb")
+        addon_path = File.join(@object_dir, "#{object_type}_addon.erb")
         spec_path = File.join(@object_dir, "#{object_type}_spec.erb")
 
         if File.file?(object_path) && File.readable?(object_path)
           result = { object: object_path }
+          result[:addon] = addon_path if File.file?(addon_path) && File.readable?(addon_path)
           result[:spec] = spec_path if File.file?(spec_path) && File.readable?(spec_path)
           result
         else
@@ -213,7 +217,7 @@ module PDK
         temp_paths = []
         dirlocs = []
         dirs.each do |dir|
-          raise ArgumentError, _("The directory '%{dir}' doesn't exist") unless Dir.exist?(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

data/lib/pdk/module/update.rb

@@ -0,0 +1,111 @@
+require 'pdk/module/convert'
+
+module PDK
+  module Module
+    class Update < Convert
+      GIT_DESCRIBE_PATTERN = %r{\A(?<base>.+?)-(?<additional_commits>\d+)-g(?<sha>.+)\Z}
+
+      def run
+        stage_changes!
+
+        unless update_manager.changes?
+          if current_version == new_version
+            PDK.logger.info _('This module is already up to date with version %{version} of the template.') % {
+              version: new_version,
+            }
+          else
+            PDK::Report.default_target.puts(_('No changes required.'))
+          end
+          return
+        end
+
+        PDK.logger.info(update_message)
+
+        print_summary
+        full_report('update_report.txt') unless update_manager.changes[:modified].empty?
+
+        return if noop?
+
+        unless force?
+          message = _('Do you want to continue and make these changes to your module?')
+          return unless PDK::CLI::Util.prompt_for_yes(message)
+        end
+
+        # Remove these files straight away as these changes are not something that the user needs to review.
+        if needs_bundle_update?
+          update_manager.unlink_file('Gemfile.lock')
+          update_manager.unlink_file(File.join('.bundle', 'config'))
+        end
+
+        update_manager.sync_changes!
+
+        PDK::Util::Bundler.ensure_bundle! if needs_bundle_update?
+
+        print_result 'Update completed'
+      end
+
+      def module_metadata
+        @module_metadata ||= PDK::Module::Metadata.from_file('metadata.json')
+      rescue ArgumentError => e
+        raise PDK::CLI::ExitWithError, e.message
+      end
+
+      def template_url
+        @template_url ||= module_metadata.data['template-url']
+      end
+
+      def current_version
+        @current_version ||= describe_ref_to_s(current_template_version)
+      end
+
+      def new_version
+        @new_version ||= fetch_remote_version(new_template_version)
+      end
+
+      private
+
+      def current_template_version
+        @current_template_version ||= module_metadata.data['template-ref']
+      end
+
+      def describe_ref_to_s(describe_ref)
+        data = GIT_DESCRIBE_PATTERN.match(describe_ref)
+
+        return data if data.nil?
+
+        if data[:base].start_with?('heads/')
+          "#{data[:base].gsub(%r{^heads/}, '')}@#{data[:sha]}"
+        else
+          data[:base]
+        end
+      end
+
+      def new_template_version
+        PDK::Util.default_template_ref
+      end
+
+      def fetch_remote_version(version)
+        return version unless version.include?('/')
+
+        branch = version.partition('/').last
+        sha_length = GIT_DESCRIBE_PATTERN.match(current_template_version)[:sha].length - 1
+        "#{branch}@#{PDK::Util::Git.ls_remote(template_url, "refs/heads/#{branch}")[0..sha_length]}"
+      end
+
+      def update_message
+        format_string = if template_url == PDK::Util.puppetlabs_template_url
+                          _('Updating %{module_name} using the default template, from %{current_version} to %{new_version}')
+                        else
+                          _('Updating %{module_name} using the template at %{template_url}, from %{current_version} to %{new_version}')
+                        end
+
+        format_string % {
+          module_name:     module_metadata.data['name'],
+          template_url:    template_url,
+          current_version: current_version,
+          new_version:     new_version,
+        }
+      end
+    end
+  end
+end

data/lib/pdk/module/update_manager.rb

@@ -1,8 +1,8 @@
-require 'set'
 require 'diff/lcs'
 require 'diff/lcs/hunk'
 require 'English'
 require 'fileutils'
+require 'set'
 
 module PDK
   module Module
@@ -86,13 +86,36 @@ module PDK
         files_to_write = @added_files
         files_to_write += @modified_files.reject { |file| @diff_cache[file[:path]].nil? }
 
+        @removed_files.each do |file|
+          unlink_file(file)
+        end
+
         files_to_write.each do |file|
           write_file(file[:path], file[:content])
         end
+      end
 
-        @removed_files.each do |file|
-          unlink_file(file)
+      # Remove a file from disk.
+      #
+      # Like FileUtils.rm_f, this method will not fail if the file does not
+      # exist. Unlike FileUtils.rm_f, this method will not blindly swallow all
+      # exceptions.
+      #
+      # @param path [String] The path to the file to be removed.
+      #
+      # @raise [PDK::CLI::ExitWithError] if the file could not be removed.
+      def unlink_file(path)
+        if File.file?(path)
+          PDK.logger.debug(_("unlinking '%{path}'") % { path: path })
+          FileUtils.rm(path)
+        else
+          PDK.logger.debug(_("'%{path}': already gone") % { path: path })
         end
+      rescue => e
+        raise PDK::CLI::ExitWithError, _("Unable to remove '%{path}': %{message}") % {
+          path:    path,
+          message: e.message,
+        }
       end
 
       private
@@ -124,29 +147,12 @@ module PDK
       # @raise [PDK::CLI::ExitWithError] if the file is not writeable.
       def write_file(path, content)
         FileUtils.mkdir_p(File.dirname(path))
+        PDK.logger.debug(_("writing '%{path}'") % { path: path })
         File.open(path, 'w') { |f| f.puts content }
       rescue Errno::EACCES
         raise PDK::CLI::ExitWithError, _("You do not have permission to write to '%{path}'") % { path: path }
       end
 
-      # Remove a file from disk.
-      #
-      # Like FileUtils.rm_f, this method will not fail if the file does not
-      # exist. Unlink FileUtils.rm_f, this method will not blindly swallow all
-      # exceptions.
-      #
-      # @param path [String] The path to the file to be removed.
-      #
-      # @raise [PDK::CLI::ExitWithError] if the file could not be removed.
-      def unlink_file(path)
-        FileUtils.rm(path) if File.file?(path)
-      rescue => e
-        raise PDK::CLI::ExitWithError, _("Unable to remove '%{path}': %{message}") % {
-          path:    path,
-          message: e.message,
-        }
-      end
-
       # Generate a unified diff of the changes to be made to a file.
       #
       # @param path [String] The path to the file being diffed (only used to

data/lib/pdk/util.rb

@@ -59,7 +59,7 @@ module PDK
     module_function :package_install?
 
     def development_mode?
-      !PDK::Util::Version.git_ref.nil?
+      (!PDK::Util::Version.git_ref.nil? || PDK::VERSION.end_with?('.pre'))
     end
     module_function :development_mode?
 
@@ -216,5 +216,17 @@ module PDK
       end
     end
     module_function :puppetlabs_template_ref
+
+    # TO-DO: Refactor replacement of lib/pdk/module/build.rb:metadata to use this function instead
+    def module_metadata
+      PDK::Module::Metadata.from_file(File.join(module_root, 'metadata.json')).data
+    end
+    module_function :module_metadata
+
+    # TO-DO: Refactor replacement of lib/pdk/module/build.rb:module_pdk_compatible? to use this function instead
+    def module_pdk_compatible?
+      ['pdk-version', 'template-url'].any? { |key| module_metadata.key?(key) }
+    end
+    module_function :module_pdk_compatible?
   end
 end

data/lib/pdk/util/git.rb

@@ -37,6 +37,21 @@ module PDK
 
         git(*args)[:exit_code].zero?
       end
+
+      def self.ls_remote(repo, ref)
+        output = git('ls-remote', '--refs', repo, ref)
+
+        unless output[:exit_code].zero?
+          PDK.logger.error output[:stdout]
+          PDK.logger.error output[:stderr]
+          raise PDK::CLI::ExitWithError, _('Unable to access the template repository "%{repository}"') % {
+            repository: repo,
+          }
+        end
+
+        matching_refs = output[:stdout].split("\n").map { |r| r.split("\t") }
+        matching_refs.find { |_sha, remote_ref| remote_ref == ref }.first
+      end
     end
   end
 end

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

@@ -5,6 +5,25 @@ require 'pdk/validate/base_validator'
 module PDK
   module Validate
     class PuppetSyntax < BaseValidator
+      # In Puppet >= 5.3.4, the error context formatting was changed to facilitate localization
+      ERROR_CONTEXT = %r{(?:file:\s(?<file>.+?)|line:\s(?<line>.+?)|column:\s(?<column>.+?))}
+      # In Puppet < 5.3.3, the error context was formatted in these variations:
+      #   - "at file_path:line_num:col_num"
+      #   - "at file_path:line_num"
+      #   - "at line line_num"
+      #   - "in file_path"
+      ERROR_CONTEXT_LEGACY = %r{(?:at\sline\s(?<line>\d+)|at\s(?<file>.+?):(?<line>\d+):(?<column>\d+)|at\s(?<file>.+?):(?<line>\d+)|in\s(?<file>.+?))}
+
+      PUPPET_SYNTAX_PATTERN = %r{^
+        (?<severity>.+?):\s
+        (?<message>.+?)
+        (?:
+          \s\(#{ERROR_CONTEXT}(,\s#{ERROR_CONTEXT})*\)| # attempt to match the new localisation friendly location
+          \s#{ERROR_CONTEXT_LEGACY}| # attempt to match the old " at file:line:column" location
+          $                                               # handle cases where the output has no location
+        )
+      $}x
+
       def self.name
         'puppet-syntax'
       end
@@ -22,39 +41,22 @@ module PDK
       end
 
       def self.parse_options(_options, targets)
-        %w[parser validate].concat(targets)
+        ['parser', 'validate', '--config', null_file].concat(targets)
+      end
+
+      def self.null_file
+        Gem.win_platform? ? 'NUL' : '/dev/null'
       end
 
       def self.parse_output(report, result, targets)
         # Due to PUP-7504, we will have to programmatically construct the json
         # object from the text output for now.
-        output = result[:stderr].split("\n")
+        output = result[:stderr].split("\n").reject { |entry| entry.empty? }
 
         results_data = []
         output.each do |offense|
-          sanitize_console_output(offense)
-          message, _at, location_raw = offense.partition(' at ')
-
-          # Parse the offense type and msg
-          severity, _colon, message = message.rpartition(': ')
-
-          # Parse the offense location info
-          location = location_raw.strip.match(%r{\A(?<file>.+):(?<line>\d+):(?<column>\d+)\Z}) unless location_raw.nil?
-
-          attributes = {
-            source:  name,
-            message: message.strip,
-            state:  :failure,
-          }
-          attributes[:severity] = severity.strip unless severity.nil?
-
-          unless location.nil?
-            attributes[:file] = location[:file]
-            attributes[:line] = location[:line]
-            attributes[:column] = location[:column]
-          end
-
-          results_data << attributes
+          offense_data = parse_offense(offense)
+          results_data << offense_data
         end
 
         # puppet parser validate does not include files without problems in its
@@ -74,6 +76,23 @@ module PDK
         end
       end
 
+      def self.parse_offense(offense)
+        sanitize_console_output(offense)
+
+        offense_data = {
+          source:  name,
+          state:  :failure,
+        }
+
+        attributes = offense.match(PUPPET_SYNTAX_PATTERN)
+
+        attributes.names.each do |name|
+          offense_data[name.to_sym] = attributes[name] unless attributes[name].nil?
+        end
+
+        offense_data
+      end
+
       def self.sanitize_console_output(line)
         line.gsub!(%r{\e\[([;\d]+)?m}, '')
       end

data/lib/pdk/version.rb

@@ -1,4 +1,4 @@
 module PDK
-  VERSION = '1.3.2'.freeze
+  VERSION = '1.4.1'.freeze
   TEMPLATE_REF = VERSION
 end

data/locales/pdk.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: puppet development kit v1.3.1-7-g6c96455\n"
+"Project-Id-Version: puppet development kit v1.4.0-20-gdc7faf3\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
-"POT-Creation-Date: 2018-01-16 14:39-0700\n"
-"PO-Revision-Date: 2018-01-16 14:39-0700\n"
+"POT-Creation-Date: 2018-02-26 13:34-0700\n"
+"PO-Revision-Date: 2018-02-26 13:34-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -47,38 +47,94 @@ msgstr ""
 msgid "When specified, skips interactive querying of metadata."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:50
+#: ../lib/pdk/cli.rb:49
+msgid "When specified, interactive querying of metadata will include all optional questions."
+msgstr ""
+
+#: ../lib/pdk/cli.rb:54
 msgid "pdk command [options]"
 msgstr ""
 
-#: ../lib/pdk/cli.rb:51
+#: ../lib/pdk/cli.rb:55
 msgid "Puppet Development Kit"
 msgstr ""
 
-#: ../lib/pdk/cli.rb:52
+#: ../lib/pdk/cli.rb:56
 msgid "The shortest path to better modules."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:55
+#: ../lib/pdk/cli.rb:59
 msgid "Show version of pdk."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:60
+#: ../lib/pdk/cli.rb:64
 msgid "Show help for this command."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:65
+#: ../lib/pdk/cli.rb:69
 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:76
+#: ../lib/pdk/cli.rb:80
 msgid "Enable debug output."
 msgstr ""
 
-#: ../lib/pdk/cli.rb:80
+#: ../lib/pdk/cli.rb:84
 msgid "Path to an answer file."
 msgstr ""
 
+#: ../lib/pdk/cli/build.rb:6
+msgid "build [options]"
+msgstr ""
+
+#: ../lib/pdk/cli/build.rb:7
+msgid "Builds a package from the module that can be published to the Puppet Forge."
+msgstr ""
+
+#: ../lib/pdk/cli/build.rb:10
+msgid "The target directory where you want PDK to write the package."
+msgstr ""
+
+#: ../lib/pdk/cli/build.rb:13
+msgid "Skips the prompts and builds the module package."
+msgstr ""
+
+#: ../lib/pdk/cli/build.rb:20
+msgid "`pdk build` can only be run from inside a valid module with a metadata.json."
+msgstr ""
+
+#: ../lib/pdk/cli/build.rb:31
+msgid "This module is missing required fields in the metadata.json. Re-run the build command without --force to add this information."
+msgstr ""
+
+#: ../lib/pdk/cli/build.rb:43
+msgid "The file '%{package}' already exists."
+msgstr ""
+
+#: ../lib/pdk/cli/build.rb:45
+msgid "Overwrite?"
+msgstr ""
+
+#: ../lib/pdk/cli/build.rb:46 ../lib/pdk/cli/build.rb:57
+msgid "Build cancelled; exiting."
+msgstr ""
+
+#: ../lib/pdk/cli/build.rb:52
+msgid "This module is not compatible with PDK, so PDK can not validate or test this build. Unvalidated modules may have errors when uploading to the Forge. To make this module PDK compatible and use validate features, cancel the build and run `pdk convert`."
+msgstr ""
+
+#: ../lib/pdk/cli/build.rb:56
+msgid "Continue build without converting?"
+msgstr ""
+
+#: ../lib/pdk/cli/build.rb:63
+msgid "Building %{module_name} version %{module_version}"
+msgstr ""
+
+#: ../lib/pdk/cli/build.rb:70
+msgid "Build of %{package_name} has completed successfully. Built package can be found here: %{package_path}"
+msgstr ""
+
 #: ../lib/pdk/cli/bundle.rb:6
 msgid "bundle `-- [bundler_options]"
 msgstr ""
@@ -111,22 +167,30 @@ msgstr ""
 msgid "Convert an existing module to be compatible with the PDK."
 msgstr ""
 
-#: ../lib/pdk/cli/convert.rb:11
+#: ../lib/pdk/cli/convert.rb:12
 msgid "Do not convert the module, just output what would be done."
 msgstr ""
 
-#: ../lib/pdk/cli/convert.rb:12
+#: ../lib/pdk/cli/convert.rb:13
 msgid "Convert the module automatically, with no prompts."
 msgstr ""
 
-#: ../lib/pdk/cli/convert.rb:19
+#: ../lib/pdk/cli/convert.rb:20
 msgid "`pdk convert` can only be run from inside a valid module directory."
 msgstr ""
 
-#: ../lib/pdk/cli/convert.rb:24
+#: ../lib/pdk/cli/convert.rb:25
 msgid "You can not specify --noop and --force when converting a module"
 msgstr ""
 
+#: ../lib/pdk/cli/convert.rb:29 ../lib/pdk/cli/new/module.rb:21
+msgid "Ignoring --full-interview and continuing with --skip-interview."
+msgstr ""
+
+#: ../lib/pdk/cli/convert.rb:34
+msgid "Ignoring --full-interview and continuing with --force."
+msgstr ""
+
 #: ../lib/pdk/cli/errors.rb:6
 msgid "An unexpected error has occurred. Try running the command again with --debug"
 msgstr ""
@@ -183,6 +247,18 @@ msgstr ""
 msgid "This command is only for reminding you how to accomplish tasks with the PDK, when you were previously doing them with the puppet module command."
 msgstr ""
 
+#: ../lib/pdk/cli/module/build.rb:6
+msgid "build"
+msgstr ""
+
+#: ../lib/pdk/cli/module/build.rb:7
+msgid "This command is now 'pdk build'."
+msgstr ""
+
+#: ../lib/pdk/cli/module/build.rb:10
+msgid "Modules are built using the ‘pdk build’ command."
+msgstr ""
+
 #: ../lib/pdk/cli/module/generate.rb:6
 msgid "generate [options] <module_name>"
 msgstr ""
@@ -195,7 +271,7 @@ msgstr ""
 msgid "New modules are created using the ‘pdk new module’ command."
 msgstr ""
 
-#: ../lib/pdk/cli/module/generate.rb:38 ../lib/pdk/cli/new/module.rb:30
+#: ../lib/pdk/cli/module/generate.rb:38 ../lib/pdk/cli/new/module.rb:36
 msgid "Creating new module: %{modname}"
 msgstr ""
 
@@ -251,10 +327,22 @@ msgstr ""
 msgid "Create a new module named [module_name] using given options"
 msgstr ""
 
-#: ../lib/pdk/cli/new/module.rb:10
+#: ../lib/pdk/cli/new/module.rb:11
 msgid "Specifies the license this module is written under. This should be a identifier from https://spdx.org/licenses/. Common values are 'Apache-2.0', 'MIT', or 'proprietary'."
 msgstr ""
 
+#: ../lib/pdk/cli/new/provider.rb:4
+msgid "provider [options] <name>"
+msgstr ""
+
+#: ../lib/pdk/cli/new/provider.rb:5
+msgid "[experimental] Create a new ruby provider named <name> using given options"
+msgstr ""
+
+#: ../lib/pdk/cli/new/provider.rb:21
+msgid "'%{name}' is not a valid provider name"
+msgstr ""
+
 #: ../lib/pdk/cli/new/task.rb:4
 msgid "task [options] <name>"
 msgstr ""
@@ -323,11 +411,39 @@ msgstr ""
 msgid "\t%{id}\t%{description}"
 msgstr ""
 
+#: ../lib/pdk/cli/update.rb:7
+msgid "update [options]"
+msgstr ""
+
+#: ../lib/pdk/cli/update.rb:8
+msgid "Update a module that has been created by or converted for use by PDK."
+msgstr ""
+
+#: ../lib/pdk/cli/update.rb:10
+msgid "Do not update the module, just output what would be done."
+msgstr ""
+
+#: ../lib/pdk/cli/update.rb:11
+msgid "Update the module automatically, with no prompts."
+msgstr ""
+
+#: ../lib/pdk/cli/update.rb:17
+msgid "`pdk update` can only be run from inside a valid module directory."
+msgstr ""
+
+#: ../lib/pdk/cli/update.rb:21
+msgid "This module does not appear to be PDK compatible. To make the module compatible with PDK, run `pdk convert`."
+msgstr ""
+
+#: ../lib/pdk/cli/update.rb:24
+msgid "You can not specify --noop and --force when updating a module"
+msgstr ""
+
 #: ../lib/pdk/cli/util.rb:26
 msgid "This command must be run from inside a valid module (no metadata.json found)."
 msgstr ""
 
-#: ../lib/pdk/cli/util.rb:49
+#: ../lib/pdk/cli/util.rb:50
 msgid "Answer \"Y\" to continue or \"n\" to cancel."
 msgstr ""
 
@@ -351,22 +467,10 @@ msgstr ""
 msgid "'%{name}' is not a valid report format (%{valid})"
 msgstr ""
 
-#: ../lib/pdk/cli/util/option_normalizer.rb:56
-msgid "'%{name}' is not a valid parameter name"
-msgstr ""
-
-#: ../lib/pdk/cli/util/option_normalizer.rb:62
-msgid "'%{type}' is not a valid data type"
-msgstr ""
-
 #: ../lib/pdk/cli/util/option_validator.rb:14
 msgid "Error: the following values are invalid: %{invalid_entries}"
 msgstr ""
 
-#: ../lib/pdk/cli/util/option_validator.rb:70
-msgid "Non-standard data type '%{type}', make sure the type is available in your code, or dependencies"
-msgstr ""
-
 #: ../lib/pdk/cli/validate.rb:6
 msgid "validate [validators] [options] [targets]"
 msgstr ""
@@ -446,75 +550,75 @@ 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:144
+#: ../lib/pdk/generate/module.rb:142
 msgid "Unable to create directory '%{dir}': %{message}"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:156
+#: ../lib/pdk/generate/module.rb:154
 msgid "If you have a name for your module, add it here."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:157
+#: ../lib/pdk/generate/module.rb:155
 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:160
-msgid "Module names can only contain lowercase letters and numbers"
+#: ../lib/pdk/generate/module.rb:158
+msgid "Module names must begin with a lowercase letter and can only include lowercase letters, numbers, and underscores."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:164
+#: ../lib/pdk/generate/module.rb:162
 msgid "If you have a Puppet Forge username, add it here."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:165
+#: ../lib/pdk/generate/module.rb:163
 msgid "We can use this to upload your module to the Forge when it's complete."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:168
+#: ../lib/pdk/generate/module.rb:166
 msgid "Forge usernames can only contain lowercase letters and numbers"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:173
+#: ../lib/pdk/generate/module.rb:171
 msgid "What version is this module?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:174
+#: ../lib/pdk/generate/module.rb:172
 msgid "Puppet uses Semantic Versioning (semver.org) to version modules."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:177
+#: ../lib/pdk/generate/module.rb:175
 msgid "Semantic Version numbers must be in the form MAJOR.MINOR.PATCH"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:182
+#: ../lib/pdk/generate/module.rb:181
 msgid "Who wrote this module?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:183
+#: ../lib/pdk/generate/module.rb:182
 msgid "This is used to credit the module's author."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:189
+#: ../lib/pdk/generate/module.rb:188
 msgid "What license does this module code fall under?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:190
+#: ../lib/pdk/generate/module.rb:189
 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:196
+#: ../lib/pdk/generate/module.rb:195
 msgid "What operating systems does this module support?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:197
+#: ../lib/pdk/generate/module.rb:196
 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:253
+#: ../lib/pdk/generate/module.rb:252
 msgid "Summarize the purpose of this module in a single sentence."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:254
+#: ../lib/pdk/generate/module.rb:253
 msgid "This helps other Puppet users understand what the module does."
 msgstr ""
 
@@ -526,71 +630,119 @@ msgstr ""
 msgid "Skip this if no repository exists yet. You can update this later in the metadata.json."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:267
+#: ../lib/pdk/generate/module.rb:268
 msgid "If there is a URL where others can learn more about this module, enter it here."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:268 ../lib/pdk/generate/module.rb:274
+#: ../lib/pdk/generate/module.rb:269 ../lib/pdk/generate/module.rb:276
 msgid "Optional. You can update this later in the metadata.json."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:273
+#: ../lib/pdk/generate/module.rb:275
 msgid "If there is a public issue tracker for this module, enter its URL here."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:288
+#: ../lib/pdk/generate/module.rb:302
+msgid "update"
+msgstr ""
+
+#: ../lib/pdk/generate/module.rb:302
+msgid "create"
+msgstr ""
+
+#: ../lib/pdk/generate/module.rb:303
 msgid ""
 "\n"
-"We need to create a metadata.json file for this module, so we\\'re going to ask you %{count} questions.\n"
+"We need to %{action} the metadata.json file for this module, so we\\'re going to ask you %{count} questions.\n"
 "If the question is not applicable to this module, accept the default option shown after each question. You can modify any answers at any time by manually updating the metadata.json file.\n"
 "\n"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:299
+#: ../lib/pdk/generate/module.rb:317
 msgid "No answers given, interview cancelled."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:317
+#: ../lib/pdk/generate/module.rb:341
 msgid "Metadata will be generated based on this information, continue?"
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:319
+#: ../lib/pdk/generate/module.rb:343
 msgid "Interview cancelled; exiting."
 msgstr ""
 
-#: ../lib/pdk/generate/module.rb:323
+#: ../lib/pdk/generate/module.rb:347
 msgid "Process cancelled; exiting."
 msgstr ""
 
-#: ../lib/pdk/generate/puppet_object.rb:91
+#: ../lib/pdk/generate/provider.rb:23
+msgid "%{error}: Creating a provider needs some local configuration in your module. Please follow the docs at https://github.com/puppetlabs/puppet-resource_api#getting-started."
+msgstr ""
+
+#: ../lib/pdk/generate/provider.rb:33
+msgid ".sync.yml not found"
+msgstr ""
+
+#: ../lib/pdk/generate/provider.rb:37
+msgid ".sync.yml contents is not a Hash"
+msgstr ""
+
+#: ../lib/pdk/generate/provider.rb:39
+msgid "Gemfile configuration not found"
+msgstr ""
+
+#: ../lib/pdk/generate/provider.rb:41
+msgid "Gemfile.optional configuration not found"
+msgstr ""
+
+#: ../lib/pdk/generate/provider.rb:43
+msgid "Gemfile.optional.:development configuration not found"
+msgstr ""
+
+#: ../lib/pdk/generate/provider.rb:45
+msgid "puppet-resource_api not found in the Gemfile config"
+msgstr ""
+
+#: ../lib/pdk/generate/provider.rb:47
+msgid "spec/spec_helper.rb configuration not found"
+msgstr ""
+
+#: ../lib/pdk/generate/provider.rb:49
+msgid "spec/spec_helper.rb.mock_with configuration not found"
+msgstr ""
+
+#: ../lib/pdk/generate/provider.rb:51
+msgid "spec/spec_helper.rb.mock_with not set to ':rspec'"
+msgstr ""
+
+#: ../lib/pdk/generate/puppet_object.rb:97
 msgid "Unable to generate %{object_type}; '%{file}' already exists."
 msgstr ""
 
-#: ../lib/pdk/generate/puppet_object.rb:143
+#: ../lib/pdk/generate/puppet_object.rb:162
 msgid "Creating '%{file}' from template."
 msgstr ""
 
-#: ../lib/pdk/generate/puppet_object.rb:150
+#: ../lib/pdk/generate/puppet_object.rb:169
 msgid "Unable to create directory '%{path}': %{message}"
 msgstr ""
 
-#: ../lib/pdk/generate/puppet_object.rb:158
+#: ../lib/pdk/generate/puppet_object.rb:177
 msgid "Unable to write to file '%{path}': %{message}"
 msgstr ""
 
-#: ../lib/pdk/generate/puppet_object.rb:181
+#: ../lib/pdk/generate/puppet_object.rb:200
 msgid "No %{dir_type} template specified; trying next template directory."
 msgstr ""
 
-#: ../lib/pdk/generate/puppet_object.rb:194
+#: ../lib/pdk/generate/puppet_object.rb:213
 msgid "Unable to find a %{type} template in %{url}; trying next template directory."
 msgstr ""
 
-#: ../lib/pdk/generate/puppet_object.rb:196
+#: ../lib/pdk/generate/puppet_object.rb:215
 msgid "Unable to find the %{type} template in %{url}."
 msgstr ""
 
-#: ../lib/pdk/generate/puppet_object.rb:253
+#: ../lib/pdk/generate/puppet_object.rb:272
 msgid "'%{dir}' does not contain valid Puppet module metadata: %{msg}"
 msgstr ""
 
@@ -598,43 +750,47 @@ msgstr ""
 msgid "A task named '%{name}' already exists in this module; defined in %{file}"
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:34
+#: ../lib/pdk/module/build.rb:147
+msgid "Symlinks in modules are not supported and will not be included in the package. Please investigate symlink %{from} -> %{to}."
+msgstr ""
+
+#: ../lib/pdk/module/convert.rb:23 ../lib/pdk/module/update.rb:17
 msgid "No changes required."
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:48
+#: ../lib/pdk/module/convert.rb:34
 msgid "Module conversion is a potentially destructive action. Ensure that you have committed your module to a version control system or have a backup, and review the changes above before continuing."
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:53
+#: ../lib/pdk/module/convert.rb:39 ../lib/pdk/module/update.rb:30
 msgid "Do you want to continue and make these changes to your module?"
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:82
-msgid "Unable to convert module metadata; %{path} exists but it is not readable."
+#: ../lib/pdk/module/convert.rb:109
+msgid "Unable to update module metadata; %{path} exists but it is not readable."
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:87
-msgid "Unable to convert module metadata; %{path} exists but it is not a file."
+#: ../lib/pdk/module/convert.rb:114
+msgid "Unable to update module metadata; %{path} exists but it is not a file."
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:126 ../lib/pdk/module/convert.rb:131 ../lib/pdk/module/convert.rb:135
+#: ../lib/pdk/module/convert.rb:157 ../lib/pdk/module/convert.rb:162 ../lib/pdk/module/convert.rb:166
 msgid ""
 "\n"
 "%{banner}"
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:137
+#: ../lib/pdk/module/convert.rb:168
 msgid ""
 "\n"
 "%{summary}\n"
 "\n"
 msgstr ""
 
-#: ../lib/pdk/module/convert.rb:147
+#: ../lib/pdk/module/convert.rb:178
 msgid ""
 "\n"
-"You can find a report of differences in convert_report.txt.\n"
+"You can find a report of differences in %{path}.\n"
 "\n"
 msgstr ""
 
@@ -650,23 +806,23 @@ msgstr ""
 msgid "Invalid JSON in metadata.json: %{msg}"
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:101
+#: ../lib/pdk/module/metadata.rb:114
 msgid "Field must be a dash-separated user name and module name."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:103
+#: ../lib/pdk/module/metadata.rb:116
 msgid "Module name must contain only alphanumeric or underscore characters."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:105
+#: ../lib/pdk/module/metadata.rb:118
 msgid "Module name must begin with a letter."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:107
+#: ../lib/pdk/module/metadata.rb:120
 msgid "Namespace must contain only alphanumeric characters."
 msgstr ""
 
-#: ../lib/pdk/module/metadata.rb:110
+#: ../lib/pdk/module/metadata.rb:123
 msgid "Invalid 'name' field in metadata.json: %{err}"
 msgstr ""
 
@@ -678,48 +834,72 @@ msgstr ""
 msgid "Unable to clone git repository '%{repo}' to '%{dest}'."
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:126
+#: ../lib/pdk/module/templatedir.rb:128
 msgid "Rendering '%{template}'..."
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:131
+#: ../lib/pdk/module/templatedir.rb:133
 msgid ""
 "Failed to render template '%{template}'\n"
 "%{exception}: %{message}"
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:192
+#: ../lib/pdk/module/templatedir.rb:196
 msgid "The specified template '%{path}' is not a directory."
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:196
+#: ../lib/pdk/module/templatedir.rb:200
 msgid "The template at '%{path}' does not contain a 'moduleroot/' directory."
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:201
+#: ../lib/pdk/module/templatedir.rb:205
 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:216
+#: ../lib/pdk/module/templatedir.rb:220
 msgid "The directory '%{dir}' doesn't exist"
 msgstr ""
 
-#: ../lib/pdk/module/templatedir.rb:274
+#: ../lib/pdk/module/templatedir.rb:278
 msgid "'%{file}' is not a valid YAML file: %{message}"
 msgstr ""
 
-#: ../lib/pdk/module/update_manager.rb:110
-msgid "Unable to open '%{path}' for reading"
+#: ../lib/pdk/module/update.rb:13
+msgid "This module is already up to date with version %{version} of the template."
 msgstr ""
 
-#: ../lib/pdk/module/update_manager.rb:129
-msgid "You do not have permission to write to '%{path}'"
+#: ../lib/pdk/module/update.rb:97
+msgid "Updating %{module_name} using the default template, from %{current_version} to %{new_version}"
 msgstr ""
 
-#: ../lib/pdk/module/update_manager.rb:144
+#: ../lib/pdk/module/update.rb:99
+msgid "Updating %{module_name} using the template at %{template_url}, from %{current_version} to %{new_version}"
+msgstr ""
+
+#: ../lib/pdk/module/update_manager.rb:109
+msgid "unlinking '%{path}'"
+msgstr ""
+
+#: ../lib/pdk/module/update_manager.rb:112
+msgid "'%{path}': already gone"
+msgstr ""
+
+#: ../lib/pdk/module/update_manager.rb:115
 msgid "Unable to remove '%{path}': %{message}"
 msgstr ""
 
+#: ../lib/pdk/module/update_manager.rb:133
+msgid "Unable to open '%{path}' for reading"
+msgstr ""
+
+#: ../lib/pdk/module/update_manager.rb:150
+msgid "writing '%{path}'"
+msgstr ""
+
+#: ../lib/pdk/module/update_manager.rb:153
+msgid "You do not have permission to write to '%{path}'"
+msgstr ""
+
 #: ../lib/pdk/report/event.rb:175
 msgid "File not specified."
 msgstr ""
@@ -870,6 +1050,10 @@ msgid ""
 "%{output}"
 msgstr ""
 
+#: ../lib/pdk/util/git.rb:47
+msgid "Unable to access the template repository \"%{repository}\""
+msgstr ""
+
 #: ../lib/pdk/validate/base_validator.rb:74
 msgid "Invoking %{cmd}"
 msgstr ""
@@ -934,7 +1118,7 @@ msgstr ""
 msgid "Checking Puppet manifest style (%{pattern})."
 msgstr ""
 
-#: ../lib/pdk/validate/puppet/puppet_syntax.rb:21
+#: ../lib/pdk/validate/puppet/puppet_syntax.rb:40
 msgid "Checking Puppet manifest syntax (%{pattern})."
 msgstr ""