souls 1.21.8 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d5989b972bb93949215156aac0d1d35110eeb998419ded0cf31c1b4872ef06a
-  data.tar.gz: 5c81810f878ce4aabb7bc155ed1c4dfce05ca787ad47d45449440d3ca111b03b
+  metadata.gz: bf225b8fb6383d37d0557dc336cf837066f80b2f9053f6cbf5710e5664a48206
+  data.tar.gz: 74a2b152293eb1aa547756f6abc50ba3937f451fc895215ced1c1c97719d485f
 SHA512:
-  metadata.gz: c8e76007b148e35453bff8d0d16309f3b50f39c8b307bb7bb17fc717ca4a74eba870b0d83b86800c73091516234996546d65ff4978a3739cb6b774b8d6df7e7c
-  data.tar.gz: 14912f26822268f96d53a97e9fc916ddfc3c98501ac47044598fcf1f3158657f4e8f8a8d922ca76bcf8d632a412d575cae3ccd1f7dc5cc66fdb4d704c7377bc0
+  metadata.gz: b412b04e1a4d1bc5a286ea2329ab416a5a94dbd285e9f9047b077d0a056c70bf577c702c4c0f5a051dbbf8879f50b878c506779ab6bb894226bf43b9547759c0
+  data.tar.gz: 729ab0de6a94f82469b8df9103740d03e671d26ecc6b42db217a947e0445f550e0a59e1725494f5e274040219155e82f5d18be596164b2dc5671459741e31f68

data/lib/souls/app/graphql/souls_mutation.rb

@@ -28,11 +28,16 @@ module SOULs
     end
 
     def souls_fb_auth(token: "")
+      raise(ArgumentError, "Invalid or Missing Token") if token.blank?
+
       FirebaseIdToken::Certificates.request!
-      sleep(3)
       user = FirebaseIdToken::Signature.verify(token)
-      raise(ArgumentError, "Invalid or Missing Token") if user.blank?
-
+      if user.blank?
+        Retryable.retryable(tries: 20, on: ArgumentError) do
+          user = FirebaseIdToken::Signature.verify(token)
+          raise(ArgumentError, "Invalid or Missing Token") if user.blank?
+        end
+      end
       user
     end
 

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

@@ -3,7 +3,8 @@ module SOULs
     desc "awake [url]", "Set Ping by Google Cloud Scheduler: Cron e.g. '0 10 * * *' or 'every 10 hours'"
     def awake
       app_name = SOULs.configuration.app.gsub("_", "-")
-      worker_names = SOULs.configuration.workers.map(&:name)
+      project_id = SOULs.configuration.project_id
+      worker_names = SOULs.configuration.workers.map { |f| f[:name] }
       services = ["souls-#{app_name}-api"]
       worker_names.each { |worker| services << "souls-#{app_name}-#{worker}" }
 
@@ -11,10 +12,10 @@ module SOULs
       service = prompt.select("Select Service?", services)
       cron = prompt.ask("Cron Schedule?", default: "every 10 mins")
 
-      url = SOULs::GcloudRun.new.get_endpoint(service)
+      url = SOULs::CloudRun.new.get_endpoint(service)
       system(
         "gcloud scheduler jobs create http #{app_name}-awake \
-            --schedule '#{cron}' --uri #{url} --http-method GET"
+            --schedule '#{cron}' --uri '#{url}' --project=#{project_id} --http-method GET"
       )
     end
 

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.21.8
+1.22.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.21.8
+1.22.0

data/lib/souls.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.21.8
+  version: 1.22.0
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -138,6 +138,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.8.3
+- !ruby/object:Gem::Dependency
+  name: retryable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement