brpm_content_framework 0.2.52 → 0.2.53

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjNiNmVmMDUzMDIxN2Q4Zjg2MGQyZDUwYmYyMzAyNjlhZjQ4YjhjMA==
+    YjU3ZTAxNWFiMGNjYTJlMjI0NzQ0ZmMzZjRiYTY3Yzg3ODRkNTc5Zg==
   data.tar.gz: !binary |-
-    YjdlOGI0NjBlYjk1ODkwZDRhNzg5ODEwMDZlZDQzOTM1ODk0ZDRiZg==
+    MDBlMTBhOTE4MWEwNDlhNGFmMWU4NzNmMDQ5YmYwOTYwNWZmN2IyNw==
 SHA512:
   metadata.gz: !binary |-
-    Mzc2MGFiMDM0MDQ3MGM3ZGM3YzMxN2FkNDZlYzI1NWU2ODMyODRhZmVjNTIx
-    M2ZkYThiZjExNDFhNDk1MjJjYzAzMDEzNzI5ODU5Y2IxNmIyMmIyNGJhNTkx
-    OWVhOGM0MDY1ODVjM2Y4NjEwZTQzNDM2YWY4OTdhMzcwYjQzZGU=
+    ZjQ5OWRlYTEwZDEzZTg0ZmQ2Zjg2ZTRhZmViOTExODM3NTFjZThmMWZjZWM4
+    ZTcwZTNjZjUzZDU5YzVjNjdhNWZkNDM5MzJkMmY0ZmJlNmU0OTgxZDQ4ZWU4
+    YjQxNDFhMjEyNmY2OTNlYzdkOWJjZjM4NjQ4MDMwNGE1MzgwNmM=
   data.tar.gz: !binary |-
-    ZGVmYjIwMGUzY2RlNGUwYTQ1ZjY3NzFkYTU3NWI0ZmVhMTJhMTIwYjg1MmYx
-    M2JjNzAzY2Y5YjU2YzI5ZGM3M2UzNWViOWU2MzRmMDIyZWQwYWExZWVjNzE5
-    MGQ2MzU5MGNkOGQ3MjJjZDM2OTRhYjMzY2FmNDA5ZDgxOWI0MWM=
+    MGY2NjJmOWI1M2YzZWFjYTEyYTQyNDBmODAxZGU0YTNmZjU4NWU3NjY3MjY3
+    NzczYWE4ZmE2YWIyODFjZjc0Y2FlMDRiNzVlZWY1YThiN2ViOWI0NmQ3ODQ5
+    ZmQ5ZTRiZGNjMzE1NDNjZTcwYTRlOGZmN2JkY2M1MDI1OWJiMzk=

data/config.yml

@@ -1,4 +1,4 @@
-version: 0.2.52
+version: 0.2.53
 author: Niek Bartholomeus
 email: niek.bartholomeus@gmail.com
 homepage: https://github.com/BMC-RLM/brpm_content_framework

data/lib/brpm_auto.rb

@@ -105,12 +105,6 @@ class BrpmAuto
       @logger = SimpleLogger.new(log_file, also_log_to_console)
     end
 
-    def is_windows?
-      require 'rbconfig'
-
-      RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/i
-    end
-
     def run_from_brpm
       @params.run_from_brpm
     end

data/lib/utilities.rb

@@ -1,9 +1,18 @@
+require 'rbconfig'
 require 'open3'
 
 module Utilities
   EXIT_CODE_FAILURE = 'Exit_Code_Failure'
-  Windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/) unless defined?(Windows)
-  
+
+  def is_windows?
+    RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/i
+  end
+
+  def is_jruby?
+
+    RbConfig::CONFIG['ruby_install_name'] =~ /jruby/i
+  end
+
   # Returns the dos path from a standard path
   #
   # ==== Attributes
@@ -47,7 +56,7 @@ module Utilities
 
     output_dir = File.join(BrpmAuto.params.output_dir,"#{precision_timestamp}")
     errfile = "#{output_dir}_stderr.txt"
-    complete_command = "#{escaped_command} 2>#{errfile}" unless Windows
+    complete_command = "#{escaped_command} 2>#{errfile}" unless is_windows?
     fil = File.open(errfile, "w+")
     fil.close
 
@@ -78,7 +87,11 @@ module Utilities
     cmd_result
   end
 
-  def execute_command(*commands)
+  def execute_command(command)
+    *commands=command
+    if is_jruby? #TODO work around for buggy jruby implementation of popen3
+      *commands = RbConfig::CONFIG['SHELL'], is_windows? ? "?C" : "-c", command
+    end
     Open3.popen3(*commands) do |stdin, stdout, stderr, thread|
       logs = {:out => "", :err => ""}
 
@@ -280,10 +293,6 @@ module Utilities
     result
   end
 
-  def windows?
-    Windows
-  end
-  
   def privatize(expression, sensitive_data = BrpmAuto.params.private_params.values)
     unless sensitive_data.nil? or sensitive_data.empty?
       sensitive_data = [sensitive_data] if sensitive_data.kind_of?(String)
@@ -330,7 +339,7 @@ module Utilities
 
     #TODO: still needed? the framework's error handling should take care of this already
     def exit_code_failure
-      return "" if Windows
+      return "" if is_windows?
       size_ = EXIT_CODE_FAILURE.size
       exit_code_failure_first_part  = EXIT_CODE_FAILURE[0..3]
       exit_code_failure_second_part = EXIT_CODE_FAILURE[4..size_]

data/transport/dispatch_base.rb

@@ -291,7 +291,7 @@ class DispatchBase
     instance_path = File.join(staging_path, package_file)
     staging_artifacts = Dir.entries(staging_path).reject{|k| [".",".."].include?(k) }
     return {"instance_path" => "ERROR - no files in staging area", "md5" => ""} if staging_artifacts.size < 1
-    cmd = "cd #{staging_path} && zip -r #{package_file} *" unless Windows
+    cmd = "cd #{staging_path} && zip -r #{package_file} *" unless BrpmAuto.is_windows?
     result = execute_shell(cmd)
     md5 = Digest::MD5.file(instance_path).hexdigest
     {"instance_path" => instance_path, "md5" => md5, "manifest" => staging_artifacts}

data/transport/transport_nsh.rb

@@ -186,7 +186,7 @@ class TransportNSH
     err_file = touch_file("#{script_dir}/nsh_errors_#{Time.now.strftime("%Y%m%d%H%M%S%L")}.txt")
     script_path = "\"#{script_path}\"" if script_path.include?(" ")
     cmd = "#{nsh_cmd("scriptutil")} -d \"#{nsh_path(target_path)}\" -h #{target_hosts.join(" ")} -s #{script_path}"
-    cmd = cmd + " 2>#{err_file}" unless BrpmAuto.windows?
+    cmd = cmd + " 2>#{err_file}" unless BrpmAuto.is_windows?
     result = execute_shell(cmd)
     result["stderr"] = "#{result["stderr"]}\n#{File.open(err_file).read}"
     result = display_result(result) unless raw_result
@@ -353,7 +353,7 @@ class TransportNSH
   
   def platform_temp
     res = "/tmp"
-    res = "C:/Windows/temp" if BrpmAuto.windows?
+    res = "C:/Windows/temp" if BrpmAuto.is_windows?
     res
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content_framework
 version: !ruby/object:Gem::Version
-  version: 0.2.52
+  version: 0.2.53
 platform: ruby
 authors:
 - Niek Bartholomeus