souls 1.8.6 → 1.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7ced5c593ab0800c80f23f80f69c695ab152aea777526801fb5dc5a2f660442
-  data.tar.gz: 3f05b4a5414f8aac43e93b6205f4787657651af44930f3dc2a017535adfb5cd5
+  metadata.gz: 6c1ba3aa74c5c645b4b967cd05f5a7c6b5b162a49da104325af8d97f0e9b47c2
+  data.tar.gz: a8963851cfe5a371b6d32a33e0c0eb7ab432de32629c133e70780c87d240d9f3
 SHA512:
-  metadata.gz: 9d2c89cf636058a73f8d8bfd5c2eefa24fd4fd143efacb67728781a8b0dab24cb9c4dc2353ce04bd53477558f4b9e083565b2fe7c6a369de1afd094af55b14c9
-  data.tar.gz: 1e38f54b14a0c74785cda717fed20fe846e720e088051cacc906786a9d7445a2ec8c068da09de95cfc66e63a65dad9ab0116e39e75649058026ff402c64f4abb
+  metadata.gz: 230fb2d6dc29cfce296e74e98b84081de18aac2ab47a4252ffd0f795d508f897786455ce926cbd346638c1e0aa3cb128a833934ccf84513a36f5814fb4d81d2a
+  data.tar.gz: 0b503f9f9a4d5c2966af65092a5e352a8b5250ef6cea7eae2b2c3e5664543efcbd9ac9631f63a08ca7f4cd7ef97dab5625ba2f901a50c619b53774e501e21918

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

@@ -195,6 +195,7 @@ end
                       --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="GITHUB_REPOSITORY=$GITHUB_REPOSITORY" \\
                       --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 }}"

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/gcloud/sql/index.rb

@@ -30,6 +30,7 @@ module Souls
             SOULS_DB_USER=postgres
             SOULS_GCP_PROJECT_ID=#{project_id}
             SOULS_SECRET_KEY_BASE='#{SecureRandom.base64(64)}'
+            GITHUB_REPOSITORY='elsoul/souls'
             TZ="#{region_to_timezone(region: region)}"
           TEXT
         end
@@ -46,6 +47,7 @@ module Souls
             SOULS_GCP_REGION=#{region}
             SOULS_GCLOUDSQL_INSTANCE="#{project_id}:#{region}:#{instance_name}"
             SOULS_SECRET_KEY_BASE='#{SecureRandom.base64(64)}'
+            GITHUB_REPOSITORY='elsoul/souls'
             TZ="#{region_to_timezone(region: region)}"
           TEXT
         end

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

@@ -30,11 +30,36 @@ 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?
+      remote_url = `git remote get-url origin`
+      split_url = %r{\A(git@github.com:)(.+/.+)(\.git)}.match(remote_url)
+      if split_url.nil? || split_url.size != 4
+        raise(CLIException, "Cannot access Github, please check your credentials")
+      end
+
+      api_request = "gh api -X GET 'repos/#{split_url[2]}/actions/runs'"
+      workflows = JSON.parse(`#{api_request}`)
+
+      if workflows.nil? || !workflows.key?("workflow_runs")
+        raise(CLIException, "Failed to parse JSON response from Github")
+      end
+
+      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 #{run_id}")
+      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/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.8.6
+1.8.12

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.8.6
+1.8.12

metadata

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