brpm_content 0.1.26 → 0.1.27

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGZjMzAyNjYxMzE1YWVkNzU1ZGE2MTFmODM2ZmMyOWY2ZTI0MGU2Yg==
+    NTQyZTc5NjQ5NGE2NTNiZjhhMTZkYTcyMDYzNmY4NTdiNTYxMTRlNQ==
   data.tar.gz: !binary |-
-    YmI4ZDA4ZjZlZWM1ZjBmMzI4Zjk5NWMxNmJmZWVlNGNjMDY3NTllMQ==
+    YWMxMmM0MzczYjFlMTlhNDQwNGI2NGMwOTZjNGQ5YzlmNzgxOTIyYg==
 SHA512:
   metadata.gz: !binary |-
-    NjBlMGM5YWRlMzlhNTFlY2I1MDE1YzM0YjhhMTQ1YmQ5ZDc3ZWYyOTdiMDM2
-    MDQ5NzNlNzk2NGI4YTEwMGRjM2Y4N2NlYjlhYzI5NTQ5ZDAzYWQwNDNiOWEy
-    YTM5YzMxMzMwYzgzN2JlNThkYjBiOTU2ZGU5ZDdlNmI4YWQ0YmY=
+    NDExYThkNzJmMWU0MDRhYzUwNWU1MzkzYzM5ZDMxOTMyOWEwZDFiMDliYmFh
+    OTc5Mjc5YTcwMjc2MjYzZDM0NzFlMTg3NDNmODhmMzM5Y2I1YjA1YzMzZTE1
+    NTgyNDZkYzc5NDU0Nzc5NGQzZjlkODI1OTZmYjI2ZGQxMGMyNmM=
   data.tar.gz: !binary |-
-    YTBiMTcwYzY1MzQzYTU0OTY4YzVkYTRlMGNjYTFlYmUwYjYxM2I4NGVhNWZk
-    MjUxNTIwMzMzNzZhYzA0MzFhYjM1NzgxNWZlOTQwMjVhMjE1ZTdjMDExNjIw
-    Njg2NGNhODE2OTVkODQwMWZmNDEzOGRhOWNjZDAwYzhhYmNmNTQ=
+    YjE5NjgwMTFiNjZmYTU2MzVjYmY1YTVlOTRjMTg2NDZmOGUzZjg5NmNhN2Jk
+    NWRjNjA0NjM5YWJhMGNkNTM3ZmQwZmM1MTYxNDE5ZjhiY2JlZmNkN2E2NjNk
+    MWI5NTY5Mzc2Y2Y4MTZlMGVmODU1MzIyMjUzZjlmYTJhYjE4NzE=

data/modules/framework/automations/direct_execute.txt

@@ -1,10 +1,10 @@
-###
-# command:
-#   name: command to run
-#   position: A1:F1
-#   type: in-text
-# success:
-#   name: term to indicate success
-#   position: A2:D2
-#   type: in-text
-###
+params:
+  command:
+    name: command to run
+    position: A1:F1
+    type: in-text
+  success:
+    name: term to indicate success
+    position: A2:D2
+    type: in-text
+

data/modules/framework/automations/install_module.txt

@@ -1,10 +1,10 @@
-###
-# name:
-#   name: name
-#   type: in-text
-#   required: yes
-# version:
-#   name: version
-#   type: in-text
-#   required: no
-###
+params:
+  name:
+    name: name
+    type: in-text
+    required: yes
+  version:
+    name: version
+    type: in-text
+    required: no
+

data/modules/framework/config.yml

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

data/modules/framework/lib/module_installer.rb

@@ -119,12 +119,12 @@ class ModuleInstaller
   end
 
   def create_automation_category_if_not_exists(module_friendly_name)
-    list_item = @brpm_rest_client.get_list_item_by_name(module_friendly_name)
+    list_item = @brpm_rest_client.get_list_item_by_name("AutomationCategory", module_friendly_name)
 
     unless list_item
       BrpmAuto.log "Automation category #{module_friendly_name} doesn't exist yet, so creating it now..."
       list_item = {}
-      list_item["list_id"] = 24 # AutomationCategory TODO: find the id by the name of the list
+      list_item["list_id"] = @brpm_rest_client.get_list_by_name("AutomationCategory")
       list_item["value_text"] = module_friendly_name
       @brpm_rest_client.create_list_item_by_hash(list_item)
     end
@@ -188,28 +188,28 @@ class ModuleInstaller
     auto_script_config_path = "#{File.dirname(auto_script_path)}/#{auto_script_name}.txt"
 
     auto_script_config_content = File.exists?(auto_script_config_path) ? File.read(auto_script_config_path) : ""
-    match = auto_script_config_content.match(/###\n(.*)\n###/m)
-    input_params_content = match ? "#{match[1]}\n" : ""
+    auto_script_config = YAML.load(auto_script_config_content) || {}
+    auto_script_config["params"] = {} unless auto_script_config["params"]
 
     if automation_type == "Automation"
-      matches = input_params_content.scan(/^# {0,1}(.*)/) || []
-      input_params_yaml = YAML.load(matches.join("\n")) || {}
-
-      input_params_content += get_input_params_template(input_params_yaml)
+      add_version_params(auto_script_config["params"])
     end
 
     wrapper_script_content = ""
-    unless input_params_content.empty?
-      wrapper_script_content = "###\n#{input_params_content}###\n"
+    if auto_script_config["params"].size > 0
+      params_content = auto_script_config["params"].to_yaml
+      params_content.sub!("---\n", "") # Remove the yaml document separator line
+      params_content.gsub!("required: 'yes'", "required: yes") # yaml adding quotes to reserved keywords yes and no :-(
+      params_content.gsub!("required: 'no'", "required: no") # yaml adding quotes to reserved keywords yes and no :-(
+      params_content.gsub!(/(^)+/, "# ") # Prepend "# " to each line
+      wrapper_script_content = "###\n#{params_content}###\n"
     end
 
-    auto_script_config = YAML.load(auto_script_config_content) || {}
-
     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
-        integration_server = integration_servers.find { |integration_server| integration_server["server_name_id"] == server_type_id } #TODO: support multiple integration servers of same type (user should pick one)
+        integration_server = integration_servers.find { |integr_server| integr_server["server_name_id"] == server_type_id } #TODO: support multiple integration servers of same type (user should pick one)
 
         if integration_server
           wrapper_script_content += "\n"
@@ -263,33 +263,23 @@ class ModuleInstaller
     end
   end
 
-  def get_input_params_template(input_params_yaml)
+  def add_version_params(auto_script_params)
     include_position_attribute = false
-    if input_params_yaml.find {|_, param| param.has_key?("position")}
+    if auto_script_params.find { |_, param| param.has_key?("position") }
       include_position_attribute = true
     end
 
-    template = <<EOR
-# framework_version:
-#   name: Framework version
-#   required: no
-EOR
-
-    if include_position_attribute
-      template += "#   position: A#{input_params_yaml.size + 1}:C#{input_params_yaml.size + 1}\n"
-    end
-
-    template += <<EOR
-# module_version:
-#   name: Module version
-#   required: no
-EOR
-
-    if include_position_attribute
-      template += "#   position: A#{input_params_yaml.size + 2}:C#{input_params_yaml.size + 2}\n"
-    end
-
-    template
+    module_version_param = {}
+    module_version_param["name"] = "module_version"
+    module_version_param["required"] = "no"
+    module_version_param["position"] = "A#{auto_script_params.size + 1}:C#{auto_script_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"] = "no"
+    framework_version_param["position"] = "A#{auto_script_params.size + 1}:C#{auto_script_params.size + 1}" if include_position_attribute
+    auto_script_params["framework_version"] = framework_version_param
   end
 
   def get_integration_server_template(integration_server_id, integration_server_name, integration_server_type)

metadata

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