lib/pdksync/utils.rb in pdksync-0.6.0 vs lib/pdksync/utils.rb in pdksync-0.8.0
- old
+ new
@@ -3,11 +3,10 @@
require 'open3'
require 'fileutils'
require 'pdk'
require 'pdksync/configuration'
require 'pdksync/gitplatformclient'
-require 'colorize'
require 'bundler'
require 'octokit'
require 'pdk/util/template_uri'
require 'pdksync/logger'
@@ -247,11 +246,11 @@
end
else
stdout, stderr, status = Open3.capture3(command)
end
PdkSync::Logger.info "\n#{stdout}\n"
- PdkSync::Logger.crit "Unable to run command '#{command}': #{stderr}" unless status.exitstatus.zero?
+ PdkSync::Logger.error "Unable to run command '#{command}': #{stderr}" unless status.exitstatus.zero?
status.exitstatus
else
# Environment cleanup required due to Ruby subshells using current Bundler environment
if command =~ %r{^sh }
Bundler.with_clean_env do
@@ -1090,9 +1089,13 @@
'Solaris'
when %r{ubuntu}i
'Ubuntu'
when %r{win}i
'Windows'
+ when %r{rocky}i
+ 'Rocky'
+ when %r{almalinux}i
+ 'AlmaLinux'
else
raise "Could not normalize OS value: #{os}"
end
end