souls 1.3.1 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9586ab30b5189eaa4af5cbd037ad0650d78a0ce8c89fd1591528d7ec4da70d8a
-  data.tar.gz: 14087a6358389fdc3f0de14ac3cde00233add048add040f379e229239d0f954f
+  metadata.gz: f7be84adf2c447eaa2ecd78cd32ca799988aff10a77669daa77323829687f18d
+  data.tar.gz: ce581a1c2d2b42bf657ea74f04076d58820b260c48fabacd46fcb064abadfef4
 SHA512:
-  metadata.gz: e28e330548810a8804c51b287e4991c973fc918a5c2b8dab694a9998e6d5e930dc7a53cff8b33fb23db5f4ba501bea42bd931fb0c6d769f7f1bd6f287b91a768
-  data.tar.gz: eafd2c306469f2685fa93acd474afd51c729469bcc0721b7157c269a760364d84271ba7698f3bb20fcdd1872c2bf9ea1c20ddf583f5ce6deff795e879769ad64
+  metadata.gz: 7b0545fb8986cbc81658387264a3d30b545dd01e3a46522dd4b6eeafbaa7f8370969d657d536b9951f10912b1a86897066a65068d045be8e82fe16155c071734
+  data.tar.gz: 1b1e25eaa958bc4a5c02ee0ce0ab9775e63aba4fc26faa2d4bbf22ea0f78d4b0c1ca780cffd581992f71a2bbec5ee10ebfb1d07c18b6781378ab92e4f7ab435e

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=asia-northeast1 \\
+                        --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

@@ -5,23 +5,45 @@ module Souls
     method_option :root_password, default: "", aliases: "--root-password", desc: "Set Cloud SQL Root Password"
     method_option :mysql, type: :boolean, default: false, aliases: "--mysql", desc: "Set Cloud SQL Type to MySQL"
     def create_instance
-      instance_name = "souls-#{Souls.configuration.app}-db" if instance_name.blank?
+      app_name = Souls.configuration.app
+      project_id = Souls.configuration.project_id
+      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"
 
       zone = "#{region}-b"
       system(
         "gcloud sql instances create #{instance_name} \
-              --database-version=#{db_type} --cpu=2 --memory=7680MB --zone=#{zone} \
+              --database-version=#{db_type} --cpu=1 --memory=3750MB --zone=#{zone} \
               --root-password='#{options[:root_password]}' --database-flags cloudsql.iam_authentication=on"
       )
       Dir.chdir(Souls.get_api_path.to_s) do
         file_path = ".env"
-        lines = File.readlines(".env")
-        lines[0] = "DB_HOST=#{get_sql_ip.strip}\n"
-        lines[1] = "DB_PW=#{options[:root_password]}\n"
-        lines[2] = "DB_USER=postgres\n"
-        File.open(file_path, "w") { |f| f.write(lines.join) }
+        File.open(file_path, "w") do |line|
+          line.write(<<~TEXT)
+            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
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_path = ".env.production"
+        File.open(file_path, "w") do |line|
+          line.write(<<~TEXT)
+            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
     rescue Thor::Error => e
       raise(Thor::Error, e)
@@ -46,7 +68,7 @@ module Souls
     desc "assign_network", "Assign Network"
     def assign_network
       app_name = Souls.configuration.app
-      instance_name = "#{Souls.configuration.app}-db"
+      instance_name = Souls.configuration.instance_name
       project_id = Souls.configuration.project_id
       system("gcloud beta sql instances patch #{instance_name} --project=#{project_id} --network=#{app_name}")
     rescue Thor::Error => e
@@ -91,8 +113,8 @@ module Souls
     desc "assgin_ip", "Add Current Grobal IP to White List"
     def assign_ip(instance_name: "", ip: "")
       ip = `curl inet-ip.info` if ip.blank?
-      project_id = Souls.configuration.project_id
-      instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
+      project_id = Souls.configuration.project_id if instance_name.blank?
+      instance_name = Souls.configuration.instance_name if instance_name.blank?
       system(
         "
             gcloud beta sql instances patch #{instance_name} \
@@ -111,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"

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.3.1
+1.3.5

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.3.1
+1.3.5

data/lib/souls.rb

@@ -49,5 +49,9 @@ module Souls
       @fixed_gems = nil
       @workers = nil
     end
+
+    def instance_name
+      "souls-#{@app}-db"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.5
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport