diff options
Diffstat (limited to 'lib/license/management')
| -rw-r--r-- | lib/license/management/shell.rb | 25 | ||||
| -rw-r--r-- | lib/license/management/tool_box.rb | 6 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 |
3 files changed, 14 insertions, 19 deletions
diff --git a/lib/license/management/shell.rb b/lib/license/management/shell.rb index e4fd35a..6a6f0b6 100644 --- a/lib/license/management/shell.rb +++ b/lib/license/management/shell.rb @@ -17,7 +17,9 @@ module License mono: '/opt/asdf/installs/mono/6.8.0.123/bin/mono', mvn: '/opt/asdf/bin/asdf exec mvn', nuget: '/opt/asdf/installs/mono/6.8.0.123/bin/nuget.exe', + pip: '/opt/asdf/bin/asdf exec pip', ruby: '/opt/asdf/bin/asdf exec ruby', + virtualenv: '/opt/asdf/bin/asdf exec virtualenv', yarn: '/opt/asdf/bin/asdf exec yarn' }.freeze @@ -31,14 +33,15 @@ module License trust!(certificate) if present?(certificate) end - def execute(command, env: {}) + def execute(command, env: {}, capture: true) expanded_command = expand(command) - collapsible_section(expanded_command) do - logger.debug(expanded_command) - stdout, stderr, status = Open3.capture3(default_env.merge(env), expanded_command) - record(stdout, stderr, status) - [stdout, stderr, status] - end + expanded_env = default_env.merge(env) + return system(expanded_env, expanded_command) unless capture + + logger.debug(expanded_command) + stdout, stderr, status = Open3.capture3(expanded_env, expanded_command) + record(stdout, stderr, status) + [stdout, stderr, status] end def sh(command, env: {}) @@ -85,14 +88,6 @@ module License def flush(message, severity) logger.add(severity, message) if present?(message) end - - def collapsible_section(header) - id = header.downcase.gsub(/[[:space:]]/, '_').gsub(/[^0-9a-z ]/i, '_') - logger.debug("\nsection_start:#{Time.now.to_i}:#{id}\r\e[0K#{header}") - yield - ensure - logger.debug("\nsection_end:#{Time.now.to_i}:#{id}\r\e[0K") - end end end end diff --git a/lib/license/management/tool_box.rb b/lib/license/management/tool_box.rb index ddfd222..6906cb5 100644 --- a/lib/license/management/tool_box.rb +++ b/lib/license/management/tool_box.rb @@ -17,17 +17,17 @@ module License deb = deb_for(tool, version) if deb&.exist? ::License::Management.logger.error("Installing #{deb} ...") - shell.execute([:dpkg, '-i', deb]) + shell.execute([:dpkg, '-i', deb], capture: false) else ::License::Management.logger.error("Installing #{version} via asdf ...") shell.execute([:asdf, "plugin-update", tool.to_s], env: env) shell.execute(['/opt/asdf/plugins/nodejs/bin/import-release-team-keyring']) if tool == :nodejs end - shell.execute([:asdf, :install, tool.to_s, version], env: env) + install_common_libraries(env: env) if C_BASED_TOOLS.include?(tool.to_sym) + shell.execute([:asdf, :install, tool.to_s, version], env: env, capture: false) shell.execute([:asdf, :local, tool.to_s, version], env: env) shell.execute([:asdf, :reshim], env: env) end - install_common_libraries(env: env) if C_BASED_TOOLS.include?(tool.to_sym) install_certificates_into_java_keystore(env, version) if tool == :java end diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index 2965174..1645717 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.28.1' + VERSION = '3.28.2' end end |