souls 0.40.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fbe1578d6e8e0cb026243d7796df2e826a3c8850151de318170f8a80afb2879
-  data.tar.gz: 5b22531a5e03fcd18494ff61e0cfc28e6699ef7a5b526c91c04450d5a9db62af
+  metadata.gz: df2f39add13ab11ad55c08ea91fb0c36bb310360c78ec6afd39456cdb6055f0d
+  data.tar.gz: 5feca9108b6cdaa7fdc84064f58aba6213c42ea803333180f49dbfceca33055a
 SHA512:
-  metadata.gz: 0dfdb6a0bf05853ded99da0a75f73005f02129ba78c5c23dabd58c6e8073d7d04a74fb0f9fb50fbe4c6d5ecbb7015da57005059aac89ecb70a435c9145db7b74
-  data.tar.gz: aab8c8adb4ef5da4f0855a9b3d4aa9f5a3244a1f17228754d64daf4c2232466e6fcba0e700a3ab6162b68222af33045c4f38fa15acfddc93e83ab756ba3737a2
+  metadata.gz: 2206bc5906aaa1530d7ec2207f53cf9ddb4ad4930e527609cac18fd591de0c08d4773fc6cf53289928daf897b424f334539a48d9b8a53aeea45a8c843c85a721
+  data.tar.gz: 0fbc64fbedb1bcedb240b042310c6e3ae72b89b03f83909b2ef3e90c386f02e9e9f5dcb032abe140dc2762ca1eaa4fa808cbd2c9aa85fa8e1fb30961c7c808a9

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/gcloud/sql/index.rb

@@ -10,6 +10,18 @@ module Souls
               --root-password='#{root_pass}' --database-flags cloudsql.iam_authentication=on"
           )
         end
+
+        def pathch_instance(instance_name: "")
+          app_name = Souls.configuration.app
+          instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
+          project_id = Souls.configuration.project_id
+          system(
+            "gcloud beta sql instances patch #{instance_name} \
+              --project=#{project_id} \
+              --network=#{app_name} \
+              --no-assign-ip"
+          )
+        end
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Souls
         pubsub = Google::Cloud::Pubsub.new
         topics = pubsub.topics
 
-        puts("Topics in project:")
         topic_names =
           topics.map do |topic|
             topic.name.gsub("projects/#{project_id}/topics/", "")
@@ -24,7 +23,10 @@ module Souls
         end
 
         workers.each do |key, value|
-          create_topic(topic_id: key) if value == 1
+          if value == 1
+            create_topic(topic_id: key)
+            create_push_subscription(topic_id: key)
+          end
           delete_topic(topic_id: key) if value == -1
         end
         workers
@@ -43,6 +45,24 @@ module Souls
         puts("Topic #{topic_id} deleted.")
       end
 
+      def create_push_subscription(topic_id: "mailer")
+        require("#{Souls.get_mother_path}/config/souls")
+        worker_name = topic_id.split("_")[0]
+
+        subscription_id = "#{topic_id}-sub"
+        endpoint = ""
+        worker_paths = Souls.configuration.workers
+        worker_paths.each do |worker|
+          endpoint = worker[:endpoint] if worker[:name] == worker_name
+        end
+
+        pubsub = Google::Cloud::Pubsub.new
+
+        topic = pubsub.topic(topic_id)
+        topic.subscribe(subscription_id, endpoint: endpoint)
+        puts("Push subscription #{subscription_id} created.")
+      end
+
       def get_workers
         require("#{Souls.get_mother_path}/config/souls")
         worker_paths = Souls.configuration.workers.map { |n| n[:name] }

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.19.0
+0.20.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.19.0
+0.20.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2021-09-04 00:00:00.000000000 Z
@@ -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 ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。