Use environment within forked process to pass temporary directory

Author: kpaulisse

lib/octocatalog-diff/catalog-util/builddir.rb

@@ -39,7 +39,7 @@ class BuildDir
       # @param options [Hash] Options for class; see above description
       def initialize(options = {}, logger = nil)
         @options = options.dup
-        @tempdir = OctocatalogDiff::Util::Util.temp_dir('ocd-builddir-', options[:existing_tempdir])
+        @tempdir = OctocatalogDiff::Util::Util.temp_dir('ocd-builddir-')
         @factdir = nil
         @enc = nil
         @fact_file = nil

lib/octocatalog-diff/catalog/computed.rb

@@ -83,7 +83,7 @@ def bootstrap(logger)
           tmphash[:basedir] = @options[:bootstrapped_dir]
         elsif @options[:branch] == '.'
           if @options[:bootstrap_current]
-            tmphash[:basedir] = OctocatalogDiff::Util::Util.temp_dir('ocd-bootstrap-basedir-', @options[:existing_tempdir])
+            tmphash[:basedir] = OctocatalogDiff::Util::Util.temp_dir('ocd-bootstrap-basedir-')
             FileUtils.cp_r File.join(@options[:basedir], '.'), tmphash[:basedir]
 
             o = @options.reject { |k, _v| k == :branch }.merge(path: tmphash[:basedir])
@@ -92,7 +92,7 @@ def bootstrap(logger)
             tmphash[:basedir] = @options[:basedir]
           end
         else
-          tmphash[:basedir] = OctocatalogDiff::Util::Util.temp_dir('ocd-bootstrap-checkout-', @options[:existing_tempdir])
+          tmphash[:basedir] = OctocatalogDiff::Util::Util.temp_dir('ocd-bootstrap-checkout-')
           OctocatalogDiff::CatalogUtil::Bootstrap.bootstrap_directory(@options.merge(path: checkout_dir), logger)
         end
 
@@ -173,8 +173,7 @@ def exec_puppet(logger)
         # Set up the ScriptRunner
         scriptrunner = OctocatalogDiff::Util::ScriptRunner.new(
           default_script: 'puppet/puppet.sh',
-          override_script_path: @options[:override_script_path],
-          existing_tempdir: @options[:existing_tempdir]
+          override_script_path: @options[:override_script_path]
         )
 
         begin

lib/octocatalog-diff/util/parallel.rb

@@ -114,6 +114,7 @@ def self.run_tasks_parallel(result, task_array, logger)
           # simplecov doesn't see this because it's forked
           # :nocov:
           this_pid = fork do
+            ENV['OCTOCATALOG_DIFF_TEMPDIR'] = ipc_tempdir
             task_result = execute_task(task, logger)
             File.open(File.join(ipc_tempdir, "#{Process.pid}.dat"), 'w') { |f| f.write Marshal.dump(task_result) }
             Kernel.exit! 0 # Kernel.exit! avoids at_exit from parents being triggered by children exiting

lib/octocatalog-diff/util/util.rb

@@ -55,7 +55,7 @@ def self.deep_dup(object)
       # basedir - A String with the directory in which to make the tempdir
       #
       # Returns the full path to the temporary directory.
-      def self.temp_dir(prefix = 'ocd-', basedir = nil)
+      def self.temp_dir(prefix = 'ocd-', basedir = ENV['OCTOCATALOG_DIFF_TEMPDIR'])
         # If the base directory is specified, make sure it exists, and then create the
         # temporary directory within it.
         if basedir

spec/octocatalog-diff/tests/util/scriptrunner_spec.rb

@@ -57,43 +57,6 @@
     end
   end
 
-  describe '#temp_script' do
-    context 'when running under --parallel' do
-      before(:each) do
-        @base_tempdir = Dir.mktmpdir('ocd-tempdir')
-      end
-
-      after(:each) do
-        OctocatalogDiff::Spec.clean_up_tmpdir(@base_tempdir)
-      end
-
-      it 'should create a temporary directory within the existing tempdir' do
-        opts = {
-          default_script: 'env/env.sh',
-          existing_tempdir: @base_tempdir
-        }
-        subject = described_class.new(opts)
-        script = subject.send(:temp_script, subject.script_src)
-
-        regex = Regexp.new('\\A' + Regexp.escape(@base_tempdir) + '/ocd-scriptrunner[^/]+/env.sh\\z')
-        expect(script).to match(regex)
-      end
-    end
-
-    context 'when not running under --parallel' do
-      it 'should create a new temporary directory and clean it up at_exit' do
-        opts = {
-          default_script: 'env/env.sh'
-        }
-        subject = described_class.new(opts)
-        script = subject.send(:temp_script, subject.script_src)
-
-        regex = Regexp.new('/ocd-scriptrunner[^/]+/env.sh\\z')
-        expect(script).to match(regex)
-      end
-    end
-  end
-
   describe '#run' do
     before(:each) do
       @logger, @logger_str = OctocatalogDiff::Spec.setup_logger