brpm_module_brpm 0.1.25 → 0.1.26

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjY2YzYwMWRkMWUxOTNjYTBiZTVjYjY4YjEwNTAzZDE0NjJmNzdlNA==
+    MGVjM2UxNDU2ZGFmZWExODY2MDI4ZDAzMTVlYzgyMTVmOTZhOWI4MA==
   data.tar.gz: !binary |-
-    NzMzNTMzZjQxY2U0MjNiMWYxODRiYmQ4ZTA1OTJkZWU0YjRmZTMxMg==
+    ZDg3YTQ0OWFjYjMzMzk2OGQxZTUyYmYzYWVlODM3MjkzYTYwMTc3OA==
 SHA512:
   metadata.gz: !binary |-
-    YmJlZjI0ZTA3YzZmNjczNWRjNjU4N2VlMzM0ODBmZjczM2YwMzc3ZDcxMDAx
-    NjUwZGUxODJlMjAyYTc1Y2QyZWQ1ZWJlZmIwN2U4ZGIwMmE0YzhiYmQ0YTA0
-    YzhmZDU3YmE5Yzk4ZTk2MjlkZDIwZjZjMDNmZmRlNWZlMjdjN2U=
+    NmE1NTE2NzA0MzUwOTQ1YmJhNjg3NzRjNzVhYTEwNDQ0NjQwNDRiMmE2YmQ5
+    YTczZTE4YjJkMGI3MGU2NmM1OGE3Y2RmNzViYjcxZmIyZjVmNDdhMDk4ZGM4
+    OTFlNWYzMWE4MjE0YmQ2YjNjYjMwZjEwMDc2NTM1MmFiM2MwMDE=
   data.tar.gz: !binary |-
-    ZTQ5MGI3ZDc3YmJmZWQ1Y2EzOWQ4NzRhOTRmMTVkNTVjNzQ4NDliZjU5NTBh
-    ZmIxZmFlODgwZmM4OTUwODRkNGJjMTZmNGI4NjE5ZDZmMTU3OTJhYTgyYTEx
-    YzgxNDkyZjg5MzljNTJkNzUwMzc2ZTM1ODdjNjdkZGYzM2VlOTQ=
+    ZjQ0NzNlMmY2MjJiMGE5NTYyNzA4ZDkzMGU0MTBiNGRkN2QyMzU4YzdhNTUz
+    MTc2YjE5YWY0ZTFlYTMzM2Y5YmQ5NjFhMzQwMzdmZDZhNmUyMzIwOTk5YWUy
+    M2I2YTk1Mjc0NDlhZTA4YzY1ZmVlZDg1N2MwNzI4N2RjODQyOWU=

data/config.yml

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

data/lib/brpm_rest_client.rb

@@ -1633,10 +1633,14 @@ class BrpmRestClient
   end
 
   def get_script_by_name(name)
-    result = brpm_get "v1/scripts?filters[name]=#{name}"
+    # 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
+
+    # result = brpm_get "v1/scripts?filters[name]=#{name}"
+    result = brpm_get "v1/scripts"
 
     if result["status"] == "success"
-      result_hash = result["response"].first
+      # result_hash = result["response"].first
+      result_hash = result["response"].find { |script| script["name"] == name}
     else
       if result["code"] == 404
         result_hash = nil
@@ -1691,44 +1695,31 @@ class BrpmRestClient
   end
 
   def create_or_update_script(script)
-    # 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
+    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..."
-    #   script = create_script_from_hash(script)
-    #   BrpmAuto.log "Script is created."
-    # end
-
-    BrpmAuto.log "Creating the script..."
-    begin
+    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."
-    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.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Niek Bartholomeus