hybrid_platforms_conductor 33.2.1 → 33.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f311db8004c9c9bce51821d58c9cee66e36b73565a70e990d5d56269a758ef07
-  data.tar.gz: 232be58c9d26f1821afea89a55421514c8f97becd2b316acf62c2e51c5e29b8c
+  metadata.gz: 90e31431abb4e4924342d8057fbb2d2f54d780975ef7079498045a7897262067
+  data.tar.gz: 3bfcb046a30115a681d407559f9395766439ada582a0d57070d5bae067776292
 SHA512:
-  metadata.gz: d2c2fe3c9d0f5fccceb5a2a2b9759316730c536a5de99e63b5ecc32ef857b4f33a5aef5c4494c4b42f54a1b17a620af7a06526a953a095a8ac3e8fdc7d6fcd8e
-  data.tar.gz: 6d15f57eae1683425b64871b0234a33a6a98cf3300a3c481d98b88a525809c8ad277836a228565675b5bcd76bc23a130b5392431a045bbe18ec6cd032eeea27d
+  metadata.gz: c532fc150a6ac25db61a70de51b88332728cb93b27f1275fda6cf15b0fce03d2fce9b90f7ea1c65134c0475e10708d075235e9abc2ec5710bf8e4823a98dc2e7
+  data.tar.gz: d081b32a30c854f0445f98669ba417ee80256f65558b1d274e476b20bd6a0c35133f0f711adae65c9e118a027136caaffce91cd179a2202ae32623b2469d6b54

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [v33.2.2](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.2.1...v33.2.2) (2021-06-21 12:41:35)
+
+## Global changes
+### Patches
+
+* [[Hotfix(cmd_runner)] Retain dynamically set environment while executing commands](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/d709d5d2871e43196cc1f5f9eaf5b2155b34ed4e)
+
+## Changes for cmd_runner
+### Patches
+
+* [[Hotfix(cmd_runner)] Retain dynamically set environment while executing commands](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/d709d5d2871e43196cc1f5f9eaf5b2155b34ed4e)
+
 # [v33.2.1](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.2.0...v33.2.1) (2021-06-21 10:23:51)
 
 ## Global changes

data/lib/hybrid_platforms_conductor/cmd_runner.rb

@@ -130,7 +130,7 @@ module HybridPlatformsConductor
               (log_to_stdout ? [@logger_stderr] : []) +
               (file_output.nil? ? [] : [file_output])
           ) do
-            Bundler.with_unbundled_env do
+            Bundler.without_bundled_env do
               cmd_result = TTY::Command.new(
                 printer: :null,
                 pty: true,

data/lib/hybrid_platforms_conductor/core_extensions/bundler/without_bundled_env.rb

@@ -0,0 +1,37 @@
+# Add a way to clean the current env from Bundler variables
+module Bundler
+
+  class << self
+
+    # Run block with all bundler-related variables removed from the current environment
+    def without_bundled_env(&block)
+      with_env(current_unbundled_env, &block)
+    end
+
+    # @return [Hash] Environment with all bundler-related variables removed
+    def current_unbundled_env
+      env = ENV.clone.to_hash
+
+      env['MANPATH'] = env['BUNDLER_ORIG_MANPATH'] if env.key?('BUNDLER_ORIG_MANPATH')
+
+      env.delete_if { |k, _| k[0, 7] == 'BUNDLE_' }
+
+      if env.key?('RUBYOPT')
+        rubyopt = env['RUBYOPT'].split
+        rubyopt.delete("-r#{File.expand_path('bundler/setup', __dir__)}")
+        rubyopt.delete('-rbundler/setup')
+        env['RUBYOPT'] = rubyopt.join(' ')
+      end
+
+      if env.key?('RUBYLIB')
+        rubylib = env['RUBYLIB'].split(File::PATH_SEPARATOR)
+        rubylib.delete(File.expand_path(__dir__))
+        env['RUBYLIB'] = rubylib.join(File::PATH_SEPARATOR)
+      end
+
+      env
+    end
+
+  end
+
+end

data/lib/hybrid_platforms_conductor/executable.rb

@@ -1,4 +1,6 @@
 require 'English'
+require 'bundler'
+require 'hybrid_platforms_conductor/core_extensions/bundler/without_bundled_env'
 require 'optparse'
 require 'logger'
 require 'hybrid_platforms_conductor/config'

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '33.2.1'
+  VERSION = '33.2.2'
 
 end

data/spec/hybrid_platforms_conductor_test/api/cmd_runner_spec.rb

@@ -51,6 +51,14 @@ describe HybridPlatformsConductor::CmdRunner do
     end
   end
 
+  it 'keeps dynamically set environment' do
+    with_repository do
+      value = ('a'..'z').to_a.sample(8).join
+      ENV['hpc_test_new_variable'] = value
+      expect(test_cmd_runner.run_cmd('echo "${hpc_test_new_variable}"')).to eq [0, "#{value}\n", '']
+    end
+  end
+
   it 'fails when the command does not exit 0' do
     with_repository do
       expect { test_cmd_runner.run_cmd 'exit 1' }.to raise_error(HybridPlatformsConductor::CmdRunner::UnexpectedExitCodeError, 'Command \'exit 1\' returned error code 1 (expected 0).')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 33.2.1
+  version: 33.2.2
 platform: ruby
 authors:
 - Muriel Salvan
@@ -695,6 +695,7 @@ files:
 - lib/hybrid_platforms_conductor/config.rb
 - lib/hybrid_platforms_conductor/confluence.rb
 - lib/hybrid_platforms_conductor/connector.rb
+- lib/hybrid_platforms_conductor/core_extensions/bundler/without_bundled_env.rb
 - lib/hybrid_platforms_conductor/core_extensions/cleanroom/fix_kwargs.rb
 - lib/hybrid_platforms_conductor/core_extensions/symbol/zero.rb
 - lib/hybrid_platforms_conductor/credentials.rb