souls 1.3.3 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56948b07884486be23ef9be575ff30331999c0fbcdf02d63991d30d23a161a57
-  data.tar.gz: dec91f275f65b3c2d8e2bc114eecfc6c43fd7d16473905b60866db5453c38816
+  metadata.gz: 73b47b6755808ed066fd4e432cdb9344b5a466efef74a03ef5655037ceed6f3b
+  data.tar.gz: d7c93e44fc0f81d58f316f3e3e802c60836ad80c4adf65dd8b0eff1b8387964c
 SHA512:
-  metadata.gz: 04a255e490b590891b25e1f4c33409fba65ff677e556bca9dd90ff5eb62358cf5f80b0ec840b09c301a85bcabc06786e4d44a1512004c32f134e399317bfaad3
-  data.tar.gz: b2278cc9e0b024cee8559972a71d99f26e880bd22da4b44c9453500e2fd492601ecad085c4725de4e2a2d5cf0cce16d55a7a2b364235b7827ec1bf57bccfce78
+  metadata.gz: e046965ef59b0a1908a5edbf1d822e7c3e1e390517f3bf8b79544d4539b02981250cea58aa3611e984fd6768a2625aaaaeaac478880653e4bd47932b9c07b0b4
+  data.tar.gz: e8ae0f582ef5124a21474b41fd9993eda507c044edcaeb6de16db1ef1b5822c30e3e391e52eff686d0072ae437fc939368e8c12d2b0310952c3f08235a194cec

data/README.md

@@ -68,6 +68,7 @@ It is a development environment where you can immediately notice the mistakes th
 - [Docker](https://www.docker.com/)
 - [Firebase CLI](https://firebase.google.com/docs/cli)
 - [Ruby](https://www.ruby-lang.org)
+- [Github CLI](https://cli.github.com/)
 
 ## Cloud Infrastructure
 

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

@@ -173,39 +173,38 @@ end
                   uses: google-github-actions/setup-gcloud@master
                   with:
                     version: "323.0.0"
-                    project_id: ${{ secrets.GCP_PROJECT_ID }}
-                    service_account_key: ${{ secrets.GCP_SA_KEY }}
+                    project_id: ${{ secrets.SOULS_GCP_PROJECT_ID }}
+                    service_account_key: ${{ secrets.SOULS_GCP_SA_KEY }}
                     export_default_credentials: true
 
                 - name: Configure Docker
                   run: gcloud auth configure-docker --quiet
 
                 - name: Build Docker container
-                  run: docker build -f ./apps/#{worker_name}/Dockerfile ./apps/#{worker_name} -t gcr.io/${{ secrets.GCP_PROJECT_ID }}/${{secrets.APP_NAME}}-#{worker_name}
+                  run: docker build -f ./apps/#{worker_name}/Dockerfile ./apps/#{worker_name} -t gcr.io/${{ secrets.SOULS_GCP_PROJECT_ID }}/${{secrets.SOULS_APP_NAME}}-#{worker_name}
 
                 - name: Push to Container Resistory
-                  run: docker push gcr.io/${{ secrets.GCP_PROJECT_ID }}/${{secrets.APP_NAME}}-#{worker_name}
+                  run: docker push gcr.io/${{ secrets.SOULS_GCP_PROJECT_ID }}/${{secrets.SOULS_APP_NAME}}-#{worker_name}
 
                 - name: Deploy to Cloud Run
                   run: |
-                      gcloud run deploy souls-${{ secrets.APP_NAME }}-#{worker_name} \\
-                        --service-account=${{ secrets.APP_NAME }}@${{ secrets.GCP_PROJECT_ID }}.iam.gserviceaccount.com \\
-                        --image=gcr.io/${{ secrets.GCP_PROJECT_ID }}/${{secrets.APP_NAME}}-#{worker_name} \\
+                      gcloud run deploy souls-${{ secrets.SOULS_APP_NAME }}-#{worker_name} \\
+                        --service-account=${{ secrets.SOULS_APP_NAME }}@${{ secrets.SOULS_GCP_PROJECT_ID }}.iam.gserviceaccount.com \\
+                        --image=gcr.io/${{ secrets.SOULS_GCP_PROJECT_ID }}/${{secrets.SOULS_APP_NAME}}-#{worker_name} \\
                         --memory=4Gi \\
-                        --region=${{ secrets.GCP_REGION }} \\
+                        --region=${{ secrets.SOULS_GCP_REGION }} \\
                         --allow-unauthenticated \\
                         --platform=managed \\
                         --quiet \\
                         --concurrency=80 \\
                         --port=8080 \\
-                        --set-cloudsql-instances=${{ secrets.GCLOUDSQL_INSTANCE }} \\
-                        --set-env-vars="DB_USER=${{ secrets.DB_USER }}" \\
-                        --set-env-vars="DB_PW=${{ secrets.DB_PW }}" \\
-                        --set-env-vars="DB_HOST=${{ secrets.DB_HOST }}" \\
-                        --set-env-vars="TZ=${{ secrets.TZ }}" \\
-                        --set-env-vars="SLACK=${{ secrets.SLACK }}" \\
-                        --set-env-vars="SECRET_KEY_BASE=${{ secrets.SECRET_KEY_BASE }}" \\
-                        --set-env-vars="PROJECT_ID=${{ secrets.GCP_PROJECT_ID }}"
+                        --set-cloudsql-instances=${{ secrets.SOULS_GCLOUDSQL_INSTANCE }} \\
+                        --set-env-vars="SOULS_DB_USER=${{ secrets.SOULS_DB_USER }}" \\
+                        --set-env-vars="SOULS_DB_PW=${{ secrets.SOULS_DB_PW }}" \\
+                        --set-env-vars="SOULS_DB_HOST=${{ secrets.SOULS_DB_HOST }}" \\
+                        --set-env-vars="SOULS_TZ=${{ secrets.SOULS_TZ }}" \\
+                        --set-env-vars="SOULS_SECRET_KEY_BASE=${{ secrets.SOULS_SECRET_KEY_BASE }}" \\
+                        --set-env-vars="SOULS_PROJECT_ID=${{ secrets.SOULS_GCP_PROJECT_ID }}"
         TEXT
       end
       puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])

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

@@ -7,7 +7,6 @@ module Souls
     def create_instance
       app_name = Souls.configuration.app
       project_id = Souls.configuration.project_id
-      region = Souls.configuration.region
       instance_name = Souls.configuration.instance_name if instance_name.blank?
       region = Souls.configuration.region if options[:region].blank?
       db_type = options[:mysql] ? "MYSQL_8_0" : "POSTGRES_13"
@@ -22,12 +21,11 @@ module Souls
         file_path = ".env"
         File.open(file_path, "w") do |line|
           line.write(<<~TEXT)
-            DB_HOST=#{get_sql_ip.strip}
-            DB_PW=#{options[:root_password]}
-            DB_USER=postgres
-            SLACK=YOUR_WEB_HOOK_URL
-            TZ="Asia/Tokyo"
-            SECRET_KEY_BASE=xxxxxxxxxxxxxx
+            SOULS_DB_HOST=#{get_sql_ip.strip}
+            SOULS_DB_PW=#{options[:root_password]}
+            SOULS_DB_USER=postgres
+            SOULS_TZ="#{region_to_timezone(region: region)}"
+            SOULS_SECRET_KEY_BASE="#{SecureRandom.base64(64)}"
           TEXT
         end
       end
@@ -35,16 +33,15 @@ module Souls
         file_path = ".env.production"
         File.open(file_path, "w") do |line|
           line.write(<<~TEXT)
-            DB_HOST="/cloudsql/#{project_id}:#{region}:#{instance_name}"
-            DB_PW=#{options[:root_password]}
-            DB_USER=postgres
-            APP_NAME=#{app_name}
-            GCP_PROJECT_ID=#{project_id}
-            GCP_REGION=#{region}
-            GCLOUDSQL_INSTANCE="#{project_id}:#{region}:#{instance_name}"
-            TZ="Asia/Tokyo"
-            SLACK="https://YOUR.WEB_HOOK_URL"
-            SECRET_KEY_BASE="XXXXXXXSecureTokenXXXXXXXXXX"
+            SOULS_DB_HOST="/cloudsql/#{project_id}:#{region}:#{instance_name}"
+            SOULS_DB_PW=#{options[:root_password]}
+            SOULS_DB_USER=postgres
+            SOULS_APP_NAME=#{app_name}
+            SOULS_GCP_PROJECT_ID=#{project_id}
+            SOULS_GCP_REGION=#{region}
+            SOULS_GCLOUDSQL_INSTANCE="#{project_id}:#{region}:#{instance_name}"
+            SOULS_TZ="#{region_to_timezone(region: region)}"
+            SOULS_SECRET_KEY_BASE="#{SecureRandom.base64(64)}"
           TEXT
         end
       end
@@ -136,5 +133,15 @@ module Souls
     def get_sql_ip
       `gcloud sql instances list | grep james | awk '{print $5}'`
     end
+
+    def region_to_timezone(region: "asia-northeast1")
+      if region.include?("asia")
+        "Asia/Tokyo"
+      elsif region.include?("europe")
+        "Europe/Amsterdam"
+      else
+        "America/Los_Angeles"
+      end
+    end
   end
 end

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

@@ -1,8 +1,7 @@
 module Souls
   class Github < Thor
-    desc "secret_set", "Github Secret Set by Github CLI"
+    desc "secret_set", "Github Secret Set from .env.production"
     def secret_set
-      require("#{Souls.get_api_path}/config/souls")
       file_path = ".env.production"
       File.open(file_path, "r") do |file|
         file.each_line do |line|
@@ -11,5 +10,50 @@ module Souls
         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])
+      Souls::Github.new.invoke(:secret_set)
+    end
+
+    private
+
+    def update_env_production(key:, value:, dqm: false)
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_path = ".env.production"
+        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
+
+    def update_api_env(key:, value:, dqm: false)
+      Dir.chdir(Souls.get_api_path.to_s) do
+        file_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
+
+    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
+          puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+        end
+      end
+    end
   end
 end

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

@@ -119,15 +119,15 @@ module Souls
 
           gem "activesupport", "6.1.4.1"
           gem "foreman", "0.87.2"
-          gem "google-cloud-pubsub", "2.8.1"
+          gem "google-cloud-pubsub", "2.9.0"
           gem "paint", "2.2.1"
           gem "parser", "3.0.2.0"
           gem "pg", "1.2.3"
           gem "rake", "13.0.6"
           gem "rspec", "3.10.0"
-          gem "rubocop", "1.21.0"
+          gem "rubocop", "1.22.3"
           gem "sinatra-activerecord", "2.0.23"
-          gem "solargraph", "0.43.2"
+          gem "solargraph", "0.44.0"
           gem "souls", "#{Souls::VERSION}"
           gem "steep", "0.46.0"
           gem "thor", "1.1.0"
@@ -159,14 +159,13 @@ module Souls
       system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Procfile")
       system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Steepfile")
       system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/gitignore")
-      system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/.env.production.sample")
       system("cd #{app_name} && mv gitignore .gitignore")
       system("cd #{app_name} && bundle")
       system("cd #{app_name}/apps/api && bundle")
       FileUtils.rm(sig_name)
     end
 
-    def souls_api_credit(app_name: "souls", service_name: "api")
+    def souls_api_credit(app_name: "souls")
       line = Paint["====================================", :yellow]
       puts("\n")
       puts(line)

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.3.3
+1.3.7

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.3.3
+1.3.7

metadata

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