souls 1.4.10 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08cc1c411069255bac7a97299c362167c4f5a1051305a973a5da901f9aabf488'
-  data.tar.gz: 4d7d2f6a14c5e631be088991ed35bcd03aee3dcee8b21f00c7a0f3a020898cca
+  metadata.gz: 610ae84aae1c7d75c24a0362d9aa8d26d8db04f5fceb3156a89717c2a04d2f43
+  data.tar.gz: d7aa00e87059adc6c94669ae690ac2d44553d798518f9e4241d9539e391d1a9c
 SHA512:
-  metadata.gz: 1d0cdba28abb50e703f9fc37d55b1c7acbdf49d459306f48d2f9d5c11797e0d12a4b338da73a1d4fa9be6602f229d817109a3e2ccfb899b1b53a0fbee0bd3bb2
-  data.tar.gz: fdc5cd9b1e18a27737cd495520f1ed58522b44d74c30c748de057af68a31346f93dfbedcd541227361399a55a09ef28d151b6cc782aebedb259582e6ffcb004c
+  metadata.gz: d1e30d414c8464bdeff2abc95bd92a26f58f234e731ccba69dc034a010c1043150e62affd95309d1197cd418c2ebdbc51c31fba65a65268f2b2b77126b006f3e
+  data.tar.gz: dcc28cc09610d9263bd060290f6399017f6bad0c8b6962f01c1c226fda890d126b61dd83e6b9877a4ecbbc3cec6108b6e48084c707993704f999bf3be9998a55

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

@@ -23,7 +23,7 @@ module Souls
     desc "get_endpoint", "Show Worker's Endpoint"
     def get_endpoint(worker_name: "")
       project_id = Souls.configuration.project_id
-      `gcloud run services list  --project #{project_id} | grep #{worker_name} | awk '{print $4}'`
+      `gcloud run services list  --project #{project_id} | grep -x #{worker_name} | awk '{print $4}'`
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end

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

@@ -8,21 +8,23 @@ module Souls
       password = prompt.mask("Set DB PassWord:")
       app_name = Souls.configuration.app
       project_id = Souls.configuration.project_id
-      instance_name = Souls.configuration.instance_name if instance_name.blank?
+      instance_name = Souls.configuration.instance_name
       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=1 --memory=3750MB --zone=#{zone} \
+              --database-version=#{db_type} --cpu=1 --memory=4096MB --zone=#{zone} \
               --root-password='#{password}' --database-flags cloudsql.iam_authentication=on"
       )
+      instance_ip = `gcloud sql instances list | grep -x #{instance_name} | awk '{print $5}'`.strip
+      sleep(5) until instance_ip.match?(Resolv::IPv4::Regex)
       Dir.chdir(Souls.get_api_path.to_s) do
         file_path = ".env"
         File.open(file_path, "w") do |line|
           line.write(<<~TEXT)
-            SOULS_DB_HOST=#{get_sql_ip.strip}
+            SOULS_DB_HOST=#{instance_ip}
             SOULS_DB_PW=#{password}
             SOULS_DB_USER=postgres
             SOULS_GCP_PROJECT_ID=#{project_id}
@@ -36,7 +38,7 @@ module Souls
         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_PW=#{password}
             SOULS_DB_USER=postgres
             SOULS_APP_NAME=#{app_name}
             SOULS_GCP_PROJECT_ID=#{project_id}
@@ -133,10 +135,6 @@ module Souls
 
     private
 
-    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"

data/lib/souls/cli/release/release.rb

@@ -33,7 +33,7 @@ module Souls
         puts("before build")
         system("rake build")
         system("rake release")
-        system("gsutil -m cp -r coverage gs://souls-bucket/souls-coverage")
+        system("gsutil -m -q cp -r coverage gs://souls-bucket/souls-coverage")
         Whirly.status = Paint["soul-v#{souls_new_ver} successfully updated!"]
       end
     end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.4.10
+1.5.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.4.10
+1.5.1

data/lib/souls.rb

@@ -9,6 +9,7 @@ require "paint"
 require "whirly"
 require "tty-prompt"
 require "thor"
+require "resolv"
 
 module Souls
   extend Souls::Utils

metadata

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