souls 1.7.26 → 1.7.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bf29cd0a67c02c749b95e990e33d317c8f9978bea6730ea96be3b708bcb01d3
-  data.tar.gz: 446f800f997e6bf63f1026dccb429187958158c64afca7101827e6eed1c7a05a
+  metadata.gz: 80dfee065bf6d86083af944a33c78e40be35e56bce803f508b6a9ee1bdd09414
+  data.tar.gz: 52e08753467723afeb3daa1c691c0e8470f31023d04100a296ec3c3bb79a0ce8
 SHA512:
-  metadata.gz: 7dee8b607379ccac680668e882d74c29cf7349b8da9820f78f551094b84f4c6f1bb9c869048ddecec7500b7eb531646e4e6c41596c7fbfdab084055507bfb8c2
-  data.tar.gz: 710aaedd7fb46b877cabc73b02572de2d87788eeda7d58635b7cc7726ba97cec57ef439c6ef37d1b9751cf9163ee236c840f3a44c5dfa11e9dcce2b05d432d49
+  metadata.gz: 74823ff46d148f8bb6892d16c7fa0b222d33a805bafba3c092eb5104b96babe63e337aa1bd91246dec7e6686bf48de01e6d69d20ff8ef4438b01db9609443d92
+  data.tar.gz: bf7c3ee0a09bec5de9230b60025efe439b0710bc1c6ad401b57a74c8d5e8542b1956ff7d016924e6a359c4243fa12d80858beb45bb237588daf559f2e9837c3c

data/README.md

@@ -16,7 +16,7 @@
     <img alt="" src="https://badgen.net/rubygems/dt/souls">
   </a>
    <a aria-label="Test" href="https://rubygems.org/gems/souls">
-    <img alt="" src="https://github.com/elsoul/souls/actions/workflows/gem-test.yml/badge.svg">
+    <img alt="" src="https://github.com/elsoul/souls/actions/workflows/test.yml/badge.svg">
   </a>
   <a aria-label="License" href="https://github.com/elsoul/souls/blob/master/LICENSE.txt">
     <img alt="" src="https://badgen.net/badge/license/Apache/blue">

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

@@ -145,7 +145,6 @@ end
                 uses: ruby/setup-ruby@v1
                 with:
                   ruby-version: 3.0
-                  bundler-cache: true
               - name: Build and test with Rake
                 env:
                   PGHOST: 127.0.0.1

data/lib/souls/cli/db/create_migration.rb

@@ -0,0 +1,28 @@
+module Souls
+  class DB < Thor
+    desc "create_migration [CLASS_NAME]", "Create ActiveRecord Migration File"
+    def create_migration(class_name)
+      pluralized_class_name = class_name.underscore.pluralize
+      singularized_class_name = class_name.underscore.singularize
+      Souls::DB.new.invoke(:model, [singularized_class_name], {})
+      Souls::DB.new.invoke(:rspec_model, [singularized_class_name], {})
+      Souls::DB.new.invoke(:model_rbs, [singularized_class_name], {})
+      puts(Paint["Created file! : ", :green])
+      system("rake db:create_migration NAME=create_#{pluralized_class_name}")
+      file_path = Dir["db/migrate/*create_#{pluralized_class_name}.rb"].first
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          class Create#{pluralized_class_name.camelize} < ActiveRecord::Migration[6.1]
+            def change
+              create_table :#{pluralized_class_name} do |t|
+
+                t.boolean :is_deleted, null: false, default: false
+                t.timestamps
+              end
+            end
+          end
+        TEXT
+      end
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
+require_relative "./create_migration"
 require_relative "./create_migration_rbs"
 require_relative "./model"
 require_relative "./rspec_model"
@@ -17,8 +18,6 @@ module Souls
         db_system("rake db:migrate RACK_ENV=test")
       end
       true
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
     end
 
     desc "create", "Create Database"
@@ -30,8 +29,6 @@ module Souls
       else
         db_system("rake db:create")
       end
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
     end
 
     desc "seed", "Insert Seed Data"
@@ -44,8 +41,6 @@ module Souls
         db_system("rake db:seed")
         db_system("rake db:seed RACK_ENV=test")
       end
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
     end
 
     desc "migrate_reset", "Reset Database"
@@ -57,75 +52,36 @@ module Souls
       else
         db_system("rake db:migrate:reset")
       end
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
-    end
-
-    desc "create_migration [CLASS_NAME]", "Create ActiveRecord Migration File"
-    def create_migration(class_name)
-      pluralized_class_name = class_name.underscore.pluralize
-      singularized_class_name = class_name.underscore.singularize
-      Souls::DB.new.invoke(:model, [singularized_class_name], {})
-      Souls::DB.new.invoke(:rspec_model, [singularized_class_name], {})
-      Souls::DB.new.invoke(:model_rbs, [singularized_class_name], {})
-      puts(Paint["Created file! : ", :green])
-      system("rake db:create_migration NAME=create_#{pluralized_class_name}")
-      file_path = Dir["db/migrate/*create_#{pluralized_class_name}.rb"].first
-      File.open(file_path, "w") do |f|
-        f.write(<<~TEXT)
-          class Create#{pluralized_class_name.camelize} < ActiveRecord::Migration[6.1]
-            def change
-              create_table :#{pluralized_class_name} do |t|
-
-                t.boolean :is_deleted, null: false, default: false
-                t.timestamps
-              end
-            end
-          end
-        TEXT
-      end
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
     end
 
     desc "add_column [CLASS_NAME]", "Create ActiveRecord Migration File"
     def add_column(class_name)
       pluralized_class_name = class_name.underscore.pluralize
       system("rake db:create_migration NAME=add_column_to_#{pluralized_class_name}")
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
     end
 
     desc "rename_column [CLASS_NAME]", "Create ActiveRecord Migration File"
     def rename_column(class_name)
       pluralized_class_name = class_name.underscore.pluralize
       system("rake db:create_migration NAME=rename_column_to_#{pluralized_class_name}")
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
     end
 
     desc "change_column [CLASS_NAME]", "Create ActiveRecord Migration File"
     def change_column(class_name)
       pluralized_class_name = class_name.underscore.pluralize
       system("rake db:create_migration NAME=change_column_to_#{pluralized_class_name}")
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
     end
 
     desc "remove_column [CLASS_NAME]", "Create ActiveRecord Migration File"
     def remove_column(class_name)
       pluralized_class_name = class_name.underscore.pluralize
       system("rake db:create_migration NAME=remove_column_to_#{pluralized_class_name}")
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
     end
 
     desc "drop_table [CLASS_NAME]", "Create ActiveRecord Migration File"
     def drop_table(class_name)
       pluralized_class_name = class_name.underscore.pluralize
       system("rake db:create_migration NAME=drop_table_to_#{pluralized_class_name}")
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
     end
 
     private

data/lib/souls/cli/gcloud/sql/index.rb

@@ -24,6 +24,7 @@ module Souls
         file_path = ".env"
         File.open(file_path, "w") do |line|
           line.write(<<~TEXT)
+            GOOGLE_AUTH_SUPPRESS_CREDENTIALS_WARNINGS=1
             SOULS_DB_HOST=#{instance_ip}
             SOULS_DB_PW=#{password}
             SOULS_DB_USER=postgres

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

@@ -9,7 +9,9 @@ module Souls
         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"
-        type_file_path = "./sig/#{worker_name}/app/graphql/types/#{singularized_class_name}_type.rbs"
+        sig_type_path = "./sig/#{worker_name}/app/graphql/types"
+        FileUtils.mkdir_p(sig_type_path) unless Dir.exist?(sig_type_path)
+        type_file_path = "#{sig_type_path}/#{singularized_class_name}_type.rbs"
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)
             module Queries

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

@@ -2,23 +2,27 @@ module Souls
   class Github < Thor
     desc "secret_set", "Github Secret Set from .env.production"
     def secret_set
-      file_path = ".env.production"
-      File.open(file_path, "r") do |file|
-        file.each_line do |line|
-          key_and_value = line.split("=")
-          system("gh secret set #{key_and_value[0]} -b \"#{key_and_value[1].strip}\"")
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_path = ".env.production"
+        File.open(file_path, "r") do |file|
+          file.each_line do |line|
+            key_and_value = line.split("=")
+            system("gh secret set #{key_and_value[0]} -b \"#{key_and_value[1].strip}\"")
+          end
         end
       end
     end
 
     desc "add_env", "Add New env and Sync Github Secret"
-    method_option :key, aliases: "--key", required: true, desc: "Key Name"
-    method_option :value, aliases: "--value", required: true, desc: "Value Name"
     method_option :dqm, type: :boolean, aliases: "--dqm", default: false, desc: "Enable Double Quotation Mark"
     def add_env
-      update_env_production(key: options[:key], value: options[:value], dqm: options[:dqm])
-      update_api_env(key: options[:key], value: options[:value], dqm: options[:dqm])
-      update_github_actions(key: options[:key])
+      prompt = TTY::Prompt.new
+      key = prompt.ask("Set Key:")
+      value = prompt.ask("Set Value:")
+      update_env_production(key: key, value: value, dqm: options[:dqm])
+      update_api_env(key: key, value: value, dqm: options[:dqm])
+      update_workers_env(key: key, value: value, dqm: options[:dqm])
+      update_github_actions(key: key)
       Souls::Github.new.invoke(:secret_set)
     end
 
@@ -52,6 +56,20 @@ module Souls
       end
     end
 
+    def update_workers_env(key:, value:, dqm: false)
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        workers = Dir["apps/*"]
+        workers.delete("apps/api")
+        workers.each do |worker_path|
+          file_path = "#{worker_path}/.env"
+          File.open(file_path, "a") do |line|
+            dqm ? line.write("\n#{key.upcase}=\"#{value}\"") : line.write("\n#{key.upcase}=#{value}")
+          end
+          puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+        end
+      end
+    end
+
     def update_github_actions(key:)
       Dir.chdir(Souls.get_mother_path.to_s) do
         file_paths = Dir[".github/workflows/*.yml"]

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.7.26
+1.7.30

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.7.26
+1.7.30

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.7.26
+  version: 1.7.30
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -130,6 +130,7 @@ files:
 - lib/souls/cli/cli_exception.rb
 - lib/souls/cli/console/index.rb
 - lib/souls/cli/create/index.rb
+- lib/souls/cli/db/create_migration.rb
 - lib/souls/cli/db/create_migration_rbs.rb
 - lib/souls/cli/db/index.rb
 - lib/souls/cli/db/model.rb