souls 1.19.6 → 1.19.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b5f7b94188e33045595ee50df3761dc486c786992aea9f803560f27500f4aae
-  data.tar.gz: 6d0659f46eb9ca1f9154c4cec5b97381cc04ca2f773b2bd1752eb82c0f6dac2e
+  metadata.gz: 7397cc9eb56f0420edff1764b05af2411bc28df50fcaacf53e1babc6af2531d1
+  data.tar.gz: fb3283fb3e09e06e1e37f00870f9d9f577fac509cd2564d2f97cf9be0d614f37
 SHA512:
-  metadata.gz: 3ff3dcf7fa1cf290a4998ec3bf1428f2c4fc94973095e9d7a678ccd7b528fdbdaf5f8c5f58149784f97a0219467c992bc0ccbd75b989fefd428a88d0d248ec4a
-  data.tar.gz: 20e054999324d5d082544a4ca31e11bdde030aec3f664bf127df8a8912fbffa62864eb8ece8a701f75e0df37bf7126105438b44ef13c4d5ed4ab19836d85ab67
+  metadata.gz: 9c164ae100be15a59717e16d991f8fb4ce3520eca314a16d3e82dfd6f54b87eed01ea99efd56a86e8d6a68cedc9999b103713696ae06f395f8898597ccd2b34f
+  data.tar.gz: ecbb2177e6ba224cea34fba5b8f7af6951c8dbfdc49a45e60f33d3df7e60fb7c9c6b3051733cba703c784e6af4fcc43d5f173c60afd56350c4b3b653cb8d4f50

data/lib/souls/app/utils/painter.rb

@@ -13,16 +13,28 @@ module SOULs
         puts(Paint % ["✓ %{white_text}", :red, { white_text: ["Deleted file #{text}", :white] }])
       end
 
-      def error(text)
-        puts(Paint["🚨 #{text}", :red])
+      def error(text, emoji = nil)
+        if emoji
+          puts(Paint["#{emoji} #{text}", :red])
+        else
+          puts(Paint["🚨 #{text}", :red])
+        end
       end
 
-      def warning(text)
-        puts(Paint["🚨 #{text}", :yellow])
+      def warning(text, emoji = nil)
+        if emoji
+          puts(Paint["#{emoji} #{text}", :yellow])
+        else
+          puts(Paint["🚨 #{text}", :yellow])
+        end
       end
 
-      def success(text)
-        puts(Paint["🎉 #{text}", :green])
+      def success(text, emoji = nil)
+        if emoji
+          puts(Paint["#{emoji} #{text}", :green])
+        else
+          puts(Paint["🎉 #{text}", :green])
+        end
       end
 
       def sync(text)

data/lib/souls/cli/sync/pubsub.rb

@@ -15,15 +15,14 @@ module SOULs
       return false if url.blank?
 
       worker_file_names = get_workers_file_paths
-      return false if worker_file_names.blank?
 
-      sync_pubsub_topics_and_subscriptions(workers: worker_file_names, worker_url: url)
+      sync_pubsub_topics_and_subscriptions(worker_file_names: worker_file_names, worker_url: url)
       SOULs::Painter.sync("All Jobs with PubSub Subscription!")
     end
 
     private
 
-    def sync_pubsub_topics_and_subscriptions(worker_url:, workers: {})
+    def sync_pubsub_topics_and_subscriptions(worker_url:, worker_file_names: {})
       project_id = SOULs.configuration.project_id
       pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
       topics = pubsub.topics
@@ -38,20 +37,29 @@ module SOULs
 
       souls_topics.each do |name|
         file_name = name.gsub("-", "_")
-        value = workers[file_name.to_sym] || 0
-        workers[file_name.to_sym] = value - 1
+        value = worker_file_names[file_name.to_sym] || 0
+        worker_file_names[file_name.to_sym] = value - 1
       end
 
-      workers.each do |key, value|
-        topic_id = key.to_s.gsub("_", "-")
-        if value == 1
-          create_topic(topic_id: topic_id)
-          create_push_subscription(worker_url: worker_url, topic_id: topic_id)
+      if worker_file_names.blank?
+        return if souls_topics.blank?
+
+        souls_topics.each do |topic_id|
+          delete_topic(topic_id: topic_id)
+          delete_subscription(topic_id: topic_id)
+        end
+      else
+        worker_file_names.each do |key, value|
+          topic_id = key.to_s.gsub("_", "-")
+          if value == 1
+            create_topic(topic_id: topic_id)
+            create_push_subscription(worker_url: worker_url, topic_id: topic_id)
+          end
+          delete_topic(topic_id: topic_id) if value == -1
+          delete_subscription(topic_id: topic_id) if value == -1
         end
-        delete_topic(topic_id: topic_id) if value == -1
-        delete_subscription(topic_id: topic_id) if value == -1
       end
-      workers
+      worker_file_names
     end
 
     def create_topic(topic_id: "worker-mailer")
@@ -66,7 +74,7 @@ module SOULs
       pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
       topic = pubsub.topic(topic_id.to_s)
       topic.delete
-      SOULs::Painter.error("Topic #{topic_id} deleted.")
+      SOULs::Painter.warning("Topic #{topic_id} deleted.", "✨")
     end
 
     def delete_subscription(topic_id: "worker-mailer")

data/lib/souls/version.rb

@@ -1,4 +1,4 @@
 module SOULs
-  VERSION = "1.19.6".freeze
+  VERSION = "1.19.7".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.19.6
+1.19.7

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.19.6
+1.19.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.19.6
+  version: 1.19.7
 platform: ruby
 authors:
 - POPPIN-FUMI