souls 1.6.3 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0b6870319e1ec1a6b819c2b56e817cb9e8d831305388a2d43e047f8244c0916
-  data.tar.gz: c04a0bcdca122e881b32bf78c29060d078cdb6aa30b7ed674797f2201c740709
+  metadata.gz: 25ee0de0f9c28874dc6201e1cbe27644bc7b3f1a8f484eb35f1d09cae66d4490
+  data.tar.gz: caa656342e58a8e91c2fd4373ca933da2def2bdf101591e9ccd09bbb1fa9e5ec
 SHA512:
-  metadata.gz: d46e174bed964ed2eee82d92d56d8f9c4a051a53713e7ba2a0cc9c3f5ebd04b24885930d2136acdfdfb66d8f6a591c760c5677fc41e3dfd9211db3fafd0a9fb7
-  data.tar.gz: 9a446715a7e901c7637dd70c34b0739427d123aa3414f6ae361b63bf0ebe31e48e585730cc28b384c0226d883e0d396a0b8a6a399db25c38d1f1c350ce4b6bc3
+  metadata.gz: ddc22be57371d30a46d167502f4edd8ba1b680a4f59094428df85c1b4b32f4b863b90b57634064bcf1fb34714ac15a9e1335dfa224eed4b51a2ae9429d1911aa
+  data.tar.gz: fccce39e3346db82988f5eb9f1bc23f2e586f83ef8963dca440815c81daec72679d1767abf5fd381c8789b3f957f036ca7f475b4ae724f4c9a57af58dde892cc

data/exe/souls

@@ -5,7 +5,7 @@ begin
   souls_command = ARGV[0]
   require("./config/souls") unless ["new", "docker", "-v", "help", "", nil].include?(souls_command)
 rescue StandardError
-  raise(StandardError, "No confif! Please make `./config/souls.rb` File!")
+  raise(StandardError, "No config! Please make `./config/souls.rb` File!")
 end
 
 Souls::CLI.start

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

@@ -4,10 +4,13 @@ module Souls
     method_option :mailer, type: :boolean, aliases: "--mailer", default: false, desc: "Mailer Option"
     def job(class_name)
       if options[:mailer]
+        create_job_mailer_type(class_name)
         mailgun_mailer(class_name)
       else
-        create_job_mutation(class_name)
+        create_job_type(class_name)
+        create_job(class_name)
       end
+      update_query_type(class_name)
       Souls::Generate.new.invoke(:job_rbs, [class_name], {})
       Souls::Generate.new.invoke(:rspec_job, [class_name], { mailer: options[:mailer] })
     rescue Thor::Error => e
@@ -16,25 +19,20 @@ module Souls
 
     private
 
-    def create_job_mutation(class_name)
-      file_dir = "./app/graphql/mutations/"
+    def create_job(class_name)
+      file_dir = "./app/graphql/queries/"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "#{file_dir}#{class_name.singularize}.rb"
-      raise(StandardError, "Mutation already exist! #{file_path}") if File.exist?(file_path)
+      raise(StandardError, "Query already exist! #{file_path}") if File.exist?(file_path)
 
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
-          module Mutations
-            class #{class_name.camelize} < BaseMutation
-              description "Job Description"
-              field :response, String, null: false
-
+          module Queries
+            class #{class_name.camelize} < BaseQuery
+              description ""
+              type Types::#{class_name.camelize}Type, null: false
+          
               def resolve
-                # Define Job Here
-
-                { response: "Job done!" }
-              rescue StandardError => e
-                GraphQL::ExecutionError.new(e.to_s)
               end
             end
           end
@@ -43,32 +41,50 @@ module Souls
       puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path
     end
+    
+    def create_job_type(class_name)
+      file_dir = "./app/graphql/types/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+      file_path = "#{file_dir}#{class_name.singularize}_type.rb"
+      raise(StandardError, "Type already exists! #{file_path}") if File.exist?(file_path)
+
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          module Types
+            class #{class_name.camelize}Type < BaseObject
+            end
+          end
+        TEXT
+      end
+      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      file_path
+    end
 
     def mailgun_mailer(class_name)
-      file_dir = "./app/graphql/mutations/"
+      file_dir = "./app/graphql/queries/"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "#{file_dir}#{class_name.singularize}.rb"
-      raise(StandardError, "Mailer already exist! #{file_path}") if File.exist?(file_path)
+      raise(StandardError, "Mailer already exists! #{file_path}") if File.exist?(file_path)
 
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
-          module Mutations
-            class #{class_name.camelize} < BaseMutation
-              description "Mail を送信します。"
-              field :response, String, null: false
-
+          module Queries
+            class #{class_name.camelize} < BaseQuery
+              description ""
+              type Types::#{class_name.camelize}Type, null: false
+          
               def resolve
                 # First, instantiate the Mailgun Client with your API key
                 mg_client = ::Mailgun::Client.new("YOUR-API-KEY")
-
+          
                 # Define your message parameters
                 message_params = {
-                  from: "postmaster@YOUR-DOMAIN",
+                  from: "postmaster@from.mail.com",
                   to: "sending@to.mail.com",
                   subject: "SOULs Mailer test!",
                   text: "It is really easy to send a message!"
                 }
-
+          
                 # Send your message through the client
                 mg_client.send_message("YOUR-MAILGUN-DOMAIN", message_params)
                 { response: "Job done!" }
@@ -82,5 +98,44 @@ module Souls
       puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path
     end
+
+    def create_job_mailer_type(class_name)
+      file_dir = "./app/graphql/types/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+      file_path = "#{file_dir}#{class_name.singularize}_type.rb"
+      raise(StandardError, "Type already exists! #{file_path}") if File.exist?(file_path)
+
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          module Types
+            class #{class_name.camelize}Type < BaseObject
+              field :response, String, null: true
+            end
+          end
+        TEXT
+      end
+      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      file_path
+    end
+    
+    def update_query_type(class_name)
+      file_dir = "./app/graphql/types/base/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+      file_path = "#{file_dir}query_type.rb"
+      raise(StandardError, "Query type doesn't exist, please re-create it") unless File.exist?(file_path)
+
+      lines = File.readlines(file_path)
+      unless lines[-1].strip == "end" and lines[-2].strip == "end"
+        puts(Paint % ["Base query file has changed significantly and cannot be modified automatically, please update routes manually"], :yellow)
+        return
+      end
+
+      insert_string = "    field :#{class_name.singularize}, resolver: Queries::#{class_name.camelize}\n"
+      lines.insert(-3, insert_string)
+      File.open(file_path, "w") { |f| f.write(lines.join) }
+
+      puts(Paint % ["Updated file : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      file_path
+    end
   end
 end

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

@@ -6,7 +6,7 @@ module Souls
       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/#{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"
         File.open(file_path, "w") do |f|

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

@@ -4,7 +4,7 @@ module Souls
     method_option :mailer, type: :boolean, aliases: "--mailer", default: false, desc: "Mailgun Template"
     def rspec_job(class_name)
       singularized_class_name = class_name.underscore.singularize
-      file_dir = "./spec/mutations/jobs/"
+      file_dir = "./spec/queries/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)
@@ -15,9 +15,9 @@ module Souls
             RSpec.describe("#{singularized_class_name.camelize}") do
               describe "Define #{singularized_class_name.camelize}" do
 
-                let(:mutation) do
-                  %(mutation {
-                    #{singularized_class_name.camelize(:lower)}(input: {}) {
+                let(:query) do
+                  %(query {
+                    #{singularized_class_name.camelize(:lower)} {
                         response
                       }
                     }
@@ -28,15 +28,12 @@ module Souls
                   SoulsApiSchema.execute(mutation).as_json
                 end
 
-                it "return StockSheet Data" do
+                it "return #{singularized_class_name.camelize} response" do
                   stub_request(:post, "https://api.mailgun.net/v3/YOUR-MAILGUN-DOMAIN/messages")
                     .to_return(status: 200, body: "", headers: {})
-                  begin
-                    a1 = result.dig("data", "#{singularized_class_name.camelize(:lower)}")
-                    raise unless a1.present?
-                  rescue StandardError
-                    raise(StandardError, result)
-                  end
+                  
+                  a1 = result.dig("data", "#{singularized_class_name.camelize(:lower)}")
+                  expect(a1).not_to be_empty
                   expect(a1).to(include("response" => be_a(String)))
                 end
               end
@@ -49,9 +46,9 @@ module Souls
             RSpec.describe("#{singularized_class_name.camelize}") do
               describe "Define #{singularized_class_name.camelize}" do
 
-                let(:mutation) do
-                  %(mutation {
-                    #{singularized_class_name.camelize(:lower)}(input: {}) {
+                let(:query) do
+                  %(query {
+                    #{singularized_class_name.camelize(:lower)} {
                         response
                       }
                     }
@@ -59,16 +56,12 @@ module Souls
                 end
 
                 subject(:result) do
-                  SoulsApiSchema.execute(mutation).as_json
+                  SoulsApiSchema.execute(query).as_json
                 end
 
-                it "return StockSheet Data" do
-                  begin
-                    a1 = result.dig("data", "#{singularized_class_name.camelize(:lower)}")
-                    raise unless a1.present?
-                  rescue StandardError
-                    raise(StandardError, result)
-                  end
+                it "return #{singularized_class_name.camelize} response" do
+                  a1 = result.dig("data", "#{singularized_class_name.camelize(:lower)}")
+                  expect(a1).not_to be_empty
                   expect(a1).to(include("response" => be_a(String)))
                 end
               end

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

@@ -27,7 +27,7 @@ module Souls
                 SoulsApiSchema.execute(mutation).as_json
               end
 
-              it "return StockSheet Data" do
+              it "return User response" do
                 begin
                   a1 = result.dig("data", "#{options[:mutation].singularize.camelize(:lower)}", "response")
                   raise unless a1.present?

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

@@ -22,6 +22,14 @@ module Souls
       Souls::Github.new.invoke(:secret_set)
     end
 
+    desc "watch", "Watch GitHub Actions Workflow"
+    def watch
+      run_id = `gh run list | grep Mailer | awk '{print $7}'`.strip
+      raise(StandardError, "No workflow is running.") if run_id.include?("push")
+
+      system("gh run watch #{run_id}")
+    end
+
     private
 
     def update_env_production(key:, value:, dqm: false)

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

@@ -33,6 +33,11 @@ module Souls
         puts("before build")
         system("rake build")
         system("rake release")
+        system(
+          "git -c log.ShowSignature=false log v#{current_souls_ver}...v#{souls_new_ver}
+            --reverse --merges --grep='Merge pull request' --pretty=format:%B > ./CHANGELOG.md"
+        )
+        system("gh release create v#{souls_new_ver} -t v#{souls_new_ver} -F ./CHANGELOG.md")
         system("gsutil -m -q cp -r coverage gs://souls-bucket/souls-coverage")
         Whirly.status = Paint["soul-v#{souls_new_ver} successfully updated!"]
       end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.6.3
+1.6.7

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.6.3
+1.6.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.7
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -232,7 +232,7 @@ licenses:
 metadata:
   homepage_uri: https://souls.elsoul.nl
   source_code_uri: https://github.com/elsoul/souls
-  changelog_uri: https://github.com/elsoul/souls/releases/tag/1.6.3
+  changelog_uri: https://github.com/elsoul/souls/releases/tag/v1.6.7
 post_install_message: 
 rdoc_options: []
 require_paths: