souls 1.16.1 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 519f43da77592c6ab41222c6d6360c4714956a798eadc81ca366348728671bad
-  data.tar.gz: 112fba381d121ee4d6ea7cc553135ac3a75e99d2599b394c193c7eff24491f03
+  metadata.gz: f4cc729425eab2ed36694f36ccf139073767e24704cf28ca9aacf29667e1eb3e
+  data.tar.gz: 6966f1f77c229a66e38b8cf3466ae7677f0c56256094871b659bf1cee6f8e694
 SHA512:
-  metadata.gz: 4b87c00166c78b696858f3d1f5fee6a9efa9cf04423d8468b7a6f19e28a312170de538770b06655c747674b3792adf4b2f5040593cf153f2f76683a31f02d4ce
-  data.tar.gz: 615cb63fb293900589e113d418d5af710a9e34cf55494f76b287b2b597e64ff769c61af03582a63b58ed1315caa4e1192f5cb4d704bbc25daa545129cd898a45
+  metadata.gz: 79ee3df57517aa7342591da910fe7b853bde51819070cb4c0aae49c972e3500b194f50ccf1b3e8e33f36af733503c5a6c8d7217698a7809f76a5125ed5ac1e9a
+  data.tar.gz: fdeb3916a7cd4449254fe9c0e2d4d76fe627c8784af93b1d9ce6ada36b1fb1f061b22bf2aa39cbb24724534340588cecb145b09f32bb761543a267457f86107c

data/lib/souls/cli/create/functions.rb

@@ -6,7 +6,7 @@ end
 
 module Souls
   class Create < Thor
-    desc "functions", "Create SOULs functions"
+    desc "functions [name]", "Create SOULs functions"
     def functions(function_name)
       supported_languages = {
         ruby: %w[2.6 2.7],

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

@@ -1,36 +1,36 @@
 require_relative "./functions"
 module Souls
   class Create < Thor
-    desc "worker", "Create SOULs Worker"
-    method_option :name, aliases: "--name", desc: "Worker Name", required: true
-    def worker
+    desc "worker [name]", "Create SOULs Worker"
+    def worker(name)
       require("#{Souls.get_mother_path}/config/souls")
       Dir.chdir(Souls.get_mother_path.to_s) do
-        file_dir = "apps/#{options[:name]}"
+        worker_name = "worker-#{name}"
+        file_dir = "apps/worker-#{name}"
         raise(StandardError, "Same Worker Already Exist!") if Dir.exist?(file_dir)
 
         workers = Souls.configuration.workers
         app = Souls.configuration.app
         port = 3000 + workers.size
-        souls_worker_name = "souls-#{app}-#{options[:name]}"
-        download_worker(worker_name: options[:name])
+        souls_worker_name = "souls-#{app}-#{worker_name}"
+        download_worker(worker_name: worker_name)
         souls_conf_update(worker_name: souls_worker_name)
         souls_conf_update(worker_name: souls_worker_name, strain: "api")
-        workflow(worker_name: options[:name])
-        procfile(worker_name: options[:name], port: port)
-        mother_procfile(worker_name: options[:name])
-        souls_config_init(worker_name: options[:name])
-        steepfile(worker_name: options[:name])
-        souls_helper_rbs(worker_name: options[:name])
-        system("cd apps/#{options[:name]} && bundle")
-        souls_worker_credit(worker_name: options[:name])
+        workflow(worker_name: worker_name)
+        procfile(worker_name: worker_name, port: port)
+        mother_procfile(worker_name: worker_name)
+        souls_config_init(worker_name: worker_name)
+        steepfile(worker_name: worker_name)
+        souls_helper_rbs(worker_name: worker_name)
+        system("cd #{file_dir} && bundle")
+        souls_worker_credit(worker_name: worker_name)
       end
       true
     end
 
     private
 
-    def steepfile(worker_name: "mailer")
+    def steepfile(worker_name: "worker-mailer")
       file_path = "./Steepfile"
 
       write_txt = ""
@@ -49,21 +49,21 @@ module Souls
       File.open(file_path, "w") { |f| f.write(write_txt) }
     end
 
-    def procfile(worker_name: "mailer", port: 123)
+    def procfile(worker_name: "worker-mailer", port: 123)
       file_path = "apps/#{worker_name}/Procfile.dev"
       File.open(file_path, "w") do |f|
         f.write("#{worker_name}: bundle exec puma -p #{port} -e development")
       end
     end
 
-    def mother_procfile(worker_name: "mailer")
+    def mother_procfile(worker_name: "worker-mailer")
       file_path = "Procfile.dev"
       File.open(file_path, "a") do |f|
         f.write("\n#{worker_name}: foreman start -f ./apps/#{worker_name}/Procfile.dev")
       end
     end
 
-    def souls_conf_update(worker_name: "mailer", strain: "mother")
+    def souls_conf_update(worker_name: "worker-mailer", strain: "mother")
       workers = Souls.configuration.workers
       port = 3000 + workers.size
       file_path = strain == "mother" ? "config/souls.rb" : "apps/api/config/souls.rb"
@@ -84,7 +84,6 @@ module Souls
             write_txt += <<-TEXT
     {
       name: "#{worker[:name]}",
-      endpoint: "#{worker[:endpoint]}",
       port: #{worker[:port]}
     },
             TEXT
@@ -95,7 +94,6 @@ module Souls
       write_txt += <<-TEXT
     {
       name: "#{worker_name}",
-      endpoint: "",
       port: #{port}
     }
   ]
@@ -105,12 +103,11 @@ end
       File.open(file_path, "w") { |f| f.write(write_txt) }
     end
 
-    def workflow(worker_name: "mailer")
+    def workflow(worker_name: "worker-mailer")
       file_dir = ".github/workflows"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "#{file_dir}/#{worker_name}.yml"
-      worker_name = worker_name.underscore
-      worker_name_camelize = worker_name.camelize
+      worker_name_camelize = worker_name.gsub("-", "_").camelize
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
           name: #{worker_name_camelize}
@@ -176,6 +173,9 @@ end
               - name: Sync Tasks
                 run: cd apps/#{worker_name} && souls gcloud scheduler sync_schedules --timezone=${{ secrets.TZ }}
 
+              - name: Sync PubSub
+                run: cd apps/#{worker_name} && souls sync pubsub
+
               - name: Configure Docker
                 run: gcloud auth configure-docker --quiet
 
@@ -210,7 +210,7 @@ end
       file_path
     end
 
-    def souls_config_init(worker_name: "mailer")
+    def souls_config_init(worker_name: "worker-mailer")
       app_name = Souls.configuration.app
       project_id = Souls.configuration.project_id
       config_dir = "apps/#{worker_name}/config"
@@ -232,7 +232,7 @@ end
       end
     end
 
-    def souls_helper_rbs(worker_name: "mailer")
+    def souls_helper_rbs(worker_name: "worker-mailer")
       file_dir = "./sig/#{worker_name}/app/utils"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "#{file_dir}/souls_helper.rbs"
@@ -273,7 +273,7 @@ end
       end
     end
 
-    def download_worker(worker_name: "mailer")
+    def download_worker(worker_name: "worker-mailer")
       version = Souls.get_latest_version_txt(service_name: "worker").join(".")
       file_name = "worker-v#{version}.tgz"
       url = "https://storage.googleapis.com/souls-bucket/boilerplates/workers/#{file_name}"
@@ -285,7 +285,7 @@ end
       FileUtils.rm_f(file_name)
     end
 
-    def souls_worker_credit(worker_name: "mailer")
+    def souls_worker_credit(worker_name: "worker-mailer")
       line = Paint["====================================", :yellow]
       puts("\n")
       puts(line)

data/lib/souls/cli/create/templates/ruby/{index.rb → app.rb}

@@ -1,6 +1,6 @@
 module Template
   module Ruby
-    def self.index(file_name)
+    def self.app(file_name)
       <<~APP
         require "functions_framework"
         require "sinatra/base"

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

@@ -3,6 +3,7 @@ module Souls
     desc "deploy", "Deploy Cloud Functions"
     def deploy
       require(Souls.get_mother_path.to_s + "/config/souls")
+      project_id = Souls.configuration.project_id
       current_dir = FileUtils.pwd.split("/").last
       unless current_dir.match?(/^cf_/)
         Souls::Painter.error("You are at wrong dir!\nPlease go to `apps/functions` dir!")
@@ -25,6 +26,17 @@ module Souls
       system("gcloud functions describe souls_functions --project=#{project_id}")
     end
 
+    desc "delete", "Delete SOULs Functions"
+    def delete(name)
+      require(Souls.get_mother_path.to_s + "/config/souls")
+      project_id = Souls.configuration.project_id
+      system("gcloud functions delete #{name} --project=#{project_id}")
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        FileUtils.rm_rf("apps/#{name}")
+      end
+      Souls::Painter.success("Deleted #{name} functions!")
+    end
+
     desc "url", "Get SOULs Functions URL"
     def url
       require(Souls.get_mother_path.to_s + "/config/souls")

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

@@ -89,8 +89,7 @@ module Souls
 
     def update_workers_env(key:, value:, dqm: false)
       Dir.chdir(Souls.get_mother_path.to_s) do
-        workers = Dir["apps/*"]
-        workers.delete("apps/api")
+        workers = Dir["apps/worker-*"]
         workers.each do |worker_path|
           file_path = "#{worker_path}/.env"
           File.open(file_path, "a") do |line|

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

@@ -1,37 +1,38 @@
 module Souls
   class Sync < Thor
-    desc "pubsub", "Sync Worker Jobs & Google Cloud Pubsub Subscriptions"
+    desc "pubsub", "Sync Worker Jobs & Google Cloud Pubsub Topics/Subscriptions"
     def pubsub
-      get_worker_endpoints
-      Souls::Gcloud.new.config_set
-      get_topics(workers: get_workers)
+      worker_name = FileUtils.pwd.split("/").last
+
+      unless worker_name.match(/^worker-(\d|\w)+(-)*(\d|\w)+$/)
+        Souls::Painter.error("You are at wrong dir!\nPlease go to worker-* dir!")
+        return false
+      end
+
+      url = `gcloud run services list |grep souls-#{project_id}-#{worker_name}| awk '{print $4}'`.strip
+      return false if url.blank?
+
+      worker_file_names = get_workers_file_paths
+      return false if worker_file_names.blank?
+
+      sync_pubsub_topics_and_subscriptions(workers: worker_file_names, worker_url: url)
       Souls::Painter.sync("All Jobs with PubSub Subscription!")
     end
 
     private
 
-    def get_worker_endpoints
-      require("#{Souls.get_mother_path}/config/souls")
-      worker_paths = Souls.configuration.workers
-      worker_paths.each do |worker|
-        endpoint = worker[:endpoint]
-        unless endpoint.include?("https://")
-          raise(StandardError, "You need to set endpoint.\nPlease Run:\n\n$ souls sync conf\n\n")
-        end
-      end
-    end
-
-    def get_topics(workers: {})
+    def sync_pubsub_topics_and_subscriptions(worker_url:, workers: {})
       project_id = Souls.configuration.project_id
       pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
       topics = pubsub.topics
+      worker_name = FileUtils.pwd.split("/").last
 
       topic_names =
         topics.map do |topic|
           topic.name.gsub("projects/#{project_id}/topics/", "")
         end
 
-      souls_topics = topic_names.select { |n| n.include?("souls_") }
+      souls_topics = topic_names.select { |n| n.include?("souls-#{worker_name}") }
 
       souls_topics.each do |name|
         value = workers[name.to_sym] || 0
@@ -39,24 +40,25 @@ module Souls
       end
 
       workers.each do |key, value|
+        topic_id = key.to_s.gsub("_", "-")
         if value == 1
-          create_topic(topic_id: key.to_s)
-          create_push_subscription(topic_id: key.to_s)
+          create_topic(topic_id: topic_id)
+          create_push_subscription(worker_url: worker_url, topic_id: topic_id)
         end
-        delete_topic(topic_id: key.to_s) if value == -1
-        delete_subscription(topic_id: key.to_s) if value == -1
+        delete_topic(topic_id: topic_id) if value == -1
+        delete_subscription(topic_id: topic_id) if value == -1
       end
       workers
     end
 
-    def create_topic(topic_id: "mailer")
+    def create_topic(topic_id: "worker-mailer")
       project_id = Souls.configuration.project_id
       pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
       topic = pubsub.create_topic(topic_id.to_s)
       puts("Topic #{topic.name} created.")
     end
 
-    def delete_topic(topic_id: "mailer")
+    def delete_topic(topic_id: "worker-mailer")
       project_id = Souls.configuration.project_id
       pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
       topic = pubsub.topic(topic_id.to_s)
@@ -64,25 +66,18 @@ module Souls
       puts("Topic #{topic_id} deleted.")
     end
 
-    def delete_subscription(topic_id: "mailer")
+    def delete_subscription(topic_id: "worker-mailer")
       project_id = Souls.configuration.project_id
       pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
-      subscription_id = "#{topic_id}_sub"
+      subscription_id = "#{topic_id}-sub"
       subscription = pubsub.subscription(subscription_id)
       subscription.delete
     end
 
-    def create_push_subscription(topic_id: "mailer")
-      app = Souls.configuration.app
-      require("#{Souls.get_mother_path}/config/souls")
-      worker_name = topic_id.split("_")[1]
-
-      subscription_id = "#{topic_id}_sub"
-      endpoint = ""
-      worker_paths = Souls.configuration.workers
-      worker_paths.each do |worker|
-        endpoint = worker[:endpoint] if worker[:name] == "souls-#{app}-#{worker_name}"
-      end
+    def create_push_subscription(worker_url:, topic_id: "worker-mailer")
+      souls_endpoint = Souls.configuration.endpoint
+      subscription_id = "#{topic_id}-sub"
+      endpoint = "#{worker_url}/#{souls_endpoint}"
 
       project_id = Souls.configuration.project_id
       pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
@@ -93,21 +88,16 @@ module Souls
       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].split("-").last }
+    def get_workers_file_paths
+      worker_name = FileUtils.pwd.split("/").last
       response = {}
-      Dir.chdir(Souls.get_mother_path.to_s) do
-        worker_paths.each do |worker|
-          workers =
-            Dir["apps/#{worker}/app/graphql/queries/*.rb"].map do |file|
-              file.gsub("apps/#{worker}/app/graphql/queries/", "").gsub(".rb", "")
-            end
-          workers.delete("base_query")
-          workers.each do |file|
-            response[:"souls_#{worker}_#{file}"] = 1
-          end
+      workers =
+        Dir["app/graphql/queries/*.rb"].map do |file|
+          file.split("/").last.gsub(".rb", "")
         end
+      workers.delete("base_query")
+      workers.each do |file|
+        response[:"souls_#{worker_name}_#{file}"] = 1
       end
       response
     end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.16.1
+1.17.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.16.1
+1.17.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.17.0
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-03 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -183,8 +183,8 @@ files:
 - lib/souls/cli/create/templates/nodejs/package.rb
 - lib/souls/cli/create/templates/python/main.rb
 - lib/souls/cli/create/templates/python/requirements.rb
+- lib/souls/cli/create/templates/ruby/app.rb
 - lib/souls/cli/create/templates/ruby/gemfile.rb
-- lib/souls/cli/create/templates/ruby/index.rb
 - lib/souls/cli/db/create_migration.rb
 - lib/souls/cli/db/create_migration_rbs.rb
 - lib/souls/cli/db/index.rb