brpm_content_framework 0.2.47 → 0.2.48

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWJhZjJkYzBkMjE3NDZiMDZjZjk3ZGZkOWQ1MzIwNDRkZGIwNWNlNA==
+    MDcyOTBlZDU1ZWQxNjY2NTJmZDVkNzdkOWRiZDgxMmIzMWZkMTAzNw==
   data.tar.gz: !binary |-
-    YjFhZWJlODYyYWYwNmU0MzEzZWU5MGZjYWNmNGU2NWY5YThkMDM4Yw==
+    YzBmYjBjMWM4Yzk0MzNkYzQ0YWNlNGQ1NGZiZTg3YzBhYmU4NDc3Mg==
 SHA512:
   metadata.gz: !binary |-
-    ZmJmOTFiYTRkMzYxZDk5NDRhNDZmZmYxMTAwYWNkYzkwZDkxMDA3OTliZWZl
-    YjE2NDljZWU4YWY5MTliZjJhMTU3NzY3OWMyYzkzN2E3MzM4NzEwN2NiMzFk
-    OGZkY2Y4NWUxNDczNTZjMTdlNTQ2MzI5YWNlYTA1MTNlNjhmNzc=
+    YmM5MTk3NWNlNjA2YTc2NmUxMTE3NjlhYjYzODVjYjc1YzFmNDA4ZTRmMDdm
+    ZmY1NmIyYWYxNTFlZDUyNDczYTE5MTFjMTZiYTg2OGVkNmU0MTRkY2QzYzEy
+    MDFkNmQ2N2FkMjRhZWQ4ZTczNDRkNjgzODIxNzQ2OTU4NDZlMDk=
   data.tar.gz: !binary |-
-    ZGY2M2MyZWFmYmU1MmRiNzY4MDQ4YzJiNjBiOWIwOWY2NWE2ZTJjMTZmMzMw
-    OGEzMmJiYjgxYmQ3Nzg5YmQxMThhNmQ4M2FmZDI3OTgzNjUxZDgwZmQ5MGQ1
-    OWIyNWUxNzBlZWJiZmI0ZTY3NDc2MjBiYjYxMzYxNGY1MDYxMTc=
+    NDM1MGM0OWMyNzE2ZmFkMTQ5MzRmYmRiZmY2MGQ4YzljMjA5NjBiZmM5NjZj
+    MDA3NDI4NjJkMTMyYjViNDNhODM5MTI0YjA4NGI2ZDk0Y2M0YzViZTA3Nzg2
+    NTE0NzU4ZGY4YWQ3YjgxMTE0ODE3ZGE1OTBlZDk3YjcxN2NlNjE=

data/config.yml

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

data/lib/logging/simple_logger.rb

@@ -8,12 +8,16 @@ class SimpleLogger < LoggerBase
     print "Logging to #{@log_file}\n" unless also_log_to_console
   end
 
-  def log(message)
+  def log(message, with_prefix = true)
     message = message.to_s # in case booleans or whatever are passed
     timestamp = "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}"
 
-    prefix = "#{timestamp}|"
-    message = message.gsub("\n", "\n" + (" " * prefix.length))
+    if with_prefix
+      prefix = ""
+    else
+      prefix = "#{timestamp}|"
+      message = message.gsub("\n", "\n" + (" " * prefix.length))
+    end
 
     log_message = "#{prefix}#{message}\n"
 

data/lib/module_installer.rb

@@ -186,6 +186,7 @@ class ModuleInstaller
             raise stderr.chomp
           elsif BrpmAuto.global_params["execute_automation_scripts_in_docker"] == "if_docker_image_exists"
             BrpmAuto.log stderr.chomp
+            BrpmAuto.log "docker is only optional so ignoring the error."
           end
         else
           raise "The process failed with status #{status.exitstatus}.\n#{stderr}" unless status.success?
@@ -198,7 +199,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 images | grep bmcrlm/#{module_name} | grep #{module_version} | awk {'print $3'} | xargs docker rmi") do |stdout_err|
+      _, stderr, _, status = BrpmAuto.execute_command("docker images | grep bmcrlm/#{module_name} | grep #{module_version} | awk {'print $3'} | xargs -r docker rmi") do |stdout_err|
         BrpmAuto.log "    #{stdout_err.chomp}"
       end
       raise "The process failed with status #{status.exitstatus}.\n#{stderr}" unless status.success?

metadata

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