souls 0.53.4 → 0.53.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 564e0bedd2c3f6d26daad5f9bc4307051b042ce2867e16fe0667372e70b3b432
-  data.tar.gz: 5a4fef479822068f0e49405c7b5b974adfe9c68845681454e6ec0a2d1aa35904
+  metadata.gz: e35280f32390cf55c390b73dbb3e344ab8de636460e5464e1b0ebe5a7830f562
+  data.tar.gz: 3a429067cc9388575fd606ba7d056d6072d1c9c0d63a8231c628c25855c80310
 SHA512:
-  metadata.gz: 467f58902722373ee1ee48af87a1b59383d4f71117c64a9242118b487aca907384fc5d8c9c5128f358852c6d29090de7274eb8719e7780e0e5d150e91d976920
-  data.tar.gz: 23b9061872e797e8e6803848e21dc30a29919519f4b929776aee8d87ae95e7b41cde8aa5a0fade7f8723a571cbb7d09ea934f172ced208f830c3d3af943f9a65
+  metadata.gz: 11eb6b2e3683f6dcdcf45312bbb8ead4ab569e5a999a51c54ca74d94f07c6e5fe1b5527eac12c8286b71b34533e01b5bf307b68b49c7821ebed53a7aa545a8ab
+  data.tar.gz: 58bbefc266178a10f8ee51bcc4f2b6ab203ad2dc6cd4fd84c169b9dd19e75178e64be2f1e0c6b00a5843184b08811685033d8c7e1a492bd4dfb8027e97418940

data/lib/souls/api/index.rb

@@ -8,6 +8,6 @@ module Souls
     desc "update [COMMAND]", "souls api update Commands"
     subcommand "update", Update
 
-    map "g" => :generate
+    map g: :generate
   end
 end

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

@@ -12,6 +12,7 @@ module Souls
     private
 
     def get_topics(workers: {})
+      app_name = Souls.configuration.app
       project_id = Souls.configuration.project_id
       pubsub = Google::Cloud::Pubsub.new
       topics = pubsub.topics
@@ -21,6 +22,8 @@ module Souls
           topic.name.gsub("projects/#{project_id}/topics/", "")
         end
 
+      topic_names.select { |n| n.include?("#{app_name}_souls_") }
+
       topic_names.each do |name|
         value = workers[name.to_sym] || 0
         workers[name.to_sym] = value - 1
@@ -37,23 +40,29 @@ module Souls
     end
 
     def create_topic(topic_id: "mailer")
+      app_name = Souls.configuration.app
       pubsub = Google::Cloud::Pubsub.new
-      topic = pubsub.create_topic(topic_id)
+      topic_name = "#{app_name}_souls_#{topic_id}"
+      topic = pubsub.create_topic(topic_name.to_s)
       puts("Topic #{topic.name} created.")
     end
 
     def delete_topic(topic_id: "mailer")
+      app_name = Souls.configuration.app
       pubsub = Google::Cloud::Pubsub.new
-      topic = pubsub.topic(topic_id)
+      topic_name = "#{app_name}_souls_#{topic_id}"
+      topic = pubsub.topic(topic_name.to_s)
       topic.delete
-      puts("Topic #{topic_id} deleted.")
+      puts("Topic #{topic_name} deleted.")
     end
 
     def create_push_subscription(topic_id: "mailer")
       require("#{Souls.get_mother_path}/config/souls")
       worker_name = topic_id.split("_")[0]
+      app_name = Souls.configuration.app
+      topic_name = "#{app_name}_souls_#{topic_id}"
 
-      subscription_id = "#{topic_id}_sub"
+      subscription_id = "#{topic_name}_sub"
       endpoint = ""
       worker_paths = Souls.configuration.workers
       worker_paths.each do |worker|

data/lib/souls/version.rb

@@ -1,4 +1,4 @@
 module Souls
-  VERSION = "0.53.4".freeze
+  VERSION = "0.53.5".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.32.4
+0.32.5

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.32.4
+0.32.5

data/lib/souls/worker/index.rb

@@ -5,6 +5,6 @@ module Souls
     desc "generate [COMMAND]", "souls worker generate Commands"
     subcommand "generate", Generate
 
-    map "g" => :generate
+    map g: :generate
   end
 end

metadata

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