brpm_content_framework 0.2.34 → 0.2.35

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGU0ZTZmOTMzOTFmMjgyMzVhZjA4M2ZiM2UzZmNlMWU2ODZmMzliMA==
+    ZjYxYjhmYzJmNTg0MjZkMDJjNzkwMzI1M2YxNWM5MjJkZjE4MWU4Ng==
   data.tar.gz: !binary |-
-    MzFjMmMzOTIwOGM5NmU3YmU5OGE3ODE4OWUyMWQ0MzNkYzgwNTIxZA==
+    ODQyZWRjYzYwODJjZDhlYTU1ZTlhNWI1ZjIzMmVhYTM5OTZjMWViMA==
 SHA512:
   metadata.gz: !binary |-
-    ZjBmNGY4YTQ4ZTYwNzVlZDljYjQ5MTc1OTMzOGExMmE0MjI0NjAyZjY1ODA4
-    MWMxNmY0ZjJiN2FjZGJjMDAxZWFhMzZlZWZhYjZlZTVmMGEyNzc1YTQ1Zjc5
-    YmY2ZjY5N2FmZmQ1N2IxYzQwOWNmMWY5YzZlYTJmMjdiNjM5Mzk=
+    NmY2Yzk0N2MyMTVhNTc5MDkxY2Q1NzRiYmVjMmE0YmY3NzM0MWYxNDU0ZmIz
+    YjE4NjZiMTI0NzQwODdiNGQ4MDJlM2U1ODUxNGVlYzJiYzBjNmUxZTdhNGE1
+    ZjlmMGRiMjNmYTRmZDJhZWNmYmY2OWIzOTRhZWU2ZWFjOWNmZWQ=
   data.tar.gz: !binary |-
-    MmQxZWEyZTNiYmYxN2Q5ZTA0ODdjZGZhZjk1NDliMzMwYmUxODUxODA0NGI3
-    NTM3NjhhNDUzNWJlZDllZTIxMWIxOTFmYTA2NzhiYjhjNGU4NDJjOTRkNzE5
-    NTFjOWM3MDIxYzU4NDNiZTBmZjNmYzFkMzZhYjgyMDc0OWJmNGQ=
+    NWE0Y2RhNDM1ZmFlMTgzYTExMjVjOTNlZTBjYWJjYzhkY2RlZGRkNjc0NGFl
+    N2U4MWI0Yzk3NDI1NDAxNzRkOWRlZDRlYjMxNmI5MzBmYTFjNmU4ZDYyNzA1
+    ZmE5NDdlYjViYjg0MmIyNzUyMTNiNTU2OTJiM2U2MTc5NDgxYTc=

data/config.yml

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

data/docker/Dockerfile

@@ -5,8 +5,9 @@ ENV BRPM_CONTENT_FRAMEWORK_VERSION 1.0.0
 ENV GEM_HOME /usr/lib/ruby/gems/1.9.1
 
 RUN gem install brpm_content_framework --ignore-dependencies -v "$BRPM_CONTENT_FRAMEWORK_VERSION" && \
-    cd $GEM_HOME/gems/brpm_content_framework-$BRPM_CONTENT_FRAMEWORK_VERSION && bundle install && \
-    rm -rf $GEM_HOME/cache
+    cd "$GEM_HOME/gems/brpm_content_framework-$BRPM_CONTENT_FRAMEWORK_VERSION" && \
+    bundle install && \
+    rm -rf "$GEM_HOME/cache"
 
 ADD . /
 

data/infrastructure/module_template/{Dockerfile → docker/Dockerfile}

@@ -4,6 +4,7 @@ MAINTAINER Niek Bartholomeus <niek.bartholomeus@gmail.com>
 ENV MODULE <module name>
 ENV VERSION <module version>
 
-RUN gem install $MODULE --ignore-dependencies -v "$VERSION" && \
-    cd $GEM_HOME/gems/$MODULE-$VERSION && bundle install && \
-    rm -rf $GEM_HOME/cache
+RUN gem install "$MODULE" --ignore-dependencies -v "$VERSION" && \
+    cd "$GEM_HOME/gems/$MODULE-$VERSION" && \
+    bundle install && \
+    rm -rf "$GEM_HOME/cache"

data/lib/brpm_script_executor.rb

@@ -74,8 +74,7 @@ class BrpmScriptExecutor
           result = BrpmAuto.execute_shell(command)
 
         else
-          env_vars = {}
-          env_vars["GEM_HOME"] = ENV["BRPM_CONTENT_HOME"] || "#{ENV["BRPM_HOME"]}/modules"
+          env_var_gem_home = "export GEM_HOME=#{ENV["BRPM_CONTENT_HOME"] || "#{ENV["BRPM_HOME"]}/modules"};"
 
           module_path = get_module_gem_path(modul, module_version)
 
@@ -88,15 +87,21 @@ class BrpmScriptExecutor
           gemfile_path = "#{module_path}/Gemfile"
           if File.exists?(gemfile_path)
             BrpmAuto.log "Using Gemfile #{gemfile_path}."
-            env_vars["BUNDLE_GEMFILE"] = gemfile_path
+            env_var_bundler = "export BUNDLE_GEMFILE=#{gemfile_path};"
             require_bundler = "require 'bundler/setup';"
           else
             BrpmAuto.log("This module doesn't have a Gemfile.")
+            env_var_bundler = ""
             require_bundler = ""
           end
 
           BrpmAuto.log "Executing the script in a separate process..."
-          result = Bundler.with_clean_env { BrpmAuto.execute_shell(env_vars, "ruby", "-e", "#{require_bundler}require 'brpm_script_executor'; BrpmScriptExecutor.execute_automation_script_from_other_process(\"#{modul}\", \"#{name}\", \"#{params_path}\", \"#{automation_type}\", \"#{parent_id}\", \"#{offset}\", \"#{max_records}\")") }
+          command = <<EOR
+#{require_bundler}
+require \\"brpm_script_executor\\"
+BrpmScriptExecutor.execute_automation_script_from_other_process(\\"#{modul}\\", \\"#{name}\\", \\"#{params_path}\\", \\"#{automation_type}\\", \\"#{parent_id}\\", \\"#{offset}\\", \\"#{max_records}\\")
+EOR
+          result = Bundler.with_clean_env { BrpmAuto.execute_shell("#{env_var_gem_home}#{env_var_bundler}ruby -e \"#{command}\"") }
         end
 
         FileUtils.rm(params_path) if File.exists?(params_path)
@@ -113,8 +118,8 @@ class BrpmScriptExecutor
         end
 
         if automation_type == "resource_automation"
-          BrpmAuto.log "Loading the result from #{result_path} and cleaning it up..."
           result_path = params_path.sub!("params", "result")
+          BrpmAuto.log "Loading the result from #{result_path} and cleaning it up..."
           result = YAML.load_file(result_path)
           FileUtils.rm result_path
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content_framework
 version: !ruby/object:Gem::Version
-  version: 0.2.34
+  version: 0.2.35
 platform: ruby
 authors:
 - Niek Bartholomeus
@@ -186,13 +186,13 @@ files:
 - infrastructure/config/customer_include.rb
 - infrastructure/config/server.yml
 - infrastructure/log.html
-- infrastructure/module_template/Dockerfile
 - infrastructure/module_template/Gemfile
 - infrastructure/module_template/Rakefile
 - infrastructure/module_template/Rakefile_for_private_gem_repo
 - infrastructure/module_template/automations/my_automation_script.meta
 - infrastructure/module_template/automations/my_automation_script.rb
 - infrastructure/module_template/config.yml
+- infrastructure/module_template/docker/Dockerfile
 - infrastructure/module_template/lib/my_library.rb
 - infrastructure/module_template/module.gemspec
 - infrastructure/module_template/resource_automations/my_resource_automation_script.meta