souls 0.38.5 → 0.40.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e0cfc8aff16ebc5d9fd873249ce97234b93abe6f95705841fc24cd8cbf7a95
-  data.tar.gz: 86e60dbfea5ec5b8fba12b9e6cac9818420f7648253681d94cb46e6b64da84cb
+  metadata.gz: e777d40acc58d576ed2f737e9524903c29e2cfe6a5242cbfa90ffa76292df395
+  data.tar.gz: e793146caaf8286f1240441e0b9bfdc789f0aa3bc64bd231482d2da49586a905
 SHA512:
-  metadata.gz: 52fa18a4e2d590e1970436d7bb0c96cadf6f814aba9eff998408491431fb94dc7fe5037b4fb281ddbc79b0d6d256ba2c1e1040a8c1fd9879fee075b66c727958
-  data.tar.gz: cb59910b2cd27a5866c17a061f5621e9406bf4672cf4f53badda89d46516db6b98d6e76d7bab7f53c6cc2a363c29771561955d9625be1d1b87553d15b4ba12ec
+  metadata.gz: b9873772fe08923d77ba44a5c7a773689914f625060f30f6c16ec907cac2e07606ab0f0702973e7ff8d115fcb6bc2f6d3ec1567d67c66553ae8a75e9957f7247
+  data.tar.gz: a1fb4a32637d210e27a42ee6d3755eb0089054a6841e00553d6705a08bad77279efeb4abf1fc0c0a9ff4746e94e979b19ece86b98b7df71491a5afe66260c431

data/exe/souls

@@ -142,7 +142,14 @@ begin
       Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
         Whirly.status = status
         Souls::Sync.model
-        Whirly.status = Paint["API and Worker Both Models Synced!", :green]
+        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])

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

@@ -8,6 +8,7 @@ module Souls
           create_firewall_ssh(app_name: app_name)
           create_subnet(app_name: app_name, region: region, range: range)
           create_connector(app_name: app_name, region: region)
+          create_router(app_name: app_name, region: region)
           create_external_ip(app_name: app_name, region: region)
           create_nat(app_name: app_name, region: region)
           nat_credit(app_name: app_name)
@@ -53,6 +54,11 @@ module Souls
           )
         end
 
+        def create_router(app_name: "", region: "asia-northeast1")
+          app_name = Souls.configuration.app if app_name.blank?
+          system("gcloud compute routers create #{app_name}-router --network=#{app_name} --region=#{region}")
+        end
+
         def create_external_ip(app_name: "", region: "asia-northeast1")
           app_name = Souls.configuration.app if app_name.blank?
           system("gcloud compute addresses create #{app_name}-worker-ip --region=#{region}")
@@ -62,7 +68,7 @@ module Souls
           app_name = Souls.configuration.app if app_name.blank?
           system(
             "gcloud compute routers nats create #{app_name}-worker-nat \
-                  --router=#{app_name}-connector \
+                  --router=#{app_name}-router \
                   --region=#{region} \
                   --nat-custom-subnet-ip-ranges=#{app_name}-subnet \
                   --nat-external-ip-pool=#{app_name}-worker-ip"
@@ -99,7 +105,7 @@ module Souls
 
             Edit  `.github/workflow/worker.yml`
 
-            Add these 2 options in `- name: Deploy to Cloud Run` step
+            Add these 2 options in \n`- name: Deploy to Cloud Run` step
             \n--vpc-connector=#{app_name}-connector \
             \n--vpc-egress=all \
 

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

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

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

@@ -0,0 +1,71 @@
+module Souls
+  module Sync
+    class << self
+      def pubsub
+        get_topics(workers: get_workers)
+      end
+
+      private
+
+      def get_topics(workers: {})
+        project_id = Souls.configuration.project_id
+        pubsub = Google::Cloud::Pubsub.new
+        topics = pubsub.topics
+
+        topic_names =
+          topics.map do |topic|
+            topic.name.gsub("projects/#{project_id}/topics/", "")
+          end
+
+        topic_names.each do |name|
+          value = workers[name.to_sym] || 0
+          workers[name.to_sym] = value - 1
+        end
+
+        workers.each do |key, value|
+          create_topic(topic_id: key) if value == 1
+          delete_topic(topic_id: key) if value == -1
+        end
+        workers
+      end
+
+      def create_topic(topic_id: "mailer")
+        pubsub = Google::Cloud::Pubsub.new
+        topic = pubsub.create_topic(topic_id)
+        puts("Topic #{topic.name} created.")
+      end
+
+      def delete_topic(topic_id: "mailer")
+        pubsub = Google::Cloud::Pubsub.new
+        topic = pubsub.topic(topic_id)
+        topic.delete
+        puts("Topic #{topic_id} deleted.")
+      end
+
+      def get_workers
+        require("#{Souls.get_mother_path}/config/souls")
+        worker_paths = Souls.configuration.workers.map { |n| n[:name] }
+        response = {}
+        Dir.chdir(Souls.get_mother_path.to_s) do
+          worker_paths.each do |worker|
+            mailers =
+              Dir["apps/#{worker}/app/graphql/mutations/mailers/*.rb"].map do |file|
+                file.gsub("apps/#{worker}/app/graphql/mutations/mailers/", "").gsub(".rb", "")
+              end
+
+            workers =
+              Dir["apps/#{worker}/app/graphql/mutations/*.rb"].map do |file|
+                file.gsub("apps/#{worker}/app/graphql/mutations/", "").gsub(".rb", "")
+              end
+            workers.delete("base_mutation")
+            local_files = mailers + workers
+            local_files.each do |file|
+              response[:"#{worker}_#{file}"] = 1
+            end
+          end
+        end
+        response
+      end
+    end
+  end
+end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.17.5
+0.19.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.17.5
+0.19.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.38.5
+  version: 0.40.1
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2021-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -40,6 +40,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.87.2
+- !ruby/object:Gem::Dependency
+  name: google-cloud-pubsub
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +154,7 @@ files:
 - lib/souls/cli/release/release.rb
 - lib/souls/cli/sync/index.rb
 - lib/souls/cli/sync/model.rb
+- lib/souls/cli/sync/pubsub.rb
 - lib/souls/cli/upgrade/gem_update.rb
 - lib/souls/cli/upgrade/index.rb
 - lib/souls/index.rb