brpm_content_framework 0.2.17 → 0.2.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjViNDgwZmYyZjFiYWMxYmRhYzhlNWI4YjYyMzNiZDAxMTBmYjViZQ==
+    YjY5YmEwNzU4M2E3NjI1ZGRlZWU3YTBiZWQxMjM2ZTNhZmM5NGY4YQ==
   data.tar.gz: !binary |-
-    YjU2YWVlNWVmZDJlZjk0ZDFjNWFlMTZmMDNmYjExNDE3YTJiMDdlZg==
+    MjExNWRhNDA4OTNiZjUwMzZjMjY2Mzk3OGU1NmJhODJkNTU2ODkwOA==
 SHA512:
   metadata.gz: !binary |-
-    NTY4NzNlOWQxNzFhOGYyNmY0M2E0OGE2NmE4MmExYWVhZGM3MjlmMjg4NTQz
-    NWI5ZDJlMDUwNDlmOWQ2NzBlYWE1ODFhYTZhYjFkZWU4NGJiMDdmNjliNjMx
-    Njc2NWZkZWZkNWRlYjk1YjMwZjEyMzdjNDZmODU2NzBiNDNiMzM=
+    MDM0NzVjZjY0YTA3MmQ4MmNlZDZjZDM2MzNjOGExMWQ0YjNmZTM3MzNjMDhl
+    ZWNmNTEyOGM1NWM5ZmQ0M2QzYmFlMjFkNTg4ZjAwNDY3NjYwOTRmNmYzMzYy
+    OTE0OGEzMWUxOGYzZmU3MDAzZDQzMDUwZGVmOGYzMjc2NjdkMTk=
   data.tar.gz: !binary |-
-    NzE1MTU5YmFlNmI5NTVkNTQwMjM5MTEwZWY4MjM4OTBkMjc3MjMxODYwN2Zh
-    ZGYwZWEwNTE4NGE4Mzg2M2JjMDAzYTJiM2Q3MjBjN2NiODczMmFiNDAyODQ5
-    Y2E5YTkzMGY2OGE1ZDAzNzI3YjJkNDZkNWI0MGU3MTRkYzdmYzE=
+    MGNkYjI3MmFkMTcyZWY2ZjM2M2VlMjIwNWY3NDA4N2YyNmIxZTdhNGQ1Mjcy
+    YmIyZjU2ZWJlMmEyMDRmNzc0MzM3YjQ4MGUxMDliZGU3ZTIxMGM3MzRmNDA5
+    MGFkNTE2OTE1ZDg2MDE1Yzc4NTk2NTdiOGI3MTQxMDRlMjA4ZjU=

data/README.md

@@ -116,9 +116,11 @@ The config.yml file contains the meta data of the module as well as a list of th
 
 The automations directory contains the actual automation scripts and the resource_automations directory contains the resource automation scripts. For each of these scripts a meta file must exist that contains (you guessed it right) the meta data of the automation script.
 
+You can optionally include a Gemfile to your module. This will make sure that the versions of the modules (and other gems) that your module depends on are pinned during the installation of your module, even if more recent versions of these dependencies are installed later on. If you include a Gemfile.lock to the module (automatically generated when you do a 'bundle install') you can even pin these versions during build time. This will make sure that your module uses the same versions of the dependencies wherever and whenever it is installed. If you don't include any of these files then the latest available version of the dependent modules is automatically used.      
+
 See the example files from the module_template directory for more information on the mandatory and optional fields.
 
-In order to publish your module, three more files are needed: a Gemfile, a module.gemspec file and a Rakefile. These files can be copied from the module_template directory unmodified.
+In order to publish your module, two more files are needed: a module.gemspec file and a Rakefile. These files can be copied from the module_template directory unmodified.
 
 During the development life cycle, after you have committed the changes to your automation scripts and bumped the version number from the config.yml file, you can now publish the new version of your module with a simple command:
 ```shell

data/config.yml

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

data/lib/brpm_script_executor.rb

@@ -16,8 +16,11 @@ 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)
+      BrpmAuto.log ""
+      BrpmAuto.log "Executing #{automation_type} '#{name}' from module '#{modul}' in a separate process..."
 
       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"
 
       BrpmAuto.log "Finding the module path..."
@@ -55,7 +58,7 @@ class BrpmScriptExecutor
         file.puts(params.to_yaml)
       end
 
-      BrpmAuto.log "Executing automation script '#{name}' from module '#{modul}' in a separate process..."
+      BrpmAuto.log "Executing the script in a separate process..."
       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?
@@ -87,18 +90,19 @@ class BrpmScriptExecutor
       params = YAML.load_file(params_file)
       FileUtils.rm(params_file)
 
-      puts "Setting up the BRPM Content framework..."
+      puts "  Setting up the BRPM Content framework..."
       BrpmAuto.setup(params)
+      BrpmAuto.log "  BRPM Content framework is version #{BrpmAuto.version}."
 
       if BrpmAuto.params["SS_run_key"] and BrpmAuto.params["SS_script_support_path"]
-        puts "Loading the BRPM core framework's libraries..."
+        BrpmAuto.log "  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 "Temporarily storing the result 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)
@@ -119,7 +123,7 @@ class BrpmScriptExecutor
         BrpmAuto.setup(params)
 
         BrpmAuto.log ""
-        BrpmAuto.log ">>>>>>>>>>>>>> START #{automation_type} #{name}"
+        BrpmAuto.log ">>>>>>>>>>>>>> START #{automation_type} #{modul} #{name}"
         start_time = Time.now
 
         module_spec = Gem::Specification.find_by_name(modul) # will raise an error when the module is not installed
@@ -136,7 +140,6 @@ class BrpmScriptExecutor
         load automation_script_path
 
         if automation_type == "resource_automation"
-          BrpmAuto.log "Calling execute_resource_automation_script(params, parent_id, offset, max_records)..."
           execute_script(params, parent_id, offset, max_records)
         end
       rescue Exception => e
@@ -149,7 +152,7 @@ class BrpmScriptExecutor
         duration = 0
         duration = stop_time - start_time unless start_time.nil?
 
-        BrpmAuto.log ">>>>>>>>>>>>>> STOP #{automation_type} #{name} - total duration: #{Time.at(duration).utc.strftime("%H:%M:%S")}"
+        BrpmAuto.log ">>>>>>>>>>>>>> STOP #{automation_type} #{modul} #{name} - total duration: #{Time.at(duration).utc.strftime("%H:%M:%S")}"
         BrpmAuto.log ""
 
         #load File.expand_path("#{File.dirname(__FILE__)}/../infrastructure/write_to.rb") if BrpmAuto.params.run_from_brpm

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content_framework
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - Niek Bartholomeus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client