souls 0.42.0 → 0.44.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa300e5c98f77bd34a175fea19aeb7982c226f86bc5a72b4f4d2e90e53cbfb9
-  data.tar.gz: e097d76e90e34baad6dca406eea10e38d6fab705c92fc632aa9ff0ca85b7978d
+  metadata.gz: 5332b02ca046ad798b993475937f538d18af28d0e937fd0e7949410249e4c394
+  data.tar.gz: 6cce8d7bfb49388171ecc74b978a400da928231a23da6a43c320d746c53030eb
 SHA512:
-  metadata.gz: 7856cced25102ad503fee8f5d497eebd902bddfb2114c6b0e9680f152c72bffdfaf67bb4a51b38c5161ae0ddc97777e94380069c14dd984f1b83f1e0a949bcf3
-  data.tar.gz: 5bb650da465fa28e1375538c091bdc5e95ad87317cb0db5aa7861df4dbb9dfc4a7079ff3bbb4c09725137a097423b0081a209e535ed7be365fe347ae37401fd0
+  metadata.gz: 1f2a807f9a71fd245cf6b04ff646814a9ec677a85df5645fd827f8023dde60306a2f9f5ed0846abc7f1696b49a110d8e61267f6e0668cbffc97f9160d7dd1cc8
+  data.tar.gz: 984d551c3ebc578469d28edc6d6cde32c8b03484850f5108d5d54a3c49bf3e0e873a65cb6f300fa6c1acf85cf974bbef07abd9fbf003f433e3870582b8cc87c8

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,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/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.0".freeze
+  VERSION = "0.44.1".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.21.0
+0.23.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.21.0
+0.23.1

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.42.0
+  version: 0.44.1
 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