brpm_content_framework 0.2.16 → 0.2.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTQxMzQ5YmYwOTQ2NDBiNWNkYTFlOTdlZTVjYWM1ODY0YzZlY2MxZA==
+    NjViNDgwZmYyZjFiYWMxYmRhYzhlNWI4YjYyMzNiZDAxMTBmYjViZQ==
   data.tar.gz: !binary |-
-    MjlmYmI0YjI5ZjAyZGU0NzUyZGY2MjAyNWM3ZmRkOTAzMzBmZGZmZQ==
+    YjU2YWVlNWVmZDJlZjk0ZDFjNWFlMTZmMDNmYjExNDE3YTJiMDdlZg==
 SHA512:
   metadata.gz: !binary |-
-    NTEzMjE0Mjk1MjdmMGU5YzlhZDU4ZWFiNTFlNDc2MDJiNDU1NTVkZTcwZDU4
-    MzE5YTg1NmM5NWY2NTg0Y2E4OWZjOGRkMTMxYzIwYWE3ZjUyYjMwN2ViOGYz
-    N2UyMzI0OGE3Nzc1NjQ4ODEwZWM3NzMwYjZlNzE5OGNkOGJkMzM=
+    NTY4NzNlOWQxNzFhOGYyNmY0M2E0OGE2NmE4MmExYWVhZGM3MjlmMjg4NTQz
+    NWI5ZDJlMDUwNDlmOWQ2NzBlYWE1ODFhYTZhYjFkZWU4NGJiMDdmNjliNjMx
+    Njc2NWZkZWZkNWRlYjk1YjMwZjEyMzdjNDZmODU2NzBiNDNiMzM=
   data.tar.gz: !binary |-
-    MDFkOWViMzY2ZWU2NzZlMGJlNmE1ODIzZWQyOTljMjA3ZGEzYjFhNjAxZmUx
-    ZjE2NDkxNzk1MzQxYjYxZDZlYzUyZWY4NGNkODBjODI4ZWM5MjgyNGNhNjk3
-    MThmMmFiMWJmNGVmM2RhZjZkMjAyMTViMTYyNGYwOWIyMDBmYzk=
+    NzE1MTU5YmFlNmI5NTVkNTQwMjM5MTEwZWY4MjM4OTBkMjc3MjMxODYwN2Zh
+    ZGYwZWEwNTE4NGE4Mzg2M2JjMDAzYTJiM2Q3MjBjN2NiODczMmFiNDAyODQ5
+    Y2E5YTkzMGY2OGE1ZDAzNzI3YjJkNDZkNWI0MGU3MTRkYzdmYzE=

data/config.yml

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

data/lib/brpm_script_executor.rb

@@ -17,15 +17,6 @@ class BrpmScriptExecutor
     def execute_automation_script_in_separate_process_internal(modul, name, params, automation_type, parent_id = nil, offset = nil, max_records = nil)
       BrpmAuto.setup(params)
 
-      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|
-        file.puts(params.to_yaml)
-      end
-
       env_vars = {}
       env_vars["GEM_HOME"] = ENV["BRPM_CONTENT_HOME"] || "#{ENV["BRPM_HOME"]}/modules"
 
@@ -47,16 +38,25 @@ class BrpmScriptExecutor
       end
 
       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}.")
-        return
+      if File.exists?(gemfile_path)
+        BrpmAuto.log "Using Gemfile #{gemfile_path}."
+        env_vars["BUNDLE_GEMFILE"] = gemfile_path
+        require_bundler = "require 'bundler/setup';"
+      else
+        BrpmAuto.log("This module doesn't have a Gemfile.")
+        require_bundler = ""
       end
 
-      BrpmAuto.log "Using Gemfile #{gemfile_path}."
-      env_vars["BUNDLE_GEMFILE"] = gemfile_path
+      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 "Temporarily storing the params to #{params_file}..."
+      File.open(params_file, "w") do |file|
+        file.puts(params.to_yaml)
+      end
 
       BrpmAuto.log "Executing automation script '#{name}' from module '#{modul}' in a separate process..."
-      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}\")")
+      return_value = Bundler.clean_system(env_vars, RbConfig.ruby, "-e", "#{require_bundler}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'."
@@ -70,7 +70,7 @@ class BrpmScriptExecutor
 
       if automation_type == "resource_automation"
         result_file = "#{working_path}/result_#{$?.pid}.yml"
-        BrpmAuto.log "Returning the results from #{result_file}..."
+        BrpmAuto.log "Loading the result from #{result_file} and cleaning it up..."
         result = YAML.load_file(result_file)
         FileUtils.rm result_file
 
@@ -83,12 +83,11 @@ class BrpmScriptExecutor
     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}..."
+      puts "Loading the params from #{params_file} and cleaning it up..."
       params = YAML.load_file(params_file)
-
       FileUtils.rm(params_file)
 
-      puts "Loading the BRPM Content framework..."
+      puts "Setting up the BRPM Content framework..."
       BrpmAuto.setup(params)
 
       if BrpmAuto.params["SS_run_key"] and BrpmAuto.params["SS_script_support_path"]
@@ -99,7 +98,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"
-        BrpmAuto.log "Saving the results to #{result_file}..."
+        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|
           file.puts(result.to_yaml)

data/lib/module_installer.rb

@@ -152,14 +152,14 @@ class ModuleInstaller
   def install_bundle(spec)
     gemfile_path = File.join(spec.gem_dir, "Gemfile")
 
-    unless File.exists?(gemfile_path)
-      raise "This module doesn't have a Gemfile. Expected it at #{gemfile_path}."
+    if File.exists?(gemfile_path)
+      command = "cd #{spec.gem_dir}; bundle install"
+      BrpmAuto.log "Found a Gemfile so executing command '#{command}'..."
+      result = BrpmAuto.execute_shell(command)
+    else
+      BrpmAuto.log "This module doesn't have a Gemfile."
     end
 
-    command = "cd #{spec.gem_dir}; bundle install"
-    BrpmAuto.log "Found a Gemfile so executing command '#{command}'..."
-    result = BrpmAuto.execute_shell(command)
-
     BrpmAuto.log result["stdout"] if result["stdout"] and !result["stdout"].empty?
     unless result["status"] == 0
       raise result["stderr"]
@@ -532,12 +532,12 @@ params["direct_execute"] = "true"
 params["framework_version"] = nil if params["framework_version"].empty?
 params["module_version"] = nil if params["module_version"].empty?
 
-require "\#{ENV["BRPM_CONTENT_HOME"] || "\#{ENV["BRPM_HOME"]}/modules"}/gems/brpm_content_framework-\#{params["framework_version"] || "latest"}/lib/brpm_script_executor.rb"
 EOR
 
     if automation_type == "Automation"
 
       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_in_separate_process("#{module_name}", "#{auto_script_name}", params)
 EOR
@@ -545,6 +545,7 @@ EOR
     elsif automation_type == "ResourceAutomation"
 
       template += <<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_in_separate_process("#{module_name}", "#{auto_script_name}", script_params, parent_id, offset, max_records)

data/tests/brpm_script_executor_spec.rb

@@ -1,4 +1,5 @@
 require_relative "spec_helper"
+require "fileutils"
 
 describe 'BRPM Script Executor' do
   before(:all) do
@@ -8,10 +9,12 @@ describe 'BRPM Script Executor' do
     require_relative "../lib/brpm_auto"
     BrpmAuto.setup(get_default_params)
 
-    test_gems = Dir.glob("#{ENV["BRPM_HOME"]}/modules/gems/brpm_module_test*")
+    @module_name = "brpm_module_test"
+    # We are running inside bundler and the brpm_module_test is not specified in it so don't use the Gem methods
+    test_gems = Dir.glob("#{ENV["BRPM_HOME"]}/modules/gems/#{@module_name}*")
 
     if test_gems.empty?
-      # watch out we are running inside bundler, known for messing up the gem configs
+      # watch out we are running inside bundler, known for messing up the gem configs, so explicitly set the GEM_HOME env var
       ENV["GEM_HOME"] = "#{ENV["BRPM_HOME"]}/modules"
       Gem.paths = ENV
 
@@ -20,31 +23,45 @@ describe 'BRPM Script Executor' do
       # result = Bundler.clean_system("export GEM_HOME=#{ENV["GEM_HOME"]} && cd .. && rake install")
       # raise "rake install failed" unless result
 
-      BrpmAuto.log "Installing brpm_module_test..."
+      BrpmAuto.log "Installing #{@module_name}..."
       specs = Gem.install("brpm_module_test")
-      spec = specs.find { |spec| spec.name == "brpm_module_test"}
+      spec = specs.find { |spec| spec.name == @module_name}
       BrpmAuto.log "Bundle install..."
       result = Bundler.clean_system("export GEM_HOME=#{ENV["GEM_HOME"]} && export BUNDLE_GEMFILE=#{spec.gem_dir}/Gemfile && bundle install")
       raise "bundle install failed" unless result
     end
   end
 
-  it "should execute an automation script in a separate process" 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_in_separate_process("brpm_module_test", "test_ruby", get_default_params)
 
     expect(result).to be_truthy
   end
 
+  it "should execute an automation script in a separate process outside a bundler context" do
+    module_version = BrpmScriptExecutor.get_latest_installed_version(@module_name)
+    module_gem_path = BrpmScriptExecutor.get_module_gem_path(@module_name, module_version)
+    gemfile_path = "#{module_gem_path}/Gemfile"
+
+    FileUtils.move(gemfile_path, "#{gemfile_path}_tmp")
+    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_in_separate_process("brpm_module_test", "xxx", get_default_params)}.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_in_separate_process("brpm_module_test", "test_ruby_raises_error", get_default_params)}.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_in_separate_process("brpm_module_test", "test_resource", get_default_params, 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content_framework
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Niek Bartholomeus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client