(maint) Remove unnecessary fileutils requires

puppetlabs · Nov 12, 2019 · d419c56 · d419c56
1 parent a9edfe4
commit d419c56
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 17 deletions.
diff --git a/lib/pdk/generate/module.rb b/lib/pdk/generate/module.rb
@@ -22,7 +22,6 @@ def self.invoke(opts = {})
         require 'pdk/module/templatedir'
         require 'pdk/util'
         require 'pdk/util/template_uri'
-        require 'fileutils'
         require 'pathname'
 
         validate_options(opts) unless opts[:module_name].nil?
@@ -137,8 +136,6 @@ def self.prepare_metadata(opts = {})
       end
 
       def self.prepare_module_directory(target_dir)
-        require 'fileutils'
-
         [
           File.join(target_dir, 'examples'),
           File.join(target_dir, 'files'),

diff --git a/lib/pdk/module/build.rb b/lib/pdk/module/build.rb
@@ -67,8 +67,6 @@ def build_dir
       #
       # If the directory already exists, remove it first.
       def create_build_dir
-        require 'fileutils'
-
         cleanup_build_dir
 
         PDK::Util::Filesystem.mkdir_p(build_dir)
@@ -78,8 +76,6 @@ def create_build_dir
       #
       # @return nil.
       def cleanup_build_dir
-        require 'fileutils'
-
         PDK::Util::Filesystem.rm_rf(build_dir, secure: true)
       end
 
@@ -115,7 +111,6 @@ def stage_module_in_build_dir
       # @return nil.
       def stage_path(path)
         require 'pathname'
-        require 'fileutils'
 
         relative_path = Pathname.new(path).relative_path_from(Pathname.new(module_dir))
         dest_path = File.join(build_dir, relative_path)
@@ -224,7 +219,6 @@ def validate_ustar_path!(path)
       #
       # @return nil.
       def build_package
-        require 'fileutils'
         require 'zlib'
         require 'minitar'
         require 'find'

diff --git a/lib/pdk/util/bundler.rb b/lib/pdk/util/bundler.rb
@@ -6,8 +6,6 @@ module Bundler
       class BundleHelper; end
 
       def self.ensure_bundle!(gem_overrides = nil)
-        require 'fileutils'
-
         bundle = BundleHelper.new
 
         # This will default ensure_bundle! to re-resolving everything to latest
@@ -110,7 +108,6 @@ def installed?(gem_overrides = {})
 
         def lock!
           require 'pdk/util'
-          require 'fileutils'
           require 'pdk/util/ruby_version'
 
           if PDK::Util.package_install?

diff --git a/lib/pdk/util/filesystem.rb b/lib/pdk/util/filesystem.rb
@@ -1,4 +1,5 @@
 require 'pdk'
+autoload :FileUtils, 'fileutils'
 
 module PDK
   module Util

diff --git a/lib/pdk/util/puppet_version.rb b/lib/pdk/util/puppet_version.rb
@@ -52,7 +52,6 @@ def fetch_puppet_dev(options = {})
         return if options[:run] == :once && puppet_dev_fetched?
 
         require 'pdk/util/git'
-        require 'fileutils'
 
         # Check if the source is cloned and is a readable git repo
         unless PDK::Util::Git.remote_repo? puppet_dev_path

diff --git a/lib/pdk/validate/puppet/puppet_epp.rb b/lib/pdk/validate/puppet/puppet_epp.rb
@@ -68,8 +68,6 @@ def self.remove_validate_tmpdir
         return unless @validate_tmpdir
         return unless PDK::Util::Filesystem.directory?(@validate_tmpdir)
 
-        require 'fileutils'
-
         PDK::Util::Filesystem.remove_entry_secure(@validate_tmpdir)
         @validate_tmpdir = nil
       end

diff --git a/lib/pdk/validate/puppet/puppet_syntax.rb b/lib/pdk/validate/puppet/puppet_syntax.rb
@@ -68,8 +68,6 @@ def self.remove_validate_tmpdir
         return unless @validate_tmpdir
         return unless PDK::Util::Filesystem.directory?(@validate_tmpdir)
 
-        require 'fileutils'
-
         PDK::Util::Filesystem.remove_entry_secure(@validate_tmpdir)
         @validate_tmpdir = nil
       end