pdk 1.13.0 → 1.14.0

data/lib/pdk/util/template_uri.rb

@@ -1,5 +1,3 @@
-require 'pdk/util'
-
 module PDK
   module Util
     class TemplateURI
@@ -34,6 +32,8 @@ module PDK
       # /c:/foo#master (internal use only)
       #
       def initialize(opts_or_uri)
+        require 'addressable'
+
         # If a uri string is passed, skip the valid uri finding code.
         @uri = if opts_or_uri.is_a?(self.class)
                  opts_or_uri.uri
@@ -81,6 +81,8 @@ module PDK
       end
 
       def self.git_remote(uri)
+        require 'addressable'
+
         if uri.is_a?(Addressable::URI) && uri.fragment
           human_readable(uri.to_s.chomp('#' + uri.fragment))
         else
@@ -105,6 +107,9 @@ module PDK
 
       # @returns PDK::Util::TemplateURI
       def self.default_template_uri(ref = nil)
+        require 'pdk/util'
+        require 'addressable'
+
         if PDK::Util.package_install?
           PDK::Util::TemplateURI.new(Addressable::URI.new(scheme: 'file', host: '', path: File.join(PDK::Util.package_cachedir, 'pdk-templates.git'), fragment: ref))
         else
@@ -117,6 +122,8 @@ module PDK
       end
 
       def ref_is_tag?
+        require 'pdk/util/git'
+
         PDK::Util::Git.git('ls-remote', '--tags', '--exit-code', git_remote, git_ref)[:exit_code].zero?
       end
 
@@ -140,6 +147,9 @@ module PDK
       end
 
       def self.parse_scp_url(url)
+        require 'pathname'
+        require 'addressable'
+
         # Valid URIs to avoid catching:
         # - absolute local paths
         # - have :'s in paths when preceeded by a slash
@@ -168,6 +178,10 @@ module PDK
       #   the template file is not in this template directory.
       #
       def self.templates(opts)
+        require 'pdk/answer_file'
+        require 'pdk/util'
+        require 'addressable'
+
         explicit_url = opts.fetch(:'template-url', nil)
         explicit_ref = opts.fetch(:'template-ref', nil)
 
@@ -208,6 +222,9 @@ module PDK
 
       # @returns String
       def self.default_template_ref(uri = nil)
+        require 'pdk/util'
+        require 'pdk/version'
+
         return 'master' if PDK::Util.development_mode?
         return PDK::TEMPLATE_REF if uri.nil?
 
@@ -228,6 +245,10 @@ module PDK
       end
 
       def self.valid_template?(template)
+        require 'addressable'
+        require 'pdk/util/git'
+        require 'pdk/module/templatedir'
+
         return false if template.nil? || !template.is_a?(Hash)
         return false if template[:uri].nil? || !template[:uri].is_a?(Addressable::URI)
 

data/lib/pdk/util/vendored_file.rb

@@ -1,51 +1,50 @@
-require 'pdk/util'
-require 'net/https'
-require 'openssl'
-require 'fileutils'
-require 'pdk/util/filesystem'
-
 module PDK
   module Util
     class VendoredFile
       class DownloadError < StandardError; end
 
-      HTTP_ERRORS = [
-        EOFError,
-        Errno::ECONNRESET,
-        Errno::EINVAL,
-        Errno::ECONNREFUSED,
-        Net::HTTPBadResponse,
-        Net::HTTPHeaderSyntaxError,
-        Net::ProtocolError,
-        Timeout::Error,
-      ].freeze
-
       attr_reader :file_name
       attr_reader :url
 
-      include PDK::Util::Filesystem
-
       def initialize(file_name, url)
         @file_name = file_name
         @url = url
       end
 
       def read
-        return File.read(package_vendored_path) if PDK::Util.package_install?
-        return File.read(gem_vendored_path) if File.file?(gem_vendored_path)
+        require 'pdk/util'
+        require 'pdk/util/filesystem'
+
+        return PDK::Util::Filesystem.read_file(package_vendored_path) if PDK::Util.package_install?
+        return PDK::Util::Filesystem.read_file(gem_vendored_path) if PDK::Util::Filesystem.file?(gem_vendored_path)
 
         content = download_file
 
         # TODO: should only write if it's valid JSON
         # TODO: need a way to invalidate if out of date
-        FileUtils.mkdir_p(File.dirname(gem_vendored_path))
-        write_file(gem_vendored_path, content)
+        PDK::Util::Filesystem.mkdir_p(File.dirname(gem_vendored_path))
+        PDK::Util::Filesystem.write_file(gem_vendored_path, content)
         content
       end
 
       private
 
       def download_file
+        require 'uri'
+        require 'net/https'
+        require 'openssl'
+
+        http_errors = [
+          EOFError,
+          Errno::ECONNRESET,
+          Errno::EINVAL,
+          Errno::ECONNREFUSED,
+          Net::HTTPBadResponse,
+          Net::HTTPHeaderSyntaxError,
+          Net::ProtocolError,
+          Timeout::Error,
+        ]
+
         PDK.logger.debug _('%{file_name} was not found in the cache, downloading it from %{url}.') % {
           file_name: file_name,
           url:       url,
@@ -69,7 +68,7 @@ module PDK
         end
 
         response.body
-      rescue *HTTP_ERRORS => e
+      rescue *http_errors => e
         raise DownloadError, _('Unable to download %{url}. Check internet connectivity and try again. %{error}') % {
           url: url,
           error: e,
@@ -77,10 +76,15 @@ module PDK
       end
 
       def package_vendored_path
+        require 'pdk/util'
+
         @package_vendored_path ||= File.join(PDK::Util.package_cachedir, file_name)
       end
 
       def gem_vendored_path
+        require 'pdk/util'
+        require 'pdk/version'
+
         @gem_vendored_path ||= File.join(PDK::Util.cachedir, PDK::VERSION, file_name)
       end
     end

data/lib/pdk/util/version.rb

@@ -1,12 +1,9 @@
-require 'pdk/version'
-require 'pdk/cli/exec'
-require 'pdk/util/git'
-require 'pdk/logger'
-
 module PDK
   module Util
     module Version
       def self.version_string
+        require 'pdk/version'
+
         "#{PDK::VERSION} #{pdk_ref}".strip.freeze
       end
 
@@ -25,6 +22,7 @@ module PDK
       end
 
       def self.git_ref
+        require 'pdk/util/git'
         source_git_dir = File.join(File.expand_path('../../..', File.dirname(__FILE__)), '.git')
 
         return unless File.directory?(source_git_dir)
@@ -33,6 +31,8 @@ module PDK
       end
 
       def self.version_file
+        require 'pdk/util'
+
         # FIXME: this gets called a LOT and doesn't currently get cached
         PDK::Util.find_upwards('PDK_VERSION', File.dirname(__FILE__))
       end

data/lib/pdk/validate/base_validator.rb

@@ -1,7 +1,3 @@
-require 'pdk'
-require 'pdk/cli/exec'
-require 'pdk/module'
-
 module PDK
   module Validate
     class BaseValidator
@@ -82,6 +78,8 @@ module PDK
       end
 
       def self.ignore_pathspec
+        require 'pdk/module'
+
         ignore_pathspec = PDK::Module.default_ignored_pathspec(ignore_dotfiles?)
 
         if respond_to?(:pattern_ignore)
@@ -136,6 +134,8 @@ module PDK
       end
 
       def self.invoke(report, options = {})
+        require 'pdk/cli/exec/command'
+
         targets, skipped, invalid = parse_targets(options)
 
         process_skipped(report, skipped)
@@ -154,6 +154,7 @@ module PDK
         if self::INVOKE_STYLE == :per_target
           targets = targets.combination(1).to_a
         else
+          require 'pdk/cli/exec_group'
           targets = targets.each_slice(1000).to_a
           options[:split_exec] = PDK::CLI::ExecGroup.new(spinner_text(targets), parallel: false)
         end

data/lib/pdk/validate/metadata/metadata_json_lint.rb

@@ -1,8 +1,4 @@
-require 'pdk'
-require 'pdk/cli/exec'
 require 'pdk/validate/base_validator'
-require 'pdk/util/bundler'
-require 'pathname'
 
 module PDK
   module Validate

data/lib/pdk/validate/metadata/metadata_syntax.rb

@@ -1,7 +1,4 @@
-require 'pdk'
-require 'pdk/cli/exec'
 require 'pdk/validate/base_validator'
-require 'pathname'
 
 module PDK
   module Validate
@@ -21,13 +18,18 @@ module PDK
       end
 
       def self.create_spinner(targets = [], options = {})
+        require 'pdk/cli/util'
+
         return unless PDK::CLI::Util.interactive?
+
         options = options.merge(PDK::CLI::Util.spinner_opts_for_platform)
 
         exec_group = options[:exec_group]
         @spinner = if exec_group
                      exec_group.add_spinner(spinner_text(targets), options)
                    else
+                     require 'pdk/cli/util/spinner'
+
                      TTY::Spinner.new("[:spinner] #{spinner_text(targets)}", options)
                    end
         @spinner.auto_spin

data/lib/pdk/validate/metadata_validator.rb

@@ -1,5 +1,3 @@
-require 'pdk'
-require 'pdk/cli/exec'
 require 'pdk/validate/base_validator'
 require 'pdk/validate/metadata/metadata_json_lint'
 require 'pdk/validate/metadata/metadata_syntax'

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

@@ -1,8 +1,4 @@
-require 'pdk'
-require 'pdk/cli/exec'
 require 'pdk/validate/base_validator'
-require 'fileutils'
-require 'tmpdir'
 
 module PDK
   module Validate
@@ -63,6 +59,8 @@ module PDK
       end
 
       def self.validate_tmpdir
+        require 'tmpdir'
+
         @validate_tmpdir ||= Dir.mktmpdir('puppet-epp-validate')
       end
 
@@ -70,6 +68,8 @@ module PDK
         return unless @validate_tmpdir
         return unless File.directory?(@validate_tmpdir)
 
+        require 'fileutils'
+
         FileUtils.remove_entry_secure(@validate_tmpdir)
         @validate_tmpdir = nil
       end

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

@@ -1,6 +1,3 @@
-require 'pdk'
-require 'pdk/util'
-require 'pdk/cli/exec'
 require 'pdk/validate/base_validator'
 
 module PDK

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

@@ -1,8 +1,4 @@
-require 'pdk'
-require 'pdk/cli/exec'
 require 'pdk/validate/base_validator'
-require 'fileutils'
-require 'tmpdir'
 
 module PDK
   module Validate
@@ -63,6 +59,8 @@ module PDK
       end
 
       def self.validate_tmpdir
+        require 'tmpdir'
+
         @validate_tmpdir ||= Dir.mktmpdir('puppet-parser-validate')
       end
 
@@ -70,6 +68,8 @@ module PDK
         return unless @validate_tmpdir
         return unless File.directory?(@validate_tmpdir)
 
+        require 'fileutils'
+
         FileUtils.remove_entry_secure(@validate_tmpdir)
         @validate_tmpdir = nil
       end

data/lib/pdk/validate/puppet_validator.rb

@@ -1,5 +1,3 @@
-require 'pdk'
-require 'pdk/cli/exec'
 require 'pdk/validate/base_validator'
 require 'pdk/validate/puppet/puppet_lint'
 require 'pdk/validate/puppet/puppet_syntax'

data/lib/pdk/validate/ruby/rubocop.rb

@@ -1,9 +1,4 @@
-require 'pdk'
-require 'pdk/cli/exec'
-require 'pdk/util'
-require 'pdk/util/bundler'
 require 'pdk/validate/base_validator'
-require 'pdk/validate/ruby_validator'
 
 module PDK
   module Validate

data/lib/pdk/validate/ruby_validator.rb

@@ -1,5 +1,3 @@
-require 'pdk'
-require 'pdk/cli/exec'
 require 'pdk/validate/base_validator'
 require 'pdk/validate/ruby/rubocop'
 

data/lib/pdk/validate/tasks/metadata_lint.rb

@@ -1,9 +1,4 @@
-require 'pdk'
-require 'pdk/cli/exec'
 require 'pdk/validate/base_validator'
-require 'pdk/util'
-require 'pathname'
-require 'json-schema'
 
 module PDK
   module Validate
@@ -26,13 +21,18 @@ module PDK
         end
 
         def self.create_spinner(targets = [], options = {})
+          require 'pdk/cli/util'
+
           return unless PDK::CLI::Util.interactive?
+
           options = options.merge(PDK::CLI::Util.spinner_opts_for_platform)
 
           exec_group = options[:exec_group]
           @spinner = if exec_group
                        exec_group.add_spinner(spinner_text(targets), options)
                      else
+                       require 'pdk/cli/util/spinner'
+
                        TTY::Spinner.new("[:spinner] #{spinner_text(targets)}", options)
                      end
           @spinner.auto_spin
@@ -47,6 +47,8 @@ module PDK
         end
 
         def self.schema_file
+          require 'pdk/util/vendored_file'
+
           schema = PDK::Util::VendoredFile.new('task.json', FORGE_SCHEMA_URL).read
 
           JSON.parse(schema)
@@ -67,6 +69,8 @@ module PDK
           return_val = 0
           create_spinner(targets, options)
 
+          require 'json-schema'
+
           targets.each do |target|
             unless File.readable?(target)
               report.add_event(

data/lib/pdk/validate/tasks/name.rb

@@ -1,6 +1,4 @@
-require 'pdk'
 require 'pdk/validate/base_validator'
-require 'pdk/util'
 
 module PDK
   module Validate
@@ -26,6 +24,8 @@ module PDK
         end
 
         def self.create_spinner(targets = [], options = {})
+          require 'pdk/cli/util'
+
           return unless PDK::CLI::Util.interactive?
           options = options.merge(PDK::CLI::Util.spinner_opts_for_platform)
 
@@ -33,6 +33,8 @@ module PDK
           @spinner = if exec_group
                        exec_group.add_spinner(spinner_text(targets), options)
                      else
+                       require 'pdk/cli/util/spinner'
+
                        TTY::Spinner.new("[:spinner] #{spinner_text(targets)}", options)
                      end
           @spinner.auto_spin

data/lib/pdk/validate/tasks_validator.rb

@@ -1,5 +1,3 @@
-require 'pdk'
-require 'pdk/cli/exec'
 require 'pdk/validate/base_validator'
 require 'pdk/validate/tasks/metadata_lint'
 require 'pdk/validate/tasks/name'