souls 1.4.12 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5cc5e9a1f4b76338e2ca2e1c2e867b6251c3a1f7490f130f13e576b2b42a2b3
-  data.tar.gz: 92b0fd3daf3de2d62717d2def476a4c3afa78ff17952937b91b905ac3f4c99f5
+  metadata.gz: 3469889eb53b99c477008678edde936ac8b0eb2d706c8e9558f952fe909d6777
+  data.tar.gz: 1c7b81422aa93ab37bfca70caf243ec02f3946bbc7c656d6a934835400d79fed
 SHA512:
-  metadata.gz: 5ddab2f3a81d30546b80803666f141e4ea997242a86813c56e12cbcd69675095a1745f17dca7e342488b2f92ce11a0da099ab306e66c9c0c480384f7d9c4c2fd
-  data.tar.gz: 3a99d05753b8173337180e85946521265f0397ac706184d75544ce936595d132235f79433452b68134259567141a02e0f5feb1a38e455c521c01594568bb52ef
+  metadata.gz: 32c16bd091866026827fec6c897622baa598197ebc89088f7ef6d0b3491532cd2d0dff775d6cd67671eae1b72fdf9e8d6dd0fbaab22270cef1c7c6ac3784d556
+  data.tar.gz: 2afe09c0a90271def102750e8b20d4b6bc894627c48738418fb580516ef5b8bdcef165e6e42d3d3b550c2f5786f64603f1da5cd2b9308bdb9d0a0b55ef0f3834

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

@@ -18,11 +18,13 @@ module Souls
               --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/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.4.12
+1.5.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.4.12
+1.5.0

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.12
+  version: 1.5.0
 platform: ruby
 authors:
 - POPPIN-FUMI