souls 1.7.27 → 1.7.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a290f2d3352519c56e7fc9bd6700e0d2e4491f72baffd2b68c8577a7fb66a79
-  data.tar.gz: 37cfe63c0027a77d9e0e3d034ea613878400cf2693d76c35a3d92410d78e5680
+  metadata.gz: dacaa8204429d10d4c47a1f13dcff780c1e9984314b297d7e99142e34025b4a4
+  data.tar.gz: 2f75725f2aa4c2364b2a5590408b964079644add22f104a58d7dc805fb21f5f7
 SHA512:
-  metadata.gz: bc96eb79e065a30d1dea1ffd3453ed945e5e685290e02f37afdab0d96b196359c728129d133c311fdbd53736013d46ff38225546fb0d16acb261dd8b4025ff23
-  data.tar.gz: aa9a78d415b6b0ff15d68033461b56ad38db2e020f41ab7b2936582505f7e9864dc0336d67b4b05198f6adcdaa94f729889d7247ba746f789b1206db3a5ebcdf
+  metadata.gz: 60ceef310ddad467a8c0c54461ece1958e6c27cf707804eee71afd6fa0100554c5ef1e8ca58df63dfb0118aacb8e18ed1d03010d30b57261a35c2fc729987ffe
+  data.tar.gz: 9da15cc3507dbbbdbc2019dd118d2b674750c08c0ec61737dddc28fe450615b1027149eb56e423cae8796e617d80dcecdf63020197610b513ab1db8477742eb0

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/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,13 +56,29 @@ 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"]
+        file_paths.delete(".github/workflows/api.yml")
         file_paths.each do |file_path|
-          File.open(file_path, "a") do |line|
-            line.write(" \\ \n            --set-env-vars=\"#{key.upcase}=${{ secrets.#{key.upcase} }}\"")
-          end
+          worker_workflow = File.readlines(file_path)
+          worker_workflow[worker_workflow.size - 1] = worker_workflow.last.chomp
+          worker_workflow << " \\ \n            --set-env-vars=\"#{key.upcase}=${{ secrets.#{key.upcase} }}\""
+          File.open(file_path, "w") { |f| f.write(worker_workflow.join) }
           puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
         end
       end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.7.27
+1.7.31

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.7.27
+1.7.31

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.7.27
+  version: 1.7.31
 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