souls 1.3.8 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15b543f68c631153cb55d9db471e72bb9a0a8bf057abfcefb7abe115eb3cad50
-  data.tar.gz: dcb2091faf7d1dba574743f119b9019d70fd2544a07f25c46043f6a153827b59
+  metadata.gz: 504cd4ab4030690ba86843de1b9af5544394c39480a8394e2bc0be6e9cc09494
+  data.tar.gz: 1294690c238452bcd9a5d06e2f4b1f6eeec02c1da8850772bb523a88e80f41ec
 SHA512:
-  metadata.gz: ab28c78e9531eca9678af3a1910ae2436f2ea0739729f235516fb248f109f4511581f4dfeb0602c5c25b7d69522e7d128db8816bd8ba81b9ce7df664a6592d1a
-  data.tar.gz: c56cbdd2485dfc68d08f74147a5cba66cc388a32c2fc1c74fe3c0affde2385b1d9ed8b94f2fbe448d8441656e3c9c237ecb71a0a2a9216630fe31f5ca5cbc6bd
+  metadata.gz: 58ba05001034b78f384ab7fb2c6c9d36b3e15881433a810242530c60677aef2b4f69e55d67542f676bc2ccd638744bb79b5c99c97c16c42575082d5bc2e8b112
+  data.tar.gz: 3ac42b34963cd62fd8e53520594a5f2ece24763dcdbdd70ac4dbea94694014b724caed14c75f543f61847de7313f92b63e2518fb1213561c4da3aeeae1554693

data/lib/souls/cli/cli_exception.rb

@@ -0,0 +1,10 @@
+module Souls
+  class CLIException < StandardError
+    attr_reader :message
+
+    def initialize(message)
+      super
+      @message = message
+    end
+  end
+end

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

@@ -3,14 +3,8 @@ module Souls
     desc "console", "Run IRB Console"
     method_option :env, aliases: "--e", default: "development", desc: "Difine APP Enviroment - development | production"
     def console
-      case options[:env]
-      when "production"
-        system("RACK_ENV=production bundle exec irb")
-      else
-        system("bundle exec irb")
-      end
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
+      return system("RACK_ENV=production bundle exec irb") if options[:env].eql? "production"
+      system("bundle exec irb")
     end
   end
 end

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

@@ -12,92 +12,86 @@ module Souls
         app = Souls.configuration.app
         port = 3000 + workers.size
         souls_worker_name = "souls-#{app}-#{options[:name]}"
-        download_worker(worker_name: options[:name])
-        souls_conf_update(worker_name: souls_worker_name)
-        souls_conf_update(worker_name: souls_worker_name, strain: "api")
-        workflow(worker_name: options[:name])
-        procfile(worker_name: options[:name], port: port)
-        mother_procfile(worker_name: options[:name])
-        souls_config_init(worker_name: options[:name])
-        steepfile(worker_name: options[:name])
-        souls_helper_rbs(worker_name: options[:name])
+        download_worker(options[:name])
+        souls_conf_update(souls_worker_name)
+        souls_conf_update(souls_worker_name, "api")
+        workflow(options[:name])
+        procfile(options[:name], port)
+        mother_procfile(options[:name])
+        souls_config_init(options[:name])
+        steepfile(options[:name])
+        souls_helper_rbs(options[:name])
         system("cd apps/#{options[:name]} && bundle")
-        souls_worker_credit(worker_name: options[:name])
+        souls_worker_credit(options[:name])
       end
       true
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
     end
 
     private
 
-    def steepfile(worker_name: "mailer")
+    def steepfile(worker_name)
       file_path = "./Steepfile"
-      new_file_path = "config/Steepfile"
-      File.open(new_file_path, "w") do |new_line|
-        File.open(file_path, "r") do |f|
-          f.each_line do |line|
-            case line.strip.to_s
-            when "end"
-              ["app", "db/seeds.rb", "constants", "app.rb"].each do |path|
-                new_line.write("  check \"apps/#{worker_name}/#{path}\"\n")
-              end
-              new_line.write("end\n")
-            else
-              new_line.write(line)
+
+      write_txt = ""
+      File.open(file_path, "r") do |f|
+        f.each_line do |line|
+          if line.strip.to_s == "end"
+            ["app", "db/seeds.rb", "constants", "app.rb"].each do |path|
+              write_txt += "  check \"apps/#{worker_name}/#{path}\"\n"
             end
+            write_txt += "end\n"
+          else
+            write_txt += line
           end
         end
       end
-      FileUtils.rm(file_path)
-      FileUtils.mv(new_file_path, file_path)
+      File.open(file_path, "w") { |f| f.write(write_txt) }
     end
 
-    def procfile(worker_name: "mailer", port: 3000)
-      file_dir = "apps/#{worker_name}"
-      file_path = "#{file_dir}/Procfile.dev"
+    def procfile(worker_name, port)
+      file_path = "apps/#{worker_name}/Procfile.dev"
       File.open(file_path, "w") do |f|
         f.write("#{worker_name}: bundle exec puma -p #{port} -e development")
       end
     end
 
-    def mother_procfile(worker_name: "mailer")
+    def mother_procfile(worker_name)
       file_path = "Procfile.dev"
       File.open(file_path, "a") do |f|
         f.write("\n#{worker_name}: foreman start -f ./apps/#{worker_name}/Procfile.dev")
       end
     end
 
-    def souls_conf_update(worker_name: "", strain: "mother")
+    def souls_conf_update(worker_name, strain)
       workers = Souls.configuration.workers
       port = 3000 + workers.size
       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
+      write_txt = ""
+      File.open(file_path, "r") do |f|
+        f.each_line do |line|
+          worker_switch = line.include?("config.workers")
+          next if line.strip == "end"
 
-            next unless worker_switch
+          unless worker_switch
+            write_txt += line
+            next
+          end
 
-            new_line.write("  config.workers = [\n")
-            workers.each do |worker|
-              new_line.write(<<-TEXT)
+          write_txt += "  config.workers = [\n"
+          workers.each do |worker|
+            write_txt += <<-TEXT
     {
       name: "#{worker[:name]}",
       endpoint: "#{worker[:endpoint]}",
       port: #{worker[:port]}
     },
-              TEXT
-            end
-            break
+            TEXT
           end
+          break
         end
-        new_line.write(<<-TEXT)
+      end
+      write_txt += <<-TEXT
     {
       name: "#{worker_name}",
       endpoint: "",
@@ -105,13 +99,12 @@ module Souls
     }
   ]
 end
-        TEXT
-      end
-      FileUtils.rm(file_path)
-      FileUtils.mv(new_file_path, file_path)
+      TEXT
+
+      File.open(file_path, "w") { |f| f.write(write_txt) }
     end
 
-    def workflow(worker_name: "")
+    def workflow(worker_name)
       file_dir = ".github/workflows"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "#{file_dir}/#{worker_name}.yml"
@@ -119,101 +112,99 @@ end
       worker_name_camelize = worker_name.camelize
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
-            name: #{worker_name_camelize}
+          name: #{worker_name_camelize}
 
-            on:
-              push:
-                branches:
-                  - main
-                paths:
-                  - "apps/#{worker_name}/**"
-                  - ".github/workflows/#{worker_name}.yml"
+          on:
+            push:
+              branches:
+                - main
+              paths:
+                - "apps/#{worker_name}/**"
+                - ".github/workflows/#{worker_name}.yml"
 
-            jobs:
-              build:
+          jobs:
+            build:
 
-                runs-on: ubuntu-20.04
+              runs-on: ubuntu-20.04
 
-                services:
-                  db:
-                    image: postgres:13
-                    ports: ["5433:5432"]
-                    env:
-                      POSTGRES_PASSWORD: postgres
-                    options: >-
-                      --health-cmd pg_isready
-                      --health-interval 10s
-                      --health-timeout 5s
-                      --health-retries 5
-
-                steps:
-                - uses: actions/checkout@v2
-                - name: Set up Ruby 3.0
-                  uses: actions/setup-ruby@v1
-                  with:
-                    ruby-version: 3.0
-                - name: Build and test with Rake
+              services:
+                db:
+                  image: postgres:13
+                  ports: ["5433:5432"]
                   env:
-                    PGHOST: 127.0.0.1
-                    PGUSER: postgres
-                    RACK_ENV: test
-                  run: |
-                    sudo apt-get -yqq install libpq-dev
-                    cd apps/#{worker_name}
-                    gem install bundler
-                    bundle install --jobs 4 --retry 3
-                    bundle exec rake db:create RACK_ENV=test
-                    bundle exec rake db:migrate RACK_ENV=test
-                    bundle exec rspec
+                    POSTGRES_PASSWORD: postgres
+                  options: >-
+                    --health-cmd pg_isready
+                    --health-interval 10s
+                    --health-timeout 5s
+                    --health-retries 5
+
+              steps:
+              - uses: actions/checkout@v2
+              - name: Set up Ruby 3.0
+                uses: actions/setup-ruby@v1
+                with:
+                  ruby-version: 3.0
+              - name: Build and test with Rake
+                env:
+                  PGHOST: 127.0.0.1
+                  PGUSER: postgres
+                  RACK_ENV: test
+                run: |
+                  sudo apt-get -yqq install libpq-dev
+                  cd apps/#{worker_name}
+                  gem install bundler
+                  bundle install --jobs 4 --retry 3
+                  bundle exec rake db:create RACK_ENV=test
+                  bundle exec rake db:migrate RACK_ENV=test
+                  bundle exec rspec
 
-                - name: Checkout the repository
-                  uses: actions/checkout@v2
+              - name: Checkout the repository
+                uses: actions/checkout@v2
 
-                - name: GCP Authenticate
-                  uses: google-github-actions/setup-gcloud@master
-                  with:
-                    version: "323.0.0"
-                    project_id: ${{ secrets.SOULS_GCP_PROJECT_ID }}
-                    service_account_key: ${{ secrets.SOULS_GCP_SA_KEY }}
-                    export_default_credentials: true
+              - name: GCP Authenticate
+                uses: google-github-actions/setup-gcloud@master
+                with:
+                  version: "323.0.0"
+                  project_id: ${{ secrets.SOULS_GCP_PROJECT_ID }}
+                  service_account_key: ${{ secrets.SOULS_GCP_SA_KEY }}
+                  export_default_credentials: true
 
-                - name: Configure Docker
-                  run: gcloud auth configure-docker --quiet
+              - name: Configure Docker
+                run: gcloud auth configure-docker --quiet
 
-                - name: Build Docker container
-                  run: docker build -f ./apps/#{worker_name}/Dockerfile ./apps/#{worker_name} -t gcr.io/${{ secrets.SOULS_GCP_PROJECT_ID }}/${{secrets.SOULS_APP_NAME}}-#{worker_name}
+              - name: Build Docker container
+                run: docker build -f ./apps/#{worker_name}/Dockerfile ./apps/#{worker_name} -t gcr.io/${{ secrets.SOULS_GCP_PROJECT_ID }}/${{secrets.SOULS_APP_NAME}}-#{worker_name}
 
-                - name: Push to Container Resistory
-                  run: docker push gcr.io/${{ secrets.SOULS_GCP_PROJECT_ID }}/${{secrets.SOULS_APP_NAME}}-#{worker_name}
+              - name: Push to Container Resistory
+                run: docker push gcr.io/${{ secrets.SOULS_GCP_PROJECT_ID }}/${{secrets.SOULS_APP_NAME}}-#{worker_name}
 
-                - name: Deploy to Cloud Run
-                  run: |
-                      gcloud run deploy souls-${{ secrets.SOULS_APP_NAME }}-#{worker_name} \\
-                        --service-account=${{ secrets.SOULS_APP_NAME }}@${{ secrets.SOULS_GCP_PROJECT_ID }}.iam.gserviceaccount.com \\
-                        --image=gcr.io/${{ secrets.SOULS_GCP_PROJECT_ID }}/${{secrets.SOULS_APP_NAME}}-#{worker_name} \\
-                        --memory=4Gi \\
-                        --region=${{ secrets.SOULS_GCP_REGION }} \\
-                        --allow-unauthenticated \\
-                        --platform=managed \\
-                        --quiet \\
-                        --concurrency=80 \\
-                        --port=8080 \\
-                        --set-cloudsql-instances=${{ secrets.SOULS_GCLOUDSQL_INSTANCE }} \\
-                        --set-env-vars="SOULS_DB_USER=${{ secrets.SOULS_DB_USER }}" \\
-                        --set-env-vars="SOULS_DB_PW=${{ secrets.SOULS_DB_PW }}" \\
-                        --set-env-vars="SOULS_DB_HOST=${{ secrets.SOULS_DB_HOST }}" \\
-                        --set-env-vars="SOULS_TZ=${{ secrets.SOULS_TZ }}" \\
-                        --set-env-vars="SOULS_SECRET_KEY_BASE=${{ secrets.SOULS_SECRET_KEY_BASE }}" \\
-                        --set-env-vars="SOULS_PROJECT_ID=${{ secrets.SOULS_GCP_PROJECT_ID }}"
+              - name: Deploy to Cloud Run
+                run: |
+                    gcloud run deploy souls-${{ secrets.SOULS_APP_NAME }}-#{worker_name} \\
+                      --service-account=${{ secrets.SOULS_APP_NAME }}@${{ secrets.SOULS_GCP_PROJECT_ID }}.iam.gserviceaccount.com \\
+                      --image=gcr.io/${{ secrets.SOULS_GCP_PROJECT_ID }}/${{secrets.SOULS_APP_NAME}}-#{worker_name} \\
+                      --memory=4Gi \\
+                      --region=${{ secrets.SOULS_GCP_REGION }} \\
+                      --allow-unauthenticated \\
+                      --platform=managed \\
+                      --quiet \\
+                      --concurrency=80 \\
+                      --port=8080 \\
+                      --set-cloudsql-instances=${{ secrets.SOULS_GCLOUDSQL_INSTANCE }} \\
+                      --set-env-vars="SOULS_DB_USER=${{ secrets.SOULS_DB_USER }}" \\
+                      --set-env-vars="SOULS_DB_PW=${{ secrets.SOULS_DB_PW }}" \\
+                      --set-env-vars="SOULS_DB_HOST=${{ secrets.SOULS_DB_HOST }}" \\
+                      --set-env-vars="SOULS_TZ=${{ secrets.SOULS_TZ }}" \\
+                      --set-env-vars="SOULS_SECRET_KEY_BASE=${{ secrets.SOULS_SECRET_KEY_BASE }}" \\
+                      --set-env-vars="SOULS_PROJECT_ID=${{ secrets.SOULS_GCP_PROJECT_ID }}"
         TEXT
       end
       puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path
-    rescue StandardError => e
-      raise(StandardError, e)
     end
 
-    def souls_config_init(worker_name: "mailer")
+    def souls_config_init(worker_name)
       app_name = Souls.configuration.app
       project_id = Souls.configuration.project_id
       config_dir = "apps/#{worker_name}/config"
@@ -222,23 +213,23 @@ end
       file_path = "#{config_dir}/souls.rb"
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
-            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 = ["spring"]
-              config.workers = []
-            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 = ["spring"]
+            config.workers = []
+          end
         TEXT
       end
     rescue StandardError => e
       puts(e)
     end
 
-    def souls_helper_rbs(worker_name: "mailer")
-      file_dir = "./sig/#{worker_name}/app/utils/"
+    def souls_helper_rbs(worker_name)
+      file_dir = "./sig/#{worker_name}/app/utils"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "#{file_dir}/souls_helper.rbs"
       File.open(file_path, "w") do |f|
@@ -278,7 +269,7 @@ end
       end
     end
 
-    def download_worker(worker_name: "mailer")
+    def download_worker(worker_name)
       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}"
@@ -289,7 +280,7 @@ end
       FileUtils.rm(file_name)
     end
 
-    def souls_worker_credit(worker_name: "mailer")
+    def souls_worker_credit(worker_name)
       line = Paint["====================================", :yellow]
       puts("\n")
       puts(line)

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

@@ -4,9 +4,9 @@ module Souls
     method_option :mailer, type: :boolean, aliases: "--mailer", default: false, desc: "Mailer Option"
     def job(class_name)
       if options[:mailer]
-        mailgun_mailer(class_name: class_name)
+        mailgun_mailer(class_name)
       else
-        create_job_mutation(class_name: class_name)
+        create_job_mutation(class_name)
       end
       Souls::Generate.new.invoke(:job_rbs, [class_name], {})
       Souls::Generate.new.invoke(:rspec_job, [class_name], {})
@@ -16,7 +16,7 @@ module Souls
 
     private
 
-    def create_job_mutation(class_name: "send-mailer")
+    def create_job_mutation(class_name)
       file_dir = "./app/graphql/mutations/"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "#{file_dir}#{class_name.singularize}.rb"
@@ -44,7 +44,7 @@ module Souls
       file_path
     end
 
-    def mailgun_mailer(class_name: "mailer")
+    def mailgun_mailer(class_name)
       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/cli/generate/manager.rb

@@ -3,18 +3,28 @@ module Souls
     desc "manager [MANAGER_NAME]", "Generate GraphQL Mutation Template"
     method_option :mutation, aliases: "--mutation", required: true, desc: "Mutation File Name"
     def manager(class_name)
+      create_manager(class_name, options[:mutation])
+      Souls::Generate.new.invoke(:manager_rbs, [singularized_class_name], { mutation: options[:mutation] })
+      Souls::Generate.new.invoke(:rspec_manager, [singularized_class_name], { mutation: options[:mutation] })
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+
+    private
+
+    def create_manager(class_name, mutation)
       singularized_class_name = class_name.underscore.singularize
       file_dir = "./app/graphql/mutations/managers/#{singularized_class_name}_manager"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-      file_path = "#{file_dir}/#{options[:mutation]}.rb"
+      file_path = "#{file_dir}/#{mutation}.rb"
       raise(StandardError, "Already Exist!") if File.exist?(file_path)
 
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
           module Mutations
             module Managers::#{singularized_class_name.camelize}Manager
-              class #{options[:mutation].underscore.camelize} < BaseMutation
-                description "#{options[:mutation]} description"
+              class #{mutation.underscore.camelize} < BaseMutation
+                description "#{mutation} description"
                 ## Edit `argument` and `field`
                 argument :argument, String, required: true
 
@@ -32,11 +42,7 @@ module Souls
         TEXT
       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)
     end
   end
 end

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

@@ -21,7 +21,7 @@ module Souls
 
     private
 
-    def create_mutation(class_name: "user")
+    def create_mutation(class_name)
       singularized_class_name = class_name.singularize.underscore
       file_dir = "./app/graphql/mutations/base/#{singularized_class_name}"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
@@ -29,7 +29,7 @@ module Souls
       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|
+      File.open(file_path, "a") do |f|
         f.write(<<~TEXT)
           module Mutations
             module Base::#{singularized_class_name.camelize}
@@ -91,7 +91,7 @@ module Souls
       file_path
     end
 
-    def update_mutation(class_name: "user")
+    def update_mutation(class_name)
       singularized_class_name = class_name.singularize.underscore
       file_dir = "./app/graphql/mutations/base/#{singularized_class_name}"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
@@ -165,7 +165,7 @@ module Souls
     end
 
     # 3. Mutation - Delete
-    def delete_mutation(class_name: "user")
+    def delete_mutation(class_name)
       file_path = "./app/graphql/mutations/base/#{class_name}/delete_#{class_name}.rb"
       return "Mutation already exist! #{file_path}" if File.exist?(file_path)
 
@@ -195,7 +195,7 @@ module Souls
     end
 
     # 4. Mutation - Destroy Delete
-    def destroy_delete_mutation(class_name: "user")
+    def destroy_delete_mutation(class_name)
       file_path = "./app/graphql/mutations/base/#{class_name}/destroy_delete_#{class_name}.rb"
       return "Mutation already exist! #{file_path}" if File.exist?(file_path)
 

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

@@ -13,7 +13,7 @@ module Souls
 
     private
 
-    def create_rbs_mutation(class_name: "user")
+    def create_rbs_mutation(class_name)
       file_path = ""
       Dir.chdir(Souls.get_mother_path.to_s) do
         file_dir = "./sig/api/app/graphql/mutations/base/#{class_name}"
@@ -96,14 +96,14 @@ module Souls
       raise(Thor::Error, e)
     end
 
-    def update_rbs_mutation(class_name: "user")
+    def update_rbs_mutation(class_name)
       file_path = ""
       Dir.chdir(Souls.get_mother_path.to_s) do
         file_dir = "./sig/api/app/graphql/mutations/base/#{class_name}"
         FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
         file_path = "#{file_dir}/update_#{class_name}.rbs"
         params = Souls.get_relation_params(class_name: class_name, col: "mutation")
-        params[:params] << { column_name: "id", type: "string", array: false }
+        params[:params] < { column_name: "id", type: "string", array: false }
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)
             module Mutations
@@ -175,7 +175,7 @@ module Souls
       file_path
     end
 
-    def delete_rbs_mutation(class_name: "user")
+    def delete_rbs_mutation(class_name)
       file_path = ""
       Dir.chdir(Souls.get_mother_path.to_s) do
         file_dir = "./sig/api/app/graphql/mutations/base/#{class_name}"
@@ -206,7 +206,7 @@ module Souls
       raise(Thor::Error, e)
     end
 
-    def destroy_delete_rbs_mutation(class_name: "user")
+    def destroy_delete_rbs_mutation(class_name)
       file_path = ""
       Dir.chdir(Souls.get_mother_path.to_s) do
         file_dir = "./sig/api/app/graphql/mutations/base/#{class_name}"

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

@@ -6,10 +6,10 @@ module Souls
       file_path = "./spec/queries/#{singularized_class_name}_spec.rb"
       return "RspecQuery already exist! #{file_path}" if File.exist?(file_path)
 
-      rspec_query_head(class_name: singularized_class_name)
-      rspec_query_after_head(class_name: singularized_class_name)
-      rspec_query_params(class_name: singularized_class_name)
-      rspec_query_end(class_name: singularized_class_name)
+      rspec_query_head(singularized_class_name)
+      rspec_query_after_head(singularized_class_name)
+      rspec_query_params(singularized_class_name)
+      rspec_query_end(singularized_class_name)
       puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path
     rescue Thor::Error => e
@@ -18,7 +18,7 @@ module Souls
 
     private
 
-    def rspec_query_head(class_name: "user")
+    def rspec_query_head(class_name)
       file_dir = "./spec/queries/"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "./spec/queries/#{class_name.singularize}_spec.rb"
@@ -30,8 +30,10 @@ module Souls
       end
     end
 
-    def rspec_query_after_head(class_name: "user")
+    def rspec_query_after_head(class_name)
       file_path = "./spec/queries/#{class_name.singularize}_spec.rb"
+      return unless File.exist?(file_path)
+
       path = "./db/schema.rb"
       @on = false
       @user_exist = false
@@ -78,8 +80,10 @@ module Souls
       end
     end
 
-    def rspec_query_params(class_name: "user")
+    def rspec_query_params(class_name)
       file_path = "./spec/queries/#{class_name.singularize}_spec.rb"
+      return unless File.exist?(file_path)
+
       path = "./db/schema.rb"
       @on = false
       File.open(file_path, "a") do |new_line|
@@ -123,7 +127,7 @@ module Souls
       end
     end
 
-    def rspec_query_end(class_name: "user")
+    def rspec_query_end(class_name)
       file_path = "./spec/queries/#{class_name.singularize}_spec.rb"
       path = "./db/schema.rb"
       @on = false

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

@@ -6,10 +6,10 @@ module Souls
       file_path = "./spec/resolvers/#{singularized_class_name}_search_spec.rb"
       return "Resolver already exist! #{file_path}" if File.exist?(file_path)
 
-      rspec_resolver_head(class_name: singularized_class_name)
-      rspec_resolver_after_head(class_name: singularized_class_name)
-      rspec_resolver_params(class_name: singularized_class_name)
-      rspec_resolver_end(class_name: singularized_class_name)
+      rspec_resolver_head(singularized_class_name)
+      rspec_resolver_after_head(singularized_class_name)
+      rspec_resolver_params(singularized_class_name)
+      rspec_resolver_end(singularized_class_name)
       puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path
     rescue Thor::Error => e
@@ -18,7 +18,7 @@ module Souls
 
     private
 
-    def rspec_resolver_head(class_name: "user")
+    def rspec_resolver_head(class_name)
       file_dir = "./spec/resolvers/"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "./spec/resolvers/#{class_name.singularize}_search_spec.rb"
@@ -30,7 +30,7 @@ module Souls
       end
     end
 
-    def rspec_resolver_after_head(class_name: "user")
+    def rspec_resolver_after_head(class_name)
       file_path = "./spec/resolvers/#{class_name.singularize}_search_spec.rb"
       path = "./db/schema.rb"
       @on = false
@@ -86,7 +86,7 @@ module Souls
       end
     end
 
-    def rspec_resolver_params(class_name: "user")
+    def rspec_resolver_params(class_name)
       file_path = "./spec/resolvers/#{class_name.singularize}_search_spec.rb"
       path = "./db/schema.rb"
       @on = false
@@ -142,7 +142,7 @@ module Souls
       end
     end
 
-    def rspec_resolver_end(class_name: "user")
+    def rspec_resolver_end(class_name)
       file_path = "./spec/resolvers/#{class_name.singularize}_search_spec.rb"
       path = "./db/schema.rb"
       @on = false

data/lib/souls/cli/release/release.rb

@@ -2,6 +2,8 @@ module Souls
   class CLI < Thor
     desc "release", "Release Gem"
     def release
+      raise(StandardError, "hey! It's Broken!") unless system("rspec")
+
       system("gem install souls")
       sleep(3)
       current_souls_ver = Souls::VERSION.strip.split(".").map(&:to_i)

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

@@ -1,3 +1,5 @@
+require_relative "../cli_exception"
+
 module Souls
   class Update < Thor
     desc "create_mutation [CLASS_NAME]", "Update GraphQL Type from schema.rb"
@@ -5,33 +7,13 @@ module Souls
       singularized_class_name = class_name.singularize.underscore
       new_cols = Souls.get_columns_num(class_name: singularized_class_name)
       dir_name = "./app/graphql/mutations/base/#{singularized_class_name}"
-      new_file_path = "tmp/create_mutation.rb"
       file_path = "#{dir_name}/create_#{singularized_class_name}.rb"
-      argument = false
-      File.open(file_path) do |f|
-        File.open(new_file_path, "w") do |new_line|
-          f.each_line do |line|
-            new_line.write(line)
-            next unless line.include?("argument") && !argument
-
-            new_cols.each do |col|
-              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])
-              next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
+      raise Souls::CLIException.new("File #{file_path} is missing. Please recreate it and then run this command again.") unless
+        File.exist? file_path
 
-              new_line.write("      argument :#{col[:column_name]}, #{type}, required: false\n")
-            end
-            argument = true
-          end
-        end
-      end
-      FileUtils.rm(file_path)
-      FileUtils.mv(new_file_path, file_path)
+      mutation_argument = check_mutation_argument(class_name, "create")
+      overwrite_class_file(mutation_argument, file_path, new_cols)
       puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
     end
 
     desc "update_mutation [CLASS_NAME]", "Update GraphQL Type from schema.rb"
@@ -39,38 +21,41 @@ module Souls
       singularized_class_name = class_name.singularize.underscore
       new_cols = Souls.get_columns_num(class_name: singularized_class_name)
       dir_name = "./app/graphql/mutations/base/#{singularized_class_name}"
-      new_file_path = "tmp/update_mutation.rb"
       file_path = "#{dir_name}/update_#{singularized_class_name}.rb"
-      argument = false
-      File.open(file_path) do |f|
-        File.open(new_file_path, "w") do |new_line|
-          f.each_line do |line|
-            new_line.write(line)
-            next unless line.include?("argument") && !argument
+      raise Souls::CLIException.new("File #{file_path} is missing. Please recreate it and then run this command again.") unless
+        File.exist? file_path
 
-            new_cols.each do |col|
-              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])
-              next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
+      mutation_argument = check_mutation_argument(class_name, "update")
+      overwrite_class_file(mutation_argument, file_path, new_cols)
 
-              new_line.write("      argument :#{col[:column_name]}, #{type}, required: false\n")
-            end
-            argument = true
-          end
-        end
-      end
-      FileUtils.rm(file_path)
-      FileUtils.mv(new_file_path, file_path)
       puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
     end
 
     private
 
-    def check_mutation_argument(class_name: "user", action: "create")
+    def overwrite_class_file(mutation_argument, file_path, new_cols)
+      write_txt = String.new
+      File.open(file_path, "r") do |f|
+        f.each_line do |line|
+          write_txt << line
+          next if new_cols.empty? || !line.strip.start_with?("argument")
+
+          until new_cols.empty?
+            col = new_cols.pop
+            type = Souls.type_check(col[:type])
+            type = "[#{type}]" if col[:array]
+            args = mutation_argument
+            next if args.include?(col[:column_name])
+            next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
+
+            write_txt << "      argument :#{col[:column_name]}, #{type}, required: false\n"
+          end
+        end
+      end
+      File.open(file_path, "w") { |f| f.write(write_txt) }
+    end
+
+    def check_mutation_argument(class_name, action)
       singularized_class_name = class_name.singularize.underscore
       dir_name = "./app/graphql/mutations/base/#{singularized_class_name}"
       file_path = "#{dir_name}/#{action}_#{singularized_class_name}.rb"

data/lib/souls/utils/index.rb

@@ -1,11 +1,11 @@
 module Souls
   module Utils
     def get_mother_path
-      FileUtils.pwd.split(Souls.configuration.app)[0] + Souls.configuration.app
+      Dir.pwd.split(Souls.configuration.app)[0] + Souls.configuration.app
     end
 
     def get_api_path
-      FileUtils.pwd.split(Souls.configuration.app)[0] + Souls.configuration.app + "/apps/api"
+      Dir.pwd.split(Souls.configuration.app)[0] + Souls.configuration.app + "/apps/api"
     end
 
     def type_check(type)

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.3.8
+1.4.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.3.8
+1.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.4.0
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -127,6 +127,7 @@ files:
 - exe/souls
 - lib/souls.rb
 - lib/souls/cli.rb
+- lib/souls/cli/cli_exception.rb
 - lib/souls/cli/console/index.rb
 - lib/souls/cli/create/index.rb
 - lib/souls/cli/db/create_migration_rbs.rb