souls 0.48.1 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa05b4d9e6f1e1dcfa5dc51d60048bf7724cf9bec95febac0426b3a6ea362b9f
-  data.tar.gz: edcac235aa2f1f760df232a4a2e77805428f1380a26dbafc52257ffa2f7d3c81
+  metadata.gz: a7367fa762682e76ba67083cf1b6d602de00187a21a556c1e9a42c92cf50a154
+  data.tar.gz: a669713a544dea89c5481049ecd88bcb256cce2d571ba284998205563f3d7fb9
 SHA512:
-  metadata.gz: 302038e0b74ebe5552a08708c1f0d483ce0709ec75fee545bed16d056497fcd452d35d3d9f7b7b34b1cc43962fd5117cebe5b95f74f55139ab52e63ec74eafb3
-  data.tar.gz: 6ee9dc50622a972abc5a2d68b6c006babc4f50c3eb12267697a02e2ebd381e8f0ff635da1e4dadb5b003369f8c7c18dd752b9c9304f7a866b88f25dc3a668176
+  metadata.gz: 943d98643861cab7f4a4f6b87f14f3e8704fd25bfff163c57a8998d12379935aea9680b41c7c540470f189878c8eb5dfeace448e2c36c65b73ce89f0b93ce98d
+  data.tar.gz: df0a5eaba3954eb7b7c2a2dc1b3f8e9393598a1eb2ec52c47c418f3ad2e7c2ba657c883e6b234c685e3e756c8d1e99d7412df9204851199099f8962dfb8989c6

data/exe/souls

@@ -10,37 +10,39 @@ begin
   case souls_command
   when "api"
     api_command = ARGV[1]
-    case api_command
-    when "generate", "g"
-      method_name = ARGV[2]
-      class_name = ARGV[3]
-      args = { class_name: class_name }
-      args[:mutation] = ARGV[4] if ARGV.size > 4
-      status = Paint["Running SOULs Generate Commands...", :yellow]
-      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
-        Whirly.status = status
-        Souls::Api::Generate.public_send(method_name, **args)
-        Whirly.status = "Done!"
-      end
-    when "update"
-      class_name = ARGV[2]
-      status = Paint["Running SOULs Update Commands...", :yellow]
-      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
-        Whirly.status = status
-        Souls::Api::Update.create_mutation(class_name: class_name)
-        Souls::Api::Update.update_mutation(class_name: class_name)
-        Souls::Api::Update.resolver(class_name: class_name)
-        Souls::Api::Update.type(class_name: class_name)
-        Souls::Api::Update.rspec_factory(class_name: class_name)
-        Souls::Api::Update.rspec_mutation(class_name: class_name)
-        Souls::Api::Update.rspec_resolver(class_name: class_name)
-        Whirly.status = "Done!"
+    Dir.chdir(Souls.get_api_path.to_s) do
+      case api_command
+      when "generate", "g"
+        method_name = ARGV[2]
+        class_name = ARGV[3]
+        args = { class_name: class_name }
+        args[:mutation] = ARGV[4] if ARGV.size > 4
+        status = Paint["Running SOULs Generate Commands...", :yellow]
+        Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+          Whirly.status = status
+          Souls::Api::Generate.public_send(method_name, **args)
+          Whirly.status = "Done!"
+        end
+      when "update"
+        class_name = ARGV[2]
+        status = Paint["Running SOULs Update Commands...", :yellow]
+        Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+          Whirly.status = status
+          Souls::Api::Update.create_mutation(class_name: class_name)
+          Souls::Api::Update.update_mutation(class_name: class_name)
+          Souls::Api::Update.resolver(class_name: class_name)
+          Souls::Api::Update.type(class_name: class_name)
+          Souls::Api::Update.rspec_factory(class_name: class_name)
+          Souls::Api::Update.rspec_mutation(class_name: class_name)
+          Souls::Api::Update.rspec_resolver(class_name: class_name)
+          Whirly.status = "Done!"
+        end
+      when "d", "delete"
+        class_name = ARGV[2]
+        Souls::Api::Generate.delete_all(class_name: class_name)
+      else
+        puts(Paint["Comannd doesn't exist.Check you command again!...", :red])
       end
-    when "d", "delete"
-      class_name = ARGV[2]
-      Souls::Api::Generate.delete_all(class_name: class_name)
-    else
-      puts(Paint["Comannd doesn't exist.Check you command again!...", :red])
     end
   when "worker"
     api_command = ARGV[1]

data/lib/souls/api/generate/application.rb

@@ -27,21 +27,6 @@ module Souls
         ]
       end
 
-      def get_type_and_name(line)
-        line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-      end
-
-      def get_tables
-        path = "./db/schema.rb"
-        tables = []
-        File.open(path, "r") do |f|
-          f.each_line.with_index do |line, _i|
-            tables << line.split("\"")[1] if line.include?("create_table")
-          end
-        end
-        tables
-      end
-
       def test_dir
         FileUtils.mkdir_p("./app/graphql/mutations")
         FileUtils.mkdir_p("./app/graphql/queries")
@@ -62,54 +47,6 @@ module Souls
         puts("test dir created!")
       end
 
-      def type_check(type)
-        {
-          bigint: "Integer",
-          string: "String",
-          float: "Float",
-          text: "String",
-          datetime: "String",
-          date: "String",
-          boolean: "Boolean",
-          integer: "Integer"
-        }[type.to_sym]
-      end
-
-      def get_type(type)
-        {
-          bigint: "Integer",
-          string: "String",
-          float: "Float",
-          text: "String",
-          datetime: "GraphQL::Types::ISO8601DateTime",
-          date: "GraphQL::Types::ISO8601DateTime",
-          boolean: "Boolean",
-          integer: "Integer"
-        }[type.to_sym]
-      end
-
-      def get_test_type(type)
-        {
-          bigint: "rand(1..10)",
-          float: 4.2,
-          string: '"MyString"',
-          text: '"MyString"',
-          datetime: "Time.now",
-          date: "Time.now.strftime('%F')",
-          boolean: false,
-          integer: "rand(1..10)"
-        }[type.to_sym]
-      end
-
-      def table_check(line: "", class_name: "")
-        if line.include?("create_table") && (line.split[1].gsub("\"", "").gsub(",", "") == class_name.pluralize.to_s)
-
-          return true
-        end
-
-        false
-      end
-
       def scaffold(class_name: "user")
         singularized_class_name = class_name.singularize
         model(class_name: singularized_class_name)
@@ -133,7 +70,7 @@ module Souls
 
       def scaffold_all
         puts(Paint["Let's Go SOULs AUTO CRUD Assist!\n", :cyan])
-        Souls::Api::Generate.get_tables.each do |table|
+        Souls.get_tables.each do |table|
           Souls::Api::Generate.scaffold(class_name: table.singularize)
           puts(Paint["Generated #{table.camelize} CRUD Files\n", :yellow])
         end

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

@@ -48,7 +48,7 @@ module Souls
                 end
                 field = "[String]" if line.include?("array: true")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                field ||= type_check(type)
+                field ||= Souls.type_check(type)
                 case name
                 when "user_id"
                   @user_exist = true
@@ -61,7 +61,7 @@ module Souls
                   new_line.write("      argument :#{name}, #{field}, required: false\n")
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end
@@ -144,7 +144,7 @@ module Souls
                 end
                 field = "[String]" if line.include?("array: true")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                field ||= type_check(type)
+                field ||= Souls.type_check(type)
                 case name
                 when "user_id"
                   @user_exist = true
@@ -157,7 +157,7 @@ module Souls
                   new_line.write("      argument :#{name}, #{field}, required: false\n")
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end

data/lib/souls/api/generate/resolver.rb

@@ -34,8 +34,8 @@ module Souls
                 break if line.include?("t.index") || line.strip == "end"
 
                 field = "[String]" if line.include?("array: true")
-                type, name = get_type_and_name(line)
-                field ||= type_check(type)
+                type, name = Souls.get_type_and_name(line)
+                field ||= Souls.type_check(type)
                 case name
                 when "user_id"
                   @user_exist = true
@@ -48,7 +48,7 @@ module Souls
                   new_line.write("      argument :#{name}, #{field}, required: false\n")
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end
@@ -89,7 +89,7 @@ module Souls
               if @on
                 break if line.include?("t.index") || line.strip == "end"
 
-                type, name = get_type_and_name(line)
+                type, name = Souls.get_type_and_name(line)
                 if line.include?("array: true")
                   new_line.write(
                     "      scope = scope.where(\"#{name} @> ARRAY[?]::text[]\", value[:#{name}]) if value[:#{name}]\n"
@@ -115,7 +115,7 @@ module Souls
                   end
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end

data/lib/souls/api/generate/rspec_factory.rb

@@ -24,7 +24,7 @@ module Souls
                 new_line.write("\n" && break) if line.include?("t.index") || line.strip == "end"
                 field = '["tag1", "tag2", "tag3"]' if line.include?("array: true")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                field ||= get_test_type(type)
+                field ||= Souls.get_test_type(type)
                 if type == "bigint" && name.include?("_id")
                   id_name = name.gsub("_id", "")
                   new_line.write("    association :#{id_name}, factory: :#{id_name}\n")
@@ -32,7 +32,7 @@ module Souls
                   new_line.write("    #{name} { #{field} }\n")
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end

data/lib/souls/api/generate/rspec_mutation.rb

@@ -58,7 +58,7 @@ module Souls
                   new_line.write("    let(:#{relation_col}) { FactoryBot.create(:#{relation_col}) }\n")
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end
@@ -113,7 +113,7 @@ module Souls
                   end
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end
@@ -193,7 +193,7 @@ module Souls
                   end
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end
@@ -217,7 +217,7 @@ module Souls
                   break
                 end
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                field ||= type_check(type)
+                field ||= Souls.type_check(type)
                 array_true = line.include?("array: true")
                 case name
                 when "user_id", "created_at", "updated_at", /$*_id\z/
@@ -245,7 +245,7 @@ module Souls
                   end
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end

data/lib/souls/api/generate/rspec_query.rb

@@ -56,7 +56,7 @@ module Souls
                   new_line.write("    let(:#{relation_col}) { FactoryBot.create(:#{relation_col}) }\n")
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end
@@ -101,7 +101,7 @@ module Souls
                   new_line.write("          #{name.camelize(:lower)}\n")
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end
@@ -125,7 +125,7 @@ module Souls
                   break
                 end
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                field ||= type_check(type)
+                field ||= Souls.type_check(type)
                 array_true = line.include?("array: true")
                 case name
                 when "user_id", "created_at", "updated_at", /$*_id\z/
@@ -145,7 +145,7 @@ module Souls
                   end
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end

data/lib/souls/api/generate/rspec_resolver.rb

@@ -64,7 +64,7 @@ module Souls
                   new_line.write("    let(:#{relation_col}) { FactoryBot.create(:#{relation_col}) }\n")
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end
@@ -120,7 +120,7 @@ module Souls
                   new_line.write("              #{name.camelize(:lower)}\n")
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end
@@ -144,7 +144,7 @@ module Souls
                   break
                 end
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                field ||= type_check(type)
+                field ||= Souls.type_check(type)
                 array_true = line.include?("array: true")
                 case name
                 when "user_id", "created_at", "updated_at", /$*_id\z/
@@ -172,7 +172,7 @@ module Souls
                   end
                 end
               end
-              @on = true if table_check(line: line, class_name: class_name)
+              @on = true if Souls.table_check(line: line, class_name: class_name)
             end
           end
         end

data/lib/souls/api/generate/type.rb

@@ -27,7 +27,7 @@ module Souls
                 new_line.write("\n" && break) if line.include?("t.index") || line.strip == "end"
                 field = "[String]" if line.include?("array: true")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-                field ||= type_check(type)
+                field ||= Souls.type_check(type)
                 case name
                 when /$*_id\z/
                   new_line.write(
@@ -43,7 +43,7 @@ module Souls
                   new_line.write("    field :#{name}, #{field}, null: true\n")
                 end
               end
-              if table_check(line: line, class_name: class_name)
+              if Souls.table_check(line: line, class_name: class_name)
                 @on = true
                 new_line.write("    global_id_field :id\n")
               end

data/lib/souls/api/update/mutation.rb

@@ -16,7 +16,7 @@ module Souls
                 next unless line.include?("argument") && !argument
 
                 new_cols.each do |col|
-                  type = Souls::Api::Generate.type_check(col[:type])
+                  type = Souls.type_check(col[:type])
                   type = "[#{type}]" if col[:array]
                   args = check_mutation_argument(class_name: class_name)
                   next if args.include?(col[:column_name])
@@ -47,7 +47,7 @@ module Souls
                 next unless line.include?("argument") && !argument
 
                 new_cols.each do |col|
-                  type = Souls::Api::Generate.type_check(col[:type])
+                  type = Souls.type_check(col[:type])
                   type = "[#{type}]" if col[:array]
                   args = check_mutation_argument(class_name: class_name, action: "update")
                   next if args.include?(col[:column_name])

data/lib/souls/api/update/resolver.rb

@@ -18,7 +18,7 @@ module Souls
                 new_line.write(line)
                 if line.include?("argument") && !argument
                   new_cols.each do |col|
-                    type = Souls::Api::Generate.type_check(col[:type])
+                    type = Souls.type_check(col[:type])
                     type = "[#{type}]" if col[:array]
                     add_line = "      argument :#{col[:column_name]}, #{type}, required: false\n"
                     new_line.write(add_line) unless args.include?(col[:column_name])
@@ -26,7 +26,7 @@ module Souls
                   argument = true
                 elsif line.include?("scope = ::") && !scope
                   new_cols.each do |col|
-                    type = Souls::Api::Generate.type_check(col[:type])
+                    type = Souls.type_check(col[:type])
                     type = "[#{type}]" if col[:array]
 
                     if type.include?("[")

data/lib/souls/api/update/rspec_factory.rb

@@ -19,7 +19,7 @@ module Souls
                 new_cols.each do |col|
                   next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
 
-                  type = Souls::Api::Generate.get_test_type(col[:type])
+                  type = Souls.get_test_type(col[:type])
                   type = "[#{type}]" if col[:array]
                   args = check_factory_argument(class_name: class_name)
 

data/lib/souls/api/update/rspec_mutation.rb

@@ -22,7 +22,7 @@ module Souls
 
                 if line.include?('#{') && !argument
                   new_cols.each do |col|
-                    type = Souls::Api::Generate.type_check(col[:type])
+                    type = Souls.type_check(col[:type])
                     next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
 
                     type_line =
@@ -46,7 +46,7 @@ module Souls
                 elsif test_res && line.include?("=> be_")
                   test_args = check_rspec_mutation_argument(class_name: class_name, action: "test_args")
                   new_cols.each do |col|
-                    type = Souls::Api::Generate.type_check(col[:type])
+                    type = Souls.type_check(col[:type])
                     text =
                       case type
                       when "Integer", "Float"

data/lib/souls/api/update/rspec_resolver.rb

@@ -30,7 +30,7 @@ module Souls
                 elsif test_res && line.include?("=> be_")
                   test_args = check_rspec_resolver_argument(class_name: class_name, action: "test_args")
                   new_cols.each do |col|
-                    type = Souls::Api::Generate.type_check(col[:type])
+                    type = Souls.type_check(col[:type])
                     text =
                       case type
                       when "Integer", "Float"

data/lib/souls/api/update/type.rb

@@ -16,7 +16,7 @@ module Souls
                 next unless line.include?("field") && !argument
 
                 new_cols.each do |col|
-                  type = Souls::Api::Generate.get_type(col[:type])
+                  type = Souls.get_type(col[:type])
                   type = "[#{type}]" if col[:array]
                   args = check_type_argument(class_name: class_name)
                   unless args.include?(col[:column_name])

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

@@ -23,7 +23,7 @@ module Souls
         file_dir = "apps/#{worker_name}"
         file_path = "#{file_dir}/Procfile.dev"
         File.open(file_path, "w") do |f|
-          f.write("web: bundle exec puma -p #{port} -e development")
+          f.write("#{worker_name}: bundle exec puma -p #{port} -e development")
         end
       end
 
@@ -192,9 +192,10 @@ end
             Souls.configure do |config|
               config.app = "#{app_name}"
               config.project_id = "#{project_id}"
+              config.region = "asia-northeast1"
               config.endpoint = "/endpoint"
               config.strain = "worker"
-              config.fixed_gems = ["excluded_gem"]
+              config.fixed_gems = ["spring"]
               config.workers = []
             end
           TEXT
@@ -204,20 +205,12 @@ end
       end
 
       def download_worker(worker_name: "mailer")
-        raise(StandardError, "Can't use `worker` for worker. Change Name.") if worker_name == "worker"
-
-        current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
-        wrong_dir = %w[apps api worker]
-        if wrong_dir.include?(current_dir_name)
-          raise(StandardError, "You are at wrong directory!Go to Mother Directory!")
-        end
-
         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}"
         system("curl -OL #{url}")
-        system("tar -zxvf ./#{file_name} -C ./apps/")
-        system("mv apps/worker apps/#{worker_name}")
+        system("tar -zxvf ./#{file_name}")
+        system("mv ./worker apps/#{worker_name}")
         system("cp ./apps/api/config/database.yml ./apps/#{worker_name}/config/")
         FileUtils.rm(file_name)
       end

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

@@ -2,50 +2,52 @@ module Souls
   module Gcloud
     module Compute
       class << self
-        def setup_vpc_nat(app_name: "", region: "asia-northeast1", range: "10.124.0.0/28")
-          create_network(app_name: app_name)
-          create_firewall_tcp(app_name: app_name, range: range)
-          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)
+        def setup_vpc_nat(range: "10.124.0.0/28")
+          create_network
+          create_firewall_tcp(range: range)
+          create_firewall_ssh
+          create_subnet(range: range)
+          create_connector
+          create_router
+          create_external_ip
+          create_nat
+          nat_credit
         end
 
-        def create_network(app_name: "")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_network
+          app_name = Souls.configuration.app
           system("gcloud compute networks create #{app_name}")
         end
 
-        def create_firewall_tcp(app_name: "", range: "10.124.0.0/28")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_firewall_tcp(range: "10.124.0.0/28")
+          app_name = Souls.configuration.app
           system(
             "gcloud compute firewall-rules create #{app_name} \
                   --network #{app_name} --allow tcp,udp,icmp --source-ranges #{range}"
           )
         end
 
-        def create_firewall_ssh(app_name: "")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_firewall_ssh
+          app_name = Souls.configuration.app
           system(
             "gcloud compute firewall-rules create #{app_name}-ssh --network #{app_name} \
             --allow tcp:22,tcp:3389,icmp"
           )
         end
 
-        def create_subnet(app_name: "", region: "asia-northeast1", range: "10.124.0.0/28")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_subnet(range: "10.124.0.0/28")
+          app_name = Souls.configuration.app
+          region = Souls.configuration.region
           system(
             "gcloud compute networks subnets create #{app_name}-subnet \
             --range=#{range} --network=#{app_name} --region=#{region}"
           )
         end
 
-        def create_connector(app_name: "", region: "asia-northeast1")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_connector
+          app_name = Souls.configuration.app
           project_id = Souls.configuration.project_id
+          region = Souls.configuration.region
           system(
             "gcloud compute networks vpc-access connectors create #{app_name}-connector \
               --region=#{region} \
@@ -54,18 +56,21 @@ module Souls
           )
         end
 
-        def create_router(app_name: "", region: "asia-northeast1")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_router
+          app_name = Souls.configuration.app
+          region = Souls.configuration.region
           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?
+        def create_external_ip
+          app_name = Souls.configuration.app
+          region = Souls.configuration.region
           system("gcloud compute addresses create #{app_name}-worker-ip --region=#{region}")
         end
 
-        def create_nat(app_name: "", region: "asia-northeast1")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_nat
+          app_name = Souls.configuration.app
+          region = Souls.configuration.region
           system(
             "gcloud compute routers nats create #{app_name}-worker-nat \
                   --router=#{app_name}-router \
@@ -79,8 +84,8 @@ module Souls
           system("gcloud compute network list")
         end
 
-        def nat_credit(app_name: "")
-          app_name = Souls.configuration.app if app_name.blank?
+        def nat_credit
+          app_name = Souls.configuration.app
           line = Paint["====================================", :yellow]
           puts("\n")
           puts(line)

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

@@ -2,8 +2,10 @@ module Souls
   module Gcloud
     module Sql
       class << self
-        def create_instance(instance_name: "", root_pass: "Postgre123!", zone: "asia-northeast1-b")
+        def create_instance(root_pass: "PassWord")
           instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
+          region = Souls.configuration.region
+          zone = "#{region}-b"
           system(
             "gcloud sql instances create #{instance_name} \
               --database-version=POSTGRES_13 --cpu=2 --memory=7680MB --zone=#{zone} \
@@ -15,12 +17,16 @@ module Souls
           system("gcloud sql instances list")
         end
 
-        def setup_private_ip(instance_name: "")
-          app_name = Souls.configuration.app
-          instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
-          project_id = Souls.configuration.project_id
+        def setup_private_ip
           create_ip_range
           create_vpc_connector
+          assign_network
+        end
+
+        def assign_network
+          app_name = Souls.configuration.app
+          instance_name = "#{Souls.configuration.app}-db"
+          project_id = Souls.configuration.project_id
           system("gcloud beta sql instances patch #{instance_name} --project=#{project_id} --network=#{app_name}")
         end
 

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

@@ -42,10 +42,11 @@ module Souls
           f.write(<<~TEXT)
             Souls.configure do |config|
               config.app = "#{app_name}"
-              config.project_id = "#{app_name}-project"
+              config.project_id = "#{app_name}"
+              config.region = "asia-northeast1"
               config.endpoint = "/endpoint"
               config.strain = "api"
-              config.fixed_gems = ["excluded_gem"]
+              config.fixed_gems = ["spring"]
               config.workers = []
             end
           TEXT
@@ -72,10 +73,11 @@ module Souls
           f.write(<<~TEXT)
             Souls.configure do |config|
               config.app = "#{app_name}"
-              config.project_id = "#{app_name}-project"
+              config.project_id = "#{app_name}"
+              config.region = "asia-northeast1"
               config.endpoint = "/endpoint"
               config.strain = "mother"
-              config.fixed_gems = ["excluded_gem"]
+              config.fixed_gems = ["spring"]
               config.workers = []
             end
           TEXT

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

@@ -24,16 +24,26 @@ module Souls
                 next unless worker_switch
 
                 new_line.write("  config.workers = [\n")
-                workers.each do |worker|
+                workers.each_with_index do |worker, i|
                   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
+                  if (i + 1) == workers.size
+                    new_line.write(<<-TEXT)
+    {
+      name: "#{worker[:name]}",
+      endpoint: "#{base_url.strip}#{endpoint}",
+      port: #{worker[:port]}
+    }
+                    TEXT
+                  else
+                    new_line.write(<<-TEXT)
+    {
+      name: "#{worker[:name]}",
+      endpoint: "#{base_url.strip}#{endpoint}",
+      port: #{worker[:port]}
+    },
+                    TEXT
+                  end
                 end
                 break
               end

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

@@ -59,7 +59,8 @@ module Souls
         pubsub = Google::Cloud::Pubsub.new
 
         topic = pubsub.topic(topic_id)
-        topic.subscribe(subscription_id, endpoint: endpoint)
+        sub = topic.subscribe(subscription_id, endpoint: endpoint, deadline: 20)
+        sub.expires_in = nil
         puts("Push subscription #{subscription_id} created.")
       end
 

data/lib/souls/utils/index.rb

@@ -8,6 +8,69 @@ module Souls
       FileUtils.pwd.split(Souls.configuration.app)[0] + Souls.configuration.app + "/apps/api"
     end
 
+    def type_check(type)
+      {
+        bigint: "Integer",
+        string: "String",
+        float: "Float",
+        text: "String",
+        datetime: "String",
+        date: "String",
+        boolean: "Boolean",
+        integer: "Integer"
+      }[type.to_sym]
+    end
+
+    def get_type_and_name(line)
+      line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
+    end
+
+    def get_type(type)
+      {
+        bigint: "Integer",
+        string: "String",
+        float: "Float",
+        text: "String",
+        datetime: "GraphQL::Types::ISO8601DateTime",
+        date: "GraphQL::Types::ISO8601DateTime",
+        boolean: "Boolean",
+        integer: "Integer"
+      }[type.to_sym]
+    end
+
+    def get_test_type(type)
+      {
+        bigint: "rand(1..10)",
+        float: 4.2,
+        string: '"MyString"',
+        text: '"MyString"',
+        datetime: "Time.now",
+        date: "Time.now.strftime('%F')",
+        boolean: false,
+        integer: "rand(1..10)"
+      }[type.to_sym]
+    end
+
+    def get_tables
+      path = "./db/schema.rb"
+      tables = []
+      File.open(path, "r") do |f|
+        f.each_line.with_index do |line, _i|
+          tables << line.split("\"")[1] if line.include?("create_table")
+        end
+      end
+      tables
+    end
+
+    def table_check(line: "", class_name: "")
+      if line.include?("create_table") && (line.split[1].gsub("\"", "").gsub(",", "") == class_name.pluralize.to_s)
+
+        return true
+      end
+
+      false
+    end
+
     def version_detector(current_ver: [0, 0, 1], update_kind: "patch")
       case update_kind
       when "patch"
@@ -45,7 +108,7 @@ module Souls
           if class_check_flag == true && !line.include?("create_table")
             return cols if line.include?("t.index") || line.strip == "end"
 
-            types = Souls::Api::Generate.get_type_and_name(line)
+            types = Souls.get_type_and_name(line)
             array = line.include?("array: true")
             cols << { column_name: types[1], type: types[0], array: array }
           end
@@ -69,7 +132,7 @@ module Souls
           next unless class_check_flag == true && !line.include?("create_table")
           return response if line.include?("t.timestamps") || line.strip == "end"
 
-          types = Souls::Api::Generate.get_type_and_name(line)
+          types = Souls.get_type_and_name(line)
           types.map { |n| n.gsub!(":", "") }
           array = line.include?("array: true")
           response << { column_name: types[1], type: types[0], array: array }

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.27.1
+0.30.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.27.1
+0.30.0

metadata

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