brpm_content_framework 0.2.31 → 0.2.32

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTEzY2UxYjA2ZWNhZGM2NTRkMzkyNTFkMDFlYjk3NjVkYzFmYmM4Mg==
+    YzQxZGE2NGI0ZGQ4YzgxZGY1YzQyYjBiZGIzOTE2YzQ2Y2RhZTdhYg==
   data.tar.gz: !binary |-
-    YTI3MWZmZmIwZGVmYmJkMzYyMmZhMWFlMzQwOWY2NzdiMmFkM2NiYQ==
+    NDkxOWQ3ZTk0OTQ0ZDkyMTZlOWYxMTgzZWRjYjY2ZDQyMTJmZTMyMg==
 SHA512:
   metadata.gz: !binary |-
-    MzAzMmNlMTAxZjhlMDU5ODg0ZmY3YzVhYjhjNzJjMjhmYThmNjM4OWE4ZWNl
-    MjBhN2YwMDE4OWM1Njg1Y2FkM2QwYmJkNjUyYzA3NTM4MzE5Y2NjOWQwNTkz
-    Y2IxZGM1NDFmMWYzY2ZjZDNhMjhiZDMyYmUzYWFlZGI2ODQ2YTQ=
+    ODEzYWRlZjg4YWQ3ZDkwZTk3ODJjNjIwOGY0YzAwOGFmOWZmYjdhYTdjOTg2
+    OWZjMzdkZjMyZDcyZWQ5MzI0M2RiYmFmZDM0YzFhMjVhNTNmNTU3YzE2NzM5
+    ZjBiNGM2YzM1OTUyNjA2Y2RkOGI5YTY0NTJmM2FmZGViODhjYWE=
   data.tar.gz: !binary |-
-    MzY1NmE4YjdhYmE5MGI4MGVhMWI4NjAzNzUzNmM2MGVjZmY4MzFkOWQ0NmE3
-    NjIyMjlkNGJkOWI0MTJjZjlkNDJmZGEyY2ZhYTQyYWJlZjcxYmZjNDRjYTk4
-    ZGQ4MTE0ZmYyMjc4Njk5YmNlODg0MzI2NWZkY2NjMTE3NmFhZWM=
+    OTI2MWQ0N2U4NDgwMzM2OThhMGE2NGE0MDQ2ODRlMzdiZmI0NzJhMWEwYTFi
+    MzQxYjkzZDMyOTUwM2U5OGUxMmZjN2JjNTJjOTA1NWRjMTRkMjgzM2NlNzhk
+    YjEzZmExMTUzZGM4ZGZhY2VkMGRhYWZhZDRkODAzOGUzNjk2YmY=

data/config.yml

@@ -1,4 +1,4 @@
-version: 0.2.31
+version: 0.2.32
 
 author: Niek Bartholomeus
 email: niek.bartholomeus@gmail.com

data/infrastructure/scripts/publish_module_version.sh

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+USAGE="publish_module_version.sh <module name>"
+
+MODULE_NAME=$1
+MODULE_VERSION=$2
+
+if [ -z "$MODULE_NAME" ]; then
+    echo "Module name is not specified. Aborting."
+    echo "Usage: $USAGE"
+    exit 1
+fi
+
+cd $(dirname $0)/../../../$MODULE_NAME
+
+echo ">>> Publishing the module as a gem to rubygems.org..."
+rake release
+if [ -f "Dockerfile" ]; then
+    MODULE_VERSION=$(eval "sed -n \"s=version: \(.*\)=\1=p\" config.yml")
+
+    OLD_MODULE_VERSION=$(eval "sed -n \"s=ENV VERSION \(.*\)=\1=p\" Dockerfile")
+    sed -i "" s/$OLD_MODULE_VERSION/$MODULE_VERSION/ Dockerfile
+
+    echo ">>> Building the docker image..."
+    docker build -t bmcrlm/$MODULE_NAME:$MODULE_VERSION .
+
+    echo ">>> Publishing the docker image to the docker hub..."
+    docker push bmcrlm/$MODULE_NAME:$MODULE_VERSION
+
+    echo ">>> Tagging the module version as 'latest'..."
+    docker tag -f bmcrlm/$MODULE_NAME:$MODULE_VERSION bmcrlm/$MODULE_NAME:latest
+    docker push bmcrlm/$MODULE_NAME:latest
+
+    sed -i "" s/$MODULE_VERSION/$OLD_MODULE_VERSION/ Dockerfile
+fi

data/lib/brpm_script_executor.rb

@@ -45,6 +45,7 @@ class BrpmScriptExecutor
       else
         use_docker = false
       end
+      BrpmAuto.log "The automation script will be executed in a docker container." if	use_docker
 
       working_path = File.expand_path(BrpmAuto.params.output_dir)
       params_file = "params_#{params["SS_run_key"] || params["run_key"] || "000"}.yml"
@@ -53,9 +54,10 @@ class BrpmScriptExecutor
 
       if use_docker
         params["SS_output_dir"] = "/workdir"
-        params["SS_output_file"].sub!(working_path, "/workdir")
-
+        params["SS_output_file"].sub!(working_path, "/workdir") if params["SS_output_file"]
         params["SS_automation_results_dir"] = "/automation_results"
+
+        params["log_file"].sub!(working_path, "/workdir") if params["log_file"]
       end
 
       BrpmAuto.log "Temporarily storing the params to #{params_path}..."
@@ -72,7 +74,7 @@ class BrpmScriptExecutor
           command += " \"#{max_records}\"" if max_records
         end
         BrpmAuto.log command
-        exec(command)
+        return_value = system(command)
       else
         env_vars = {}
         env_vars["GEM_HOME"] = ENV["BRPM_CONTENT_HOME"] || "#{ENV["BRPM_HOME"]}/modules"
@@ -97,20 +99,21 @@ class BrpmScriptExecutor
 
         BrpmAuto.log "Executing the script in a separate process..."
         return_value = Bundler.clean_system(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}\")")
-        FileUtils.rm(params_path) if File.exists?(params_path)
-        if return_value.nil?
-          message = "The process that executed the automation script returned with 'Command execution failed'."
-          BrpmAuto.log_error message
-          raise message
-        elsif return_value == false
-          message = "The process that executed the automation script returned with non-zero exit code: #{$?.exitstatus}"
-          BrpmAuto.log_error message
-          raise message
-        end
+      end
+
+      FileUtils.rm(params_path) if File.exists?(params_path)
+      if return_value.nil?
+        message = "The process that executed the automation script returned with 'Command execution failed'."
+        BrpmAuto.log_error message
+        raise message
+      elsif return_value == false
+        message = "The process that executed the automation script returned with non-zero exit code: #{$?.exitstatus}"
+        BrpmAuto.log_error message
+        raise message
       end
 
       if automation_type == "resource_automation"
-        result_file = "#{working_path}/result_#{$?.pid}.yml"
+        result_file = params_file.sub!("params", "result")
         BrpmAuto.log "Loading the result from #{result_file} and cleaning it up..."
         result = YAML.load_file(result_file)
         FileUtils.rm result_file
@@ -139,7 +142,7 @@ class BrpmScriptExecutor
 
       result = execute_automation_script_internal(modul, name, params, automation_type, parent_id, offset, max_records)
       if automation_type == "resource_automation"
-        result_file = "#{File.dirname(params_file)}/result_#{Process.pid}.yml"
+        result_file = params_file.sub!("params", "result")
         BrpmAuto.log "  Temporarily storing the result to #{result_file}..."
         FileUtils.rm(result_file) if File.exists?(result_file)
         File.open(result_file, "w") do |file|

data/lib/logging/simple_logger.rb

@@ -11,7 +11,6 @@ class SimpleLogger < LoggerBase
   def log(message)
     message = message.to_s # in case booleans or whatever are passed
     timestamp = "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}"
-    log_message = ""
 
     prefix = "#{timestamp}|"
     message = message.gsub("\n", "\n" + (" " * prefix.length))

data/tests/brpm_script_executor_spec.rb

@@ -52,6 +52,16 @@ describe 'BRPM Script Executor' do
     expect(result).to be_truthy
   end
 
+  it "should execute an automation script in a docker container" do
+    params = get_default_params
+    params['output_dir'] = File.expand_path("~/tmp/brpm_content") # docker volume mappong only works from the current user's home directory on Mac OSX
+    params["execute_automation_scripts_in_docker"] = "always"
+
+    result = BrpmScriptExecutor.execute_automation_script_in_separate_process("brpm_module_test", "test_ruby", params)
+
+    expect(result).to be_truthy
+  end
+
   it "should return false when executing an non-existing automation script in a separate process" do
     expect{BrpmScriptExecutor.execute_automation_script_in_separate_process(@module_name, "xxx", get_default_params)}.to raise_exception
   end
@@ -65,4 +75,14 @@ describe 'BRPM Script Executor' do
 
     expect(result.count).to eql(3)
   end
+
+  it "should execute a resource automation script in a docker container" do
+    params = get_default_params
+    params['output_dir'] = File.expand_path("~/tmp/brpm_content") # docker volume mappong only works from the current user's home directory on Mac OSX
+    params["execute_automation_scripts_in_docker"] = "always"
+
+    result = BrpmScriptExecutor.execute_resource_automation_script_in_separate_process(@module_name, "test_resource", params, nil, 0, 10)
+
+    expect(result.count).to eql(3)
+  end
 end

data/tests/customer_include/config/server.yml

@@ -1,3 +1,4 @@
 # This file should be located in BRPM_HOME/config
 # See the README for more information on how to use this file
-key2: "value2"
+key2: "value2"
+# a_commented_out_key: "comment"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content_framework
 version: !ruby/object:Gem::Version
-  version: 0.2.31
+  version: 0.2.32
 platform: ruby
 authors:
 - Niek Bartholomeus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -205,6 +205,7 @@ files:
 - infrastructure/scripts/install_brpm.sh
 - infrastructure/scripts/maintenance.sh
 - infrastructure/scripts/patch_brpm.sh
+- infrastructure/scripts/publish_module_version.sh
 - infrastructure/scripts/restore_database.sh
 - infrastructure/scripts/run_event_handler.cmd
 - infrastructure/scripts/run_event_handler.sh