brpm_content 0.1.35 → 0.1.36

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzJkYjhkZDYzZmM5NjFiZWNkYWQwYTNjNTAzMDM0MTM3ZmFlZjk5OA==
+    ZjAzMTJkNWM2YjUwNjA1ZGU2ZDg3YWE2OWFlYzUwMGFkYjAzYTQ1Zg==
   data.tar.gz: !binary |-
-    ZmVhNmYyZTE2NGU2OTA1NDEyZDVjYmI2NmNmYmUxNTE5MGNlMDQwMw==
+    YWMwNDI2ZWI2Mzg4NjdlNDQxZTQ2MDQxZGY1ODNlMTdjNTI3OWI3NA==
 SHA512:
   metadata.gz: !binary |-
-    MWY5NDU2ZjFlOWY0ZjdjNzI1OWQwMDI3MGQ1ZGJlNzA0ODM1ODUwOWNmYWZk
-    Y2JlMzViOWI5NDk2NGQxMmQ3Y2Y1MmVlZjQ4MjhlMjZlYzM1OTYxOGU3ZjE4
-    Y2QwYTczOTEzZDc5MDBkOGUyZjg1YTczZjJlYTZmZmE3YjE1NjA=
+    MjNhMjJmMWE3MTZkYTcxZjI3YmQyMzdhMzAxZDlhZDc5OTY0MWUzZDA4ZmUx
+    ZDg5Mjk3ZDc0NzNmNGVjY2VkNzliYTM3MWUyMjEyMzUxZDUyMDgyYzYzOTUx
+    NTE4ZGQxMzY1NmFiODE3ZGM4YzNjNTBmY2YyMzRiOGUwMjA0OTQ=
   data.tar.gz: !binary |-
-    YTI4Y2MyYWRhY2U0OGNkOTZjMTBjMzM5YTYwZDU3ZTEwN2M2MmJkZmViMzBj
-    NWQwYTk2MWJkYTM2NTZjYjFhMDYyNzkxYjdlMDlmZjkzODMzYjMzMjE5OGFh
-    YmQzNDI2ZjMzNTI1NmMyZWFlNDViYWQyZDY0ODdkZjU0YjRkMWU=
+    ODBiMTgxMTQ2M2FmZmE2OTM5NDBmNDRiZGUzNDU2OGQ2MzhiOWY3YWY4ODVh
+    ZWI3NWFkNjNmYzg0ZGY3MGRmYjM1YzQ0YWNlODM3ODBlYTQwYWY3OWI2MzBk
+    NjM2ZDcwOWUwZmQ0YzU1ZTZiMDhmOWIyNWI3NDY0Mjg1NzU4ZDk=

data/modules/framework/config.yml

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

data/modules/framework/lib/module_installer.rb

@@ -14,7 +14,7 @@ class ModuleInstaller
       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..."
-          update_symlink_to_brpm_content(brpm_content_spec)
+          update_symlink_to_brpm_content(brpm_content_spec.gem_dir)
         end
 
         if brpm_content_spec.version > Gem::Version.new(BrpmAuto.version) or ! File.exist?("#{ENV["BRPM_HOME"]}/automation_results/log.html")
@@ -25,11 +25,10 @@ class ModuleInstaller
 
       BrpmAuto.log "Preparing the connectivity to BRPM..."
       if prepare_brpm_connection
-        module_friendly_name = get_module_friendly_name(module_name)
-
         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)
         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)
 
@@ -108,8 +107,8 @@ class ModuleInstaller
     "#{ENV["GEM_HOME"]}/gems/brpm_content-latest"
   end
 
-  def update_symlink_to_brpm_content(brpm_content_spec)
-    new_version_path = brpm_content_spec.gem_dir
+  def update_symlink_to_brpm_content(brpm_content_path)
+    new_version_path = brpm_content_path
     symlink_path = get_symlink_path
 
     BrpmAuto.log "Linking #{symlink_path} to #{new_version_path}..."
@@ -247,12 +246,15 @@ class ModuleInstaller
     wrapper_script_content += get_script_executor_template(automation_type, module_name, auto_script_name)
 
     module_friendly_name = get_module_friendly_name(module_name)
-    auto_script_friendly_name = auto_script_config["friendly_name"] || "#{module_friendly_name} - #{auto_script_name.gsub("_", " ").capitalize}"
     if auto_script_config["automation_category"]
       automation_category = auto_script_config["automation_category"]
       create_automation_category_if_not_exists(automation_category)
+
+      module_friendly_name = automation_category
     end
 
+    auto_script_friendly_name = auto_script_config["friendly_name"] || "#{module_friendly_name} - #{auto_script_name.gsub("_", " ").capitalize}"
+
     script = {}
     script["name"] = auto_script_friendly_name
     script["description"] = auto_script_config["description"] || ""

metadata

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