souls 0.66.0 → 0.67.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: badff53370c04ff529c865e90e33f7fffd0f046759027d917992fdb868e50782
-  data.tar.gz: edd9677f32e2cdb62f507da4807bc659e63c15c0293701349be5a760572f0f93
+  metadata.gz: 1a8a73d2576e7e778ac9c146e667f6a0c6c5b7d60f14d9cd3f87d7a782455da3
+  data.tar.gz: c6ce668992cb359293852b9e417136d9fd52188e6a2b5c3e33442540856bb827
 SHA512:
-  metadata.gz: d7bb2bd4099d1aab172120a713b6a9ab1cf3b22911072e52cf3964705d310c214757cdfbb6d35f33c1649bc52128f490c2c51294ae871c2d362a55da40944964
-  data.tar.gz: 71e553091f8ec4368eebb66243e4e9878c39f633a3e6c036b0141fa225c8d16f157e74b9367b5ae402ef680a8e66efbb6f3cf48a42765d4a1769ac02abb84be8
+  metadata.gz: 40eb1a0cab71929a0fec2e6b51c7b8a0a91258065ad1e2f657657be9432c3699fb85a6c67098237bb3da9271384f8dcb9afd569ddb7ad5e918d869a5fa719c44
+  data.tar.gz: 62f392d86d935bdb41d8976a322e981bd4ab3d069227fd3f6fd1a82b5ce6e7239a14b2ce5cc71b873d7ede4d70382372b31b7ed3b3db48231c009b04fd070bdc

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

@@ -21,6 +21,7 @@ module Souls
         souls_config_init(worker_name: options[:name])
         steepfile(worker_name: options[:name])
         souls_helper_rbs(worker_name: options[:name])
+        system("cd apps/#{options[:name]} && bundle")
         souls_worker_credit(worker_name: options[:name])
       end
       true
@@ -313,7 +314,6 @@ end
       endroll = <<~TEXT
         Easy to Run
         $ cd apps/#{worker_name}
-        $ bundle
         $ souls sync model
         $ souls s
         Go To : http://localhost:3000

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

@@ -1,7 +1,7 @@
 module Souls
   class Generate < Thor
     desc "job [CLASS_NAME]", "Generate Job File in Worker"
-    method_option :mutation, type: :boolean, aliases: "--mailer", default: false, desc: "Mailer Option"
+    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)

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

@@ -122,6 +122,7 @@ module Souls
           cols.each_with_index do |param, i|
             type = Souls.rbs_type_check(param[:type])
             type = "[#{type}]" if param[:array]
+            type = "String" if param[:column_name].match?(/$*_id\z/)
 
             if i == params[:params].size - 1
               f.write("                          #{param[:column_name]}: #{type}?\n")
@@ -142,15 +143,12 @@ module Souls
             type = Souls.type_check(param[:type])
             rbs_type = Souls.rbs_type_check(param[:type])
             type = "[#{type}]" if param[:array]
+            type = "String" if param[:column_name].match?(/$*_id\z/)
+            rbs_type = "String" if param[:column_name].match?(/$*_id\z/)
 
             required = param[:column_name] == "id" ? "required: true" : "required: false"
             if i.zero?
-              if param[:column_name].match?(/$*_id\z/)
-                f.write("        def self.argument: (:#{param[:column_name]}, String, #{required} ) -> String\n")
-              else
-                f.write("        def self.argument: (:#{param[:column_name]}, #{type}, #{required} ) -> #{rbs_type}\n")
-              end
-
+              f.write("        def self.argument: (:#{param[:column_name]}, #{type}, #{required} ) -> #{rbs_type}\n")
             else
               f.write("                         | (:#{param[:column_name]}, #{type}, #{required} ) -> #{rbs_type}\n")
             end

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

@@ -10,12 +10,12 @@ module Souls
 
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
-          RSpec.describe("#{class_name.singularize.camelize}") do
-            describe "Define #{class_name.singularize.camelize}" do
+          RSpec.describe("#{singularized_class_name.camelize}") do
+            describe "Define #{singularized_class_name.camelize}" do
 
               let(:mutation) do
                 %(mutation {
-                  #{class_name.singularize.camelize(:lower)}(input: {}) {
+                  #{singularized_class_name.camelize(:lower)}(input: {}) {
                       response
                     }
                   }
@@ -28,7 +28,7 @@ module Souls
 
               it "return StockSheet Data" do
                 begin
-                  a1 = result.dig("data", "#{options[:mutation].singularize.camelize(:lower)}", "response")
+                  a1 = result.dig("data", "#{singularized_class_name.camelize(:lower)}", "response")
                   raise unless a1.present?
                 rescue StandardError
                   raise(StandardError, result)

data/lib/souls/cli.rb

@@ -39,23 +39,27 @@ module Souls
     end
 
     desc "test", "Run Rspec & Rubocop"
+    method_option :all, type: :boolean, aliases: "--all", default: false, desc: "Run (Rspec & steep check & Rubocop)"
     def test
-      system("rubocop -A")
-      system("bundle exec rspec")
-    end
-
-    desc "test_all", "Run (Rspec & steep check & Rubocop)"
-    def test_all
-      Dir.chdir(Souls.get_mother_path.to_s) do
-        system("steep check")
+      if options[:all]
+        Dir.chdir(Souls.get_mother_path.to_s) do
+          system("steep check")
+        end
+        Dir.chdir(Souls.get_api_path.to_s) do
+          system("rubocop -A")
+          system("bundle exec rspec")
+        end
+      else
+        system("rubocop -A")
+        system("bundle exec rspec")
       end
-      system("rubocop -A")
-      system("bundle exec rspec")
     end
 
     desc "check", "Run steep check"
     def check
-      system("steep check")
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        system("steep check")
+      end
     end
 
     def self.exit_on_failure?

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.45.0
+0.46.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.45.0
+0.46.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.66.0
+  version: 0.67.0
 platform: ruby
 authors:
 - POPPIN-FUMI