brpm_content_framework 0.2.14 → 0.2.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGU3ZDU0OWIwNTRjMjA5NzgwOTQ1MjRiODg1ZWI0NDI2YTYwZThhZA==
+    YTYzNTgyN2Y4MTk2YzU3OWRlMWIwZjk1Mjk5NDBjZjQyNmYyNjEwYw==
   data.tar.gz: !binary |-
-    MjIyMGQ5ZTIxOTJkYzlmM2IyNGEyNjY2YzZmY2NiYTJkOTA4NTZmYg==
+    MzIwN2IzNDllMGQxYWI3ZDQ0YTIwZmMxZDMwZmUwYmZmZTdlODhlNA==
 SHA512:
   metadata.gz: !binary |-
-    NWY5Y2EwMjAyYzg5MDFhMTBmOGY3ZWFmZWIyNjI0ZmFiZGRiYTlmZjg0ODBi
-    OTIwZWUwMjRiN2M3ZGQ0NDUzMzRhYTU4YTNjMGYzNjc2ODYzMTE5ZDg2OTcx
-    MDkzZGY2YTAzNGVlMWFhZjMxY2U0ZmU5MmU0ZWRjNTZhYzljOTg=
+    OTM2NzdiYzRiOTg3NjZkNzNiMDdmYTU3Zjg2OWUyZDY2ODJkMDk2OTQ0YWZh
+    YTg3NDNmYmRhMWNlZGU2MTNiOTdjNzAwMTljYjczMTBhZGM0ZjQ0ZTkwYWJk
+    YmZlZWZkMzZmYjA1Yzg1NzAxNTE0NDE1YTc4M2NmODZiZDYwOGU=
   data.tar.gz: !binary |-
-    MzkyZDQ5NzI3N2ExMjQzMDhkYTM0NTY2MzU4OTc4ZDQwZTM1OThjM2YyMWU3
-    MWQ5ZmZjOWYxY2IyYjQxNWQ5MDQ4MGNlYzZkYTY2MzBkZTZkNzU3NjIxNTE0
-    NTk3ZjI0ZDI2MmI3MTYxNDgwNjEwN2RlNWJiMjk3YWE1MzYwYjg=
+    ZGQ2MTc4ZmUwNDIxODU3NTVjZDRmMTg5OGVhNTYyMDc1YTdjNDg2OTkwMDZh
+    ZjQzMDBmODM3ZmZlOWU1ODI4YWNkMGQ3ODljMDYyZjJhYzNlMDZiMmE0YWMy
+    OTk5MTlkYmU0MjJiM2EyNzJjYWYwMGI0NTZhNGU2ZTk0YjNjYmQ=

data/config.yml

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

data/lib/brpm_script_executor.rb

@@ -85,14 +85,17 @@ class BrpmScriptExecutor
       BrpmAuto.log "Using Gemfile #{gemfile_path}."
       env_vars["BUNDLE_GEMFILE"] = gemfile_path
       require_statements += "require 'bundler/setup'; "
-      # TODO Bundler.require
 
       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?
-        BrpmAuto.log_error("The process that executed the automation script returned with 'Command execution failed'.")
+        message = "The process that executed the automation script returned with 'Command execution failed'."
+        BrpmAuto.log_error message
+        raise message
       elsif result == false
-        BrpmAuto.log_error("The process that executed the automation script returned with non-zero exit code: #{$?.exitstatus}")
+        message = "The process that executed the automation script returned with non-zero exit code: #{$?.exitstatus}"
+        BrpmAuto.log_error message
+        raise message
       end
 
       result
@@ -139,6 +142,9 @@ class BrpmScriptExecutor
         #load File.expand_path("#{File.dirname(__FILE__)}/../infrastructure/write_to.rb") if BrpmAuto.params.run_from_brpm
       end
     end
+
+    ############################################################################################################################################################
+    # These methods are used to find gems outside of the active bundle so they should not rely on any logic from the gem or bundler libraries
     def get_module_gem_path(module_name, module_version)
       "#{get_gems_root_path}/gems/#{module_name}-#{module_version}"
     end
@@ -147,7 +153,6 @@ class BrpmScriptExecutor
       latest_version_path = get_module_gem_path(module_name, "latest")
       return "latest" if File.exists?(latest_version_path)
 
-      # TODO: use Gem::Specification.find_by_name(@module_name, Gem::Requirement.create(Gem::Version.new(@module_version)))
       all_version_search = get_module_gem_path(module_name, "*")
       version_paths = Dir.glob(all_version_search)
 
@@ -169,6 +174,8 @@ class BrpmScriptExecutor
         raise "Unable to find out the gems root path."
       end
     end
+    ############################################################################################################################################################
+
   end
 end
 

data/lib/module_installer.rb

@@ -35,9 +35,6 @@ class ModuleInstaller
 
       BrpmAuto.log "Preparing the connectivity to BRPM..."
       if prepare_brpm_connection
-        BrpmAuto.log "Creating an automation error for '******** ERROR ********' if one doesn't exist yet..."
-        create_automation_error_if_not_exists("******** ERROR ********")
-
         module_friendly_name = get_module_friendly_name(module_spec)
         BrpmAuto.log "Creating an automation category for #{module_friendly_name} if one doesn't exist yet..."
         create_automation_category_if_not_exists(module_friendly_name)

metadata

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