souls 0.41.2 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa53fbf9c79d49d1d58e132b0dee2b5ddc8ea26b6f0c8175e6358080907b53e9
-  data.tar.gz: 0cfca344f041fcd6f41428909dce517b432fd4e4cedb5751a6d10b45c7b8d5e1
+  metadata.gz: 10295ad8cce6115a41b8d1dc02b3a4889df8bf4f798fdf19afec48020f9af866
+  data.tar.gz: 89f8bebc45e20ac5a0dac7130d4016afc4519f122addf443748495c5e4f1296a
 SHA512:
-  metadata.gz: 80ec7918fb52d203d9dfb87c1c326f9f90acd83d24055efa824061477b82177030fe7793c25ceaf736f2acbe9a7bb824c5e99400154a36bae3ca38979152cad0
-  data.tar.gz: ee25cb4b3ae05f1af3c4b075678e50c70c1244ea320cd0826503fb15d5f83580c4d9a91a11d7e8dcf8ea25caf8f83d868d2f3dcffe07790939362816960327c7
+  metadata.gz: 899007fe8edd25ee186331a788caec03728b28a678d99739881d4999d07ccff36651b8f484fac00015b824e652298ec038a963725df067d39f4ab8307f8b05d1
+  data.tar.gz: 7a2e289db5b166bd967aa21a0c38e4c4d33a06507509b52b317d4a2e115720bb702104541a4a0cf21587d1dbb62425fb52cd5feab31b6f52e372596403d8182b

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

@@ -16,7 +16,7 @@ module Souls
         end
 
         def get_endpoint(worker_name: "")
-          system("gcloud run services list | grep #{worker_name} | awk '{print $4}'")
+          `gcloud run services list | grep #{worker_name} | awk '{print $4}'`
         end
       end
     end

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

@@ -11,7 +11,7 @@ module Souls
           )
         end
 
-        def pathch_instance(instance_name: "")
+        def patch_instance(instance_name: "")
           app_name = Souls.configuration.app
           instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
           project_id = Souls.configuration.project_id

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

@@ -7,38 +7,44 @@ module Souls
       end
 
       def update_conf(strain: "mother")
+        require("#{Souls.get_mother_path}/config/souls")
         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"
+        Dir.chdir(Souls.get_mother_path.to_s) do
+          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
+                new_line.write(line) unless worker_switch
 
-              next 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
+                new_line.write("  config.workers = [\n")
+                workers.each do |worker|
+                  base_url = Souls::Gcloud::Run.get_endpoint(worker_name: worker[:name])
+                  endpoint = Souls.configuration.endpoint
+                  new_line.write(<<-TEXT)
+      {
+        name: "#{worker[:name]}",
+        endpoint: "#{base_url.strip}#{endpoint}",
+        port: #{worker[:port]}
+      },
+                  TEXT
+                end
+                break
               end
-              break
             end
+            new_line.write(<<~TEXT)
+                ]
+              end
+            TEXT
           end
-          new_line.write(<<-TEXT)
-  ]
-end
-          TEXT
+          FileUtils.rm(file_path)
+          FileUtils.mv(new_file_path, file_path)
         end
       end
     end

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

@@ -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.41.2".freeze
+  VERSION = "0.43.0".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.20.2
+0.22.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.20.2
+0.22.0

data/lib/souls/worker/generate/mailer.rb

@@ -13,37 +13,35 @@ module Souls
         private
 
         def mailgun_mailer(class_name: "mailer")
-          file_dir = "./app/graphql/mutations/mailers/"
+          file_dir = "./app/graphql/mutations/"
           FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-          file_path = "#{file_dir}#{class_name.singularize}_mailer.rb"
+          file_path = "#{file_dir}#{class_name.singularize}.rb"
           raise(StandardError, "Mailer already exist! #{file_path}") if File.exist?(file_path)
 
           File.open(file_path, "w") do |f|
             f.write(<<~TEXT)
               module Mutations
-                module Mailers
-                  class #{class_name.camelize}Mailer < BaseMutation
-                    description "Mail を送信します。"
-                    field :response, String, null: false
+                class #{class_name.camelize} < BaseMutation
+                  description "Mail を送信します。"
+                  field :response, String, null: false
 
-                    def resolve
-                      # First, instantiate the Mailgun Client with your API key
-                      mg_client = ::Mailgun::Client.new("YOUR-API-KEY")
+                  def resolve
+                    # First, instantiate the Mailgun Client with your API key
+                    mg_client = ::Mailgun::Client.new("YOUR-API-KEY")
 
-                      # Define your message parameters
-                      message_params = {
-                        from: "postmaster@YOUR-DOMAIN",
-                        to: "sending@to.mail.com",
-                        subject: "SOULs Mailer test!",
-                        text: "It is really easy to send a message!"
-                      }
+                    # Define your message parameters
+                    message_params = {
+                      from: "postmaster@YOUR-DOMAIN",
+                      to: "sending@to.mail.com",
+                      subject: "SOULs Mailer test!",
+                      text: "It is really easy to send a message!"
+                    }
 
-                      # Send your message through the client
-                      mg_client.send_message("YOUR-MAILGUN-DOMAIN", message_params)
-                      { response: "Job done!" }
-                    rescue StandardError => e
-                      GraphQL::ExecutionError.new(e.to_s)
-                    end
+                    # Send your message through the client
+                    mg_client.send_message("YOUR-MAILGUN-DOMAIN", message_params)
+                    { response: "Job done!" }
+                  rescue StandardError => e
+                    GraphQL::ExecutionError.new(e.to_s)
                   end
               end
             TEXT

data/lib/souls/worker/generate/mutation.rb

@@ -5,13 +5,13 @@ module Souls
         def mutation(class_name: "csv_export")
           file_dir = "./app/graphql/mutations/"
           FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-          file_path = "#{file_dir}#{class_name.singularize}_job.rb"
+          file_path = "#{file_dir}#{class_name.singularize}.rb"
           raise(StandardError, "Mailer already exist! #{file_path}") if File.exist?(file_path)
 
           File.open(file_path, "w") do |f|
             f.write(<<~TEXT)
               module Mutations
-                class #{class_name.camelize}Job < BaseMutation
+                class #{class_name.camelize} < BaseMutation
                   description "Job Description"
                   field :response, String, null: false
 

data/lib/souls.rb

@@ -247,14 +247,13 @@ module Souls
   end
 
   class Configuration
-    attr_accessor :app, :strain, :project_id, :github_repo, :worker_endpoint, :fixed_gems, :workers
+    attr_accessor :app, :strain, :project_id, :endpoint, :fixed_gems, :workers
 
     def initialize
       @app = nil
       @project_id = nil
+      @endpoint = nil
       @strain = nil
-      @github_repo = nil
-      @worker_endpoint = nil
       @fixed_gems = nil
       @workers = nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.41.2
+  version: 0.43.0
 platform: ruby
 authors:
 - POPPIN-FUMI