Merge pull request #1374 from puppetlabs/cat-1896-use_puppet-modulebu…

…ilder

(CAT-1896) - Use puppet-modulebuilder for `PDK build`

lib/pdk/cli/build.rb

@@ -12,7 +12,6 @@ module CLI
       option nil, 'force', 'Skips the prompts and builds the module package.'
 
       run do |opts, _args, _cmd|
-        require 'pdk/module/build'
         require 'pdk/module/metadata'
         require 'pdk/cli/util'
 
@@ -37,7 +36,11 @@ module CLI
           end
         end
 
-        builder = PDK::Module::Build.new(opts)
+        # build module
+        require 'puppet/modulebuilder'
+        module_dir = PDK::Util::Filesystem.expand_path(Dir.pwd)
+        target_dir = PDK::Util::Filesystem.expand_path(opts[:'target-dir'])
+        builder = Puppet::Modulebuilder::Builder.new(module_dir, target_dir, PDK.logger)
 
         unless opts[:force]
           if builder.package_already_exists?
@@ -49,7 +52,7 @@ module CLI
             end
           end
 
-          unless builder.module_pdk_compatible?
+          unless PDK::Util.module_pdk_compatible?(module_dir)
             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`.'

lib/pdk/cli/release.rb

@@ -3,7 +3,6 @@
 require 'pdk/util/bundler'
 require 'pdk/cli/util/interview'
 require 'pdk/util/changelog_generator'
-require 'pdk/module/build'
 
 module PDK
   module CLI

lib/pdk/module/release.rb

@@ -1,5 +1,6 @@
 require 'pdk'
 require 'uri'
+require 'puppet/modulebuilder'
 
 module PDK
   module Module
@@ -77,7 +78,7 @@ def run
           # Use the default as a last resort
           package_file = default_package_filename if package_file.nil?
         else
-          package_file = run_build(options)
+          package_file = run_build
         end
 
         run_publish(options.dup, package_file) unless skip_publish?
@@ -95,7 +96,7 @@ def write_module_metadata!
       def default_package_filename
         return @default_tarball_filename unless @default_tarball_filename.nil?
 
-        builder = PDK::Module::Build.new(module_dir: module_path)
+        builder = Puppet::Modulebuilder::Builder.new(module_path, nil, PDK.logger)
         @default_tarball_filename = builder.package_file
       end
 
@@ -135,8 +136,11 @@ def run_dependency_checker(_opts)
       end
 
       # @return [String] Path to the built tarball
-      def run_build(opts)
-        PDK::Module::Build.invoke(opts.dup)
+      def run_build
+        module_dir = PDK::Util::Filesystem.expand_path(module_path || Dir.pwd)
+        target_dir = File.join(module_dir, 'pkg')
+        builder = Puppet::Modulebuilder::Builder.new(module_dir, target_dir, PDK.logger)
+        builder.build
       end
 
       def run_publish(_opts, tarball_path)
@@ -238,8 +242,7 @@ def forge_compatible?
       def pdk_compatible?
         return @pdk_compatible unless @pdk_compatible.nil?
 
-        builder = PDK::Module::Build.new(module_dir: module_path)
-        @pdk_compatible = builder.module_pdk_compatible?
+        @pdk_compatible = PDK::Util.module_pdk_compatible?(module_path)
       end
       # :nocov:
 

lib/pdk/util.rb

@@ -32,6 +32,7 @@ module Util
     def exit_process(exit_code)
       exit exit_code
     end
+    module_function :exit_process
     # :nocov:
 
     # Searches upwards from current working directory for the given target file.