souls 0.49.0 → 0.51.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acb1a478eea7adee5b08030cc7684079c61c2923638a26a12283ea1415a83578
-  data.tar.gz: 7f705d45cfc5172d6ef3e9a3d2194113a8d698056457c28b541eb114acea93b7
+  metadata.gz: 62fc5434cd97d243c168e4524d26a39437f5237f16ee89778c4ea5995f244aee
+  data.tar.gz: 2368dfe07467e449a0548ab40a6155399918a9a1359b286bbf3351a7ff0349f7
 SHA512:
-  metadata.gz: 569f199d2f30351f729939d09ed6cd63bd1d254f15b1750ebca5b07c7ebde57ebf9405c03861af4cd73d40adaa460b1550fedaf4dc5187f165724e0d01f89ba8
-  data.tar.gz: 53082a4de7a34616c46e8015ac89fefedff53162434041d351575d258e3f5498184f270d8aae42c46e9790b64e0eabab495038129d3f7c49fe41773cea761c7d
+  metadata.gz: 8f2b2acef6fc5cb3678d6df40c0bdc2d56c7769fe20699bf214e32e70de341ef6110ba7b8fb2e63ae596f3d5da428beeb81fce1e126abe56aab982dc92f481fa
+  data.tar.gz: 4bb3d0636e6b9c6ee696ffc2fb623850368550f7b8dde0a7b10e334cc3d221a42fba0987f28cb1b781957f98ea82a714ca2cc9617553ce08a50b79ba3ea8a3dd

data/README.md

@@ -102,6 +102,7 @@ souls upgrade gemfile
 Souls.configure do |config|
   config.app = "souls-api"
   config.project_id = "souls-api"
+  config.region = "asia-northeast1"
   config.endpoint = "/endpoint"
   config.strain = "api"
   config.fixed_gems = ["selenium-webdriver", "pg"]

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

@@ -23,7 +23,7 @@ module Souls
         file_dir = "apps/#{worker_name}"
         file_path = "#{file_dir}/Procfile.dev"
         File.open(file_path, "w") do |f|
-          f.write("web: bundle exec puma -p #{port} -e development")
+          f.write("#{worker_name}: bundle exec puma -p #{port} -e development")
         end
       end
 
@@ -154,7 +154,7 @@ end
 
                 - name: Deploy to Cloud Run
                   run: |
-                      gcloud run deploy ${{ secrets.APP_NAME }}-#{worker_name} \\
+                      gcloud run deploy ${{ secrets.APP_NAME }}-souls-#{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} \\
                         --memory=4Gi \\
@@ -192,9 +192,10 @@ end
             Souls.configure do |config|
               config.app = "#{app_name}"
               config.project_id = "#{project_id}"
+              config.region = "asia-northeast1"
               config.endpoint = "/endpoint"
               config.strain = "worker"
-              config.fixed_gems = ["excluded_gem"]
+              config.fixed_gems = ["spring"]
               config.workers = []
             end
           TEXT

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

@@ -2,50 +2,52 @@ module Souls
   module Gcloud
     module Compute
       class << self
-        def setup_vpc_nat(app_name: "", region: "asia-northeast1", range: "10.124.0.0/28")
-          create_network(app_name: app_name)
-          create_firewall_tcp(app_name: app_name, range: range)
-          create_firewall_ssh(app_name: app_name)
-          create_subnet(app_name: app_name, region: region, range: range)
-          create_connector(app_name: app_name, region: region)
-          create_router(app_name: app_name, region: region)
-          create_external_ip(app_name: app_name, region: region)
-          create_nat(app_name: app_name, region: region)
-          nat_credit(app_name: app_name)
+        def setup_vpc_nat(range: "10.124.0.0/28")
+          create_network
+          create_firewall_tcp(range: range)
+          create_firewall_ssh
+          create_subnet(range: range)
+          create_connector
+          create_router
+          create_external_ip
+          create_nat
+          nat_credit
         end
 
-        def create_network(app_name: "")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_network
+          app_name = Souls.configuration.app
           system("gcloud compute networks create #{app_name}")
         end
 
-        def create_firewall_tcp(app_name: "", range: "10.124.0.0/28")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_firewall_tcp(range: "10.124.0.0/28")
+          app_name = Souls.configuration.app
           system(
             "gcloud compute firewall-rules create #{app_name} \
                   --network #{app_name} --allow tcp,udp,icmp --source-ranges #{range}"
           )
         end
 
-        def create_firewall_ssh(app_name: "")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_firewall_ssh
+          app_name = Souls.configuration.app
           system(
             "gcloud compute firewall-rules create #{app_name}-ssh --network #{app_name} \
             --allow tcp:22,tcp:3389,icmp"
           )
         end
 
-        def create_subnet(app_name: "", region: "asia-northeast1", range: "10.124.0.0/28")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_subnet(range: "10.124.0.0/28")
+          app_name = Souls.configuration.app
+          region = Souls.configuration.region
           system(
             "gcloud compute networks subnets create #{app_name}-subnet \
             --range=#{range} --network=#{app_name} --region=#{region}"
           )
         end
 
-        def create_connector(app_name: "", region: "asia-northeast1")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_connector
+          app_name = Souls.configuration.app
           project_id = Souls.configuration.project_id
+          region = Souls.configuration.region
           system(
             "gcloud compute networks vpc-access connectors create #{app_name}-connector \
               --region=#{region} \
@@ -54,18 +56,21 @@ module Souls
           )
         end
 
-        def create_router(app_name: "", region: "asia-northeast1")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_router
+          app_name = Souls.configuration.app
+          region = Souls.configuration.region
           system("gcloud compute routers create #{app_name}-router --network=#{app_name} --region=#{region}")
         end
 
-        def create_external_ip(app_name: "", region: "asia-northeast1")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_external_ip
+          app_name = Souls.configuration.app
+          region = Souls.configuration.region
           system("gcloud compute addresses create #{app_name}-worker-ip --region=#{region}")
         end
 
-        def create_nat(app_name: "", region: "asia-northeast1")
-          app_name = Souls.configuration.app if app_name.blank?
+        def create_nat
+          app_name = Souls.configuration.app
+          region = Souls.configuration.region
           system(
             "gcloud compute routers nats create #{app_name}-worker-nat \
                   --router=#{app_name}-router \
@@ -79,8 +84,8 @@ module Souls
           system("gcloud compute network list")
         end
 
-        def nat_credit(app_name: "")
-          app_name = Souls.configuration.app if app_name.blank?
+        def nat_credit
+          app_name = Souls.configuration.app
           line = Paint["====================================", :yellow]
           puts("\n")
           puts(line)

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

@@ -2,8 +2,10 @@ module Souls
   module Gcloud
     module Sql
       class << self
-        def create_instance(instance_name: "", root_pass: "Postgre123!", zone: "asia-northeast1-b")
+        def create_instance(root_pass: "PassWord")
           instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
+          region = Souls.configuration.region
+          zone = "#{region}-b"
           system(
             "gcloud sql instances create #{instance_name} \
               --database-version=POSTGRES_13 --cpu=2 --memory=7680MB --zone=#{zone} \

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

@@ -42,10 +42,11 @@ module Souls
           f.write(<<~TEXT)
             Souls.configure do |config|
               config.app = "#{app_name}"
-              config.project_id = "#{app_name}-project"
+              config.project_id = "#{app_name}"
+              config.region = "asia-northeast1"
               config.endpoint = "/endpoint"
               config.strain = "api"
-              config.fixed_gems = ["excluded_gem"]
+              config.fixed_gems = ["spring"]
               config.workers = []
             end
           TEXT
@@ -72,10 +73,11 @@ module Souls
           f.write(<<~TEXT)
             Souls.configure do |config|
               config.app = "#{app_name}"
-              config.project_id = "#{app_name}-project"
+              config.project_id = "#{app_name}"
+              config.region = "asia-northeast1"
               config.endpoint = "/endpoint"
               config.strain = "mother"
-              config.fixed_gems = ["excluded_gem"]
+              config.fixed_gems = ["spring"]
               config.workers = []
             end
           TEXT

data/lib/souls/cli/sync/pubsub.rb

@@ -59,7 +59,8 @@ module Souls
         pubsub = Google::Cloud::Pubsub.new
 
         topic = pubsub.topic(topic_id)
-        topic.subscribe(subscription_id, endpoint: endpoint)
+        sub = topic.subscribe(subscription_id, endpoint: endpoint, deadline: 20)
+        sub.expires_in = nil
         puts("Push subscription #{subscription_id} created.")
       end
 

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.28.0
+0.30.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.28.0
+0.30.2

metadata

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