souls 0.42.1 → 0.44.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edd47698ca891813c0b301df870e9d89c186f6a5daf08e0b826030f9c39fac24
-  data.tar.gz: 66d83ceba816974a327d2df21202b515e50f0bb53790c211d530566a5c07ee78
+  metadata.gz: 4683c7cbb384c8385ac8d941b5a8862593998638947ee960c9b67760307b0ff6
+  data.tar.gz: dcad3dbea6875c589097f533797e74e75594c9074d5a601011ee67f300fc664c
 SHA512:
-  metadata.gz: cb4b8d58f2dbd7ded286e3fbdb937d1d83eac27d76c16c33448a321b2f5ee2e2df366436ac7cde2a5b2b45ff8bf934b5bd4236c218412c666660921bde1d0691
-  data.tar.gz: 8d917f318dceceddc9d153a8cd7e0753b458990095155620db6bd123a5b88bf0ffaebe428d53c8e148598965125cafd0d400ab072e2238111e7a964780070965
+  metadata.gz: dedb0e70d1eb1ae7913df8553b88ff38ccb72cfe2c2c8a2bc9729dfa005a7853c1754804b3518ab5448fb0e6746c36445513ef2ae9ed34eafd3fbe8d85174c89
+  data.tar.gz: 73e5c3ca22fef23e7678f4bb45c47c4ec24601ba714e41ca274c6c0c41e1bebcc3dec835ce336b0ba63866983723230c40b522babc11b489ae0fe8e8faa74c19

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

@@ -2,18 +2,21 @@ module Souls
   module Create
     class << self
       def worker(worker_name: "mailer")
-        file_dir = "apps/#{worker_name}"
-        raise(StandardError, "Same Worker Already Exist!") if Dir.exist?(file_dir)
-
-        workers = Souls.configuration.workers
-        port = 3000 + workers.size
-        download_worker(worker_name: worker_name)
-        souls_conf_update(worker_name: worker_name)
-        souls_conf_update(worker_name: worker_name, strain: "api")
-        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)
+        require("#{Souls.get_mother_path}/config/souls")
+        Dir.chdir(Souls.get_mother_path.to_s) do
+          file_dir = "apps/#{worker_name}"
+          raise(StandardError, "Same Worker Already Exist!") if Dir.exist?(file_dir)
+
+          workers = Souls.configuration.workers
+          port = 3000 + workers.size
+          download_worker(worker_name: worker_name)
+          souls_conf_update(worker_name: worker_name)
+          souls_conf_update(worker_name: worker_name, strain: "api")
+          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)
+        end
       end
 
       def procfile(worker_name: "mailer", port: 3000)
@@ -189,6 +192,7 @@ end
             Souls.configure do |config|
               config.app = "#{app_name}"
               config.project_id = "#{project_id}"
+              config.endpoint = "/endpoint"
               config.strain = "worker"
               config.fixed_gems = ["excluded_gem"]
               config.workers = []

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

@@ -7,39 +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|
-                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
+                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/model.rb

@@ -19,6 +19,8 @@ module Souls
           system("rm -rf #{old_path}", chdir: Souls.get_mother_path)
           system("mkdir -p #{old_path}", chdir: Souls.get_mother_path)
           system("cp -r #{cp_path}/* #{old_path}", chdir: Souls.get_mother_path)
+        rescue StandardError
+          # Do nothing
         end
       end
     end

data/lib/souls/init.rb

@@ -42,6 +42,7 @@ module Souls
           Souls.configure do |config|
             config.app = "#{app_name}"
             config.project_id = "#{app_name}-project"
+            config.endpoint = "/endpoint"
             config.strain = "api"
             config.fixed_gems = ["excluded_gem"]
             config.workers = []
@@ -71,6 +72,7 @@ module Souls
           Souls.configure do |config|
             config.app = "#{app_name}"
             config.project_id = "#{app_name}-project"
+            config.endpoint = "/endpoint"
             config.strain = "mother"
             config.fixed_gems = ["excluded_gem"]
             config.workers = []

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.21.1
+0.23.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.21.1
+0.23.2

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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.42.1
+  version: 0.44.2
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-06 00:00:00.000000000 Z
+date: 2021-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport