souls 1.19.5 → 1.19.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba1ab0e3e8b972c9c6abf4462bf73d6d957e0b0da397c840fd4a1d309bd18428
-  data.tar.gz: 8f5c7235b5ad3a3684890f16ceb6c69437c338e6d20f487623436eeb89d7a533
+  metadata.gz: 47404f43681adfd3c3ee24a1bcec31e7e538f944d4b55b6d43b2024888a9a169
+  data.tar.gz: b883f0d9337e02c3ffc75ec982a156f393618b752991a256303975e80130f362
 SHA512:
-  metadata.gz: a55046924033c845df7a2bd2be75cd1ef89fa2bb491fa6d31c394198baa27920e5835a42fb224b90fffcb4cfb9deacc5a74a5f3a7e1b46c868873f11fd325633
-  data.tar.gz: 9cc31276f563aaf98e8212cddababd35c2875f5f10c4d33a285f7559b4d080545ddb39b824b43a26396f0ddda8f948bd01b84831ac8e1c22925d5f48029448ae
+  metadata.gz: 414619b49aa78b8e735705ee0e4b278d1159345a652d386bbe3cd19f80b6997584968110ce3fee19f6b135b289d0a5544cd1d774b83303dc5d1d0deab3d7e6aa
+  data.tar.gz: 6c98c7ca8c8ac5ed740649dfecb5ab899571b2421d95c5840e68087b1c4fc24aa32b239fbad6989d51afe787b5424a5c6c6cb5d3c0fda98b795cb2a5b6d173d1

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/index.rb

@@ -1,4 +1,3 @@
-require "google/cloud/pubsub"
 require_relative "./model"
 require_relative "./pubsub"
 require_relative "./conf"

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
@@ -37,20 +36,31 @@ module SOULs
       souls_topics = topic_names.select { |n| n.include?("souls-#{worker_name}") }
 
       souls_topics.each do |name|
-        value = workers[name.to_sym] || 0
-        workers[name.to_sym] = value - 1
+        file_name = name.underscore
+        value = worker_file_names[file_name.to_sym] || 0
+        worker_file_names[file_name.to_sym] = value - 1
       end
+      puts(worker_file_names)
 
-      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")
@@ -65,7 +75,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")
@@ -79,7 +89,7 @@ module SOULs
     def create_push_subscription(worker_url:, topic_id: "worker-mailer")
       souls_endpoint = SOULs.configuration.endpoint
       subscription_id = "#{topic_id}-sub"
-      endpoint = "#{worker_url}/#{souls_endpoint}"
+      endpoint = "#{worker_url}#{souls_endpoint}"
 
       project_id = SOULs.configuration.project_id
       pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
@@ -99,7 +109,7 @@ module SOULs
         end
       workers.delete("base_query")
       workers.each do |file|
-        response[:"souls_#{worker_name}_#{file}"] = 1
+        response["souls_#{worker_name.underscore}_#{file}".to_sym] = 1
       end
       response
     end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.19.5
+1.19.9

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.19.5
+1.19.9

data/lib/souls.rb

@@ -9,6 +9,7 @@ require "whirly"
 require "tty-prompt"
 require "thor"
 require "resolv"
+require "google/cloud/pubsub"
 
 module SOULs
   extend SOULs::Utils

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.19.5
+  version: 1.19.9
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,6 +124,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement