souls 1.7.28 → 1.7.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 433864951f148327fa9bea3360e1b96cf49757dff0113eccd14483fe5831483f
-  data.tar.gz: cfc5b861eac58198199c62d4b625ce5424784d135d89fa83141df6324072f5bd
+  metadata.gz: eb5a2331815decfceac613eba1aaf62b1da94bc93029bc2a7ea3633d3d49515f
+  data.tar.gz: 85893b36c5e653d01202e8ea230a872eb2843b287b5e290c4ea75d66bfbbfb1a
 SHA512:
-  metadata.gz: fd8c88200dc6611502cf7a01c1c875d29b7647e9fa0df87a3a4cc3d34282fed54a1f3bb9349ec9a35e6ae691b449be4b38e5dd78ac9dbc50b8a3d977dc78e446
-  data.tar.gz: ea9c8e5d9cf37bc0f5de58464d2114ffc4fb5f19c98a27f39d0f9d4c180ed08a98ae259b1118ddd5acfdb949c2d2e6ca0c9bc10f588a8e5d1385fee940b5556e
+  metadata.gz: cf6f4b88c770fa08d62b58dcf4720980d7570f4267b7c61881eb841304480fc31fab5b7284f1aaa0ed25eb62b23e017146af113a356a0f69fe45a1ff55fed637
+  data.tar.gz: 061e956b41e9a78d872b2d0b13aacd00d2bb9a9408be8bee68d3c647a7d6ed5a6517c52ce1cc0a0aca66f5d3da749786f44a488f67b44f96bb77075c7dbc7d28

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/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,28 @@ 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.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.28".freeze
+  VERSION = "1.7.32".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.7.28
+1.7.32

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.7.28
+1.7.32

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.7.28
+  version: 1.7.32
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -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