souls 1.11.2 → 1.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b3ca469965104a721af20e4fb8ba626642298d31c1746e777e270b38f5496c1
-  data.tar.gz: f302a612a56c322c2f747d47952ec2698786481dc9d88ed37617e14b955e6733
+  metadata.gz: 7ae2e161b570d9598845bf2b9f2627cbefe392e99109015efed058b2ef7bddf4
+  data.tar.gz: bde228cc63d5c0eca189a93c93f8b332474402f2c4aaf03a2c375433971e89c2
 SHA512:
-  metadata.gz: 86228e2b3a84297a1678618a9a93bf5de229afeb2f400ec25dfa8c3fe62eb141e86bb0835872bc9d21b9e766e3745d3fa8c734bc7c791700c74599bb517c1b62
-  data.tar.gz: 576057a8cfdf7edace3c1fd8f309f2e4c9019b379ead3e2d98e2f0e0a8f505440f023830388d7ac822a897fc864320b220f613b4116388d9ce3425b6b91de4bd
+  metadata.gz: 9facda3c27986cc37aabb685110b9e588897f2a3909489efed043bcdeca456a751af225e958f4e3dba6332b7b9f8570f8d4b8b88ebd8c1b8d09644f0a74172b0
+  data.tar.gz: 71d2617e5c88bbef8b2df242d75d413ecccc68941314843c7daa1478da3afb879d3fb771fcdc927710ced107d11bde47010b12370e63fdce06c12e6b3b2454db

data/lib/souls/cli/gcloud/scheduler/index.rb

@@ -11,6 +11,7 @@ module Souls
     end
 
     desc "sync_schedules", "Collect schedules from queries and sync with GCloud"
+    method_option :timezone, default: "Asia/Tokyo", aliases: "--timezone", desc: "Timezone e.g. Europe/Amsterdam"
     def sync_schedules
       require("./app")
       Souls::Gcloud.new.config_set
@@ -20,7 +21,9 @@ module Souls
 
       Queries::BaseQuery.all_schedules.each do |k, v|
         worker_name = FileUtils.pwd.split("/").last
-        job_name = "#{worker_name}_#{k.to_s.underscore}".to_sym
+        job_name = "souls_#{worker_name}_#{k.to_s.underscore}".to_sym
+        topic = "souls_#{worker_name}_#{k.to_s.underscore}"
+        message_body = "query { #{k.to_s.camelize(:lower)} { response }}"
 
         if schedules_list.include?(job_name)
           schedule = schedules_list[job_name]
@@ -29,17 +32,19 @@ module Souls
 
           system(
             <<~COMMAND)
-              gcloud scheduler jobs update pubsub #{job_name} --project=#{project_id} --quiet --schedule="#{v}" --topic="#{k}" --message-body="#{k}"
+              gcloud scheduler jobs update pubsub #{job_name} --project=#{project_id} --quiet --schedule="#{v}" --topic="#{topic}" --message-body="#{message_body}" --time-zone="#{options[:timezone]}"
             COMMAND
         else
           system(
             <<~COMMAND)
-              gcloud scheduler jobs create pubsub #{job_name} --project=#{project_id} --quiet --schedule="#{v}" --topic="#{k}" --attributes="" --message-body="#{k}"
+              gcloud scheduler jobs create pubsub #{job_name} --project=#{project_id} --quiet --schedule="#{v}" --topic="#{topic}" --attributes="" --message-body="#{message_body}" --time-zone="#{options[:timezone]}"
             COMMAND
         end
       end
 
       schedules_list.each do |k, _|
+        next unless k.match?(/^souls_/)
+
         system("gcloud scheduler jobs delete #{k} -q >/dev/null 2>&1")
       end
     end
@@ -49,6 +54,8 @@ module Souls
     def current_schedules
       current_schedules = {}
       jobs = `gcloud scheduler jobs list`
+      return {} if jobs.blank?
+
       jobs.split("\n")[1..].each do |line|
         columns = line.split(/\t| {2,}/)
         job_name = columns[0].to_sym

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.11.2
+1.11.6

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.11.2
+1.11.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.6
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport