brpm_content_framework 0.2.15 → 0.2.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTYzNTgyN2Y4MTk2YzU3OWRlMWIwZjk1Mjk5NDBjZjQyNmYyNjEwYw==
+    MTQxMzQ5YmYwOTQ2NDBiNWNkYTFlOTdlZTVjYWM1ODY0YzZlY2MxZA==
   data.tar.gz: !binary |-
-    MzIwN2IzNDllMGQxYWI3ZDQ0YTIwZmMxZDMwZmUwYmZmZTdlODhlNA==
+    MjlmYmI0YjI5ZjAyZGU0NzUyZGY2MjAyNWM3ZmRkOTAzMzBmZGZmZQ==
 SHA512:
   metadata.gz: !binary |-
-    OTM2NzdiYzRiOTg3NjZkNzNiMDdmYTU3Zjg2OWUyZDY2ODJkMDk2OTQ0YWZh
-    YTg3NDNmYmRhMWNlZGU2MTNiOTdjNzAwMTljYjczMTBhZGM0ZjQ0ZTkwYWJk
-    YmZlZWZkMzZmYjA1Yzg1NzAxNTE0NDE1YTc4M2NmODZiZDYwOGU=
+    NTEzMjE0Mjk1MjdmMGU5YzlhZDU4ZWFiNTFlNDc2MDJiNDU1NTVkZTcwZDU4
+    MzE5YTg1NmM5NWY2NTg0Y2E4OWZjOGRkMTMxYzIwYWE3ZjUyYjMwN2ViOGYz
+    N2UyMzI0OGE3Nzc1NjQ4ODEwZWM3NzMwYjZlNzE5OGNkOGJkMzM=
   data.tar.gz: !binary |-
-    ZGQ2MTc4ZmUwNDIxODU3NTVjZDRmMTg5OGVhNTYyMDc1YTdjNDg2OTkwMDZh
-    ZjQzMDBmODM3ZmZlOWU1ODI4YWNkMGQ3ODljMDYyZjJhYzNlMDZiMmE0YWMy
-    OTk5MTlkYmU0MjJiM2EyNzJjYWYwMGI0NTZhNGU2ZTk0YjNjYmQ=
+    MDFkOWViMzY2ZWU2NzZlMGJlNmE1ODIzZWQyOTljMjA3ZGEzYjFhNjAxZmUx
+    ZjE2NDkxNzk1MzQxYjYxZDZlYzUyZWY4NGNkODBjODI4ZWM5MjgyNGNhNjk3
+    MThmMmFiMWJmNGVmM2RhZjZkMjAyMTViMTYyNGYwOWIyMDBmYzk=

data/config.yml

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

data/infrastructure/test_separate_process.rb

@@ -1,4 +1,4 @@
 require 'bundler/setup'
 require 'brpm_script_executor'
 puts `bundle show`
-BrpmScriptExecutor.execute_automation_script_from_other_process('brpm_module_test', 'test_ruby', '/private/tmp/brpm_content/params_000.yml', "automation")
+BrpmScriptExecutor.execute_automation_script_from_other_process('brpm_module_test', 'test_resource', '/private/tmp/brpm_content/params_000.yml', "resource_automation")

data/lib/brpm_script_executor.rb

@@ -6,14 +6,6 @@ class BrpmScriptExecutor
   private_class_method :new
 
   class << self
-    def execute_automation_script(modul, name, params)
-      execute_automation_script_internal(modul, name, params, "automation")
-    end
-
-    def execute_resource_automation_script(modul, name, params, parent_id, offset, max_records)
-      execute_automation_script_internal(modul, name, params, "resource_automation", parent_id, offset, max_records)
-    end
-
     def execute_automation_script_in_separate_process(modul, name, params)
       execute_automation_script_in_separate_process_internal(modul, name, params, "automation")
     end
@@ -22,33 +14,12 @@ class BrpmScriptExecutor
       execute_automation_script_in_separate_process_internal(modul, name, params, "resource_automation", parent_id, offset, max_records)
     end
 
-    def execute_automation_script_from_other_process(modul, name, params_file, automation_type, parent_id = nil, offset = nil, max_records = nil)
-      raise "Params file #{params_file} doesn't exist." unless File.exists?(params_file)
-
-      puts "Loading params file #{params_file}..."
-      params = YAML.load_file(params_file)
-
-      puts "Loading the BRPM Content framework..."
-      BrpmAuto.setup(params)
-      BrpmAuto.log "The BRPM Content framework is loaded now. (version: #{BrpmAuto.version})"
-
-      BrpmAuto.log "Deleting params file #{params_file}..."
-      FileUtils.rm(params_file)
-
-      if BrpmAuto.params["SS_run_key"] and BrpmAuto.params["SS_script_support_path"]
-        puts "Loading the BRPM core framework's libraries..."
-        load File.expand_path("#{File.dirname(__FILE__)}/../infrastructure/create_output_file.rb")
-      end
-
-      execute_automation_script_internal(modul, name, params, automation_type, parent_id, offset, max_records)
-    end
-
-    private
-
     def execute_automation_script_in_separate_process_internal(modul, name, params, automation_type, parent_id = nil, offset = nil, max_records = nil)
       BrpmAuto.setup(params)
 
-      params_file = "#{File.expand_path(params["SS_output_dir"] || params["output_dir"] || Dir.pwd)}/params_#{params["SS_run_key"] || params["run_key"] || "000"}.yml"
+      working_path = File.expand_path(params["SS_output_dir"] || params["output_dir"] || Dir.pwd)
+
+      params_file = "#{working_path}/params_#{params["SS_run_key"] || params["run_key"] || "000"}.yml"
 
       BrpmAuto.log "Creating params file #{params_file}..."
       File.open(params_file, "w") do |file|
@@ -75,7 +46,6 @@ class BrpmScriptExecutor
         raise Gem::GemNotFoundException, "Module #{modul} version #{module_version} is not installed. Expected it on path #{module_path}."
       end
 
-      require_statements = ""
       gemfile_path = "#{module_path}/Gemfile"
       unless File.exists?(gemfile_path)
         BrpmAuto.log_error("This module doesn't have a Gemfile. Expected it at #{gemfile_path}.")
@@ -84,21 +54,65 @@ class BrpmScriptExecutor
 
       BrpmAuto.log "Using Gemfile #{gemfile_path}."
       env_vars["BUNDLE_GEMFILE"] = gemfile_path
-      require_statements += "require 'bundler/setup'; "
 
       BrpmAuto.log "Executing automation script '#{name}' from module '#{modul}' in a separate process..."
-      result = Bundler.clean_system(env_vars, RbConfig.ruby, "-e", "#{require_statements}; require 'brpm_script_executor'; BrpmScriptExecutor.execute_automation_script_from_other_process(\"#{modul}\", \"#{name}\", \"#{params_file}\", \"#{automation_type}\", \"#{parent_id}\", \"#{offset}\", \"#{max_records}\")")
-      if result.nil?
+      return_value = Bundler.clean_system(env_vars, RbConfig.ruby, "-e", "require 'bundler/setup'; require 'brpm_script_executor'; BrpmScriptExecutor.execute_automation_script_from_other_process(\"#{modul}\", \"#{name}\", \"#{params_file}\", \"#{automation_type}\", \"#{parent_id}\", \"#{offset}\", \"#{max_records}\")")
+      FileUtils.rm(params_file) if File.exists?(params_file)
+      if return_value.nil?
         message = "The process that executed the automation script returned with 'Command execution failed'."
         BrpmAuto.log_error message
         raise message
-      elsif result == false
+      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
 
-      result
+      if automation_type == "resource_automation"
+        result_file = "#{working_path}/result_#{$?.pid}.yml"
+        BrpmAuto.log "Returning the results from #{result_file}..."
+        result = YAML.load_file(result_file)
+        FileUtils.rm result_file
+
+        result
+      else
+        return_value
+      end
+    end
+
+    def execute_automation_script_from_other_process(modul, name, params_file, automation_type, parent_id = nil, offset = nil, max_records = nil)
+      raise "Params file #{params_file} doesn't exist." unless File.exists?(params_file)
+
+      puts "Loading params file #{params_file}..."
+      params = YAML.load_file(params_file)
+
+      FileUtils.rm(params_file)
+
+      puts "Loading the BRPM Content framework..."
+      BrpmAuto.setup(params)
+
+      if BrpmAuto.params["SS_run_key"] and BrpmAuto.params["SS_script_support_path"]
+        puts "Loading the BRPM core framework's libraries..."
+        load File.expand_path("#{File.dirname(__FILE__)}/../infrastructure/create_output_file.rb")
+      end
+
+      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"
+        BrpmAuto.log "Saving the results to #{result_file}..."
+        FileUtils.rm(result_file) if File.exists?(result_file)
+        File.open(result_file, "w") do |file|
+          file.puts(result.to_yaml)
+        end
+      end
+    end
+
+    def execute_automation_script(modul, name, params)
+      execute_automation_script_internal(modul, name, params, "automation")
+    end
+
+    def execute_resource_automation_script(modul, name, params, parent_id, offset, max_records)
+      execute_automation_script_internal(modul, name, params, "resource_automation", parent_id, offset, max_records)
     end
 
     def execute_automation_script_internal(modul, name, params, automation_type, parent_id = nil, offset = nil, max_records = nil)

data/tests/brpm_script_executor_spec.rb

@@ -36,14 +36,16 @@ describe 'BRPM Script Executor' do
   end
 
   it "should return false when executing an non-existing automation script in a separate process" do
-    result = BrpmScriptExecutor.execute_automation_script_in_separate_process("brpm_module_test", "xxx", get_default_params)
-
-    expect(result).to be_falsey
+    expect{BrpmScriptExecutor.execute_automation_script_in_separate_process("brpm_module_test", "xxx", get_default_params)}.to raise_exception
   end
 
   it "should return false when executing an erroneous automation script in a separate process" do
-    result = BrpmScriptExecutor.execute_automation_script_in_separate_process("brpm_module_test", "test_ruby_raises_error", get_default_params)
+    expect{BrpmScriptExecutor.execute_automation_script_in_separate_process("brpm_module_test", "test_ruby_raises_error", get_default_params)}.to raise_exception
+  end
+
+  it "should execute a resource automation script in a separate process" do
+    result = BrpmScriptExecutor.execute_resource_automation_script_in_separate_process("brpm_module_test", "test_resource", get_default_params, nil, 0, 10)
 
-    expect(result).to be_falsey
+    expect(result.count).to eql(3)
   end
 end

metadata

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