souls 1.11.4 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02ada1825153caf8ab62278c0adcc953d2ac53ca2e9aa6a341694ec264805054
-  data.tar.gz: 82dc4c02dda15dadaa2858dd3000988b58fe083246063830e4ce19c169865ac2
+  metadata.gz: 1abe96b1a98b3f9bb7ea9627d80ed6a16571f076b5fff1e9fecef34a09d789cc
+  data.tar.gz: 104add024a8c0aaa44f1b6beff35436a39df286f9462dae4a63aea28d121d71b
 SHA512:
-  metadata.gz: acea6de0deaa59fbe22a0fd55c947a9129431f4f78c86c2d97123838cbbd52f32ff7c78179480fe3d0ab3e43f75795a18a9148865d36f40c89c8cf66edf99db4
-  data.tar.gz: 7a2498dbb41d5cce3633db3f806095dcdf0e652d20f7940bf017290cbe4059e2bf70850ac9dee4c88a65983e6e19598f328b61061aaa50ae64d38a033094732d
+  metadata.gz: 507f51405d4ffc70df7094581f25c1eff0f2dcf46d7ecb9afbb68086f84f3c4f239dcd26f46fba1f03dfc72d1e7b365896620ec45f0db99eba1ef722ee0d29a8
+  data.tar.gz: ce63b83025a33541ac9fabbffca76b98b5d2a9ae4ae0ca64031c29d81004344380557cb338158d2303f90b1acd1abfbaf1d58d21d11ef02cc95282e60aa9ca4b

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,18 +11,19 @@ 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
       project_id = Souls.configuration.project_id
 
       schedules_list = current_schedules
-
+      worker_name = FileUtils.pwd.split("/").last
       Queries::BaseQuery.all_schedules.each do |k, v|
         worker_name = FileUtils.pwd.split("/").last
         job_name = "souls_#{worker_name}_#{k.to_s.underscore}".to_sym
         topic = "souls_#{worker_name}_#{k.to_s.underscore}"
-        message_body = "{'query':'query { #{k.to_s.camelize(:lower)} { response }}'}"
+        message_body = "query { #{k.to_s.camelize(:lower)} { response }}"
 
         if schedules_list.include?(job_name)
           schedule = schedules_list[job_name]
@@ -31,18 +32,18 @@ module Souls
 
           system(
             <<~COMMAND)
-              gcloud scheduler jobs update pubsub #{job_name} --project=#{project_id} --quiet --schedule="#{v}" --topic="#{topic}" --message-body="#{message_body}"
+              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="#{topic}" --attributes="" --message-body="#{message_body}"
+              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_/)
+        next unless k.match?(/^souls_#{worker_name}/)
 
         system("gcloud scheduler jobs delete #{k} -q >/dev/null 2>&1")
       end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.11.4
+1.12.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.11.4
+1.12.0

metadata

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