souls 1.3.0 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a268cc2c1da6a5192359f7ac46028f340b066ba8fd52b79f17639b1e0ee97fd
-  data.tar.gz: 571e1896e5ce83ea3813457cd3f4aa094d295b03340781b08f19b92cef626728
+  metadata.gz: db171a41f8de9bb4f402c769cd2c46dbba8ca747175e70e8a61ae6c8c4298a40
+  data.tar.gz: b8efa059a87e83ffa2753fe7f91df0df7049fdf64f3f301bdcab73d753458ba1
 SHA512:
-  metadata.gz: bcf221fef615359fe8be1f979cf76ae54e773ef8075c49940989df5c2fd0cc37ee104dcfbf0b2ce441cc80316dd2f10a84d051746def38dd2706f51494314c8f
-  data.tar.gz: a5a2fd8e0b9b2374750941656ccd63b3362e159a4cad2df2e00ac8caefd226a9e90d6c54da6b3b7982b61a33ee0dd1d0834872c11fcfc3276913d2550dec926c
+  metadata.gz: 79a2a2a9f9f8266861cd9363f7299576bd227224a3ef6e78e2e566067b14535547b399862d558eb9133474c8be185e5220e3785a6f6d43c48ac04732864d1a51
+  data.tar.gz: e434dec7a31f610a65083574e09abefee38b3438b58eb28c4a2dec94c82463d3a4b0ed2b685d3da94061badcfdec72c365f4f8da4dc6b9d473d9524b9b85c910

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

@@ -192,7 +192,7 @@ end
                         --service-account=${{ secrets.APP_NAME }}@${{ secrets.GCP_PROJECT_ID }}.iam.gserviceaccount.com \\
                         --image=gcr.io/${{ secrets.GCP_PROJECT_ID }}/${{secrets.APP_NAME}}-#{worker_name} \\
                         --memory=4Gi \\
-                        --region=asia-northeast1 \\
+                        --region=${{ secrets.GCP_REGION }} \\
                         --allow-unauthenticated \\
                         --platform=managed \\
                         --quiet \\

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

@@ -5,23 +5,48 @@ 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
+      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"
 
       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}" << $RS
-        lines[1] = "DB_PW=#{options[:root_password]}" << $RS
-        lines[2] = "DB_USER=#{instance_name}" << $RS
-        File.open(file_path, "w") { |f| f.write(lines.join) }
+        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
+          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)
+            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"
+          TEXT
+        end
       end
     rescue Thor::Error => e
       raise(Thor::Error, e)
@@ -46,7 +71,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 +116,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} \

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.0".freeze
+  VERSION = "1.3.4".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.3.0
+1.3.4

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.3.0
+1.3.4

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.0
+  version: 1.3.4
 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