brpm_content_framework 0.2.19 → 0.2.20

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjQ0NmNiYWVkNjcyYTU4MTgwNDhjODM1ZjEwMjkzN2VjY2EyYTllMg==
+    ZWUyMmVmZGY2NmJjMzIzZTJiNjcyZTJiZTA1NDc0YzMyZTQzMTEzNA==
   data.tar.gz: !binary |-
-    ZmZiMGUyNTY1OTE5YjgwNWM5YTA5NTRhY2NiZGFkYmIzMGZhMTBkMg==
+    YmJlZjRhMGM1ZTFiMjY4ZDBjZWU2MjQ5YzkxNGZkNDliYTgzM2Y0Mg==
 SHA512:
   metadata.gz: !binary |-
-    NjY0NWYzM2JiMTY2OTI2M2Q0OTQ5YjI1YTU4ZmQzOThkN2RmODMyZTkyODY3
-    OGMzYzg1YmNhZmZiM2YzZTZhYWRhOTVhNzQzNDhkMzQ1NTg5MjA0OTE5YThj
-    YWM0OGExOGZkNTdjZDRiZDIxMTNmMWE2YTQyNzJjOTliNGU2MTc=
+    MjUyNDJmYzJiZDdiODUxNjc0ODVjOGM3ODk5ZGQ4NGY5YTg1MWRiNDcyMjc0
+    MjYzNDcxODc0ZWZiNGI3YzY2ZDA1YTNjYjVmODhjZDY1OGI2MTQxMWYwYmRi
+    MmJjZjg2MzBhNjQxY2Q4ZTljYWQ1MjBhZDRmYWZlZmVhYTBlOTc=
   data.tar.gz: !binary |-
-    ZDA0NTljY2YzN2M1M2I1YzEwZGNhOTBjOWVmNTNiN2YzYWYyODM2ZjVjZDFk
-    YTlmNWYxMGU3YzQzMzkzYWYyYjAzYzllMDMyMWNlMDI2Yzg4ZTM5OTIzMTRm
-    ZWZmNGMyOWE4ODRlNzZiNDcwZGM0NGIwOGZmZmM2OTJiYzE5OGI=
+    OTJhOWMxY2RmMzlkMGU5Nzk5YWRlY2I4NWI4MmEyODYyZjVkZGIwMzBkOGM1
+    MjVmYjY0YmJkOWVmNmQxMzNhMGMwZmZkNTE4ODc0OTBhOTEwMDc4YWVlOWFj
+    YTMyMTg0MDE1MDFmNjY4MjliN2UyOWM2ZDM4NTdmNDM1NjBkNDM=

data/config.yml

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

data/lib/brpm_script_executor.rb

@@ -6,28 +6,19 @@ class BrpmScriptExecutor
   private_class_method :new
 
   class << self
-    def execute_automation_script(modul, name, params, in_separate_process = nil)
-      execute_automation_script_internal(modul, name, params, "automation", in_separate_process)
+    def execute_automation_script_in_separate_process(modul, name, params)
+      execute_automation_script_in_separate_process_internal(modul, name, params, "automation")
     end
 
-    def execute_resource_automation_script(modul, name, params, in_separate_process = nil, parent_id, offset, max_records)
-      execute_automation_script_internal(modul, name, params, "resource_automation", in_separate_process, parent_id, offset, max_records)
+    def execute_resource_automation_script_in_separate_process(modul, name, params, parent_id, offset, max_records)
+      execute_automation_script_in_separate_process_internal(modul, name, params, "resource_automation", parent_id, offset, max_records)
     end
 
-    def execute_automation_script_internal(modul, name, params, automation_type, in_separate_process = nil, parent_id = nil, offset = nil, max_records = nil)
+    def execute_automation_script_in_separate_process_internal(modul, name, params, automation_type, parent_id = nil, offset = nil, max_records = nil)
       BrpmAuto.setup(params)
       BrpmAuto.log ""
+      BrpmAuto.log "Executing #{automation_type} '#{name}' from module '#{modul}' in a separate process..."
 
-      if in_separate_process || BrpmAuto.params["execute_automations_in_separate_process"]
-        BrpmAuto.log "Executing #{automation_type} '#{name}' from module '#{modul}' in a separate process..."
-        execute_automation_script_in_separate_process_internal(modul, name, params, automation_type, parent_id, offset, max_records)
-      else
-        BrpmAuto.log "Executing #{automation_type} '#{name}' from module '#{modul}' in-process..."
-        execute_automation_script_in_same_process_internal(modul, name, params, automation_type, parent_id, offset, max_records)
-      end
-    end
-
-    def execute_automation_script_in_separate_process_internal(modul, name, params, automation_type, parent_id = nil, offset = nil, max_records = nil)
       env_vars = {}
       env_vars["JRUBY_OPTS"] = "-Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -Xcompile.mode=OFF" # improve jvm startup time (see http://rexchung.com/2013/08/02/speed-up-jruby-rails-startup-time/)
       env_vars["GEM_HOME"] = ENV["BRPM_CONTENT_HOME"] || "#{ENV["BRPM_HOME"]}/modules"
@@ -108,7 +99,7 @@ class BrpmScriptExecutor
         load File.expand_path("#{File.dirname(__FILE__)}/../infrastructure/create_output_file.rb")
       end
 
-      result = execute_automation_script_in_same_process_internal(modul, name, params, automation_type, parent_id, offset, max_records)
+      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 "  Temporarily storing the result to #{result_file}..."
@@ -119,8 +110,18 @@ class BrpmScriptExecutor
       end
     end
 
-    def execute_automation_script_in_same_process_internal(modul, name, params, automation_type, parent_id = nil, offset = nil, max_records = nil)
+    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)
       begin
+        BrpmAuto.setup(params)
+
         BrpmAuto.log ""
         BrpmAuto.log ">>>>>>>>>>>>>> START #{automation_type} #{modul} #{name}"
         start_time = Time.now

data/lib/module_installer.rb

@@ -539,7 +539,7 @@ EOR
       template += <<EOR
 require "\#{ENV["BRPM_CONTENT_HOME"] || "\#{ENV["BRPM_HOME"]}/modules"}/gems/brpm_content_framework-\#{params["framework_version"] || "latest"}/lib/brpm_script_executor.rb"
 
-BrpmScriptExecutor.execute_automation_script("#{module_name}", "#{auto_script_name}", params)
+BrpmScriptExecutor.execute_automation_script_in_separate_process("#{module_name}", "#{auto_script_name}", params)
 EOR
 
     elsif automation_type == "ResourceAutomation"
@@ -548,7 +548,7 @@ EOR
 load "\#{ENV["BRPM_CONTENT_HOME"] || "\#{ENV["BRPM_HOME"]}/modules"}/gems/brpm_content_framework-\#{params["framework_version"] || "latest"}/lib/brpm_script_executor.rb"
 
 def execute(script_params, parent_id, offset, max_records)
-  BrpmScriptExecutor.execute_resource_automation_script("#{module_name}", "#{auto_script_name}", script_params, parent_id, offset, max_records)
+  BrpmScriptExecutor.execute_resource_automation_script_in_separate_process("#{module_name}", "#{auto_script_name}", script_params, parent_id, offset, max_records)
 end
 EOR
     end

data/tests/brpm_script_executor_spec.rb

@@ -35,7 +35,7 @@ describe 'BRPM Script Executor' do
   # Note: the following tests will run the automation scripts in a separate process and will therefore use an already installed brpm_content_framework module,
   # either the version from their Gemfile/Gemfile.lock or the latest, but not the one from source code
   it "should execute an automation script in a separate process inside a bundler context" do
-    result = BrpmScriptExecutor.execute_automation_script("brpm_module_test", "test_ruby", get_default_params, true)
+    result = BrpmScriptExecutor.execute_automation_script_in_separate_process("brpm_module_test", "test_ruby", get_default_params)
 
     expect(result).to be_truthy
   end
@@ -46,22 +46,22 @@ describe 'BRPM Script Executor' do
     gemfile_path = "#{module_gem_path}/Gemfile"
 
     FileUtils.move(gemfile_path, "#{gemfile_path}_tmp")
-    result = BrpmScriptExecutor.execute_automation_script(@module_name, "test_ruby", get_default_params, true)
+    result = BrpmScriptExecutor.execute_automation_script_in_separate_process(@module_name, "test_ruby", get_default_params)
     FileUtils.move("#{gemfile_path}_tmp", gemfile_path)
 
     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(@module_name, "xxx", get_default_params, true)}.to raise_exception
+    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
-    expect{BrpmScriptExecutor.execute_automation_script(@module_name, "test_ruby_raises_error", get_default_params, true)}.to raise_exception
+    expect{BrpmScriptExecutor.execute_automation_script_in_separate_process(@module_name, "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(@module_name, "test_resource", get_default_params, true, nil, 0, 10)
+    result = BrpmScriptExecutor.execute_resource_automation_script_in_separate_process(@module_name, "test_resource", get_default_params, nil, 0, 10)
 
     expect(result.count).to eql(3)
   end

metadata

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