souls 0.41.1 → 0.42.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9901b40b4c239bbf4963bddaa54b6211f12f60b5a780e409e25f34e43280a46b
-  data.tar.gz: 3937e60d4e0f2799cbae53c2c4e9662c135e5529636dd234d0cffbc9a71bafd9
+  metadata.gz: edd47698ca891813c0b301df870e9d89c186f6a5daf08e0b826030f9c39fac24
+  data.tar.gz: 66d83ceba816974a327d2df21202b515e50f0bb53790c211d530566a5c07ee78
 SHA512:
-  metadata.gz: 23ed2a5788d0c0aefdb596eff5a102f62189a0780925576a5dd51c275d65b06100d7a7e60922a6b17a91443c6bc15ec85888b796c097595da2d4d99465908c09
-  data.tar.gz: a6746ef6153e4c62a2b7f8f3d07b681970d20431b18db35c2d8738dd7ada78f630e742b378ca3d158e7296cffd61fcee1ad7b0698c64c312a8cb0689c63b1cb6
+  metadata.gz: cb4b8d58f2dbd7ded286e3fbdb937d1d83eac27d76c16c33448a321b2f5ee2e2df366436ac7cde2a5b2b45ff8bf934b5bd4236c218412c666660921bde1d0691
+  data.tar.gz: 8d917f318dceceddc9d153a8cd7e0753b458990095155620db6bd123a5b88bf0ffaebe428d53c8e148598965125cafd0d400ab072e2238111e7a964780070965

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

@@ -16,7 +16,7 @@ module Souls
         end
 
         def get_endpoint(worker_name: "")
-          system("gcloud run services list | grep #{worker_name} | awk '{print $4}'")
+          `gcloud run services list | grep #{worker_name} | awk '{print $4}'`
         end
       end
     end

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

@@ -11,7 +11,7 @@ module Souls
           )
         end
 
-        def pathch_instance(instance_name: "")
+        def patch_instance(instance_name: "")
           app_name = Souls.configuration.app
           instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
           project_id = Souls.configuration.project_id

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

@@ -23,11 +23,12 @@ module Souls
 
               new_line.write("  config.workers = [\n")
               workers.each do |worker|
-                endpoint = Souls::Gcloud::Run.get_endpoint(worker_name: worker[:name])
+                base_url = Souls::Gcloud::Run.get_endpoint(worker_name: worker[:name])
+                endpoint = Souls.configuration.endpoint
                 new_line.write(<<-TEXT)
     {
       name: "#{worker[:name]}",
-      endpoint: "#{endpoint}/endpoint",
+      endpoint: "#{base_url.strip}/#{endpoint}",
       port: #{worker[:port]}
     },
                 TEXT
@@ -35,9 +36,9 @@ module Souls
               break
             end
           end
-          new_line.write(<<-TEXT)
-  ]
-end
+          new_line.write(<<~TEXT)
+              ]
+            end
           TEXT
         end
       end

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

@@ -24,10 +24,10 @@ module Souls
 
         workers.each do |key, value|
           if value == 1
-            create_topic(topic_id: key)
-            create_push_subscription(topic_id: key)
+            create_topic(topic_id: key.to_s)
+            create_push_subscription(topic_id: key.to_s)
           end
-          delete_topic(topic_id: key) if value == -1
+          delete_topic(topic_id: key.to_s) if value == -1
         end
         workers
       end
@@ -49,7 +49,7 @@ module Souls
         require("#{Souls.get_mother_path}/config/souls")
         worker_name = topic_id.split("_")[0]
 
-        subscription_id = "#{topic_id}-sub"
+        subscription_id = "#{topic_id}_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.41.1".freeze
+  VERSION = "0.42.1".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.20.1
+0.21.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.20.1
+0.21.1

data/lib/souls.rb

@@ -247,14 +247,13 @@ module Souls
   end
 
   class Configuration
-    attr_accessor :app, :strain, :project_id, :github_repo, :worker_endpoint, :fixed_gems, :workers
+    attr_accessor :app, :strain, :project_id, :endpoint, :fixed_gems, :workers
 
     def initialize
       @app = nil
       @project_id = nil
+      @endpoint = nil
       @strain = nil
-      @github_repo = nil
-      @worker_endpoint = nil
       @fixed_gems = nil
       @workers = nil
     end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.41.1
+  version: 0.42.1
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-04 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -175,7 +175,7 @@ metadata:
   homepage_uri: https://souls.elsoul.nl
   source_code_uri: https://github.com/elsoul/souls
   changelog_uri: https://github.com/elsoul/souls
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key:
+signing_key: 
 specification_version: 4
 summary: SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
   クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。