souls 1.8.4 → 1.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ce71081e75906aa301524b7c0868d9d368172c1a09cf432a9387a0db68eeb9d
-  data.tar.gz: 3977e1cf390f2fdb9dad6cef8169a657682b761a2f138dc6d9e618c9ae21fd38
+  metadata.gz: 146c3431004d5b821a5798cd452405ce27ccd81380cedd96be8b19a07cc43878
+  data.tar.gz: 6f46af2a1838f22628d171dd43bf86b80ee483ea1ce6276203de0f12c69b3e12
 SHA512:
-  metadata.gz: 728cb4d032060cbe75e4147ffa935404d5957485a7543f0e7e4a94e6bf19649728b6bf7b3ecd99b3c5f32c5b5807ff0bcb353326f852d1ddb87b414bb00196f7
-  data.tar.gz: f5475fe81ceea4312773086ff14f55dd735b1b4311bd25dce18bcbdfa6ba3e39478984f466c0b8dc0cf993d412318cfd6e43a9df696edccf77ded0425f6fe4ef
+  metadata.gz: d1128c85a3f8673faa6649407db2205d88c48bd52720e0ef72227a6dc19535c45a46e664dfa655756204cf6a5b666a6bb12642f4c4fdde80433eaf2dd9e71a57
+  data.tar.gz: fd40d4dab0b32bfec0ec563405d7e4625f47b5f1eebaf80826d1601a8a0bc6ab6d993c21b0bc555662b67898ff77ba8b8ce6402a28406d430d9a82b03a615e9f

data/lib/souls/cli/delete/application.rb

@@ -17,11 +17,7 @@ module Souls
     def scaffold_all
       puts(Paint["Delete All Scaffold Files!\n", :cyan])
       Souls.get_tables.each do |table|
-        if options[:rbs]
-          Souls::Delete.new.invoke(:scaffold, [table.singularize], { rbs: options[:rbs] })
-        else
-          Souls::Delete.new.invoke(:scaffold, [table.singularize], {})
-        end
+        Souls::Delete.new.invoke(:scaffold, [table.singularize], { rbs: options[:rbs] })
       end
       true
     end
@@ -30,21 +26,16 @@ module Souls
 
     def run_scaffold(class_name: "user")
       type(class_name)
-      type_rbs(class_name)
       query(class_name)
-      query_rbs(class_name)
       mutation(class_name)
-      mutation_rbs(class_name)
       edge(class_name)
-      edge_rbs(class_name)
       connection(class_name)
-      connection_rbs(class_name)
       resolver(class_name)
-      resolver_rbs(class_name)
       rspec_factory(class_name)
       rspec_mutation(class_name)
       rspec_query(class_name)
       rspec_resolver(class_name)
+      run_rbs_scaffold(class_name: class_name)
     end
 
     def run_rbs_scaffold(class_name: "user")

data/lib/souls/cli/delete/connection.rb

@@ -3,10 +3,9 @@ module Souls
     desc "connection [CLASS_NAME]", "Delete GraphQL Connection"
     def connection(class_name)
       file_dir = "./app/graphql/types/connections/"
-      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       singularized_class_name = class_name.underscore.singularize
-      file_path = "./app/graphql/types/connections/#{singularized_class_name}_connection.rb"
-      FileUtils.rm(file_path)
+      file_path = "#{file_dir}#{singularized_class_name}_connection.rb"
+      FileUtils.rm_f(file_path)
       puts(Paint % ["Delete file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
       file_path
     end

data/lib/souls/cli/delete/connection_rbs.rb

@@ -4,11 +4,10 @@ module Souls
     def connection_rbs(class_name)
       file_path = ""
       Dir.chdir(Souls.get_mother_path.to_s) do
-        file_dir = "./sig/api/app/graphql/types/connections/"
-        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
         singularized_class_name = class_name.underscore.singularize
+        file_dir = "./sig/api/app/graphql/types/connections/"
         file_path = "#{file_dir}#{singularized_class_name}_connection.rbs"
-        FileUtils.rm(file_path)
+        FileUtils.rm_f(file_path)
         puts(Paint % ["Deleted file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
       end
       file_path

data/lib/souls/cli/delete/edge.rb

@@ -2,11 +2,10 @@ module Souls
   class Delete < Thor
     desc "edge [CLASS_NAME]", "Delete GraphQL Edge"
     def edge(class_name)
-      file_dir = "./app/graphql/types/edges"
-      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+      file_dir = "./app/graphql/types/edges/"
       singularized_class_name = class_name.underscore.singularize
-      file_path = "./app/graphql/types/edges/#{singularized_class_name}_edge.rb"
-      FileUtils.rm(file_path)
+      file_path = "#{file_dir}#{singularized_class_name}_edge.rb"
+      FileUtils.rm_f(file_path)
       puts(Paint % ["Deleted file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
       file_path
     end

data/lib/souls/cli/delete/edge_rbs.rb

@@ -2,16 +2,14 @@ module Souls
   class Delete < Thor
     desc "edge_rbs [CLASS_NAME]", "Delete GraphQL Edge RBS"
     def edge_rbs(class_name)
-      file_path = ""
       Dir.chdir(Souls.get_mother_path.to_s) do
         file_dir = "./sig/api/app/graphql/types/edges/"
-        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
         singularized_class_name = class_name.underscore.singularize
         file_path = "#{file_dir}#{singularized_class_name}_edge.rbs"
-        FileUtils.rm(file_path)
+        FileUtils.rm_f(file_path)
         puts(Paint % ["Delete file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
+        file_path
       end
-      file_path
     end
   end
 end

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

@@ -3,35 +3,13 @@ module Souls
     desc "job [CLASS_NAME]", "Delete Job File in Worker"
     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)
-      else
-        delete_job_mutation(class_name: class_name)
-      end
-      Souls::Delete.new.invoke(:job_rbs, [class_name], {})
-      Souls::Delete.new.invoke(:rspec_job, [class_name], {})
-    end
-
-    private
-
-    def delete_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"
-
-      FileUtils.rm(file_path)
-      puts(Paint % ["Deleted file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
-      file_path
-    end
-
-    def mailgun_mailer(class_name: "mailer")
-      file_dir = "./app/graphql/mutations/"
-      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+      file_dir = "./app/graphql/queries/"
       file_path = "#{file_dir}#{class_name.singularize}.rb"
 
-      FileUtils.rm(file_path)
+      FileUtils.rm_f(file_path)
       puts(Paint % ["Deleted file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
-      file_path
+      Souls::Delete.new.invoke(:job_rbs, [class_name], {})
+      Souls::Delete.new.invoke(:rspec_job, [class_name], {})
     end
   end
 end

data/lib/souls/cli/delete/job_rbs.rb

@@ -4,12 +4,16 @@ module Souls
     def job_rbs(class_name)
       file_path = ""
       worker_name = FileUtils.pwd.split("/").last
+      if worker_name == "api" || FileUtils.pwd.split("/")[-2] != "apps"
+        raise(Souls::CLIException, "This task must be run from within a worker directory")
+      end
+
       Dir.chdir(Souls.get_mother_path.to_s) do
         singularized_class_name = class_name.underscore.singularize
-        file_dir = "./sig/#{worker_name}/app/graphql/mutations/"
+        file_dir = "./sig/#{worker_name}/app/graphql/queries/"
         FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
         file_path = "#{file_dir}#{singularized_class_name}.rbs"
-        FileUtils.rm(file_path)
+        FileUtils.rm_f(file_path)
         puts(Paint % ["Deleted file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
       end
       file_path

data/lib/souls/cli/delete/manager.rb

@@ -5,10 +5,10 @@ module Souls
     def manager(class_name)
       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"
+      puts(file_path)
 
-      FileUtils.rm(file_path)
+      FileUtils.rm_f(file_path)
       puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       Souls::Delete.new.invoke(:manager_rbs, [singularized_class_name], { mutation: options[:mutation] })
       Souls::Delete.new.invoke(:rspec_manager, [singularized_class_name], { mutation: options[:mutation] })

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

@@ -7,9 +7,8 @@ module Souls
       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"
-        FileUtils.rm(file_path)
+        FileUtils.rm_f(file_path)
         puts(Paint % ["Deleted file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
       end
       file_path

data/lib/souls/cli/delete/query.rb

@@ -4,7 +4,7 @@ module Souls
     def query(class_name)
       singularized_class_name = class_name.singularize
       file_path = "./app/graphql/queries/#{singularized_class_name}*.rb"
-      FileUtils.rm(file_path)
+      FileUtils.rm_f(file_path)
       puts(Paint % ["Deleted file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
       file_path
     end

data/lib/souls/cli/delete/query_rbs.rb

@@ -7,7 +7,7 @@ module Souls
         file_dir = "./sig/api/app/graphql/queries/"
         singularized_class_name = class_name.underscore.singularize
         file_path = "#{file_dir}#{singularized_class_name}*.rbs"
-        FileUtils.rm(file_path)
+        FileUtils.rm_f(file_path)
         puts(Paint % ["Deleted file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
         file_path
       end

data/lib/souls/cli/delete/resolver.rb

@@ -4,7 +4,7 @@ module Souls
     def resolver(class_name)
       singularized_class_name = class_name.singularize.underscore
       file_path = "./app/graphql/resolvers/#{singularized_class_name}_search.rb"
-      FileUtils.rm(file_path)
+      FileUtils.rm_f(file_path)
       puts(Paint % ["Deleted file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
       file_path
     end

data/lib/souls/cli/delete/resolver_rbs.rb

@@ -6,9 +6,8 @@ module Souls
       file_path = ""
       Dir.chdir(Souls.get_mother_path.to_s) do
         file_dir = "./sig/api/app/graphql/resolvers"
-        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
         file_path = "#{file_dir}/#{singularized_class_name}_search.rbs"
-        FileUtils.rm(file_path)
+        FileUtils.rm_f(file_path)
       end
       puts(Paint % ["Deleted file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
       file_path

data/lib/souls/cli/delete/rspec_factory.rb

@@ -3,7 +3,7 @@ module Souls
     desc "rspec_factory [CLASS_NAME]", "Delete Rspec Factory Test from schema.rb"
     def rspec_factory(class_name)
       file_path = "./spec/factories/#{class_name.pluralize}.rb"
-      FileUtils.rm(file_path)
+      FileUtils.rm_f(file_path)
       puts(Paint % ["Deleted file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
       file_path
     end

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

@@ -2,9 +2,10 @@ module Souls
   class Delete < Thor
     desc "rspec_job [CLASS_NAME]", "Delete Rspec Job Test Template"
     def rspec_job(class_name)
+      file_dir = "./spec/jobs"
       singularized_class_name = class_name.underscore.singularize
       file_path = "#{file_dir}/#{singularized_class_name}_spec.rb"
-      FileUtils.rm(file_path)
+      FileUtils.rm_f(file_path)
       puts(Paint % ["Deleted file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
       file_path
     end

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

@@ -136,7 +136,8 @@ module Souls
             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("        new_record = { **args, id: data_id #{relation_params.compact.join} }\n")
         else
           f.write("        new_record = args.except(:id)\n")
         end

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

@@ -142,7 +142,7 @@ module Souls
         f.write(<<~TEXT)
                 scope = scope.where("created_at >= ?", value[:start_date]) if value[:start_date]
                 scope = scope.where("created_at <= ?", value[:end_date]) if value[:end_date]
-                branches << scope
+                branches << scope.order(created_at: :desc)
                 value[:OR].inject(branches) { |s, v| normalize_filters(v, s) } if value[:OR].present?
                 branches
               end

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

@@ -30,11 +30,28 @@ module Souls
 
     desc "watch", "Watch GitHub Actions Workflow"
     def watch
-      run_list = `gh run list | grep in_progress | awk '{print $8}'`
-      run_id = run_list.split("\n")
-      raise(StandardError, "No workflow is running.") if run_id.empty?
+      api_request = "gh api -X GET 'repos/#{ENV['GITHUB_REPOSITORY']}/actions/runs'"
+      workflows = JSON.parse(`#{api_request}`)
 
-      system("gh run watch #{run_id}")
+      puts(api_request)
+
+      wf_info =
+        workflows["workflow_runs"].filter_map do |wf|
+          { wf["name"].to_sym => wf["id"] } if wf["state"] == "in_progress"
+        end
+
+      wf_id =
+        case wf_info.size
+        when 0
+          raise(CLIException, "No workflow is running.")
+        when 1
+          wf_info[0].values[0]
+        else
+          prompt = TTY::Prompt.new
+          prompt.select("Which workflow would you like to watch?", wf_info.inject(:merge))
+        end
+
+      system("gh run watch #{wf_id}")
     end
 
     private

data/lib/souls/cli/index.rb

@@ -1,3 +1,4 @@
+require_relative "./cli_exception"
 require_relative "./console/index"
 require_relative "./generate/index"
 require_relative "./github/index"

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

@@ -5,10 +5,17 @@ module Souls
     def server
       if options[:all]
         Dir.chdir(Souls.get_mother_path.to_s) do
+          front_path = "apps/console/package.json"
           system("foreman start -f Procfile.dev")
+          system("cd apps/console && yarn dev") if File.exist?(front_path)
         end
       else
-        system("foreman start -f Procfile.dev")
+        package_json_path = "package.json"
+        if File.exist?(package_json_path)
+          system("yarn dev")
+        else
+          system("foreman start -f Procfile.dev")
+        end
       end
     end
   end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.8.4
+1.8.9

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.8.4
+1.8.9

metadata

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