brpm_module_brpm 0.1.24 → 0.1.25

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTNlM2E2N2Y5MTcyOTMxMTA5MWUwN2JjODY3N2YzNDVhZDlkNjU3Ng==
+    NjY2YzYwMWRkMWUxOTNjYTBiZTVjYjY4YjEwNTAzZDE0NjJmNzdlNA==
   data.tar.gz: !binary |-
-    NjVlYmI3YmYzMjRlODQ0NWFiMGQxZTQyMmRmM2FjNDA0MTI4YWM0MQ==
+    NzMzNTMzZjQxY2U0MjNiMWYxODRiYmQ4ZTA1OTJkZWU0YjRmZTMxMg==
 SHA512:
   metadata.gz: !binary |-
-    OWE4ZGU3MDg0MTMwMTczNTYzNTI0NDQ2Y2Y0NTM3Mzg2MDQyM2ExMDhlMzBh
-    ZTNjNWU4MjZkZWRjYjU0MmJlYzJkYzNlNTA4ZGJmMzAxODRhYmE4OWJlNGI0
-    OWQ3MTJjYWNlMWI3Y2RiMzljOTFlZmE2NWI5ZmQyNzE5YzNjZDc=
+    YmJlZjI0ZTA3YzZmNjczNWRjNjU4N2VlMzM0ODBmZjczM2YwMzc3ZDcxMDAx
+    NjUwZGUxODJlMjAyYTc1Y2QyZWQ1ZWJlZmIwN2U4ZGIwMmE0YzhiYmQ0YTA0
+    YzhmZDU3YmE5Yzk4ZTk2MjlkZDIwZjZjMDNmZmRlNWZlMjdjN2U=
   data.tar.gz: !binary |-
-    NjllMmNjOTRmZmNiN2UzYTA1NTQxZmU0OGNlZGJlOWVmZTZmMWJhNjZiZTlm
-    NjJhMDdkYjU3NWM2NjIwYzM1YTkxYjQ1YTk5ODhjNmRiNmEwNzQ0Y2IzMTIy
-    ZGUwZGRmOTQ0YjU1MDBiYTZhYWQzZTRkZjI4MDNiN2UxODNmZmU=
+    ZTQ5MGI3ZDc3YmJmZWQ1Y2EzOWQ4NzRhOTRmMTVkNTVjNzQ4NDliZjU5NTBh
+    ZmIxZmFlODgwZmM4OTUwODRkNGJjMTZmNGI4NjE5ZDZmMTU3OTJhYTgyYTEx
+    YzgxNDkyZjg5MzljNTJkNzUwMzc2ZTM1ODdjNjdkZGYzM2VlOTQ=

data/config.yml

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

data/lib/brpm_rest_client.rb

@@ -1636,11 +1636,7 @@ class BrpmRestClient
     result = brpm_get "v1/scripts?filters[name]=#{name}"
 
     if result["status"] == "success"
-      if result["response"] == "null"
-        result_hash = nil
-      else
-        result_hash = result["response"].first
-      end
+      result_hash = result["response"].first
     else
       if result["code"] == 404
         result_hash = nil
@@ -1695,30 +1691,44 @@ class BrpmRestClient
   end
 
   def create_or_update_script(script)
-    BrpmAuto.log "Checking if the corresponding script already exists ..."
-    existing_script = get_script_by_name(script["name"])
-
-    if existing_script.nil?
-      BrpmAuto.log "Script doesn't exist yet."
-      script_already_exists=false
-    else
-      BrpmAuto.log "Script already exists."
-      script_already_exists=true
-
-      script["id"] = existing_script["id"].to_s
-    end
+    # TODO: the scripts REST API is not finished yet: get_script_by_name always returns "null". So for now we are going to create the script and if it returns an error that the name is already taken we will update it
+
+    # BrpmAuto.log "Checking if the corresponding script already exists ..."
+    # existing_script = get_script_by_name(script["name"])
+    #
+    # if existing_script.nil?
+    #   BrpmAuto.log "Script doesn't exist yet."
+    #   script_already_exists=false
+    # else
+    #   BrpmAuto.log "Script already exists."
+    #   script_already_exists=true
+    #
+    #   script["id"] = existing_script["id"].to_s
+    # end
 
     data = {}
     data["script"] = script
 
-    if script_already_exists
-      BrpmAuto.log "Updating the script..."
-      script = update_script_from_hash(script)
-      BrpmAuto.log "Script is updated."
-    else
-      BrpmAuto.log "Creating the script..."
+    # if script_already_exists
+    #   BrpmAuto.log "Updating the script..."
+    #   script = update_script_from_hash(script)
+    #   BrpmAuto.log "Script is updated."
+    # else
+    #   BrpmAuto.log "Creating the script..."
+    #   script = create_script_from_hash(script)
+    #   BrpmAuto.log "Script is created."
+    # end
+
+    BrpmAuto.log "Creating the script..."
+    begin
       script = create_script_from_hash(script)
       BrpmAuto.log "Script is created."
+    rescue Exception => e
+      if "#{e}".include?("has already been taken")
+        BrpmAuto.log "Script already exists, updating it..."
+        script = update_script_from_hash(script)
+        BrpmAuto.log "Script is updated."
+      end
     end
 
     script

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brpm_module_brpm
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Niek Bartholomeus