pdk 1.3.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8152056a45f108c734ac1eb4a017e986cad496b1
-  data.tar.gz: 1a0c6eb3e786de37918cc21fa6247a6460c848bf
+  metadata.gz: c3c5a5c1229e58da80498533964f4d7ae26cd5e7
+  data.tar.gz: 656f786a2d964d6ee08da649d7649580a9ea24d0
 SHA512:
-  metadata.gz: 372986f1e28505390b9f27e0ff3edb28249b3a142719a5f89392cbd222c76260c4de03c452b3a6c2a59e8e9d775be353a24143c2df4adcb933d4799860973eac
-  data.tar.gz: d6e711d87610a449e833f48afeb3dc6105ef880ef7b70041384a7107b020e97b52618699101a4ff4a8c14adb13ef4f085b4d561b1138c2474667d36ce15d45a1
+  metadata.gz: de547cceb59992ac724afbfd57888c9aea06bb875dff612d5f4fab63e52b25f39fead90fb9720fc9915c4bff40774efe1d03174742884c2903f44555b8a03a5f
+  data.tar.gz: c716798699ba50f829f8b444b41706c12d0f4310ae0ad80efd000f893ef82dd34cde7c193dcef98c059ad79f9d011cd9a4d77f625eb6eab0b0bd99cfa73e9adc

data/CHANGELOG.md

@@ -4,7 +4,68 @@ 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.3.2](https://github.com/puppetlabs/pdk/tree/v1.3.2) (2018-01-16)
+## [v1.4.1](https://github.com/puppetlabs/pdk/tree/v1.4.1) (2018-02-26)
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.4.0...v1.4.1)
+
+**Fixed bugs:**
+
+- pdk update and convert fixes [\#433](https://github.com/puppetlabs/pdk/pull/433) ([bmjen](https://github.com/bmjen))
+
+**Merged pull requests:**
+
+- Updates msg in pdk update on unconverted module [\#442](https://github.com/puppetlabs/pdk/pull/442) ([bmjen](https://github.com/bmjen))
+- Release 1.4.1 amend [\#441](https://github.com/puppetlabs/pdk/pull/441) ([bmjen](https://github.com/bmjen))
+- \(maint\) pdk update checks if module is pdk compat [\#440](https://github.com/puppetlabs/pdk/pull/440) ([bmjen](https://github.com/bmjen))
+- Release 1.4.1 amend [\#439](https://github.com/puppetlabs/pdk/pull/439) ([bmjen](https://github.com/bmjen))
+- \(maint\) add a `pdk module build` command to point to `pdk build` [\#438](https://github.com/puppetlabs/pdk/pull/438) ([DavidS](https://github.com/DavidS))
+- \(maint\) unhide the `update` command [\#437](https://github.com/puppetlabs/pdk/pull/437) ([DavidS](https://github.com/DavidS))
+- \(maint\) update: don't mention deleted Gemfile.lock and .bundle/config [\#436](https://github.com/puppetlabs/pdk/pull/436) ([DavidS](https://github.com/DavidS))
+- Release 1.4.1 [\#435](https://github.com/puppetlabs/pdk/pull/435) ([bmjen](https://github.com/bmjen))
+
+## [v1.4.0](https://github.com/puppetlabs/pdk/tree/v1.4.0) (2018-02-21)
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.3.2...v1.4.0)
+
+**Implemented enhancements:**
+
+- \(PDK-771\) Wireframe `pdk update` CLI [\#419](https://github.com/puppetlabs/pdk/pull/419) ([rodjek](https://github.com/rodjek))
+- \(PDK-550\) Removes unrequired questions from module interview [\#410](https://github.com/puppetlabs/pdk/pull/410) ([bmjen](https://github.com/bmjen))
+-  \(PDK-506\) pdk new provider [\#409](https://github.com/puppetlabs/pdk/pull/409) ([DavidS](https://github.com/DavidS))
+- \(PDK-748\) Wireframe `pdk build` CLI [\#407](https://github.com/puppetlabs/pdk/pull/407) ([rodjek](https://github.com/rodjek))
+
+**Fixed bugs:**
+
+- if a newer rubocop version is installed, pdk should fall-back to safe defaults [\#420](https://github.com/puppetlabs/pdk/issues/420)
+- Update validation regex and error message for module name question [\#430](https://github.com/puppetlabs/pdk/pull/430) ([ardrigh](https://github.com/ardrigh))
+- \(PDK-789\) Add pdk metadata to all generated templatedirs. [\#428](https://github.com/puppetlabs/pdk/pull/428) ([bmjen](https://github.com/bmjen))
+
+**Closed issues:**
+
+- WS1.Reputation - Symantec Endpoint Protection [\#403](https://github.com/puppetlabs/pdk/issues/403)
+- task input\_method 'powershell' fails validation [\#369](https://github.com/puppetlabs/pdk/issues/369)
+- PDK should have an option to disable progress indicator to make it usable in CI [\#323](https://github.com/puppetlabs/pdk/issues/323)
+
+**Merged pull requests:**
+
+- Release 1.4.0 [\#432](https://github.com/puppetlabs/pdk/pull/432) ([bmjen](https://github.com/bmjen))
+- \(PDK-808\) Fix to pdk update when there are sync.yml changes [\#431](https://github.com/puppetlabs/pdk/pull/431) ([bmjen](https://github.com/bmjen))
+- \(PDK-806\) Update metadata interview text if metadata.json already exists [\#429](https://github.com/puppetlabs/pdk/pull/429) ([rodjek](https://github.com/rodjek))
+- \(FIXUP\) Make `pdk build` overwrite prompt consistent [\#427](https://github.com/puppetlabs/pdk/pull/427) ([scotje](https://github.com/scotje))
+- \(maint\) Update unit tests to use exit\_zero/exit\_nonzero matchers [\#426](https://github.com/puppetlabs/pdk/pull/426) ([rodjek](https://github.com/rodjek))
+- \(PDK-804\) Fixes error in build without ignore file [\#425](https://github.com/puppetlabs/pdk/pull/425) ([bmjen](https://github.com/bmjen))
+- \(PDK-799\) Adds unit tests for the UX validation [\#423](https://github.com/puppetlabs/pdk/pull/423) ([bmjen](https://github.com/bmjen))
+- \(PDK-754\) Interview for missing or Forge only metadata before build [\#422](https://github.com/puppetlabs/pdk/pull/422) ([bmjen](https://github.com/bmjen))
+- \(PDK-772\) Refactor PDK::Module::Convert for re-use in PDK::Module::Update [\#421](https://github.com/puppetlabs/pdk/pull/421) ([rodjek](https://github.com/rodjek))
+- Revert "\(maint\) pin pdk-templates version ref to workaround puppet 5.… [\#418](https://github.com/puppetlabs/pdk/pull/418) ([bmjen](https://github.com/bmjen))
+- \(PDK-799\) Adds validations and checks to pdk build workflow [\#416](https://github.com/puppetlabs/pdk/pull/416) ([bmjen](https://github.com/bmjen))
+- Small fixes [\#415](https://github.com/puppetlabs/pdk/pull/415) ([DavidS](https://github.com/DavidS))
+- \(maint\) Make sure we use pdk-templates master if in development [\#414](https://github.com/puppetlabs/pdk/pull/414) ([bmjen](https://github.com/bmjen))
+- \(maint\) bump version for dev. [\#412](https://github.com/puppetlabs/pdk/pull/412) ([bmjen](https://github.com/bmjen))
+- \(PDK-758\) Initial port & cleanup of the module build code [\#411](https://github.com/puppetlabs/pdk/pull/411) ([rodjek](https://github.com/rodjek))
+- \(maint\) Fix error templatedir error message [\#408](https://github.com/puppetlabs/pdk/pull/408) ([DavidS](https://github.com/DavidS))
+- \(MAINT\) remove dead code [\#406](https://github.com/puppetlabs/pdk/pull/406) ([DavidS](https://github.com/DavidS))
+- \(PDK-575\) Run puppet parser validate with an dummy empty puppet.conf [\#402](https://github.com/puppetlabs/pdk/pull/402) ([rodjek](https://github.com/rodjek))
+
+## [v1.3.2](https://github.com/puppetlabs/pdk/tree/v1.3.2) (2018-01-17)
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.3.1...v1.3.2)
 
 **Closed issues:**
@@ -15,6 +76,7 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 **Merged pull requests:**
 
 - \(maint\) Default PDK::TEMPLATE\_REF to PDK::VERSION [\#405](https://github.com/puppetlabs/pdk/pull/405) ([rodjek](https://github.com/rodjek))
+- 1.3.2 Release Prep [\#404](https://github.com/puppetlabs/pdk/pull/404) ([HelenCampbell](https://github.com/HelenCampbell))
 - \(PDK-552\) Soften PDK::CLI::Util.ensure\_in\_module! error messages [\#401](https://github.com/puppetlabs/pdk/pull/401) ([rodjek](https://github.com/rodjek))
 - \(PDK-739\) Fall back to default template if necessary [\#400](https://github.com/puppetlabs/pdk/pull/400) ([rodjek](https://github.com/rodjek))
 

data/lib/pdk/cli.rb

@@ -45,6 +45,10 @@ module PDK::CLI
     dsl.option nil, 'skip-interview', _('When specified, skips interactive querying of metadata.')
   end
 
+  def self.full_interview_option(dsl)
+    dsl.option nil, 'full-interview', _('When specified, interactive querying of metadata will include all optional questions.')
+  end
+
   @base_cmd = Cri::Command.define do
     name 'pdk'
     usage _('pdk command [options]')
@@ -83,9 +87,11 @@ module PDK::CLI
   end
 
   require 'pdk/cli/bundle'
+  require 'pdk/cli/build'
   require 'pdk/cli/convert'
   require 'pdk/cli/new'
   require 'pdk/cli/test'
+  require 'pdk/cli/update'
   require 'pdk/cli/validate'
   require 'pdk/cli/module'
 

data/lib/pdk/cli/build.rb

@@ -0,0 +1,76 @@
+require 'pdk/cli/util'
+
+module PDK::CLI
+  @build_cmd = @base_cmd.define_command do
+    name 'build'
+    usage _('build [options]')
+    summary _('Builds a package from the module that can be published to the Puppet Forge.')
+
+    option nil, 'target-dir',
+           _('The target directory where you want PDK to write the package.'),
+           argument: :required, default: File.join(Dir.pwd, 'pkg')
+
+    option nil, 'force', _('Skips the prompts and builds the module package.')
+
+    run do |opts, _args, _cmd|
+      require 'pdk/module/build'
+
+      # Make sure build is being run in a valid module directory with a metadata.json
+      PDK::CLI::Util.ensure_in_module!(
+        message:   _('`pdk build` can only be run from inside a valid module with a metadata.json.'),
+        log_level: :info,
+      )
+
+      module_metadata = PDK::Module::Metadata.from_file('metadata.json')
+
+      # TODO: Ensure forge metadata has been set, or call out to interview
+      #       to set it.
+      #
+      unless module_metadata.forge_ready?
+        if opts[:force]
+          PDK.logger.error _('This module is missing required fields in the metadata.json. Re-run the build command without --force to add this information.')
+          exit 1
+        else
+          module_metadata.interview_for_forge!
+          module_metadata.write!('metadata.json')
+        end
+      end
+
+      builder = PDK::Module::Build.new(opts)
+
+      unless opts[:force]
+        if builder.package_already_exists?
+          PDK.logger.info _("The file '%{package}' already exists.") % { package: builder.package_file }
+
+          unless PDK::CLI::Util.prompt_for_yes(_('Overwrite?'), default: false)
+            PDK.logger.info _('Build cancelled; exiting.')
+            exit 0
+          end
+        end
+
+        unless builder.module_pdk_compatible?
+          PDK.logger.info _('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`.')
+
+          unless PDK::CLI::Util.prompt_for_yes(_('Continue build without converting?'))
+            PDK.logger.info _('Build cancelled; exiting.')
+            exit 0
+          end
+        end
+      end
+
+      PDK.logger.info _('Building %{module_name} version %{module_version}') % {
+        module_name:    module_metadata.data['name'],
+        module_version: module_metadata.data['version'],
+      }
+
+      builder.build
+
+      PDK.logger.info _('Build of %{package_name} has completed successfully. Built package can be found here: %{package_path}') % {
+        package_name: module_metadata.data['name'],
+        package_path: builder.package_file,
+      }
+    end
+  end
+end

data/lib/pdk/cli/convert.rb

@@ -8,6 +8,7 @@ module PDK::CLI
 
     PDK::CLI.template_url_option(self)
     PDK::CLI.skip_interview_option(self)
+    PDK::CLI.full_interview_option(self)
     flag nil, :noop, _('Do not convert the module, just output what would be done.')
     flag nil, :force, _('Convert the module automatically, with no prompts.')
 
@@ -24,6 +25,16 @@ module PDK::CLI
         raise PDK::CLI::ExitWithError, _('You can not specify --noop and --force when converting a module')
       end
 
+      if opts[:'skip-interview'] && opts[:'full-interview']
+        PDK.logger.info _('Ignoring --full-interview and continuing with --skip-interview.')
+        opts[:'full-interview'] = false
+      end
+
+      if opts[:force] && opts[:'full-interview']
+        PDK.logger.info _('Ignoring --full-interview and continuing with --force.')
+        opts[:'full-interview'] = false
+      end
+
       PDK::Module::Convert.invoke(opts)
     end
   end

data/lib/pdk/cli/module.rb

@@ -10,4 +10,5 @@ module PDK::CLI
   @module_cmd.add_command Cri::Command.new_basic_help
 end
 
+require 'pdk/cli/module/build'
 require 'pdk/cli/module/generate'

data/lib/pdk/cli/module/build.rb

@@ -0,0 +1,14 @@
+require 'tty-prompt'
+
+module PDK::CLI
+  @module_build_cmd = @module_cmd.define_command do
+    name 'build'
+    usage _('build')
+    summary _('This command is now \'pdk build\'.')
+
+    run do |_opts, _args, _cmd|
+      PDK.logger.warn(_('Modules are built using the ‘pdk build’ command.'))
+      exit 1
+    end
+  end
+end

data/lib/pdk/cli/new.rb

@@ -13,4 +13,5 @@ end
 require 'pdk/cli/new/class'
 require 'pdk/cli/new/defined_type'
 require 'pdk/cli/new/module'
+require 'pdk/cli/new/provider'
 require 'pdk/cli/new/task'

data/lib/pdk/cli/new/module.rb

@@ -6,6 +6,7 @@ module PDK::CLI
 
     PDK::CLI.template_url_option(self)
     PDK::CLI.skip_interview_option(self)
+    PDK::CLI.full_interview_option(self)
 
     option nil, 'license', _('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'."), argument: :required
@@ -16,6 +17,11 @@ module PDK::CLI
       module_name = args[0]
       target_dir = args[1]
 
+      if opts[:'skip-interview'] && opts[:'full-interview']
+        PDK.logger.info _('Ignoring --full-interview and continuing with --skip-interview.')
+        opts[:'full-interview'] = false
+      end
+
       unless module_name.nil? || module_name.empty?
         module_name_parts = module_name.split('-', 2)
         if module_name_parts.size > 1

data/lib/pdk/cli/new/provider.rb

@@ -0,0 +1,27 @@
+module PDK::CLI
+  @new_provider_cmd = @new_cmd.define_command do
+    name 'provider'
+    usage _('provider [options] <name>')
+    summary _('[experimental] Create a new ruby provider named <name> using given options')
+
+    PDK::CLI.template_url_option(self)
+
+    run do |opts, args, _cmd|
+      PDK::CLI::Util.ensure_in_module!
+
+      provider_name = args[0]
+      module_dir = Dir.pwd
+
+      if provider_name.nil? || provider_name.empty?
+        puts command.help
+        exit 1
+      end
+
+      unless Util::OptionValidator.valid_provider_name?(provider_name)
+        raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid provider name") % { name: provider_name }
+      end
+
+      PDK::Generate::Provider.new(module_dir, provider_name, opts).run
+    end
+  end
+end

data/lib/pdk/cli/update.rb

@@ -0,0 +1,32 @@
+require 'pdk/cli/util'
+require 'pdk/util'
+
+module PDK::CLI
+  @update_cmd = @base_cmd.define_command do
+    name 'update'
+    usage _('update [options]')
+    summary _('Update a module that has been created by or converted for use by PDK.')
+
+    flag nil, :noop, _('Do not update the module, just output what would be done.')
+    flag nil, :force, _('Update the module automatically, with no prompts.')
+
+    run do |opts, _args, _cmd|
+      require 'pdk/module/update'
+
+      PDK::CLI::Util.ensure_in_module!(
+        message:   _('`pdk update` can only be run from inside a valid module directory.'),
+        log_level: :info,
+      )
+
+      raise PDK::CLI::ExitWithError, _('This module does not appear to be PDK compatible. To make the module compatible with PDK, run `pdk convert`.') unless PDK::Util.module_pdk_compatible?
+
+      if opts[:noop] && opts[:force]
+        raise PDK::CLI::ExitWithError, _('You can not specify --noop and --force when updating a module')
+      end
+
+      updater = PDK::Module::Update.new(opts)
+
+      updater.run
+    end
+  end
+end

data/lib/pdk/cli/util.rb

@@ -46,6 +46,7 @@ module PDK
 
         begin
           response = prompt.yes?(question_text) do |q|
+            q.default opts[:default] unless opts[:default].nil?
             q.validate(validator, _('Answer "Y" to continue or "n" to cancel.'))
           end
         rescue TTY::Prompt::Reader::InputInterrupt

data/lib/pdk/cli/util/option_normalizer.rb

@@ -47,25 +47,6 @@ module PDK
             { method: "write_#{format}".to_sym, target: target }
           end
         end
-
-        def self.parameter_specification(value)
-          param_name, param_type = value.split(':', 2)
-          param_type = 'String' if param_type.nil?
-
-          unless PDK::CLI::Util::OptionValidator.valid_param_name?(param_name)
-            raise PDK::CLI::ExitWithError, _("'%{name}' is not a valid parameter name") % {
-              name: param_name,
-            }
-          end
-
-          unless PDK::CLI::Util::OptionValidator.valid_data_type?(param_type)
-            raise PDK::CLI::ExitWithError, _("'%{type}' is not a valid data type") % {
-              type: param_type,
-            }
-          end
-
-          { name: param_name, type: param_type }
-        end
       end
     end
   end

data/lib/pdk/cli/util/option_validator.rb

@@ -24,6 +24,10 @@ module PDK
         end
         singleton_class.send(:alias_method, :valid_task_name?, :valid_module_name?)
 
+        # https://puppet.com/docs/puppet/5.3/custom_types.html#creating-a-type only says the name has to be a ruby symbol.
+        # Let's assume that only strings similar to module names can actually be resolved by the puppet language.
+        singleton_class.send(:alias_method, :valid_provider_name?, :valid_module_name?)
+
         # Validate a Puppet namespace against the regular expression in the
         # documentation: https://docs.puppet.com/puppet/4.10/lang_reserved.html#classes-and-defined-resource-types
         def self.valid_namespace?(string)
@@ -46,33 +50,6 @@ module PDK
 
           !(string =~ %r{\A[a-z][a-zA-Z0-9_]*\Z}).nil?
         end
-
-        # Naive validation of a data type declaration. Extracts all the bare
-        # words and compares them against a list of known data types.
-        #
-        # @todo This prevents the use of dynamic data types like TypeReferences
-        #   but that shouldn't be a problem for the current feature set. This
-        #   should be replaced eventually by something better (or just call
-        #   Puppet::Pops::Types::TypesParser)
-        def self.valid_data_type?(string)
-          valid_types = %w[
-            String Integer Float Numeric Boolean Array Hash Regexp Undef
-            Default Class Resource Scalar Collection Variant Data Pattern Enum
-            Tuple Struct Optional Catalogentry Type Any Callable NotUndef
-          ].freeze
-
-          string.scan(%r{\b(([a-zA-Z0-9_]+)(,|\[|\]|\Z))}) do |result|
-            type = result[1]
-
-            return false unless string =~ %r{\A[A-Z]}
-
-            unless valid_types.include?(type)
-              PDK.logger.warn(_("Non-standard data type '%{type}', make sure the type is available in your code, or dependencies") % { type: type })
-            end
-          end
-
-          true
-        end
       end
     end
   end

data/lib/pdk/generate.rb

@@ -1,5 +1,6 @@
-require 'pdk/generate/module'
 require 'pdk/generate/defined_type'
+require 'pdk/generate/module'
+require 'pdk/generate/provider'
 require 'pdk/generate/puppet_class'
 require 'pdk/generate/task'
 require 'pdk/module/metadata'

data/lib/pdk/generate/module.rb

@@ -98,7 +98,7 @@ module PDK
         login_clean = 'username' if login_clean.empty?
 
         if login_clean != login
-          PDK.logger.warn _('Your username is not a valid Forge username. Proceeding with the username %{username}. You can fix this later in metadata.json.') % {
+          PDK.logger.debug _('Your username is not a valid Forge username. Proceeding with the username %{username}. You can fix this later in metadata.json.') % {
             username: login_clean,
           }
         end
@@ -125,8 +125,6 @@ module PDK
         metadata = PDK::Module::Metadata.new(defaults)
         module_interview(metadata, opts) unless opts[:'skip-interview']
 
-        metadata.update!('pdk-version' => PDK::Util::Version.version_string)
-
         metadata
       end
 
@@ -156,8 +154,8 @@ module PDK
             question:         _('If you have a name for your module, add it here.'),
             help:             _('This is the name that will be associated with your module, it should be relevant to the modules content.'),
             required:         true,
-            validate_pattern: %r{\A[a-z0-9]+\Z}i,
-            validate_message: _('Module names can only contain lowercase letters and numbers'),
+            validate_pattern: %r{\A[a-z][a-z0-9_]*\Z}i,
+            validate_message: _('Module names must begin with a lowercase letter and can only include lowercase letters, numbers, and underscores.'),
           },
           {
             name:             'forge_username',
@@ -176,6 +174,7 @@ module PDK
             validate_pattern: %r{\A[0-9]+\.[0-9]+\.[0-9]+},
             validate_message: _('Semantic Version numbers must be in the form MAJOR.MINOR.PATCH'),
             default:          metadata.data['version'],
+            forge_only:       true,
           },
           {
             name:     'author',
@@ -249,30 +248,34 @@ module PDK
             default: [1, 2, 7],
           },
           {
-            name:     'summary',
-            question: _('Summarize the purpose of this module in a single sentence.'),
-            help:     _('This helps other Puppet users understand what the module does.'),
-            required: true,
-            default:  metadata.data['summary'],
+            name:       'summary',
+            question:   _('Summarize the purpose of this module in a single sentence.'),
+            help:       _('This helps other Puppet users understand what the module does.'),
+            required:   true,
+            default:    metadata.data['summary'],
+            forge_only: true,
           },
           {
-            name:     'source',
-            question: _('If there is a source code repository for this module, enter the URL here.'),
-            help:     _('Skip this if no repository exists yet. You can update this later in the metadata.json.'),
-            required: true,
-            default:  metadata.data['source'],
+            name:       'source',
+            question:   _('If there is a source code repository for this module, enter the URL here.'),
+            help:       _('Skip this if no repository exists yet. You can update this later in the metadata.json.'),
+            required:   true,
+            default:    metadata.data['source'],
+            forge_only: true,
           },
           {
-            name:     'project_page',
-            question: _('If there is a URL where others can learn more about this module, enter it here.'),
-            help:     _('Optional. You can update this later in the metadata.json.'),
-            default:  metadata.data['project_page'],
+            name:       'project_page',
+            question:   _('If there is a URL where others can learn more about this module, enter it here.'),
+            help:       _('Optional. You can update this later in the metadata.json.'),
+            default:    metadata.data['project_page'],
+            forge_only: true,
           },
           {
-            name:     'issues_url',
-            question: _('If there is a public issue tracker for this module, enter its URL here.'),
-            help:     _('Optional. You can update this later in the metadata.json.'),
-            default:  metadata.data['issues_url'],
+            name:       'issues_url',
+            question:   _('If there is a public issue tracker for this module, enter its URL here.'),
+            help:       _('Optional. You can update this later in the metadata.json.'),
+            default:    metadata.data['issues_url'],
+            forge_only: true,
           },
         ]
 
@@ -280,18 +283,33 @@ module PDK
 
         interview = PDK::CLI::Util::Interview.new(prompt)
 
-        questions.reject! { |q| q[:name] == 'module_name' } if opts.key?(:module_name)
-        questions.reject! { |q| q[:name] == 'license' } if opts.key?(:license)
+        if opts[:only_ask]
+          questions.reject! do |question|
+            if %w[module_name forge_username].include?(question[:name])
+              metadata.data['name'] && metadata.data['name'] =~ %r{\A[a-z0-9]+-[a-z0-9]+\Z}i
+            else
+              !opts[:only_ask].include?(question[:name])
+            end
+          end
+        else
+          questions.reject! { |q| q[:name] == 'module_name' } if opts.key?(:module_name)
+          questions.reject! { |q| q[:name] == 'license' } if opts.key?(:license)
+          questions.reject! { |q| q[:forge_only] } unless opts.key?(:'full-interview')
+        end
 
         interview.add_questions(questions)
 
+        action = File.file?('metadata.json') ? _('update') : _('create')
         puts _(
-          "\nWe need to create a metadata.json file for this module, so we\'re going to ask you %{count} " \
+          "\nWe 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",
-        ) % { count: interview.num_questions }
+        ) % {
+          count: interview.num_questions,
+          action: action,
+        }
 
         answers = interview.run
 
@@ -300,15 +318,21 @@ module PDK
           exit 0
         end
 
-        opts[:username] = answers['forge_username']
-        opts[:module_name] = answers['module_name'] unless answers['module_name'].nil?
+        unless answers['forge_username'].nil?
+          opts[:username] = answers['forge_username']
 
-        answers['name'] = "#{opts[:username]}-" + (opts[:module_name])
-        answers['license'] = opts[:license] if opts.key?(:license)
-        answers['operatingsystem_support'].flatten!
+          unless answers['module_name'].nil?
+            opts[:module_name] = answers['module_name']
+
+            answers.delete('module_name')
+          end
 
-        answers.delete('forge_username')
-        answers.delete('module_name')
+          answers['name'] = "#{opts[:username]}-" + (opts[:module_name])
+          answers.delete('forge_username')
+        end
+
+        answers['license'] = opts[:license] if opts.key?(:license)
+        answers['operatingsystem_support'].flatten! if answers.key?('operatingsystem_support')
 
         metadata.update!(answers)
 
@@ -326,9 +350,11 @@ module PDK
         end
 
         PDK.answers.update!(
-          'forge_username' => opts[:username],
-          'author'         => answers['author'],
-          'license'        => answers['license'],
+          {
+            'forge_username' => opts[:username],
+            'author'         => answers['author'],
+            'license'        => answers['license'],
+          }.delete_if { |_key, value| value.nil? },
         )
       end
     end