souls 0.60.0 → 0.61.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70d25691a6e93376b3393efc7b95c0585995bf1611cce81b463a4db3f17497ca
-  data.tar.gz: 0a1fe1bcc547ad5c41d85a5bf814157f171eb5aec5f8b1ce5f847bf509a6a6fd
+  metadata.gz: 630be09191b9f58ffab7b304d247f4c5b8bc07e6f75c224badce92e946d4e35a
+  data.tar.gz: aec39e44cc2a9bf871290b5abd310d7b287b0dabb2c774a7ad4bf19fe5eb837a
 SHA512:
-  metadata.gz: 01fdbaa3e67ed0cfc1d4a78c56e55046f4e3bf3c413e7170eefb9b2ffb661cd86721140553e01807a9fe82db553003c7b108b90081ec9ca77b336e70c579577c
-  data.tar.gz: 8d83326353d091c5655ff463ee1d7e72582d8a66be7c40567206811b3b4b1a4f25c2796ec3362fa01f7142b8651f60a60c76cd4852e6b4032f3cabc49102bf08
+  metadata.gz: e7f386e93badfffc73c33a66079765644592357a18314f801299e7a3f63293b7379738fe874601263734e1cd658337862e378375221a897c7188dc79ee4c35f9
+  data.tar.gz: df0659b22c6a7d76b15c3413535c80fb014bfd497ced5ebbd01184bafacdca24a6c460097b39698f4e5bf56ceeb102c863b860ba12ac81130e844b41382fb33e

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

@@ -1,6 +1,6 @@
 module Souls
-  class CLI < Thor
-    desc "db:migrate", "Migrate Database"
+  class DB < Thor
+    desc "migrate", "Migrate Database"
     method_option :env, aliases: "--e", default: "development", desc: "Difine APP Enviroment - development | production"
     def migrate
       case options[:env]
@@ -15,9 +15,9 @@ module Souls
       raise(Thor::Error, e)
     end
 
-    desc "db:create", "Create Database"
+    desc "create", "Create Database"
     method_option :env, aliases: "--e", default: "development", desc: "Difine APP Enviroment - development | production"
-    def db_create
+    def create
       case options[:env]
       when "production"
         system("rake db:create RACK_ENV=production")
@@ -29,7 +29,7 @@ module Souls
       raise(Thor::Error, e)
     end
 
-    desc "db:seed", "Insert Seed Data"
+    desc "seed", "Insert Seed Data"
     method_option :env, aliases: "--e", default: "development", desc: "Difine APP Enviroment - development | production"
     def seed
       case options[:env]
@@ -43,7 +43,7 @@ module Souls
       raise(Thor::Error, e)
     end
 
-    desc "db:migrate:reset", "Reset Database"
+    desc "migrate_reset", "Reset Database"
     method_option :env, aliases: "--e", default: "development", desc: "Difine APP Enviroment - development | production"
     def migrate_reset
       case options[:env]
@@ -57,7 +57,7 @@ module Souls
       raise(Thor::Error, e)
     end
 
-    desc "db:create_migration [CLASS_NAME]", "Create ActiveRecord Migration File"
+    desc "create_migration [CLASS_NAME]", "Create ActiveRecord Migration File"
     def create_migration(class_name)
       pluralized_class_name = class_name.underscore.pluralize
       system("rake db:create_migration NAME=create_#{pluralized_class_name}")
@@ -79,7 +79,7 @@ module Souls
       raise(Thor::Error, e)
     end
 
-    desc "db:add_column [CLASS_NAME]", "Create ActiveRecord Migration File"
+    desc "add_column [CLASS_NAME]", "Create ActiveRecord Migration File"
     def add_column(class_name)
       pluralized_class_name = class_name.underscore.pluralize
       system("rake db:create_migration NAME=add_column_to_#{pluralized_class_name}")
@@ -87,7 +87,7 @@ module Souls
       raise(Thor::Error, e)
     end
 
-    desc "db:rename_column [CLASS_NAME]", "Create ActiveRecord Migration File"
+    desc "rename_column [CLASS_NAME]", "Create ActiveRecord Migration File"
     def rename_column(class_name)
       pluralized_class_name = class_name.underscore.pluralize
       system("rake db:create_migration NAME=rename_column_to_#{pluralized_class_name}")
@@ -95,7 +95,7 @@ module Souls
       raise(Thor::Error, e)
     end
 
-    desc "db:change_column [CLASS_NAME]", "Create ActiveRecord Migration File"
+    desc "change_column [CLASS_NAME]", "Create ActiveRecord Migration File"
     def change_column(class_name)
       pluralized_class_name = class_name.underscore.pluralize
       system("rake db:create_migration NAME=change_column_to_#{pluralized_class_name}")
@@ -103,7 +103,7 @@ module Souls
       raise(Thor::Error, e)
     end
 
-    desc "db:remove_column [CLASS_NAME]", "Create ActiveRecord Migration File"
+    desc "remove_column [CLASS_NAME]", "Create ActiveRecord Migration File"
     def remove_column(class_name)
       pluralized_class_name = class_name.underscore.pluralize
       system("rake db:create_migration NAME=remove_column_to_#{pluralized_class_name}")
@@ -111,7 +111,7 @@ module Souls
       raise(Thor::Error, e)
     end
 
-    desc "db:drop_table [CLASS_NAME]", "Create ActiveRecord Migration File"
+    desc "drop_table [CLASS_NAME]", "Create ActiveRecord Migration File"
     def drop_table(class_name)
       pluralized_class_name = class_name.underscore.pluralize
       system("rake db:create_migration NAME=drop_table_to_#{pluralized_class_name}")

data/lib/souls/{api → cli}/generate/application.rb

@@ -1,40 +1,29 @@
 module Souls
   class Generate < Thor
     desc "scaffold [CLASS_NAME]", "Generate Scaffold from schema.rb"
+    method_option :rbs, type: :boolean, aliases: "--rbs", default: false, desc: "Generates Only RBS Files"
     def scaffold(class_name)
       singularized_class_name = class_name.singularize
-      model(singularized_class_name)
-      model_rbs(singularized_class_name)
-      type(singularized_class_name)
-      type_rbs(singularized_class_name)
-      query(singularized_class_name)
-      query_rbs(singularized_class_name)
-      mutation(singularized_class_name)
-      mutation_rbs(singularized_class_name)
-      policy(singularized_class_name)
-      policy_rbs(singularized_class_name)
-      edge(singularized_class_name)
-      edge_rbs(singularized_class_name)
-      connection(singularized_class_name)
-      connection_rbs(singularized_class_name)
-      resolver(singularized_class_name)
-      resolver_rbs(singularized_class_name)
-      rspec_factory(singularized_class_name)
-      rspec_model(singularized_class_name)
-      rspec_mutation(singularized_class_name)
-      rspec_query(singularized_class_name)
-      rspec_resolver(singularized_class_name)
-      rspec_policy(singularized_class_name)
+      if options[:rbs]
+        run_scaffold(class_name: singularized_class_name)
+      else
+        run_rbs_scaffold(class_name: singularized_class_name)
+      end
       true
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
 
     desc "scaffold_all", "Generate Scaffold All Tables from schema.rb"
+    method_option :rbs, type: :boolean, aliases: "--rbs", default: false, desc: "Generates Only RBS All Schema Files"
     def scaffold_all
       puts(Paint["Let's Go SOULs AUTO CRUD Assist!\n", :cyan])
       Souls.get_tables.each do |table|
-        Souls::Generate.new.scaffold(table.singularize)
+        if options[:rbs]
+          Souls::Generate.new.invoke(:scaffold_all, [table.singularize], { rbs: options[:rbs] })
+        else
+          Souls::Generate.new.invoke(:scaffold_all, [table.singularize], {})
+        end
         puts(Paint["Generated #{table.camelize} CRUD Files\n", :yellow])
       end
       true
@@ -68,6 +57,42 @@ module Souls
 
     private
 
+    def run_scaffold(class_name: "user")
+      model(class_name: class_name)
+      model_rbs(class_name: class_name)
+      type(class_name: class_name)
+      type_rbs(class_name: class_name)
+      query(class_name: class_name)
+      query_rbs(class_name: class_name)
+      mutation(class_name: class_name)
+      mutation_rbs(class_name: class_name)
+      policy(class_name: class_name)
+      policy_rbs(class_name: class_name)
+      edge(class_name: class_name)
+      edge_rbs(class_name: class_name)
+      connection(class_name: class_name)
+      connection_rbs(class_name: class_name)
+      resolver(class_name: class_name)
+      resolver_rbs(class_name: class_name)
+      rspec_factory(class_name: class_name)
+      rspec_model(class_name: class_name)
+      rspec_mutation(class_name: class_name)
+      rspec_query(class_name: class_name)
+      rspec_resolver(class_name: class_name)
+      rspec_policy(class_name: class_name)
+    end
+
+    def run_rbs_scaffold(class_name: "user")
+      model_rbs(class_name: class_name)
+      type_rbs(class_name: class_name)
+      query_rbs(class_name: class_name)
+      mutation_rbs(class_name: class_name)
+      policy_rbs(class_name: class_name)
+      edge_rbs(class_name: class_name)
+      connection_rbs(class_name: class_name)
+      resolver_rbs(class_name: class_name)
+    end
+
     def generated_paths(class_name: "user")
       singularized_class_name = class_name.singularize.underscore
       pluralized_class_name = class_name.pluralize.underscore

data/lib/souls/{api → cli}/generate/index.rb

@@ -1,7 +1,7 @@
 require_paths = []
-dev_path = "lib/souls/api/generate/*"
+dev_path = "lib/souls/cli/generate/*"
 souls_path = Dir["#{Gem.dir}/gems/souls-*"].last
-gem_path = "#{souls_path}/lib/souls/api/generate/*"
+gem_path = "#{souls_path}/lib/souls/cli/generate/*"
 file_paths = File.exist?("souls.gemspec") ? dev_path : gem_path
 Dir[file_paths].map do |n|
   next if n.include?("index.rb")
@@ -11,3 +11,8 @@ end
 require_paths.each do |path|
   require_relative "./#{path}"
 end
+
+module Souls
+  class Generate < Thor
+  end
+end

data/lib/souls/{worker → cli}/generate/job.rb

@@ -6,16 +6,17 @@ module Souls
       if options[:mailer]
         mailgun_mailer(class_name: class_name)
       else
-        create_mutation(class_name: class_name)
+        create_job_mutation(class_name: class_name)
       end
       Souls::Generate.new.invoke(:job_rbs, [class_name], {})
+      Souls::Generate.new.invoke(:rspec_job, [class_name], {})
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
 
     private
 
-    def create_mutation(class_name: "send-mailer")
+    def create_job_mutation(class_name: "send-mailer")
       file_dir = "./app/graphql/mutations/"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "#{file_dir}#{class_name.singularize}.rb"

data/lib/souls/{worker → cli}/generate/job_rbs.rb

@@ -3,9 +3,10 @@ module Souls
     desc "job_rbs [CLASS_NAME]", "Generate SOULs Job Mutation RBS Template"
     def job_rbs(class_name)
       file_path = ""
+      worker_name = FileUtils.pwd.split("/").last
       Dir.chdir(Souls.get_mother_path.to_s) do
         singularized_class_name = class_name.underscore.singularize
-        file_dir = "./sig/#{singularized_class_name}/app/graphql/mutations/"
+        file_dir = "./sig/#{worker_name}/app/graphql/mutations/"
         FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
         file_path = "#{file_dir}#{singularized_class_name}.rbs"
         File.open(file_path, "w") do |f|

data/lib/souls/{api → cli}/generate/manager.rb

@@ -16,14 +16,15 @@ module Souls
               class #{options[:mutation].underscore.camelize} < BaseMutation
                 description "#{options[:mutation]} description"
                 ## Edit `argument` and `field`
-                argument :argment, String, required: true
+                argument :argument, String, required: true
 
                 field :response, String, null: false
 
                 def resolve(args)
                   # Define Here
+                  { response: "success!" }
                 rescue StandardError => e
-                  GraphQL::ExecutionError.new(e.to_s)
+                  GraphQL::ExecutionError.new(e.message)
                 end
               end
             end
@@ -32,6 +33,7 @@ module Souls
       end
       puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       Souls::Generate.new.invoke(:manager_rbs, [singularized_class_name], { mutation: options[:mutation] })
+      Souls::Generate.new.invoke(:rspec_manager, [singularized_class_name], { mutation: options[:mutation] })
       file_path
     rescue Thor::Error => e
       raise(Thor::Error, e)

data/lib/souls/cli/generate/manager_rbs.rb

@@ -0,0 +1,34 @@
+module Souls
+  class Generate < Thor
+    desc "manager_rbs [CLASS_NAME]", "Generate SOULs Manager RBS Template"
+    method_option :mutation, aliases: "--mutation", required: true, desc: "Mutation File Name"
+    def manager_rbs(class_name)
+      file_path = ""
+      singularized_class_name = class_name.underscore.singularize
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./sig/api/app/graphql/mutations/managers/#{singularized_class_name}_manager"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        file_path = "#{file_dir}/#{options[:mutation]}.rbs"
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            module Mutations
+              module Managers
+                module #{singularized_class_name.camelize}Manager
+                  class #{options[:mutation].singularize.camelize}
+                    def self.description: (String)-> untyped
+                    def self.argument: (untyped, untyped, untyped)-> untyped
+                    def self.field: (untyped, untyped, untyped)-> untyped
+                  end
+                end
+              end
+            end
+          TEXT
+          puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+        end
+      end
+      file_path
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+  end
+end

data/lib/souls/{api → cli}/generate/model_rbs.rb

@@ -4,15 +4,13 @@ module Souls
     def model_rbs(class_name)
       file_path = ""
       Dir.chdir(Souls.get_mother_path.to_s) do
-        file_dir = "./sig/api/app/graphql/types/models/"
+        file_dir = "./sig/api/app/models/"
         FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
         singularized_class_name = class_name.underscore.singularize
         file_path = "#{file_dir}#{singularized_class_name}_model.rbs"
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)
-            module Types
-              class #{singularized_class_name.camelize} < ActiveRecord::Base
-              end
+            class #{singularized_class_name.camelize} < ActiveRecord::Base
             end
           TEXT
         end

data/lib/souls/{api → cli}/generate/mutation.rb

@@ -8,10 +8,7 @@ module Souls
       file_path = "./app/graphql/mutations/base/#{singularized_class_name}/create_#{singularized_class_name}.rb"
       return "Mutation already exist! #{file_path}" if File.exist?(file_path)
 
-      create_mutation_head(class_name: singularized_class_name)
-      relation_params = create_mutation_params(class_name: singularized_class_name)
-      create_mutation_after_params(class_name: singularized_class_name, relation_params: relation_params)
-      create_mutation_end(class_name: singularized_class_name)
+      create_mutation(class_name: singularized_class_name)
       update_mutation(class_name: singularized_class_name)
       delete_mutation(class_name: singularized_class_name)
       destroy_delete_mutation(class_name: singularized_class_name)
@@ -23,99 +20,58 @@ module Souls
 
     private
 
-    def create_mutation_head(class_name: "user")
+    def create_mutation(class_name: "user")
+      file_path = ""
       singularized_class_name = class_name.singularize.underscore
-      dir_name = "./app/graphql/mutations/base/#{singularized_class_name}"
-      FileUtils.mkdir_p(dir_name) unless Dir.exist?(dir_name)
-      file_path = "./app/graphql/mutations/base/#{singularized_class_name}/create_#{singularized_class_name}.rb"
-      File.open(file_path, "w") do |new_line|
-        new_line.write(<<~TEXT)
-          module Mutations
-            module Base::#{singularized_class_name.camelize}
-              class Create#{singularized_class_name.camelize} < BaseMutation
-                field :#{singularized_class_name}_edge, Types::#{singularized_class_name.camelize}Type.edge_type, null: false
-                field :error, String, null: true
-
-        TEXT
-      end
-      file_path
-    end
-
-    def create_mutation_params(class_name: "user")
-      file_path = "./app/graphql/mutations/base/#{class_name}/create_#{class_name}.rb"
-      path = "./db/schema.rb"
-      @on = false
-      @user_exist = false
-      @relation_params = []
-      File.open(file_path, "a") do |new_line|
-        File.open(path, "r") do |f|
-          f.each_line.with_index do |line, _i|
-            if @on
-              if line.include?("t.index") || line.strip == "end"
-                if @user_exist
-                  new_line.write(<<-TEXT)
-
-      def resolve args
-        params = args.dup
-        params[:user_id] = context[:user][:id]
-                  TEXT
-                else
-                  new_line.write(<<-TEXT)
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./app/graphql/mutations/base/#{singularized_class_name}"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        file_path = "#{file_dir}/create_#{singularized_class_name}.rb"
+        raise(Thor::Error, "Mutation RBS already exist! #{file_path}") if File.exist?(file_path)
+
+        params = Souls.get_relation_params(class_name: singularized_class_name, col: "mutation")
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            module Mutations
+              module Base::#{singularized_class_name.camelize}
+                class Create#{singularized_class_name.camelize} < BaseMutation
+                  field :#{singularized_class_name}_edge, Types::#{singularized_class_name.camelize}Type.edge_type, null: false
+                  field :error, String, null: true
+            #{'      '}
+                  def resolve(args)
+          TEXT
+        end
+        File.open(file_path, "a") do |f|
+          if params[:relation_params]
+            f.write("        user_id = context[:user][:id]\n") if params[:user_exist]
+            params[:relation_params].each_with_index do |col, _i|
+              next if col[:column_name] == "user_id"
 
-      def resolve args
-                  TEXT
-                end
-                break
-              end
-              field = "[String]" if line.include?("array: true")
-              type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-              field ||= Souls.type_check(type)
-              case name
-              when "user_id"
-                @user_exist = true
-              when /$*_id\z/
-                @relation_params << name
-                new_line.write("      argument :#{name}, String, required: false\n")
-              when "created_at", "updated_at"
-                next
-              else
-                new_line.write("      argument :#{name}, #{field}, required: false\n")
-              end
+              f.write("        #{col[:column_name]} = SoulsApiSchema.from_global_id(args[:#{col[:column_name]}])\n")
             end
-            @on = true if Souls.table_check(line: line, class_name: class_name)
+            relation_params =
+              params[:relation_params].map do |n|
+                ", #{n[:column_name]}: #{n[:column_name]}"
+              end
+            f.write("        new_record = { **args #{relation_params.compact.join} }\n")
+            f.write("        data = ::#{singularized_class_name.camelize}.new(new_record)\n")
+          else
+            f.write("        data = ::#{singularized_class_name.camelize}.new(args)\n")
           end
         end
-      end
-      @relation_params
-    end
-
-    def create_mutation_after_params(class_name: "user", relation_params: [])
-      return false if relation_params.empty?
-
-      file_path = "./app/graphql/mutations/base/#{class_name}/create_#{class_name}.rb"
-      relation_params.each do |params_name|
         File.open(file_path, "a") do |new_line|
-          new_line.write("        _, args[:#{params_name}] = SoulsApiSchema.from_global_id(args[:#{params_name}])\n")
-        end
-      end
-      true
-    end
+          new_line.write(<<~TEXT)
+                    raise(StandardError, data.errors.full_messages) unless data.save
 
-    def create_mutation_end(class_name: "user")
-      file_path = "./app/graphql/mutations/base/#{class_name}/create_#{class_name}.rb"
-      File.open(file_path, "a") do |new_line|
-        new_line.write(<<~TEXT)
-                  data = ::#{class_name.camelize}.new args
-                  raise(StandardError, data.errors.full_messages) unless data.save
-
-                  { #{class_name}_edge: { node: data } }
-                rescue StandardError => error
-                  GraphQL::ExecutionError.new(error.message)
+                    { #{singularized_class_name}_edge: { node: data } }
+                  rescue StandardError => error
+                    GraphQL::ExecutionError.new(error.message)
+                  end
                 end
               end
             end
-          end
-        TEXT
+          TEXT
+        end
       end
       file_path
     end

data/lib/souls/{api → cli}/generate/resolver_rbs.rb

@@ -14,9 +14,6 @@ module Souls
           f.write(<<~TEXT)
             class Base
             end
-            module SearchObject
-              def self.module: (Symbol) -> untyped
-            end
             class #{singularized_class_name.camelize}Search < Base
               include SearchObject
               def self.scope: () ?{ () -> nil } -> [Hash[Symbol, untyped]]

data/lib/souls/cli/generate/rspec_job.rb

@@ -0,0 +1,48 @@
+module Souls
+  class Generate < Thor
+    desc "rspec_job [CLASS_NAME]", "Generate Rspec Job Test Template"
+    def rspec_job(class_name)
+      singularized_class_name = class_name.underscore.singularize
+      file_dir = "./spec/mutations/jobs/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+      file_path = "#{file_dir}/#{singularized_class_name}_spec.rb"
+      return "RspecJob already exist! #{file_path}" if File.exist?(file_path)
+
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          RSpec.describe("#{class_name.singularize.camelize}") do
+            describe "Define #{class_name.singularize.camelize}" do
+
+              let(:mutation) do
+                %(mutation {
+                  #{class_name.singularize.camelize(:lower)}(input: {}) {
+                      response
+                    }
+                  }
+                )
+              end
+
+              subject(:result) do
+                SoulsApiSchema.execute(mutation).as_json
+              end
+
+              it "return StockSheet Data" do
+                begin
+                  a1 = result.dig("data", "#{options[:mutation].singularize.camelize(:lower)}", "response")
+                  raise unless a1.present?
+                rescue StandardError
+                  raise(StandardError, result)
+                end
+                expect(a1).to(include("response" => be_a(String)))
+              end
+            end
+          end
+        TEXT
+      end
+      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      file_path
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+  end
+end

data/lib/souls/cli/generate/rspec_manager.rb

@@ -0,0 +1,49 @@
+module Souls
+  class Generate < Thor
+    desc "rspec_manager [CLASS_NAME]", "Generate Rspec Manager Test Template"
+    method_option :mutation, aliases: "--mutation", required: true, desc: "Mutation File Name"
+    def rspec_manager(class_name)
+      singularized_class_name = class_name.underscore.singularize
+      file_dir = "./spec/managers/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+      file_path = "./spec/mutations/managers/#{singularized_class_name}/#{options[:mutation]}_spec.rb"
+      return "RspecManager already exist! #{file_path}" if File.exist?(file_path)
+
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          RSpec.describe("#{options[:mutation].singularize.camelize}") do
+            describe "Define #{options[:mutation].singularize.camelize}" do
+
+              let(:mutation) do
+                %(mutation {
+                  #{options[:mutation].singularize.camelize(:lower)}(input: {}) {
+                      response
+                    }
+                  }
+                )
+              end
+
+              subject(:result) do
+                SoulsApiSchema.execute(mutation).as_json
+              end
+
+              it "return StockSheet Data" do
+                begin
+                  a1 = result.dig("data", "#{options[:mutation].singularize.camelize(:lower)}", "response")
+                  raise unless a1.present?
+                rescue StandardError
+                  raise(StandardError, result)
+                end
+                expect(a1).to(include("response" => be_a(String)))
+              end
+            end
+          end
+        TEXT
+      end
+      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      file_path
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+  end
+end

data/lib/souls/cli/index.rb

@@ -1,4 +1,6 @@
 require_relative "./console/index"
+require_relative "./generate/index"
+require_relative "./update/index"
 require_relative "./create/index"
 require_relative "./db/index"
 require_relative "./docker/index"

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

@@ -14,10 +14,11 @@ module Souls
       download_github_actions(app_name: app_name)
       initial_config_init(app_name: app_name, service_name: service_name)
       system("cd #{app_name} && souls add_submodule")
+      system("cd #{app_name} && git init")
       souls_api_credit(app_name: app_name, service_name: service_name)
     end
 
-    desc "init", "Run git submodule add RBS collection"
+    desc "add_submodule", "Run git submodule add RBS collection"
     def add_submodule
       system("git submodule add https://github.com/ruby/gem_rbs_collection.git vendor/rbs/gem_rbs_collection")
     end
@@ -161,10 +162,10 @@ module Souls
       system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Procfile.dev")
       system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Procfile")
       system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Steepfile")
-      system("cd #{app_name} && git init")
       system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/gitignore")
       system("cd #{app_name} && mv gitignore .gitignore")
       system("cd #{app_name} && bundle")
+      system("cd #{app_name}/apps/api && bundle")
       FileUtils.rm(sig_name)
     end
 
@@ -195,7 +196,8 @@ module Souls
         Easy to Run
         $ cd #{app_name}
         $ souls check
-        $ cd apps/api && souls s
+        $ cd apps/api
+        $ souls s
         Go To : http://localhost:4000
 
         Doc: https://souls.elsoul.nl

data/lib/souls/cli.rb

@@ -1,40 +1,34 @@
 require "souls"
 module Souls
   class CLI < Thor
-    desc "api [COMMAND]", "SOULs API Commands"
-    subcommand "api", API
+    desc "generate [COMMAND]", "SOULs Generate Commands"
+    subcommand "generate", Generate
 
-    desc "gcloud [COMMAND]", "SOULs Gcloud Commands"
-    subcommand "gcloud", Gcloud
+    desc "update [COMMAND]", "SOULs Update Commands"
+    subcommand "update", Update
+
+    desc "create [COMMAND]", "SOULs Create Worker"
+    subcommand "create", Create
+
+    desc "db [COMMAND]", "SOULs DB Commands"
+    subcommand "db", DB
 
     desc "docker [COMMAND]", "SOULs Docker Commands"
     subcommand "docker", Docker
 
-    desc "create [COMMAND]", "SOULs Create Worker"
-    subcommand "create", Create
+    desc "gcloud [COMMAND]", "SOULs Gcloud Commands"
+    subcommand "gcloud", Gcloud
 
     desc "sync", " SOULs Sync Commands"
     subcommand "sync", Sync
 
-    desc "upgrade", "SOULs Upgrade Commands"
+    desc "upgrade gemfile", "SOULs Upgrade Gemfile & Gemfile.lock"
     subcommand "upgrade", Upgrade
 
-    desc "worker [COMMAND]", "SOULs Worker Commands"
-    subcommand "worker", Worker
-
     # rubocop:disable Style/StringHashKeys
     map "c" => :console
     map "s" => :server
-    map "db:migrate:reset" => :migrate_reset
-    map "db:migrate" => :migrate
-    map "db:create_migration" => :create_migration
-    map "db:add_column" => :add_column
-    map "db:rename_column" => :rename_column
-    map "db:change_column" => :change_column
-    map "db:remove_column" => :remove_column
-    map "db:drop_table" => :drop_table
-    map "db:create" => :db_create
-    map "db:seed" => :seed
+    map "g" => :generate
     map "t" => :test
     map ["-v", "--v", "--version", "-version"] => :version
     # rubocop:enable Style/StringHashKeys

data/lib/souls/index.rb

@@ -1,8 +1,6 @@
 require "thor"
-require_relative "./api/index"
 require_relative "./cli/index"
 require_relative "./version"
-require_relative "./worker/index"
 require_relative "./utils/index"
 
 module Souls

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.39.0
+0.40.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.39.0
+0.40.0

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.60.0
+  version: 0.61.0
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-26 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -127,40 +127,6 @@ files:
 - README.md
 - exe/souls
 - lib/souls.rb
-- lib/souls/api/generate/application.rb
-- lib/souls/api/generate/connection.rb
-- lib/souls/api/generate/connection_rbs.rb
-- lib/souls/api/generate/edge.rb
-- lib/souls/api/generate/edge_rbs.rb
-- lib/souls/api/generate/index.rb
-- lib/souls/api/generate/manager.rb
-- lib/souls/api/generate/manager_rbs.rb
-- lib/souls/api/generate/model.rb
-- lib/souls/api/generate/model_rbs.rb
-- lib/souls/api/generate/mutation.rb
-- lib/souls/api/generate/mutation_rbs.rb
-- lib/souls/api/generate/policy.rb
-- lib/souls/api/generate/policy_rbs.rb
-- lib/souls/api/generate/query.rb
-- lib/souls/api/generate/query_rbs.rb
-- lib/souls/api/generate/resolver.rb
-- lib/souls/api/generate/resolver_rbs.rb
-- lib/souls/api/generate/rspec_factory.rb
-- lib/souls/api/generate/rspec_model.rb
-- lib/souls/api/generate/rspec_mutation.rb
-- lib/souls/api/generate/rspec_policy.rb
-- lib/souls/api/generate/rspec_query.rb
-- lib/souls/api/generate/rspec_resolver.rb
-- lib/souls/api/generate/type.rb
-- lib/souls/api/generate/type_rbs.rb
-- lib/souls/api/index.rb
-- lib/souls/api/update/index.rb
-- lib/souls/api/update/mutation.rb
-- lib/souls/api/update/resolver.rb
-- lib/souls/api/update/rspec_factory.rb
-- lib/souls/api/update/rspec_mutation.rb
-- lib/souls/api/update/rspec_resolver.rb
-- lib/souls/api/update/type.rb
 - lib/souls/cli.rb
 - lib/souls/cli/console/index.rb
 - lib/souls/cli/create/index.rb
@@ -174,6 +140,36 @@ files:
 - lib/souls/cli/gcloud/pubsub/topics.rb
 - lib/souls/cli/gcloud/run/index.rb
 - lib/souls/cli/gcloud/sql/index.rb
+- lib/souls/cli/generate/application.rb
+- lib/souls/cli/generate/connection.rb
+- lib/souls/cli/generate/connection_rbs.rb
+- lib/souls/cli/generate/edge.rb
+- lib/souls/cli/generate/edge_rbs.rb
+- lib/souls/cli/generate/index.rb
+- lib/souls/cli/generate/job.rb
+- lib/souls/cli/generate/job_rbs.rb
+- lib/souls/cli/generate/manager.rb
+- lib/souls/cli/generate/manager_rbs.rb
+- lib/souls/cli/generate/model.rb
+- lib/souls/cli/generate/model_rbs.rb
+- lib/souls/cli/generate/mutation.rb
+- lib/souls/cli/generate/mutation_rbs.rb
+- lib/souls/cli/generate/policy.rb
+- lib/souls/cli/generate/policy_rbs.rb
+- lib/souls/cli/generate/query.rb
+- lib/souls/cli/generate/query_rbs.rb
+- lib/souls/cli/generate/resolver.rb
+- lib/souls/cli/generate/resolver_rbs.rb
+- lib/souls/cli/generate/rspec_factory.rb
+- lib/souls/cli/generate/rspec_job.rb
+- lib/souls/cli/generate/rspec_manager.rb
+- lib/souls/cli/generate/rspec_model.rb
+- lib/souls/cli/generate/rspec_mutation.rb
+- lib/souls/cli/generate/rspec_policy.rb
+- lib/souls/cli/generate/rspec_query.rb
+- lib/souls/cli/generate/rspec_resolver.rb
+- lib/souls/cli/generate/type.rb
+- lib/souls/cli/generate/type_rbs.rb
 - lib/souls/cli/index.rb
 - lib/souls/cli/init/index.rb
 - lib/souls/cli/release/index.rb
@@ -183,6 +179,13 @@ files:
 - lib/souls/cli/sync/index.rb
 - lib/souls/cli/sync/model.rb
 - lib/souls/cli/sync/pubsub.rb
+- lib/souls/cli/update/index.rb
+- lib/souls/cli/update/mutation.rb
+- lib/souls/cli/update/resolver.rb
+- lib/souls/cli/update/rspec_factory.rb
+- lib/souls/cli/update/rspec_mutation.rb
+- lib/souls/cli/update/rspec_resolver.rb
+- lib/souls/cli/update/type.rb
 - lib/souls/cli/upgrade/gemfile.rb
 - lib/souls/cli/upgrade/index.rb
 - lib/souls/index.rb
@@ -190,10 +193,6 @@ files:
 - lib/souls/version.rb
 - lib/souls/versions/.souls_api_version
 - lib/souls/versions/.souls_worker_version
-- lib/souls/worker/generate/index.rb
-- lib/souls/worker/generate/job.rb
-- lib/souls/worker/generate/job_rbs.rb
-- lib/souls/worker/index.rb
 homepage: https://souls.elsoul.nl
 licenses:
 - Apache-2.0
@@ -201,7 +200,7 @@ metadata:
   homepage_uri: https://souls.elsoul.nl
   source_code_uri: https://github.com/elsoul/souls
   changelog_uri: https://github.com/elsoul/souls
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -217,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key:
+signing_key: 
 specification_version: 4
 summary: SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
   クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。

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

@@ -1,32 +0,0 @@
-module Souls
-  class Generate < Thor
-    desc "manager_rbs [CLASS_NAME]", "Generate SOULs Manager RBS Template"
-    method_option :mutation, aliases: "--mutation", required: true, desc: "Mutation File Name"
-    def manager_rbs(class_name)
-      file_path = ""
-      singularized_class_name = class_name.underscore.singularize
-      file_dir = "./sig/api/app/graphql/mutations/managers/#{singularized_class_name}_manager"
-      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-      file_path = "#{file_dir}/#{options[:mutation]}.rbs"
-      File.open(file_path, "w") do |f|
-        f.write(<<~TEXT)
-          module Mutations
-            module Managers
-              module #{singularized_class_name.camelize}Manager
-                class #{singularized_class_name.camelize}Login
-                  def self.description: (String)-> untyped
-                  def self.argument: (untyped, untyped, untyped)-> untyped
-                  def self.field: (untyped, untyped, untyped)-> untyped
-                end
-              end
-            end
-          end
-        TEXT
-        puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
-      end
-      file_path
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
-    end
-  end
-end

data/lib/souls/api/index.rb

@@ -1,14 +0,0 @@
-require_relative "./generate/index"
-require_relative "./update/index"
-module Souls
-  class API < Thor
-    desc "generate [COMMAND]", "souls api generate Commands"
-    subcommand "generate", Generate
-
-    desc "update [COMMAND]", "souls api update Commands"
-    subcommand "update", Update
-    # rubocop:disable Style/StringHashKeys
-    map "g" => :generate
-    # rubocop:enable Style/StringHashKeys
-  end
-end

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

@@ -1,2 +0,0 @@
-require_relative "./job"
-require_relative "./job_rbs"

data/lib/souls/worker/index.rb

@@ -1,12 +0,0 @@
-require_relative "./generate/index"
-
-module Souls
-  class Worker < Thor
-    desc "generate [COMMAND]", "souls worker generate Commands"
-    subcommand "generate", Generate
-
-    # rubocop:disable Style/StringHashKeys
-    map "g" => :generate
-    # rubocop:enable Style/StringHashKeys
-  end
-end