brpm_content_framework 0.2.39 → 0.2.40

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGJmYTgzYjZlNDBjMzYxODY3NDIwZWIxNDNlZmNhZDkzZDNlYmJiYQ==
+    MmNhY2ZkODI3N2M1MDk4OTk3YTFlN2EzNzFlMGE3OGU1NjRmMDNiNw==
   data.tar.gz: !binary |-
-    ZjkzY2VjNzZlMGU1NmM1MGU3YTgyMGY4NTU0YjI4NTA5YmZlNWUzZg==
+    MTJlZGFhODljMTQyYjdiNzQxMjNlZjk0YzU4ODQ2MTM3NTcwMDRkOQ==
 SHA512:
   metadata.gz: !binary |-
-    NjE3N2MyMTJjY2E0MWYwYmJmZWJjZDBlNTJlZjE2ZTU4ZDBiNjYyYTgzYTRj
-    MzYxN2JiN2NiYzA1Y2ZiZGUyYjYzN2U0ODgzMGE1NGZjNjc0YjljNjAyZjc0
-    MzM0NTljNjhlNjEzNGFhYjRiYmI0NDU5ODU1ZTU5OWM1OGQxMjM=
+    ODdhYjYwNDA2NzM5N2FkODUzMTQzODE5ZmFkMzA1YWMxZDdmNzllMTU3YTA4
+    ZjU2ZjVlNmJjNDg5YzU4YjM2YTc0NDkyODIyOTBiMWRmN2ZlNTQ4N2JjMDc2
+    OGEyMjliNTZiYTRkNjczNDY0NDY2ZmZiMDY3N2RhNGJkMDcwODk=
   data.tar.gz: !binary |-
-    ODJiOTk1YmRiM2IwNGM2MzM2Nzk0NDNmYjlmY2JlNTY1OGQ0OTJkMDNjNmRi
-    ZmY5NjAyMDA0YTM5YjQ5YWE0N2UxMjYwODk1ZGE4ZWJkNzFhMGY2N2JlYTFh
-    MGQzOWQ4YzczZjQ3Yzk4YTIxZDkyMmQzZjk3Njc1ODYwYTVhYmQ=
+    MzU2OTZjMjMxMDNjMjI3NmRmYWY4MzU3ZTlhYzg2MDU3MTg0OTFjMWM5NDRl
+    MjNkMTdlN2FhYWI5YWQ3NWQzNjkzYzhkMmFlYTEwYTM1MTliMjIzNDkzMTQz
+    ZWViZTM4MzA0ZmY3OGI4YzBhMmJmY2RlYWZlMTI1ZWFjMDAyZTM=

data/bin/brpm_uninstall

@@ -7,6 +7,7 @@ end
 
 require "yaml"
 require "brpm_auto"
+require "module_installer"
 
 params = {}
 params["log_file"] = "/tmp/brpm_install.log"

data/config.yml

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

data/lib/brpm_script_executor.rb

@@ -73,8 +73,13 @@ class BrpmScriptExecutor
             command += " \"#{max_records}\"" if max_records
           end
 
+          _, stderr, _, status = BrpmAuto.execute_command(command) do |stdout_err|
+            BrpmAuto.log "  stdout:#{stdout_err.chomp}"
+          end
+
         else
-          env_var_gem_home = "export GEM_HOME=#{ENV["BRPM_CONTENT_HOME"] || "#{ENV["BRPM_HOME"]}/modules"};"
+          env_vars = {}
+          env_vars["GEM_HOME"] = ENV["BRPM_CONTENT_HOME"] || "#{ENV["BRPM_HOME"]}/modules"
 
           module_path = get_module_gem_path(modul, module_version)
 
@@ -87,26 +92,18 @@ class BrpmScriptExecutor
           gemfile_path = "#{module_path}/Gemfile"
           if File.exists?(gemfile_path)
             BrpmAuto.log "Using Gemfile #{gemfile_path}."
-            env_var_bundler = "export BUNDLE_GEMFILE=#{gemfile_path};"
+            env_vars["BUNDLE_GEMFILE"] = gemfile_path
             require_bundler = "require 'bundler/setup';"
           else
             BrpmAuto.log("This module doesn't have a Gemfile.")
-            env_var_bundler = ""
             require_bundler = ""
           end
 
           BrpmAuto.log "Executing the script in a separate process..."
-          ruby_command = <<EOR
-#{require_bundler}
-require \\"brpm_script_executor\\"
-BrpmScriptExecutor.execute_automation_script_from_other_process(\\"#{modul}\\", \\"#{name}\\", \\"#{params_path}\\", \\"#{automation_type}\\", \\"#{parent_id}\\", \\"#{offset}\\", \\"#{max_records}\\")
-EOR
-          command = "#{env_var_gem_home}#{env_var_bundler}ruby -e \"#{ruby_command}\""
-        end
-
-        _, stderr, _, status = Bundler.with_clean_env do
-          BrpmAuto.execute_command(command) do |stdout_err|
-            BrpmAuto.log "    #{stdout_err.chomp}"
+          _, stderr, _, status = Bundler.with_clean_env do
+            BrpmAuto.execute_command(env_vars, "ruby", "-e", "#{require_bundler};require \"brpm_script_executor\";BrpmScriptExecutor.execute_automation_script_from_other_process(\"#{modul}\", \"#{name}\", \"#{params_path}\", \"#{automation_type}\", \"#{parent_id}\", \"#{offset}\", \"#{max_records}\")") do |stdout_err|
+              BrpmAuto.log "  stdout:#{stdout_err.chomp}"
+            end
           end
         end
 
@@ -114,6 +111,8 @@ EOR
 
         raise "The process failed with status #{status.exitstatus}.\n#{stderr}" unless status.success?
 
+        BrpmAuto.log "The process finished succesfully."
+
         if automation_type == "resource_automation"
           result_path = params_path.sub!("params", "result")
           BrpmAuto.log "Loading the result from #{result_path} and cleaning it up..."

data/lib/module_installer.rb

@@ -179,7 +179,7 @@ class ModuleInstaller
       end
       raise "The process failed with status #{status.exitstatus}.\n#{stderr}" unless status.success?
 
-      unless stdout =~ /Image is up to date for/ or output =~ /Downloaded newer image for/
+      unless stdout =~ /Image is up to date for/ or stdout =~ /Downloaded newer image for/
         if BrpmAuto.global_params["execute_automation_scripts_in_docker"] == "always"
           raise "Docker image bmcrlm/#{spec.name}:#{spec.version} doesn't exist."
         elsif BrpmAuto.global_params["execute_automation_scripts_in_docker"] == "if_docker_image_exists"
@@ -193,7 +193,7 @@ class ModuleInstaller
     case BrpmAuto.global_params["execute_automation_scripts_in_docker"]
     when "always", "if_docker_image_exists"
       BrpmAuto.log "Removing the docker image..."
-      _, stderr, _, status = BrpmAuto.execute_command("docker rmi $(docker images | grep bmcrlm/#{module_name}:#{module_version} | awk {'print $3'})") do |stdout_err|
+      _, stderr, _, status = BrpmAuto.execute_command("docker images | grep bmcrlm/#{module_name} | grep #{module_version} | awk {'print $3'} | xargs docker rmi") do |stdout_err|
         BrpmAuto.log "    #{stdout_err.chomp}"
       end
       raise "The process failed with status #{status.exitstatus}.\n#{stderr}" unless status.success?

data/lib/utilities.rb

@@ -78,15 +78,15 @@ module Utilities
     cmd_result
   end
 
-  def execute_command(command, sensitive_data = nil)
-    Open3.popen3(command) do |stdin, stdout, stderr, thread|
+  def execute_command(*commands)
+    Open3.popen3(*commands) do |stdin, stdout, stderr, thread|
       logs = {:out => "", :err => ""}
 
       if block_given?
         { :out => stdout, :err => stderr }.each do |key, stream|
           Thread.new do
             while line = stream.gets
-              privatized_line = BrpmAuto.privatize(line, sensitive_data)
+              privatized_line = BrpmAuto.privatize(line)
               logs[key] += privatized_line
               yield privatized_line
             end

metadata

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