web47core 3.2.3.49 → 3.2.3.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70781cb08eb5be20273e40a90835d91799d40c28c266631d5f905fcc8443047f
-  data.tar.gz: e876bd9972ca5ea75eb074578b98c1ba435e7100bd4c946b4ca9fa283fbe03cd
+  metadata.gz: 683f85833d91a9351863dac2996336e09fe452e7084372872c124b77e3e29781
+  data.tar.gz: 65e1da14f9427778e084a916d2466f26b3d116f9e5c7b602cdbe744d35e12a91
 SHA512:
-  metadata.gz: 1e9c9401038a170e3acf2e6677aaa7f840742771036acf8d1f50c0234299892e150d05d0395fad30169359e6c700c9fe62fa2b8bf55cdf2ba9b6e16dbf1df3ae
-  data.tar.gz: e998d7542d10b5c21088697a883eb39ac8137da958b6e1e2d9712629465a5802ce11ec7b78831750bee238976e56c429827cbfd7828bb47a62d8674575a8c926
+  metadata.gz: eb912939e26c729a3f869f101e0b79b7a22a69cb476ba4bed2b7d8dac1fb5506f7439937845a25d7b63b6f5560635d1230bfc88c54c7db3a1f95f0796c572706
+  data.tar.gz: 1595561313f0b17963e0a7acdbf3f15834faae4e1a990b87d1520eb8afc4bf7dece91c6f03e051d6d9f5d413fd996a0ed05b005aedc49338b4b46475d10ace28

data/lib/app/models/command_job.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'open3'
+
 #
 # Base class for all jobs that will be run on builds
 #
@@ -324,16 +326,16 @@ class CommandJob
     run_command "unzip #{file_path}", to_dir, error_texts: 'unzip:'
   end
 
-  #
-  # Run the command capturing the command output and any standard error to the log.
-  #
+  # @abstract Run the command capturing the command output and any standard error to the log.
+  # @param command  [String|Array] The command that needs to be run
+  # @param dir      [String] The directory where the command needs to be run
+  # @param options  [Hash] Options for the command
+  # @return [String] The output of the command
   def run_command(command, dir = '/tmp', options = {})
-    command = command.join(' ') if command.is_a?(Array)
-    output = Tempfile.open('run-command-', '/tmp') do |f|
-      Dir.chdir(dir) { `#{command} > #{f.path} 2>&1` }
-      mask_keywords(f.open.read, options[:mask_texts])
-    end
-    output = 'Success' if output.blank?
+    command = Shellwords.shelljoin(command) if command.is_a?(Array)
+    output, status = Open3.capture2e(command, chdir: dir)
+    output = mask_keywords(output, options[:mask_texts])
+    output = status.success? ? 'Success' : 'No output' if output.blank?
     command = mask_keywords(command, options[:mask_texts])
     if block_given?
       yield output
@@ -341,6 +343,7 @@ class CommandJob
       logs.create!(dir: dir, command: command, message: output)
     end
     options[:output_limit] ||= -1
+    check_for_success(command, status, output, output_limit: options[:output_limit])
     check_for_text(output, options[:error_texts], output_limit: options[:output_limit])
     check_for_text(output, options[:required_texts], inclusive_check: false, output_limit: options[:output_limit])
     output
@@ -359,10 +362,22 @@ class CommandJob
     output
   end
 
-  #
+  # @abstract Check if we were success
+  # @param command  [String] The command that was run
+  # @param status  [Process::Status] Status returned from the command
+  # @param output  [String] The output returned from the command
+  # @param output_limit [Integer] Limit of output to show in error message
+  # @return [Boolean] true if we were success
+  def check_for_success(command, status, output, output_limit: -1)
+    return if status.success?
+
+    reason = status.signaled? ? "signal #{status.termsig}" : "exit status #{status.exitstatus}"
+    error_output = output.slice(0, output_limit) || output
+    raise "Command failed with #{reason}: #{command} - #{error_output}"
+  end
+
   # Check if any occurrences were found (or not found)
   # For most command jobs, we want to see the full output. -1 accomplishes this
-  #
   def check_for_text(output, texts = [], inclusive_check: true, output_limit: -1)
     return if texts.blank?
 

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '3.2.3.49'
+  VERSION = '3.2.3.51'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.2.3.49
+  version: 3.2.3.51
 platform: ruby
 authors:
 - Chris Schroeder