brpm_content_framework 0.1.61 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTRhZWQwY2YzZGU1MjJlNDY1NTA1MmYyMDc4MDc1ZGZlMTNjOTI4OQ==
+    OTNmZjEwZDA2ZDQzMGNiNTVhMzU3YjI1NDNkYjAxMDkwNTM0YjliOA==
   data.tar.gz: !binary |-
-    OTBjMzBhOGIxZWY4YTYwY2Q4Y2IzZGUzMjQ3ZGE4M2MyMTQ4ZTc0NQ==
+    NzEyZWQ0YzBlMjA0MDlkMzE3NjI0MDE5NjJiNWQ4YzRmYmQ0NDJiMQ==
 SHA512:
   metadata.gz: !binary |-
-    NTJhNDFlZWM3YWQ1ZDAwNTFmOGI1NjExYmNmZDVhOTZmNGVmNWY0YjQzNzBi
-    ZmVhZjlhNDE0MTIwN2FmNjE4ZTAyYmJmODdmNTQwNjUzZTBjOTQ0YmQ1OTA3
-    YWRkN2E3NTY1OGEzMjliOGU2ZWYzYjFjY2U3NmFiNzMxYzBkZDU=
+    NmIwZTI4NjFkYjJhYjc3N2FmZjBjY2E3NzVhYjQ4ZDY1ZjZmYjg4YjM2MzUz
+    MGFmM2MxMGVkODg3NTYxNTkwNzcyNzA3NTUxMjc1Yzc1MWZkY2Q5NWM4NThj
+    YzA1OWE1OGRhODIyMmFiMDRiMzIzMTZjMDBkNWQ3ZDE2YWQ3Y2E=
   data.tar.gz: !binary |-
-    MjdkZTE1MGZhNGNiMGQ3MGFlNTY1YTRkNWY0NTZkNzJjOGYyYjQ5NGFmOTc5
-    NGIyOGI0MzE0YjA4NDMxMDM3MjRhNGE4NWFhYzg3YmFlN2YzOGY5N2VlMTJl
-    YmNlZWQwN2IxMmU1NGFjNjBhNGNhMGM2ZmE1ZGZiMjQ5MGUxMzk=
+    NDY1MmQxZDE3MzQzNmQ0ZDI4NmVmYzhiYjllZWJhMGUyYjQ0M2RkOTJjMGI2
+    NzI0YjEzZTIwODY1MjYwZjg5NzIwYjg3YWFlYzA2MzhlOTJhNmUzMjMyOTRh
+    N2FkZWFiODM3ZDAxODQzYjI5MzBiZjYwOWRkNTNiYTU0NDAwMTE=

data/.travis.yml

@@ -6,7 +6,8 @@ before_install:
   - gem update --system 2.1.9
 
 script:
-  - rspec tests --format documentation --color
+  - bundle exec rspec tests --format documentation --color
+  - rspec tests_no_bundler --format documentation --color
 
 notifications:
   email:

data/config.yml

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

data/infrastructure/module_template/Rakefile

@@ -1,4 +1,3 @@
-# Copied from https://github.com/mitchellh/vagrant-aws/blob/master/Rakefile
 require 'rubygems'
 require 'bundler/setup'
 require 'rspec/core/rake_task'

data/lib/brpm_auto.rb

@@ -1,4 +1,3 @@
-require "bundler"
 require "yaml"
 
 class BrpmAuto
@@ -31,9 +30,7 @@ class BrpmAuto
       @config = get_config
       @version = @config["version"]
 
-      @brpm_version = get_brpm_version if self.brpm_installed
-
-      @gems_root_path = get_gems_root_path
+      @brpm_version = get_brpm_version if self.brpm_installed?
     end
 
     def setup(params = {})
@@ -73,62 +70,6 @@ class BrpmAuto
       end
     end
 
-    def require_module(module_name, module_version = nil)
-      module_version ||= get_latest_installed_version(module_name)
-      module_gem_path = get_module_gem_path(module_name, module_version)
-
-      if File.exists?(module_gem_path)
-        BrpmAuto.log "Found module #{module_name} #{module_version || ""} in gem path #{module_gem_path}."
-      else
-        raise Gem::GemNotFoundException, "Module #{module_name} version #{module_version} is not installed. Expected it on path #{module_gem_path}."
-      end
-
-      gemfile_lock_path = "#{module_gem_path}/Gemfile.lock"
-      if File.exists?(gemfile_lock_path) # TODO: decide how to react when multiple gems are 'required', each with a gemfile.lock
-        BrpmAuto.log "Found a Gemfile.lock: #{gemfile_lock_path} so parsing the specified version numbers for later usage..."
-        Dir.chdir(File.dirname(gemfile_lock_path)) do
-          @gemfile_lock = Bundler::LockfileParser.new(Bundler.read_file(gemfile_lock_path))
-        end
-      end
-
-      require_module_internal(module_name, module_version)
-    end
-
-    def require_libs_no_file_logging(module_path)
-      require_libs(module_path, false)
-    end
-
-    def require_libs(module_path, log = true)
-      lib_path = "#{module_path}/lib/**/*.rb"
-
-      log_message = "Loading all files from #{lib_path}..."
-      log ? (BrpmAuto.log log_message) : (print "#{log_message}\n")
-
-      require_files(Dir[lib_path], log)
-    end
-
-    def require_files(files, log = true)
-      failed_files = []
-      error_messages = []
-      files.each do |file|
-        if File.file?(file)
-          begin
-            require file
-          rescue NameError => ne # when we require a set of files with inter-dependencies, the order is important, therefore we will retry the failed files later
-            failed_files << file
-            error_messages << ne
-          end
-        end
-      end
-      if failed_files.count > 0
-        if failed_files.count == files.count
-          raise NameError, "Following files failed loading: #{failed_files.join(", ")}\nError messages: #{error_messages.join(", ")}"
-        else
-          require_files(failed_files, log)
-        end
-      end
-    end
-
     def load_server_params
       server_config_file_path = "#{self.params.config_dir}/server.yml"
       if File.exists?(server_config_file_path)
@@ -184,110 +125,12 @@ class BrpmAuto
       @integration_settings = IntegrationSettings.new(dns, username, password, details)
     end
 
-    def brpm_installed
-      ENV["BRPM_HOME"] != nil
-    end
-
-    def  get_gems_root_path
-      if ENV["BRPM_CONTENT_HOME"]
-        ENV["BRPM_CONTENT_HOME"] # gemset location is overridden
-      elsif ENV["BRPM_HOME"]
-        "#{ENV["BRPM_HOME"]}/modules" # default gemset location when BRPM is installed
-      elsif ENV["GEM_HOME"]
-        ENV["GEM_HOME"] # default gemset location when BRPM is not installed
-      else
-        raise "Unable to find out the gems root path."
-      end
-    end
-
-    ###############################################################################################################################
-    # Assure backward compatibility with the ssh_script_header methods when running the automation scripts in a separate process
-    def set_property_flag(prop, value = nil)
-      acceptable_fields = ["name", "value", "environment", "component", "global", "private"]
-      flag = "#------ Block to Set Property ---------------#\n"
-      if value.nil?
-        flag += set_build_flag_data("properties", prop, acceptable_fields)
-      else
-        flag += "$$SS_Set_property{#{prop}=>#{value}}$$"
-      end
-      flag += "\n#------- End Set Property ---------------#\n"
-      BrpmAuto.log flag
-      flag
-    end
-
-    def set_server_flag(servers)
-      # servers = "server_name, env\ncserver2_name, env2"
-      acceptable_fields = ["name", "environment", "group"]
-      flag = "#------ Block to Set Servers ---------------#\n"
-      flag += set_build_flag_data("servers", servers, acceptable_fields)
-      flag += "\n#------ End Set Servers ---------------#\n"
-      BrpmAuto.log flag
-      flag
-    end
-
-    def set_component_flag(components)
-      # comps = "comp_name, version\ncomp2_name, version2"
-      flag = "#------ Block to Set Components ---------------#\n"
-      acceptable_fields = ["name", "version", "environment", "application"]
-      flag += set_build_flag_data("components", components, acceptable_fields)
-      flag += "\n#------ End Set Components ---------------#\n"
-      BrpmAuto.log flag
-      flag
-    end
-
-    def set_titles_acceptable?(cur_titles, acceptable_titles)
-      cur_titles.each.reject{ |cur| acceptable_titles.include?(cur)}.count == 0
-    end
-
-    def set_build_flag_data(set_item, set_data, acceptable_titles)
-      flag = ""; msg = ""
-      lines = set_data.split("\n")
-      titles = lines[0].split(",").map{ |it| it.strip }
-      if set_titles_acceptable?(titles, acceptable_titles)
-        flag += "$$SS_Set_#{set_item}{\n"
-        flag += "#{titles.join(", ")}\n"
-        lines[1..-1].each do |line|
-          if line.split(",").count == titles.count
-            flag += "#{line}\n"
-          else
-            msg += "Skipped: #{line}"
-          end
-        end
-        flag += "}$$\n"
-      else
-        flag += "ERROR - Unable to set #{set_item} - improper format\n"
-      end
-      flag += msg
+    def brpm_installed?
+      ENV["BRPM_HOME"] and !ENV["BRPM_HOME"].empty?
     end
 
-    def set_application_version(prop, value)
-      # set_application_flag(app_name, version)
-      flag = "#------ Block to Set Application Version ---------------#\n"
-      flag += "$$SS_Set_application{#{prop}=>#{value}}$$"
-      flag += "\n#------ End Set Application ---------------#\n"
-      BrpmAuto.log(flag)
-      flag
-    end
-
-    def pack_response(argument_name, response)
-      flag = "#------ Block to Set Pack Response ---------------#\n"
-      unless argument_name.nil?
-        if response.is_a?(Hash)
-          # Used for out-table output parameter
-          flag += "$$SS_Pack_Response{#{argument_name}@@#{response.to_json}}$$"
-        else
-          flag += "$$SS_Pack_Response{#{argument_name}=>#{response}}$$"
-        end
-      end
-      flag += "\n#------- End Set Pack Response Block ---------------#\n"
-      BrpmAuto.log flag
-      flag
-    end
-    ###############################################################################################################################
-
-    private
-
-    def require_module_internal(module_name, module_version)
+    def require_module(module_name, module_version = nil)
+      module_version ||= get_latest_installed_version(module_name)
       module_path = get_module_gem_path(module_name, module_version)
 
       module_config_file_path = "#{module_path}/config.yml"
@@ -316,7 +159,7 @@ class BrpmAuto
             end
 
             BrpmAuto.log "Loading module #{dep_module_name} version #{dep_module_version}..."
-            require_module_internal(dep_module_name, dep_module_version)
+            require_module(dep_module_name, dep_module_version)
           end
         end
       else
@@ -329,54 +172,81 @@ class BrpmAuto
       module_path
     end
 
-    def get_config
-      YAML.load_file("#{@framework_root_path}/config.yml")
-    end
-
-    def get_brpm_version
-      unless self.params.brpm_installed
-        raise "BRPM is not installed."
-      end
-
-      knob_file = "#{ENV["BRPM_HOME"]}/server/jboss/standalone/deployments/RPM-knob.yml"
-      unless File.exists?(knob_file)
-        raise "Could not find the knob file at the expected location (#{knob_file})"
-      end
-
-      knob = YAML.load_file(knob_file)
-      version_content = File.read("#{knob["application"]["root"]}/VERSION")
-      version_content.scan(/VERSION=([0-9\.]*)/)[0][0]
-    end
-
     def get_module_gem_path(module_name, module_version)
-      "#{@gems_root_path}/gems/#{module_name}-#{module_version}"
+      "#{ENV["GEM_HOME"]}/gems/#{module_name}-#{module_version}"
     end
 
     def get_latest_installed_version(module_name)
       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)
 
-      raise GemNoVersionsInstalledError, "Could not find any installed version of module #{module_name}. Expected them in #{get_module_gem_path(module_name, "*")}" if version_paths.empty?
+      raise Gem::GemNotFoundException, "Could not find any installed version of module #{module_name}. Expected them in #{get_module_gem_path(module_name, "*")}" if version_paths.empty?
 
       versions = version_paths.map { |path| File.basename(path).sub("#{module_name}-", "") }
 
       versions.sort{ |a, b| Gem::Version.new(a) <=> Gem::Version.new(b) }.last
     end
 
-    def get_version_from_gemfile_lock(module_name)
-      spec = @gemfile_lock.specs.find { |spec| spec.name == module_name }
-      spec.version
+    private
+
+    def require_libs_no_file_logging(module_path)
+      require_libs(module_path, false)
     end
-  end
 
-  self.init
-end
+    def require_libs(module_path, log = true)
+      lib_path = "#{module_path}/lib/**/*.rb"
 
-class GemNoVersionsInstalledError < Gem::GemNotFoundException
-end
+      log_message = "Loading all files from #{lib_path}..."
+      log ? (BrpmAuto.log log_message) : (print "#{log_message}\n")
+
+      require_files(Dir[lib_path], log)
+    end
+
+    def require_files(files, log = true)
+      failed_files = []
+      error_messages = []
+      files.each do |file|
+        if File.file?(file)
+          begin
+            require file
+          rescue NameError => ne # when we require a set of files with inter-dependencies, the order is important, therefore we will retry the failed files later
+            failed_files << file
+            error_messages << ne
+          end
+        end
+      end
+      if failed_files.count > 0
+        if failed_files.count == files.count
+          raise NameError, "Following files failed loading: #{failed_files.join(", ")}\nError messages: #{error_messages.join(", ")}"
+        else
+          require_files(failed_files, log)
+        end
+      end
+    end
+
+    def get_config
+      YAML.load_file("#{@framework_root_path}/config.yml")
+    end
+
+    def get_brpm_version
+      unless self.brpm_installed?
+        raise "BRPM is not installed."
+      end
 
-class GemNotInstalledError < Gem::GemNotFoundException
+      knob_file = "#{ENV["BRPM_HOME"]}/server/jboss/standalone/deployments/RPM-knob.yml"
+      unless File.exists?(knob_file)
+        raise "Could not find the knob file at the expected location (#{knob_file})"
+      end
+
+      knob = YAML.load_file(knob_file)
+      version_content = File.read("#{knob["application"]["root"]}/VERSION")
+      version_content.scan(/VERSION=([0-9\.]*)/)[0][0]
+    end
+  end
+
+  self.init
 end

data/lib/brpm_script_executor.rb

@@ -1,7 +1,46 @@
 require_relative "brpm_auto"
+require 'fileutils'
+require "yaml"
 
 class BrpmScriptExecutor
+  private_class_method :new
+
   class << self
+    def execute_automation_script_in_separate_process(modul, name, params)
+      BrpmAuto.setup(params)
+
+      params_file = "#{File.expand_path(params["SS_output_dir"] || params["output_dir"] || Dir.pwd)}/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
+
+      BrpmAuto.log "Executing '#{modul}' '#{name}' in a separate process..."
+      Bundler.clean_system({"GEM_HOME" => ENV["BRPM_CONTENT_HOME"] || "#{ENV["BRPM_HOME"]}/modules"}, get_ruby_cmd, "-r", __FILE__, "-e", "BrpmScriptExecutor.execute_automation_script_from_other_process(\"#{modul}\", \"#{name}\", \"#{params_file}\")")
+    end
+
+    def execute_automation_script_from_other_process(modul, name, params_file)
+      puts "Loading params file #{params_file}..."
+      params = YAML.load_file(params_file)
+
+      puts "Loading the BRPM Content framework..."
+      BrpmAuto.setup(params)
+      BrpmAuto.log "The BRPM Content framework is loaded now. (version: #{BrpmAuto.version})"
+
+      BrpmAuto.log "Deleting params file #{params_file}..."
+      FileUtils.rm(params_file)
+
+      if params["SS_run_key"] and params["SS_script_support_path"]
+        BrpmAuto.log "Loading script_support libraries..."
+        require "#{params["SS_script_support_path"]}/ssh_script_header.rb"
+        require "#{params["SS_script_support_path"]}/script_helper.rb"
+        require "#{params["SS_script_support_path"]}/file_in_utf.rb"
+      end
+
+      execute_automation_script(modul, name, params)
+    end
+
     def execute_automation_script(modul, name, params)
       begin
         BrpmAuto.setup(params)
@@ -10,10 +49,17 @@ class BrpmScriptExecutor
         BrpmAuto.log ">>>>>>>>>>>>>> START automation #{name}"
         start_time = Time.now
 
-        BrpmAuto.log "Loading module #{modul}#{params["module_version"] ? " #{params["module_version"]}" : ""} and its dependencies..."
-        module_path = BrpmAuto.require_module(modul, params["module_version"])
+        original_brpm_version = BrpmAuto.version
+
+        BrpmAuto.log "Initializing module #{modul}#{params["module_version"] ? " #{params["module_version"]}" : ""} and its dependencies..."
+        module_version = params["module_version"] || BrpmAuto.get_latest_installed_version(modul)
+        module_path = initialize_module(modul, module_version)
         BrpmAuto.log "Finished loading the module."
 
+        BrpmAuto.log "Note: running on a different version of the BRPM Content framework now: #{BrpmAuto.version} (was #{original_brpm_version})" if original_brpm_version != BrpmAuto.version
+
+        BrpmAuto.require_module(modul, module_version)
+
         automation_script_path = "#{module_path}/automations/#{name}.rb"
 
         BrpmAuto.log "Loading the automation script #{automation_script_path}..."
@@ -47,7 +93,7 @@ class BrpmScriptExecutor
         start_time = Time.now
 
         BrpmAuto.log "Loading module #{modul} and its dependencies..."
-        module_path = BrpmAuto.require_module(modul) #TODO: from where should we get the module version of the script?
+        module_path = BrpmAuto.require_module(modul) #TODO: get the module version of the calling script
         BrpmAuto.log "Finished loading the module."
 
         automation_script_path = "#{module_path}/resource_automations/#{name}.rb"
@@ -75,6 +121,38 @@ class BrpmScriptExecutor
     end
 
     alias_method :execute_resource_automation_script_from_gem, :execute_resource_automation_script
+
+    def get_ruby_cmd
+      @ruby ||= File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+    end
+
+    # this method is used BEFORE BrpmAuto is activated so make sure not to use any logic from BrpmAuto in here
+    def initialize_module(module_name, module_version)
+      module_gem_path = BrpmAuto.get_module_gem_path(module_name, module_version)
+
+      if File.exists?(module_gem_path)
+        BrpmAuto.log "Found module #{module_name} #{module_version || ""} in gem path #{module_gem_path}."
+      else
+        raise Gem::GemNotFoundException, "Module #{module_name} version #{module_version} is not installed. Expected it on path #{module_gem_path}."
+      end
+
+      gemfile_path = "#{module_gem_path}/Gemfile"
+      if File.exists?(gemfile_path)
+        BrpmAuto.log "Found a Gemfile (#{gemfile_path}) so activating bundler..."
+        ENV["BUNDLE_GEMFILE"] = gemfile_path
+        require "bundler/setup"
+        # TODO Bundler.require
+
+        params = BrpmAuto.params
+
+        BrpmAuto.log "Reloading brpm_auto to make sure the version that was specified by the Gemfile/Gemfile.lock of the module is active from now on..."
+        require "brpm_auto"
+        BrpmAuto.setup(params)
+      end
+
+      module_gem_path
+    end
   end
 end
 
+

data/lib/module_installer.rb

@@ -4,17 +4,13 @@ require 'rubygems/installer'
 require "bundler"
 
 class ModuleInstaller
-  def initialize
-    set_gem_home
-  end
-
   def install_module(module_name_or_path, module_version = nil)
     brpm_content_spec = nil
 
     if true #TODO: support no-gem-install mode
       module_spec, specs = install_gem(module_name_or_path, module_version)
 
-      brpm_content_spec = specs.find { |spec| spec.name == "brpm_content" } if specs
+      brpm_content_spec = specs.find { |spec| spec.name == "brpm_content_framework" } if specs
 
       install_bundle_if_necessary(module_spec)
     else
@@ -22,12 +18,12 @@ class ModuleInstaller
       module_spec = Gem::Specification.find_by_name(module_name)
     end
 
-    if brpm_installed_locally?
+    if BrpmAuto.brpm_installed?
       BrpmAuto.log "A BRPM instance is installed locally"
 
       if brpm_content_spec
         if brpm_content_spec.version > Gem::Version.new(BrpmAuto.version) or ! File.exist?(get_symlink_path)
-          BrpmAuto.log "Updating the symlink to brpm_content-latest..."
+          BrpmAuto.log "Updating the symlink to brpm_content_framework-latest..."
           update_symlink_to_brpm_content(brpm_content_spec.gem_dir)
         end
 
@@ -63,7 +59,7 @@ class ModuleInstaller
   end
 
   def uninstall_module(module_name, module_version)
-    if brpm_installed_locally?
+    if BrpmAuto.brpm_installed?
       BrpmAuto.log "A BRPM instance is installed locally"
 
       BrpmAuto.log "Preparing the connectivity to BRPM..."
@@ -74,7 +70,7 @@ class ModuleInstaller
         module_friendly_name = get_module_friendly_name(module_spec)
 
         BrpmAuto.log "Uninstalling the automation script wrappers in the local BRPM instance..."
-        failed_scripts = each_auto_script_wrapper(module_spec.gem_dir) do |auto_script_path, automation_type|
+        failed_scripts = each_auto_script_wrapper(module_spec.gem_dir) do |auto_script_path, _|
           BrpmAuto.log "Uninstalling automation script wrapper for script #{auto_script_path}..."
           uninstall_auto_script_wrapper(auto_script_path, module_friendly_name)
         end
@@ -92,11 +88,7 @@ class ModuleInstaller
     BrpmAuto.log "Uninstalling gem #{module_name} #{module_version}..."
     BrpmAuto.log `gem uninstall #{module_name} -v #{module_version} -x`
 
-    return true
-  end
-
-  def module_installed?(module_name, module_version = nil)
-    Gem::Specification.find_by_name(module_name).size > 0
+    true
   end
 
   private
@@ -137,6 +129,7 @@ class ModuleInstaller
       require 'rubygems/name_tuple'
       source = Gem::Source::SpecificFile.new module_name_or_path
       module_spec = source.spec
+      specs = [module_spec]
 
       gem = source.download module_spec
 
@@ -159,25 +152,12 @@ class ModuleInstaller
     return module_spec, specs
   end
 
-  def set_gem_home
-    if BrpmAuto.run_from_brpm or BrpmAuto.params.unit_test
-      # we need to override the GEM_HOME env var, otherwise the gems will be installed in BRPM's own gemset
-      ENV["GEM_HOME"] = BrpmAuto.get_gems_root_path
-      Gem.paths = ENV
-    end
-  end
-
   def install_bundle_if_necessary(spec)
     gemfile = File.join(spec.gem_dir, "Gemfile")
-    gemfile_lock = File.join(spec.gem_dir, "Gemfile.lock")
 
-    if File.exists?(gemfile) && File.exists?(gemfile_lock)
-      if BrpmAuto.run_from_brpm or BrpmAuto.params.unit_test
-        command = "cd #{spec.gem_dir}; export GEM_HOME=#{BrpmAuto.get_gems_root_path}; bundle install"
-      else
-        command = "cd #{spec.gem_dir}; bundle install"
-      end
-      BrpmAuto.log "Found a Gemfile.lock so executing command '#{command}'..."
+    if File.exists?(gemfile)
+      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?
@@ -188,7 +168,7 @@ class ModuleInstaller
   end
 
   def get_symlink_path
-    "#{ENV["GEM_HOME"]}/gems/brpm_content-latest"
+    "#{ENV["GEM_HOME"]}/gems/brpm_content_framework-latest"
   end
 
   def update_symlink_to_brpm_content(brpm_content_path)
@@ -203,10 +183,6 @@ class ModuleInstaller
     end
   end
 
-  def brpm_installed_locally?
-    ENV["BRPM_HOME"] and !ENV["BRPM_HOME"].empty?
-  end
-
   def get_module_friendly_name(module_spec)
     module_config = YAML.load_file("#{module_spec.gem_dir}/config.yml")
 
@@ -351,8 +327,8 @@ class ModuleInstaller
       wrapper_script_content = "###\n#{params_content}###\n"
     end
 
+    integration_server = nil
     if is_local_automation(automation_type)
-      integration_server = nil
       if auto_script_config["integration_server_type"]
         server_type_id = @brpm_rest_client.get_id_for_project_server_type(auto_script_config["integration_server_type"])
         if server_type_id
@@ -374,13 +350,12 @@ class ModuleInstaller
     case automation_type
     when "Automation", "ResourceAutomation"
       wrapper_script_content += get_script_executor_template(automation_type, module_name, auto_script_config["name"])
-
     when "Local Shell"
       wrapper_script_content += "#{auto_script_path}\n"
-
     when "Remote Shell", "Remote Dispatcher"
       wrapper_script_content += File.read(auto_script_path)
-
+    else
+      raise "Unsupported automation type: #{automation_type}"
     end
 
     script = {}
@@ -558,14 +533,14 @@ 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-\#{params["framework_version"] || "latest"}/modules/framework/brpm_script_executor.rb"
+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
 
-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"
@@ -573,7 +548,7 @@ EOR
       template += <<EOR
 
 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/lib/write_to.rb

@@ -1 +1 @@
-write_to(File.read(BrpmAuto.logger.step_run_log_file_path)) unless BrpmAuto.logger.nil?
+write_to(File.read(BrpmAuto.logger.step_run_log_file_path)) unless BrpmAuto.logger.nil? or ! BrpmAuto.logger.is_a?(BrpmLogger)

data/tests/all_params_spec.rb

@@ -1,4 +1,5 @@
 require_relative "spec_helper"
+require "brpm_auto"
 
 describe 'All params' do
   before(:each) do

data/tests/brpm_auto_spec.rb

@@ -5,6 +5,7 @@ describe 'BRPM automation framework' do
     setup_brpm_auto
   end
 
+
   describe 'privatize' do
     it 'should hide a sensitive string' do
       result = BrpmAuto.privatize("The password should be replaced here: MySecret, and also here:MySecret! ", "MySecret")

data/tests/brpm_script_executor_spec.rb

@@ -0,0 +1,26 @@
+require_relative "spec_helper"
+
+describe 'BRPM Script Executor' do
+  before(:all) do
+    setup_brpm_env
+
+    require_relative "../lib/brpm_script_executor"
+    require_relative "../lib/brpm_auto"
+    BrpmAuto.setup(get_default_params)
+
+    BrpmAuto.log "Creating ~/.brpm file..."
+    create_brpm_file
+
+    gem_installed = `gem list -i brpm_module_test`.chomp
+    if gem_installed != "true" # we are running inside bundler here so simplest to install the gem using a separate process
+      BrpmAuto.log "Installing brpm_module_test..."
+      # `gem install brpm_module_test`
+    end
+  end
+
+  it "should execute an automation script in a separate process" do
+    result = BrpmScriptExecutor.execute_automation_script_in_separate_process("brpm_module_test", "test_ruby", get_default_params)
+
+    expect(result).to be_truthy
+  end
+end

data/tests/customer_include_spec.rb

@@ -1,4 +1,5 @@
 require_relative "spec_helper"
+require "brpm_auto"
 
 describe 'Customer include' do
   before(:each) do

data/tests/params_spec.rb

@@ -1,4 +1,5 @@
 require_relative "spec_helper"
+require "brpm_auto"
 
 describe 'Params' do
   before(:each) do

data/tests/request_params_spec.rb

@@ -1,4 +1,5 @@
 require_relative "spec_helper"
+require "brpm_auto"
 
 describe 'Request params' do
   before(:each) do

data/tests/server_yaml_spec.rb

@@ -1,4 +1,5 @@
 require_relative "spec_helper"
+require "brpm_auto"
 
 describe 'Server yaml' do
   before(:each) do

data/tests/spec_helper.rb

@@ -1,10 +1,17 @@
 require 'fileutils'
 require 'yaml'
-require_relative "../lib/brpm_auto"
+require 'json'
 
 FileUtils.mkdir_p "/tmp/brpm_content"
 
+def setup_brpm_env
+  raise "$BRPM_STUB_HOME is not set" unless ENV["BRPM_STUB_HOME"]
+  ENV["BRPM_HOME"] = ENV["BRPM_STUB_HOME"]
+end
+
 def setup_brpm_auto
+  require "brpm_script_executor"
+  require "brpm_auto"
   BrpmAuto.setup(get_default_params)
 end
 

data/{tests → tests_no_bundler}/module_installer_spec.rb

@@ -1,38 +1,9 @@
+require_relative "spec_helper"
+
 describe 'Module installer' do
   before(:all) do
-    raise "Module installation tests don't work under Bundler." if ENV["RUBYOPT"] and ENV["RUBYOPT"].include?("-rbundler/setup")
-    raise "$BRPM_STUB_HOME is not set" unless ENV["BRPM_STUB_HOME"]
-
-    brpm_version = "4.6.00.00"
-    ENV["BRPM_HOME"] = ENV["BRPM_STUB_HOME"]
-
-    FileUtils.mkdir_p "#{ENV["BRPM_HOME"]}/modules"
-    FileUtils.mkdir_p "#{ENV["BRPM_HOME"]}/server/jboss/standalone/deployments"
-    FileUtils.mkdir_p "#{ENV["BRPM_HOME"]}/releases/#{brpm_version}/RPM"
-
-    knob=<<EOR
----
-application:
-  root: #{ENV["BRPM_HOME"]}/releases/#{brpm_version}/RPM
-environment:
-  RAILS_ENV: production
-web:
-  context: /brpm
-EOR
-
-    File.open("#{ENV["BRPM_HOME"]}/server/jboss/standalone/deployments/RPM-knob.yml", "w") do |file|
-      file.puts(knob)
-    end
-
-    version_content=<<EOR
-$VERSION=#{brpm_version}
-EOR
-
-    File.open("#{ENV["BRPM_HOME"]}/releases/#{brpm_version}/RPM/VERSION", "w") do |file|
-      file.puts(version_content)
-    end
-
-    require_relative "spec_helper"
+    setup_gem_env
+    setup_modules_env
 
     setup_brpm_auto
 

data/tests_no_bundler/spec_helper.rb

@@ -0,0 +1,43 @@
+def setup_gem_env
+  raise "$BRPM_STUB_HOME is not set" unless ENV["BRPM_STUB_HOME"]
+
+  ENV["BRPM_HOME"] = ENV["BRPM_STUB_HOME"]
+  ENV["GEM_HOME"] = "#{ENV["BRPM_HOME"]}/modules"
+end
+
+def setup_modules_env
+  raise "Module installer tests don't work under Bundler." if ENV["RUBYOPT"] and ENV["RUBYOPT"].include?("-rbundler/setup")
+  brpm_version = "4.6.00.00"
+
+  FileUtils.mkdir_p "#{ENV["BRPM_HOME"]}/modules"
+  FileUtils.mkdir_p "#{ENV["BRPM_HOME"]}/server/jboss/standalone/deployments"
+  FileUtils.mkdir_p "#{ENV["BRPM_HOME"]}/releases/#{brpm_version}/RPM"
+
+  knob=<<EOR
+---
+application:
+  root: #{ENV["BRPM_HOME"]}/releases/#{brpm_version}/RPM
+environment:
+  RAILS_ENV: production
+web:
+  context: /brpm
+EOR
+
+  File.open("#{ENV["BRPM_HOME"]}/server/jboss/standalone/deployments/RPM-knob.yml", "w") do |file|
+    file.puts(knob)
+  end
+
+  version_content=<<EOR
+$VERSION=#{brpm_version}
+EOR
+
+  File.open("#{ENV["BRPM_HOME"]}/releases/#{brpm_version}/RPM/VERSION", "w") do |file|
+    file.puts(version_content)
+  end
+end
+
+def setup_brpm_auto
+  require_relative "../lib/brpm_auto" #require_relative because we can't run inside bundler, we can't run inside bundler because we need the brpm_module_test which is not included in the brpm_content_framework Gemfile
+  BrpmAuto.setup(get_default_params)
+end
+

data/to_be_migrated/brpm_framework.rb

@@ -67,7 +67,7 @@ else
   end  
   @request_params = {} if not defined?(@request_params)
   SS_output_file = @params["SS_output_file"]
-  BrpmAuto.require_module("brpm")
+  BrpmAuto.require_module("brpm_module_brpm")
   @p = BrpmAuto.all_params
   @request_params = BrpmAuto.request_params
   ARG_PREFIX = "ARG_" unless defined?(ARG_PREFIX)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content_framework
 version: !ruby/object:Gem::Version
-  version: 0.1.61
+  version: 0.2.1
 platform: ruby
 authors:
 - Niek Bartholomeus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -172,15 +172,17 @@ files:
 - module.gemspec
 - tests/all_params_spec.rb
 - tests/brpm_auto_spec.rb
+- tests/brpm_script_executor_spec.rb
 - tests/customer_include/config/customer_include.rb
 - tests/customer_include/config/server.yml
 - tests/customer_include_spec.rb
 - tests/gemspec_spec.rb
-- tests/module_installer_spec.rb
 - tests/params_spec.rb
 - tests/request_params_spec.rb
 - tests/server_yaml_spec.rb
 - tests/spec_helper.rb
+- tests_no_bundler/module_installer_spec.rb
+- tests_no_bundler/spec_helper.rb
 - to_be_migrated/brpm_framework.rb
 - to_be_migrated/customer_include_default.rb
 - to_be_migrated/local_jirb.rb