souls 1.6.2 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a354c5d180157242c8b5c5b8fb5bd7c2043a58422cae6e5b7659f1bf45c3dfa
-  data.tar.gz: adb6666a22e608e98bd39ba83bcc1d47d077d4d222bddacc15a1f51fcf33ebd2
+  metadata.gz: ed868d84c673b87fa30bd5551fff5914c9262013177ef209eb7dd57bb20a1fdf
+  data.tar.gz: a292621677b313f73605bcc85e5ffd3e332b85bf405e07267de23487572e8083
 SHA512:
-  metadata.gz: 2ae8068d41a970c7aa81073ed67029e9124d466dfff2bb36760e90f1808f280e4936a95898bc93764f88bee39636ede7e255e12f0abf73e13598d335fddbc211
-  data.tar.gz: 1fea94540ec3ed5621200abd564474ffa7af29e2b1e9136e47dca41f39590542b6431af7348424f6c5b58a9109490e5f81c4b2277d3e02813db308ddc485bd1e
+  metadata.gz: 86fc4188dfd8b9104365dfb7fa2cd2e2805a60fea39a595dc38c4837179c1d68849db3b922cf657eb067c7c73c564ea3c6e2d4a32aa31b0e6bd336a5f2f6ce98
+  data.tar.gz: bcab2634608df31fef8a3686fab692936b0ab8fc6d71fba99dbba50298d1e7aa97cd4e6c5ee6c10212bcb0a6bd17544ca9a70c5e21f6f5b86fb824b3409be3fb

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,37 +4,35 @@ 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], {})
+      Souls::Generate.new.invoke(:rspec_job, [class_name], { mailer: options[:mailer] })
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
 
     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

@@ -1,6 +1,7 @@
 module Souls
   class Generate < Thor
     desc "rspec_job [CLASS_NAME]", "Generate Rspec Job Test Template"
+    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/"
@@ -8,36 +9,72 @@ module Souls
       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("#{singularized_class_name.camelize}") do
-            describe "Define #{singularized_class_name.camelize}" do
+      if options[:mailer]
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            RSpec.describe("#{singularized_class_name.camelize}") do
+              describe "Define #{singularized_class_name.camelize}" do
 
-              let(:mutation) do
-                %(mutation {
-                  #{singularized_class_name.camelize(:lower)}(input: {}) {
-                      response
+                let(:mutation) do
+                  %(mutation {
+                    #{singularized_class_name.camelize(:lower)}(input: {}) {
+                        response
+                      }
                     }
-                  }
-                )
-              end
+                  )
+                end
+
+                subject(:result) do
+                  SoulsApiSchema.execute(mutation).as_json
+                end
 
-              subject(:result) do
-                SoulsApiSchema.execute(mutation).as_json
+                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
+                  expect(a1).to(include("response" => be_a(String)))
+                end
               end
+            end
+          TEXT
+        end
+      else
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            RSpec.describe("#{singularized_class_name.camelize}") do
+              describe "Define #{singularized_class_name.camelize}" do
+
+                let(:mutation) do
+                  %(mutation {
+                    #{singularized_class_name.camelize(:lower)}(input: {}) {
+                        response
+                      }
+                    }
+                  )
+                end
+
+                subject(:result) do
+                  SoulsApiSchema.execute(mutation).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)
+                it "return #{singularized_class_name.camelize} response" do
+                  begin
+                    a1 = result.dig("data", "#{singularized_class_name.camelize(:lower)}")
+                    raise unless a1.present?
+                  rescue StandardError
+                    raise(StandardError, result)
+                  end
+                  expect(a1).to(include("response" => be_a(String)))
                 end
-                expect(a1).to(include("response" => be_a(String)))
               end
             end
-          end
-        TEXT
+          TEXT
+        end
       end
       puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path

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/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.6.2
+1.6.6

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.6.2
+1.6.6

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.6
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire: 
+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,8 +232,8 @@ 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.2
-post_install_message: 
+  changelog_uri: https://github.com/elsoul/souls/releases/tag/v1.6.6
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Build Serverless Apps faster like Rails. Powered by Ruby GraphQL, RBS/Steep,
   Active Record, RSpec, RuboCop, and Google Cloud.