brpm_content 0.1.38 → 0.1.39

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzFkN2I5ODM4MTViMDQzNTBlZDY3NjAzMDVlZWMxNmE2ZDQzY2JmYg==
+    MGJiMjY3NDAzOWU5ZGY3YmQyNjM3ODM1MzdiYTA0MzdhZmQ3ZDA1Mg==
   data.tar.gz: !binary |-
-    NDE0MzM1YmY1NWFhZmI3ODI5NmVkNzg3MmZjNzNiNzM3ZDcwOTUzZA==
+    NzM4YzA0Mjc1Mzg4NWRkNGY5YjQwMWUwMTdlMWMzZGM0MWFiYmFhNw==
 SHA512:
   metadata.gz: !binary |-
-    NjJjZGVlNjgwZGI0NmQ3MThkZmJkN2I1NWFjNmUwM2VhYmI2ZDMzMzE0Nzhk
-    NDA1YzQ1MTM1ODVmYzJlY2IwNjkyMzNlNTUzNDM4MDI4NTA5N2JmMmExYThk
-    OWY5YjJhNDRhZTI2ODc1MzZlNmQ4ZmJjYWRlMDlmN2JjMTNiMzc=
+    MzZjMDkyZDU0NmNkYmZhOWI5ZjkzMDQ5NTQ4ZTNhMzRlMGJlYjI3MjFjM2Mz
+    ZTQ2Yjk3YWRkYTc5ZGMxYjY1YzI1MjdkYWQ2YjdjOTM4NWJjYzA0ZWQyZWEw
+    MGZmNmY1MWIzZmQ2NDY3MWU0MmQ3ZjgwOGExNmYwMjY5ZWI2NTg=
   data.tar.gz: !binary |-
-    NWViZjdkMWU2YTQzY2JlMDIyZmZmMTY0ODY5M2E4YjEzMjllZDkxMGJmMDAz
-    NGZjMjllY2EwZDVjMjhmOGQ3Y2I2ZTQyMjMyODdjNTU2N2UwMmM5M2E3Y2Jm
-    YWZjYjFlODc4NmE5YmM2N2IyODM1ZWFmNjNiNjQ0MjgyNGYwNDM=
+    MDI5MzdhYWJlYjU3YTdlNzZhMDU3MDA4ZDc4MmY0NmNlMDZiNjNkMTRmYjdm
+    YWU0ZjJiZDdhMzA4ZjI3MTkyYjFmYzhiNmZmMGIyYjQ2YjNhMTVhNmMxYWNm
+    YmVkM2FjNTg3YTE0ZTBlOTJkYWEwMzk1M2M2ZWYzNGIwMzIzNzQ=

data/modules/framework/brpm_auto.rb

@@ -122,8 +122,8 @@ class BrpmAuto
       end
 
       gemfile_lock_path = "#{module_gem_path}/Gemfile.lock"
-      if File.exists?(gemfile_lock_path)
-        BrpmAuto.log "Found a Gemfile.lock: #{gemfile_lock_path}. Parsing the version numbers for later usage..."
+      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
@@ -232,6 +232,91 @@ class BrpmAuto
       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
+    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)

data/modules/framework/config.yml

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

data/modules/framework/lib/module_installer.rb

@@ -2,10 +2,15 @@ class ModuleInstaller
   def install_module(module_name, module_version)
     BrpmAuto.log "Installing module #{module_name} #{module_version.nil? ? "" : module_version}..."
 
-    specs = install_gem(module_name, module_version)
-    module_spec = specs.find { |spec| spec.name == module_name}
+    if true #TODO: support non-gem-install mode
+      specs = install_gem(module_name, module_version)
+      module_spec = specs.find { |spec| spec.name == module_name}
 
-    install_bundle_if_necessary(module_spec)
+      install_bundle_if_necessary(module_spec)
+    else
+      specs = [ Gem::Specification.find_by_name(module_name) ]
+      module_spec = specs.find { |spec| spec.name == module_name}
+    end
 
     if brpm_installed_locally?
       BrpmAuto.log "A BRPM instance is installed locally"
@@ -28,12 +33,12 @@ class ModuleInstaller
         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_name)
+        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)
 
         BrpmAuto.log "Installing the automation script wrappers in the local BRPM instance..."
-        install_auto_script_wrappers(module_spec.gem_dir, module_spec.name)
+        install_auto_script_wrappers(module_spec.gem_dir, module_spec.name, module_friendly_name)
       end
     end
   end
@@ -41,13 +46,13 @@ class ModuleInstaller
   def prepare_brpm_connection
     brpm_file = File.expand_path("~/.brpm")
 
-    config = nil
+    brpm_config = nil
     if File.exists?(brpm_file)
-      config = YAML.load_file(brpm_file)
+      brpm_config = YAML.load_file(brpm_file)
     end
 
-    if config
-      unless config["brpm_url"] and config["brpm_api_token"]
+    if brpm_config
+      unless brpm_config["brpm_url"] and brpm_config["brpm_api_token"]
         BrpmAuto.log "WARNING - Properties brpm_url and/or brpm_api_token don't exist in file ~/.brpm so not installing the automation script wrappers in BRPM. If you want to install them the next time you should add brpm_url and brpm_api_token properties in yaml format in file ~/.brpm."
         return false
       end
@@ -64,7 +69,7 @@ class ModuleInstaller
       return false
     end
 
-    @brpm_rest_client = BrpmRestClient.new(config["brpm_url"], config["brpm_api_token"])
+    @brpm_rest_client = BrpmRestClient.new(brpm_config["brpm_url"], brpm_config["brpm_api_token"])
     true
   end
 
@@ -94,13 +99,13 @@ class ModuleInstaller
     gemfile_lock = File.join(spec.gem_dir, "Gemfile.lock")
 
     if File.exists?(gemfile) && File.exists?(gemfile_lock)
-      BrpmAuto.log "Found a Gemfile.lock so executing command 'bundle install --gemfile #{gemfile}'..."
-      # %x(bundle install --gemfile #{gemfile})
       if BrpmAuto.run_from_brpm or BrpmAuto.params.unit_test
-        result = BrpmAuto.execute_shell("cd #{spec.gem_dir}; export GEM_HOME=#{BrpmAuto.get_gems_root_path}; bundle install")
+        command = "cd #{spec.gem_dir}; export GEM_HOME=#{BrpmAuto.get_gems_root_path}; bundle install"
       else
-        result = BrpmAuto.execute_shell("cd #{spec.gem_dir}; bundle install")
+        command = "cd #{spec.gem_dir}; bundle install"
       end
+      BrpmAuto.log "Found a Gemfile.lock so executing command '#{command}'..."
+      result = BrpmAuto.execute_shell(command)
 
       BrpmAuto.log result["stdout"] if result["stdout"] and !result["stdout"].empty?
       unless result["status"] == 0
@@ -129,8 +134,10 @@ class ModuleInstaller
     ENV["BRPM_HOME"] and !ENV["BRPM_HOME"].empty?
   end
 
-  def get_module_friendly_name(module_name)
-    "#{module_name.sub("brpm_module_", "").capitalize}"
+  def get_module_friendly_name(module_spec)
+    module_config = YAML.load_file("#{module_spec.gem_dir}/config.yml")
+
+    module_config["name"] || "#{module_spec.name.sub("brpm_module_", "").capitalize}"
   end
 
   def create_automation_error_if_not_exists(automation_error)
@@ -158,7 +165,7 @@ class ModuleInstaller
     end
   end
 
-  def install_auto_script_wrappers(module_path, module_name)
+  def install_auto_script_wrappers(module_path, module_name, module_friendly_name)
     BrpmAuto.log "Retrieving the integration servers..."
     integration_servers = @brpm_rest_client.get_project_servers
 
@@ -172,7 +179,7 @@ class ModuleInstaller
 
       resource_automation_script_paths.each do |auto_script_path|
         begin
-          install_auto_script_wrapper(auto_script_path, "ResourceAutomation", module_name, integration_servers)
+          install_auto_script_wrapper(auto_script_path, "ResourceAutomation", module_name, module_friendly_name, integration_servers)
         rescue Exception => e
           failed_scripts << auto_script_path
           BrpmAuto.log_error(e)
@@ -190,7 +197,7 @@ class ModuleInstaller
 
       automation_script_paths.each do |auto_script_path|
         begin
-          install_auto_script_wrapper(auto_script_path, "Automation", module_name, integration_servers)
+          install_auto_script_wrapper(auto_script_path, "Automation", module_name, module_friendly_name, integration_servers)
         rescue Exception => e
           failed_scripts << auto_script_path
           BrpmAuto.log_error(e)
@@ -209,7 +216,7 @@ class ModuleInstaller
     end
   end
 
-  def install_auto_script_wrapper(auto_script_path, automation_type, module_name, integration_servers)
+  def install_auto_script_wrapper(auto_script_path, automation_type, module_name, module_friendly_name, integration_servers)
     auto_script_name = File.basename(auto_script_path, ".rb")
     BrpmAuto.log "Installing the wrapper script for resource automation #{auto_script_name}..."
 
@@ -251,7 +258,6 @@ class ModuleInstaller
     wrapper_script_content += "\n"
     wrapper_script_content += get_script_executor_template(automation_type, module_name, auto_script_name)
 
-    module_friendly_name = get_module_friendly_name(module_name)
     if auto_script_config["automation_category"]
       automation_category = auto_script_config["automation_category"]
       create_automation_category_if_not_exists(automation_category)
@@ -298,16 +304,21 @@ class ModuleInstaller
       include_position_attribute = true
     end
 
+    input_params = auto_script_params.select do |_, param|
+      type = param["type"] || "in"
+      ! type.start_with?("out")
+    end
+
     module_version_param = {}
     module_version_param["name"] = "module_version"
     module_version_param["required"] = false
-    module_version_param["position"] = "A#{auto_script_params.size + 1}:C#{auto_script_params.size + 1}" if include_position_attribute
+    module_version_param["position"] = "A#{auto_script_params.size + 1}:C#{input_params.size + 1}" if include_position_attribute
     auto_script_params["module_version"] = module_version_param
 
     framework_version_param = {}
     framework_version_param["name"] = "framework_version"
     framework_version_param["required"] = false
-    framework_version_param["position"] = "A#{auto_script_params.size + 1}:C#{auto_script_params.size + 1}" if include_position_attribute
+    framework_version_param["position"] = "A#{auto_script_params.size + 1}:C#{input_params.size + 1}" if include_position_attribute
     auto_script_params["framework_version"] = framework_version_param
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.39
 platform: ruby
 authors:
 - Niek Bartholomeus
 autorequire: 
 bindir: modules/framework/bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client