souls 0.40.2 → 0.41.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 830e9f1e9796eb865775399585c85ff3185a4896e43d815507db9b0a5774ab08
-  data.tar.gz: 41296eeb3bab8cb8e300625cf881f270cd526cbaf4f169eb74316e623910d8fd
+  metadata.gz: fa53fbf9c79d49d1d58e132b0dee2b5ddc8ea26b6f0c8175e6358080907b53e9
+  data.tar.gz: 0cfca344f041fcd6f41428909dce517b432fd4e4cedb5751a6d10b45c7b8d5e1
 SHA512:
-  metadata.gz: 998fdb38f2a8aa35557ab76a28992098e279ae8a2b8662348fe1b536389b7013302e544d583fdf75fd5d158c403c73e57b737d368806d8ece693e04855fe3d31
-  data.tar.gz: c646f6a1f8b6c558b4717ee1da213f9d613e5396523b56247bd545ff3d2510dc3620d71a6997523653c0fb3b6c3c364626db92ad27138999ab1d70df1d233617
+  metadata.gz: 80ec7918fb52d203d9dfb87c1c326f9f90acd83d24055efa824061477b82177030fe7793c25ceaf736f2acbe9a7bb824c5e99400154a36bae3ca38979152cad0
+  data.tar.gz: ee25cb4b3ae05f1af3c4b075678e50c70c1244ea320cd0826503fb15d5f83580c4d9a91a11d7e8dcf8ea25caf8f83d868d2f3dcffe07790939362816960327c7

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

@@ -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

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.19.2
+0.20.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.19.2
+0.20.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.40.2
+  version: 0.41.2
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 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