(maint) Clean up pdk/module requires

lib/pdk/cli/build.rb

@@ -14,6 +14,7 @@ module PDK::CLI
 
     run do |opts, _args, _cmd|
       require 'pdk/module/build'
+      require 'pdk/module/metadata'
 
       # Make sure build is being run in a valid module directory with a metadata.json
       PDK::CLI::Util.ensure_in_module!(

lib/pdk/generate.rb

@@ -4,8 +4,6 @@
 require 'pdk/generate/puppet_class'
 require 'pdk/generate/task'
 require 'pdk/generate/transport'
-require 'pdk/module/metadata'
-require 'pdk/module/templatedir'
 
 module PDK
   module Generate

lib/pdk/generate/module.rb

@@ -5,8 +5,6 @@
 
 require 'pdk'
 require 'pdk/logger'
-require 'pdk/module/metadata'
-require 'pdk/module/templatedir'
 require 'pdk/cli/util'
 require 'pdk/cli/util/interview'
 require 'pdk/cli/util/option_validator'
@@ -32,6 +30,8 @@ def self.validate_options(opts)
       end
 
       def self.invoke(opts = {})
+        require 'pdk/module/templatedir'
+
         validate_options(opts) unless opts[:module_name].nil?
 
         metadata = prepare_metadata(opts)
@@ -119,6 +119,8 @@ def self.username_from_login
 
       def self.prepare_metadata(opts = {})
         require 'pdk/answer_file'
+        require 'pdk/module/metadata'
+
         opts[:username] = (opts[:username] || PDK.answers['forge_username'] || username_from_login).downcase
 
         defaults = PDK::Module::Metadata::DEFAULTS.dup

lib/pdk/generate/puppet_object.rb

@@ -1,8 +1,6 @@
 require 'fileutils'
 
 require 'pdk/logger'
-require 'pdk/module/metadata'
-require 'pdk/module/templatedir'
 require 'pdk/template_file'
 require 'pdk/util/filesystem'
 
@@ -258,6 +256,8 @@ def write_file(dest_path)
       #
       # @api private
       def with_templates
+        require 'pdk/module/templatedir'
+
         templates.each do |template|
           if template[:uri].nil?
             PDK.logger.debug(_('No %{dir_type} template found; trying next template directory.') % { dir_type: template[:type] })

lib/pdk/module/build.rb

@@ -3,7 +3,6 @@
 require 'zlib'
 require 'pathspec'
 require 'find'
-require 'pdk/module'
 require 'pdk/tests/unit'
 
 module PDK
@@ -26,6 +25,8 @@ def initialize(options = {})
       #
       # @return [Hash{String => Object}] The hash of metadata values.
       def metadata
+        require 'pdk/module/metadata'
+
         @metadata ||= PDK::Module::Metadata.from_file(File.join(module_dir, 'metadata.json')).data
       end
 
@@ -268,6 +269,8 @@ def ignore_file
       #
       # @return [PathSpec] The populated ignore path matcher.
       def ignored_files
+        require 'pdk/module'
+
         @ignored_files ||=
           begin
             ignored = if ignore_file.nil?

lib/pdk/module/convert.rb

@@ -1,5 +1,3 @@
-require 'pdk/generate/module'
-require 'pdk/module/update_manager'
 require 'pdk/util'
 require 'pdk/report'
 
@@ -107,6 +105,8 @@ def needs_bundle_update?
       end
 
       def stage_changes!
+        require 'pdk/module/templatedir'
+
         metadata_path = 'metadata.json'
 
         PDK::Module::TemplateDir.new(template_uri, nil, true) do |templates|
@@ -145,6 +145,8 @@ def stage_changes!
       end
 
       def update_manager
+        require 'pdk/module/update_manager'
+
         @update_manager ||= PDK::Module::UpdateManager.new
       end
 
@@ -153,6 +155,8 @@ def template_uri
       end
 
       def update_metadata(metadata_path, template_metadata)
+        require 'pdk/generate/module'
+
         if PDK::Util::Filesystem.file?(metadata_path)
           unless PDK::Util::Filesystem.readable?(metadata_path)
             raise PDK::CLI::ExitWithError, _('Unable to update module metadata; %{path} exists but it is not readable.') % {

lib/pdk/util.rb

@@ -218,6 +218,8 @@ def targets_relative_to_pwd(targets)
 
     # TO-DO: Refactor replacement of lib/pdk/module/build.rb:metadata to use this function instead
     def module_metadata
+      require 'pdk/module/metadata'
+
       PDK::Module::Metadata.from_file(File.join(module_root, 'metadata.json')).data
     end
     module_function :module_metadata

lib/pdk/validate/base_validator.rb

@@ -1,5 +1,4 @@
 require 'pdk'
-require 'pdk/module'
 
 module PDK
   module Validate
@@ -81,6 +80,8 @@ def self.parse_targets(options)
       end
 
       def self.ignore_pathspec
+        require 'pdk/module'
+
         ignore_pathspec = PDK::Module.default_ignored_pathspec(ignore_dotfiles?)
 
         if respond_to?(:pattern_ignore)

spec/unit/pdk/module/metadata_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'pdk/module/metadata'
 
 describe PDK::Module::Metadata do
   context '.from_file' do

spec/unit/pdk/module/template_dir_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'yaml'
+require 'pdk/module/templatedir'
 
 describe PDK::Module::TemplateDir do
   subject(:template_dir) do