souls 0.50.0 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f09e978fcff3505869e0f90ec0361236dc9ab49060a02877ee2be566920873d2
-  data.tar.gz: d752f6115d32fed0193905455e0cac1ffb799d3e2845a8e7f71807955de399ec
+  metadata.gz: a7367fa762682e76ba67083cf1b6d602de00187a21a556c1e9a42c92cf50a154
+  data.tar.gz: a669713a544dea89c5481049ecd88bcb256cce2d571ba284998205563f3d7fb9
 SHA512:
-  metadata.gz: 48020ee00fc64db00d1f98c08aa087fe2dd41bb1bbfdf0b5c68d418bd3ce90726c43016bd6c5215fdb338c01ab4e5fba046d147aeb64878728b1f565899750b4
-  data.tar.gz: 91398508a99065252a54dabc29141bea6432ba0448936796ba2eda2c10eb64d8340b2763ebcab1c61e5ca10851628997a97f4953e499d109c6fa489da40255b3
+  metadata.gz: 943d98643861cab7f4a4f6b87f14f3e8704fd25bfff163c57a8998d12379935aea9680b41c7c540470f189878c8eb5dfeace448e2c36c65b73ce89f0b93ce98d
+  data.tar.gz: df0a5eaba3954eb7b7c2a2dc1b3f8e9393598a1eb2ec52c47c418f3ad2e7c2ba657c883e6b234c685e3e756c8d1e99d7412df9204851199099f8962dfb8989c6

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
 
@@ -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/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.29.0
+0.30.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.29.0
+0.30.0

metadata

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