souls 1.11.3 → 1.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20095b05ffe684ffa19dc4328e1c7a42c02855bde1982e89ac074984d034d7f3
-  data.tar.gz: 6806d2c8ce46cd88deaac0d34e8bdfaedb0198fe105da12f5e5d08bf12d1ecec
+  metadata.gz: 19a2f6ed563280fb6f585ca4e713ce05e05b498f225c55719fd106b356c9d221
+  data.tar.gz: c319d472b4026b673ebd89eee57ad927387445387b0adfb6aed190649aa412d7
 SHA512:
-  metadata.gz: a2dc3585e724d2aa0cd49d79a392ccb60e9737b41b82263260359ee6eb5a278a1ca88c952b10c75db9bd01d6cc84a3a9b57b158cebc97edcd073cb33879bd57b
-  data.tar.gz: 97991c825cfefbdebb1f7157ae90dad2da516cd040fd8712ebb1ad527b1927b4eca5e58b79b885d76e0bd7749ee220a23aedabd01c7f3cf1a76454f831d400b2
+  metadata.gz: 71bb839aa16e0d8faabcc6416563f30c63aacede2813956396304ef6c1c79bcd5fd9f6a7ada3ae479aaa2c37b8b43779cd4dea3bd31112f7772e92ff1666d8c1
+  data.tar.gz: 47acb4944bc0d9146ffb94aa56cb6278b2f9a23a4c80d8300a567a9315a814d3569c0a4935f50f9a2290a1799e00dab3b6de3413d40a21190145ba2930643d95

data/lib/souls/cli/create/index.rb

@@ -171,7 +171,7 @@ end
                   export_default_credentials: true
 
               - name: Sync Tasks
-                run: cd apps/#{worker_name} && souls gcloud scheduler sync_schedules
+                run: cd apps/#{worker_name} && souls gcloud scheduler sync_schedules --timezone=${{ secrets.TZ }}
 
               - name: Configure Docker
                 run: gcloud auth configure-docker --quiet

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

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.11.3
+1.11.7

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.11.3
+1.11.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.11.7
 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