souls 0.40.3 → 0.41.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51159a85b2486d7b97dec78e107c883a00675a62dad2f0c38ecef3a0bcea3769
-  data.tar.gz: 325e1edba536b1f0891e10ce4f03d1301da032aaf06ca45d15a2596f147fb329
+  metadata.gz: ef9f372f2dba8df38bef5a84fc22fa4067ba65462012e7ca4b4e4ede7c20285d
+  data.tar.gz: a907baf558de2b4194770cb0767dbc33f4cc9f3335a84096ade0d0904204e93d
 SHA512:
-  metadata.gz: 1d18344b1a54e6e555f1103d1409c80b1abb9a883d61856b30ebc91d39f8535b238275b1875ff04f0096902856e8ffae0b16aa5f83aa4cff7003f623cca3540e
-  data.tar.gz: 0320ec98a816d0ca260067e93049347fe05953cdd1a994e81c58d17bb0557a324b6c3eb36055b9b3e91a6b550cca7404e5c8ffb32e7d0678a95884830a95babd
+  metadata.gz: ad4dda7083db8c61b767567407af20701d4f9e8e0a6b3f75d16bd39fe59be56819c3fa9918edcf73693ead3d27226b80e9e745e731319abb0f92103af2a089a7
+  data.tar.gz: ee9b5c0ea15eb5484a78ec9237c7c557809fff6813805d2b9cbf65e246be7b21b073b557acd2612efea0672c18edfcdc47ff20f517ffb2835caf2a5ef4ab5e59

data/exe/souls

@@ -135,24 +135,12 @@ begin
   when "release"
     Souls::Release.gem_release
   when "sync"
-    target = ARGV[1]
-    case target
-    when "model", "m"
-      status = Paint["Syncing Models...", :yellow]
-      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
-        Whirly.status = status
-        Souls::Sync.model
-        Whirly.status = Paint["API and Workers Models Synced!", :green]
-      end
-    when "pubsub"
-      status = Paint["Syncing PubSub...", :yellow]
-      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
-        Whirly.status = status
-        Souls::Sync.pubsub
-        Whirly.status = Paint["Workers and Google Cloud PubSub Synced!", :green]
-      end
-    else
-      puts(Paint["Comannd doesn't exist.Check you command again!...", :red])
+    method_name = ARGV[1]
+    status = Paint["Syncing Files...", :yellow]
+    Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+      Whirly.status = status
+      Souls::Sync.public_send(method_name)
+      Whirly.status = Paint["Synced!", :green]
     end
   when "create"
     service_name = ARGV[1]

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

@@ -2,7 +2,7 @@ module Souls
   module Gcloud
     module Run
       class << self
-        def awake(app_name: "souls-app", url: "")
+        def awake(app_name: "", url: "")
           app_name = Souls.configuration.app if app_name.blank?
           system(
             "gcloud scheduler jobs create http #{app_name}-awake

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

@@ -0,0 +1,46 @@
+module Souls
+  module Sync
+    class << self
+      def conf
+        update_conf
+        update_conf(strain: "api")
+      end
+
+      def update_conf(strain: "mother")
+        workers = Souls.configuration.workers
+        file_path = strain == "mother" ? "config/souls.rb" : "apps/api/config/souls.rb"
+        new_file_path = "souls.rb"
+        worker_switch = false
+        File.open(new_file_path, "w") do |new_line|
+          File.open(file_path, "r") do |f|
+            f.each_line do |line|
+              worker_switch = true if line.include?("config.workers")
+              next if line.strip == "end"
+
+              new_line.write(line) unless worker_switch
+
+              next unless worker_switch
+
+              new_line.write("  config.workers = [\n")
+              workers.each do |worker|
+                endpoint = Souls::Gcloud::Run.get_endpoint(worker_name: worker[:name])
+                new_line.write(<<-TEXT)
+    {
+      name: "#{worker[:name]}",
+      endpoint: "#{endpoint}/endpoint",
+      port: #{worker[:port]}
+    },
+                TEXT
+              end
+              break
+            end
+          end
+          new_line.write(<<-TEXT)
+  ]
+end
+          TEXT
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
 require "google/cloud/pubsub"
 require_relative "./model"
 require_relative "./pubsub"
+require_relative "./conf"

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.40.3".freeze
+  VERSION = "0.41.3".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.19.3
+0.20.3

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.19.3
+0.20.3

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.40.3
+  version: 0.41.3
 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
@@ -152,6 +152,7 @@ files:
 - lib/souls/cli/index.rb
 - lib/souls/cli/release/index.rb
 - lib/souls/cli/release/release.rb
+- lib/souls/cli/sync/conf.rb
 - lib/souls/cli/sync/index.rb
 - lib/souls/cli/sync/model.rb
 - lib/souls/cli/sync/pubsub.rb
@@ -174,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
@@ -190,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 ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。