hybrid_platforms_conductor 32.15.0 → 32.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c01fcd515c7641751b265f34747561465570795cb75fb0287a75c61915055a2c
-  data.tar.gz: c249eb8d612bdc9b6a09467f195c71c607619e9aea278df4ff5b2bf061b968ed
+  metadata.gz: 45e61d4a95176f285aaf24fdd34a78440dd7db0decf1c138a9f42f028afc09b4
+  data.tar.gz: fc142e6e71ac4f3240d42cb42079a7b05ae811d4da4f1f0508dd2ac5541285d1
 SHA512:
-  metadata.gz: 571f2e0effa2d3489eb8c948f90bcf23cc8890ac71a0e6bc4b2ec805dea5d9bd74a608de3d5f6a8d327015058f6c2adf8a23f07aea4f82f1c6445b4b943cd3bd
-  data.tar.gz: 749df7363532aec2976b1b070462288ee8bed7596fe419d1871390022e337ad0472570fe98a513661f95e47366bd4df3a72d022ec0595cdc73ac051ff000dbb3
+  metadata.gz: ac9b4f7a7aa937fcdd18042880fec76a5ea567d3cdeb15135f8f9cfa12652ca0adfc3dffbc115f59ea793fd6a06f567e8081c10c8a6080d51a8ac58db56708b4
+  data.tar.gz: ba302151aca73a94f4492774b6ddf32524b02351c3265591430b689e713e2de39af352fbee8d7f09c4e58667f5a960a8ec8027f583c13e3c929d0e59cd381ca3

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [v32.16.0](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v32.15.0...v32.16.0) (2021-05-31 17:55:49)
+
+## Global changes
+### Patches
+
+* [[Feature(cmd_runner)] Add option to force bash usage in run_cmd](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/0711f1f33fc8f282b925726e0631ae78bf1337b5)
+
+## Changes for cmd_runner
+### Features
+
+* [[Feature(cmd_runner)] Add option to force bash usage in run_cmd](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/0711f1f33fc8f282b925726e0631ae78bf1337b5)
+
 # [v32.15.0](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v32.14.0...v32.15.0) (2021-05-31 14:43:32)
 
 ## Global changes

data/lib/hybrid_platforms_conductor/cmd_runner.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'tempfile'
 require 'tty-command'
 require 'hybrid_platforms_conductor/logger_helpers'
 require 'hybrid_platforms_conductor/io_router'
@@ -66,6 +67,7 @@ module HybridPlatformsConductor
     #   * *timeout*: The command ended in timeout
     # * *timeout* (Integer or nil): Timeout to apply for the command to be run, or nil for no timeout [default: nil]
     # * *no_exception* (Boolean): If true, don't throw exception in case of error [default: false]
+    # * *force_bash* (Boolean): If true, then make sure command is invoked with bash instead of sh [default: false]
     # Result::
     # * Integer or Symbol: Exit status of the command, or Symbol in case of error. In case of dry-run mode the expected code is returned without executing anything.
     # * String: Standard output of the command
@@ -78,7 +80,8 @@ module HybridPlatformsConductor
       log_stderr_to_io: nil,
       expected_code: 0,
       timeout: nil,
-      no_exception: false
+      no_exception: false,
+      force_bash: false
     )
       expected_code = [expected_code] unless expected_code.is_a?(Array)
       if @dry_run
@@ -101,6 +104,14 @@ module HybridPlatformsConductor
             nil
           end
         start_time = Time.now if log_debug?
+        bash_file = nil
+        if force_bash
+          bash_file = Tempfile.new('hpc_bash')
+          bash_file.write(cmd)
+          bash_file.chmod 0700
+          bash_file.close
+          cmd = "/bin/bash -c #{bash_file.path}"
+        end
         begin
           # Make sure we keep a trace of stdout and stderr, even if it was not asked, just to use it in case of exceptions raised
           cmd_result_stdout = ''
@@ -141,6 +152,7 @@ module HybridPlatformsConductor
           cmd_stderr = "#{cmd_result_stderr.empty? ? '' : "#{cmd_result_stderr}\n"}#{$!}\n#{$!.backtrace.join("\n")}"
         ensure
           file_output.close unless file_output.nil?
+          bash_file.unlink unless bash_file.nil?
         end
         if log_debug?
           elapsed = Time.now - start_time

data/lib/hybrid_platforms_conductor/connector.rb

@@ -65,17 +65,19 @@ module HybridPlatformsConductor
     #
     # Parameters::
     # * *cmd* (String): The command to be run
+    # * *force_bash* (Boolean): If true, then make sure command is invoked with bash instead of sh [default: false]
     # Result::
     # * Integer: Exit code
     # * String: Standard output
     # * String: Error output
-    def run_cmd(cmd)
+    def run_cmd(cmd, force_bash: false)
       @cmd_runner.run_cmd(
         cmd,
         timeout: @timeout,
         log_to_stdout: false,
         log_stdout_to_io: @stdout_io,
-        log_stderr_to_io: @stderr_io
+        log_stderr_to_io: @stderr_io,
+        force_bash: force_bash
       )
     end
 

data/lib/hybrid_platforms_conductor/hpc_plugins/connector/local.rb

@@ -37,7 +37,7 @@ module HybridPlatformsConductor
         # Parameters::
         # * *bash_cmds* (String): Bash commands to execute
         def remote_bash(bash_cmds)
-          run_cmd "cd #{workspace_for(@node)} ; #{bash_cmds}"
+          run_cmd "cd #{workspace_for(@node)} ; #{bash_cmds}", force_bash: true
         end
 
         # Execute an interactive shell on the remote node

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '32.15.0'
+  VERSION = '32.16.0'
 
 end

data/spec/hybrid_platforms_conductor_test/api/cmd_runner_spec.rb

@@ -13,6 +13,13 @@ describe HybridPlatformsConductor::CmdRunner do
     end
   end
 
+  it 'runs a simple bash command and forces usage of bash' do
+    with_repository do |repository|
+      # Use set -o pipefail that does not work in /bin/sh
+      expect(test_cmd_runner.run_cmd "set -o pipefail ; echo TestStderr 1>&2 ; echo TestStdout", force_bash: true).to eq [0, "TestStdout\n", "TestStderr\n"]
+    end
+  end
+
   it 'runs a simple bash command and logs stdout and stderr to a file' do
     with_repository do |repository|
       test_cmd_runner.run_cmd "echo TestStderr 1>&2 ; sleep 1 ; echo TestStdout", log_to_file: "#{repository}/test_file"

data/spec/hybrid_platforms_conductor_test/helpers/cmd_runner_helpers.rb

@@ -31,7 +31,7 @@ module HybridPlatformsConductorTest
         end
         # We need to protect the access to this array as the mocked commands can be called by competing threads
         remaining_expected_commands_mutex = Mutex.new
-        allow(cmd_runner).to receive(:run_cmd) do |cmd, log_to_file: nil, log_to_stdout: true, log_stdout_to_io: nil, log_stderr_to_io: nil, expected_code: 0, timeout: nil, no_exception: false|
+        allow(cmd_runner).to receive(:run_cmd) do |cmd, log_to_file: nil, log_to_stdout: true, log_stdout_to_io: nil, log_stderr_to_io: nil, expected_code: 0, timeout: nil, no_exception: false, force_bash: false|
           # Check the remaining expected commands
           found_command = nil
           found_command_code = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 32.15.0
+  version: 32.16.0
 platform: ruby
 authors:
 - Muriel Salvan