brpm_content_framework 0.2.33 → 0.2.34

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGE3ODVjYmZiOTE3MzYwNTE0MjIwZWUzN2NkNDk5MGZlN2IwODE5YQ==
+    MGU0ZTZmOTMzOTFmMjgyMzVhZjA4M2ZiM2UzZmNlMWU2ODZmMzliMA==
   data.tar.gz: !binary |-
-    MDYzNWYwZjQyNjAzYzNhMDgxNmQ3ZDdmYzg3Y2Y3MzcwYjUwZTc5ZA==
+    MzFjMmMzOTIwOGM5NmU3YmU5OGE3ODE4OWUyMWQ0MzNkYzgwNTIxZA==
 SHA512:
   metadata.gz: !binary |-
-    MzkxMDAyMDA4NGNmNTE0ZGY2ZjgyNTE5NDc3YjBjMDlkYmJiYzFhZWE3YjY5
-    ZTRkOGFhMjc1OGVlYzQ1ZWM5NDUyZTY0NzZiN2JmNjhiZmI1MjNhYWRkNWQ4
-    YWZkZDIyYzg2Mjg1YTU0NjYwZDRmZTBmNmNiZjIwMjNhYmRlNWQ=
+    ZjBmNGY4YTQ4ZTYwNzVlZDljYjQ5MTc1OTMzOGExMmE0MjI0NjAyZjY1ODA4
+    MWMxNmY0ZjJiN2FjZGJjMDAxZWFhMzZlZWZhYjZlZTVmMGEyNzc1YTQ1Zjc5
+    YmY2ZjY5N2FmZmQ1N2IxYzQwOWNmMWY5YzZlYTJmMjdiNjM5Mzk=
   data.tar.gz: !binary |-
-    OTRlZDMyNzk0Yjk0OTFmNzc0ZjhmOTk3M2Q1NmQwYzJiYWRjNGU2Y2NiYzc2
-    MmE4Njk4ZmM1ZDc3NTU3ZDg1M2VmYTdmMmY2YTMyMDE2NWJhNzI3Mzc1YzRl
-    NTliNWMwZDQyOWVjOGRkYTI1MzBmNDFiMWE0NDQyMmY5NmIxMzk=
+    MmQxZWEyZTNiYmYxN2Q5ZTA0ODdjZGZhZjk1NDliMzMwYmUxODUxODA0NGI3
+    NTM3NjhhNDUzNWJlZDllZTIxMWIxOTFmYTA2NzhiYjhjNGU4NDJjOTRkNzE5
+    NTFjOWM3MDIxYzU4NDNiZTBmZjNmYzFkMzZhYjgyMDc0OWJmNGQ=

data/config.yml

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

data/docker/Dockerfile

@@ -1,7 +1,7 @@
 FROM atlashealth/ruby:1.9.3
 MAINTAINER Niek Bartholomeus <niek.bartholomeus@gmail.com>
 
-ENV BRPM_CONTENT_FRAMEWORK_VERSION 0.2.31
+ENV BRPM_CONTENT_FRAMEWORK_VERSION 1.0.0
 ENV GEM_HOME /usr/lib/ruby/gems/1.9.1
 
 RUN gem install brpm_content_framework --ignore-dependencies -v "$BRPM_CONTENT_FRAMEWORK_VERSION" && \
@@ -12,4 +12,4 @@ ADD . /
 
 VOLUME [ "/workdir" ]
 VOLUME [ "/automation_results" ]
-VOLUME [ "/script_support" ]
+VOLUME [ "/script_support" ]

data/infrastructure/scripts/publish_module_version.sh

@@ -19,7 +19,11 @@ if [ -f "docker/Dockerfile" ]; then
 
     cd docker
 
-    OLD_MODULE_VERSION=$(eval "sed -n \"s=ENV VERSION \(.*\)=\1=p\" Dockerfile")
+    if [[ "$MODULE_NAME" == brpm_content_framework ]]; then
+      OLD_MODULE_VERSION=$(eval "sed -n \"s=ENV BRPM_CONTENT_FRAMEWORK_VERSION \(.*\)=\1=p\" Dockerfile")
+    else
+      OLD_MODULE_VERSION=$(eval "sed -n \"s=ENV VERSION \(.*\)=\1=p\" Dockerfile")
+    fi
     sed -i "" s/$OLD_MODULE_VERSION/$MODULE_VERSION/ Dockerfile
 
     echo ""

data/lib/brpm_script_executor.rb

@@ -51,11 +51,11 @@ class BrpmScriptExecutor
         if use_docker
           params = params.clone # we don't want to modify the current session's params
           params["SS_output_dir"] = "/workdir"
-          params["SS_output_file"].sub!(working_path, "/workdir") if params["SS_output_file"]
+          params["SS_output_file"] = params["SS_output_file"].sub(working_path, "/workdir") if params["SS_output_file"]
           params["SS_automation_results_dir"] = "/automation_results"
           params["SS_script_support_path"] = "/script_support"
 
-          params["log_file"].sub!(working_path, "/workdir") if params["log_file"]
+          params["log_file"] = params["log_file"].sub(working_path, "/workdir") if params["log_file"]
         end
 
         BrpmAuto.log "Temporarily storing the params to #{params_path}..."
@@ -71,8 +71,8 @@ class BrpmScriptExecutor
             command += " \"#{offset}\"" if offset
             command += " \"#{max_records}\"" if max_records
           end
-          BrpmAuto.log command
-          return_value = system(command)
+          result = BrpmAuto.execute_shell(command)
+
         else
           env_vars = {}
           env_vars["GEM_HOME"] = ENV["BRPM_CONTENT_HOME"] || "#{ENV["BRPM_HOME"]}/modules"
@@ -96,29 +96,31 @@ class BrpmScriptExecutor
           end
 
           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}\")")
+          result = Bundler.with_clean_env { BrpmAuto.execute_shell(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}\")") }
         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
+
+        unless result["status"] == 0
+          if result["stdout"] and !result["stdout"].empty?
+            BrpmAuto.log "stdout of the executed process:"
+            BrpmAuto.log "-----------------------------------------------------------"
+            BrpmAuto.log result["stdout"]
+            BrpmAuto.log "-----------------------------------------------------------"
+          end
+
+          raise result["stderr"]
         end
 
         if automation_type == "resource_automation"
-          result_path = params_path.sub!("params", "result")
           BrpmAuto.log "Loading the result from #{result_path} and cleaning it up..."
+          result_path = params_path.sub!("params", "result")
           result = YAML.load_file(result_path)
           FileUtils.rm result_path
 
           result
         else
-          return_value
+          true
         end
 
       rescue Exception => e
@@ -147,7 +149,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 = params_file.sub!("params", "result")
+        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/logger_base.rb

@@ -28,7 +28,7 @@ class LoggerBase
   def log_error(message)
     log ""
     log "******** ERROR ********"
-    log "An error has occurred"
+    log "An error has occurred:"
     log "#{message}"
     log "***********************"
     log ""

data/tests/brpm_script_executor_spec.rb

@@ -52,9 +52,9 @@ describe 'BRPM Script Executor' do
     expect(result).to be_truthy
   end
 
-  it "should execute an automation script in a docker container" do
+  xit "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['output_dir'] = File.expand_path("~/tmp/brpm_content") # docker volume mapping 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)
@@ -62,11 +62,11 @@ describe 'BRPM Script Executor' do
     expect(result).to be_truthy
   end
 
-  it "should return false when executing an non-existing automation script in a separate process" do
+  it "should raise 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
 
-  it "should return false when executing an erroneous automation script in a separate process" do
+  it "should raise when executing an erroneous automation script in a separate process" do
     expect{BrpmScriptExecutor.execute_automation_script_in_separate_process(@module_name, "test_ruby_raises_error", get_default_params)}.to raise_exception
   end
 

metadata

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