souls 1.5.2 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b723d5fe6fdbb86fb785d308781dc7d0c5a13fcf6db3e714141a4d97c03d9d9
-  data.tar.gz: aa7ba7e1d4848499fa60ce609fada98d04167890f45275e485e1abe385a2fb36
+  metadata.gz: 7d3b9eb1cb5b6823cf7810614686760cffe8f38278fad5f5cbd71dcd7a9ac2ad
+  data.tar.gz: 37792d3980be9802875e160b4de033b2928ec80648e3643f5d6c2287cf911d1e
 SHA512:
-  metadata.gz: 2e141c28f1b61173a62faa5dbfcf1cb1d3e98d1ba68579ec1111583c03f34f43fec5a674caea856daf13912b3a0e0a7921c569cdf1b1d9de798fe1a70fa63ac1
-  data.tar.gz: 4ed055384cad39d2f1d82b7457cc8d3d08a3226e9af975ddb93b1340dc0e71c4939e483d6612d54b5a82ea49807618fc263042d96a674fddca3c4e8e77a19340
+  metadata.gz: e16d7589e8fd2ca4714aacf3389b6b6020df036b05914d0a7aaef4cc4fe7bc873617048632eed9883f2a555fdc856871e58a3bd0d24b8b19f6c7762efa2b0128
+  data.tar.gz: d41552dff851c5a23828420c2074144669766099e52fe378770d6fdaa323e3e5a9e4c536957a259325c6adfdad300c9efadef910143732d6c77a3b85b59a5084

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 -x #{worker_name} | awk '{print $4}'`
+      `gcloud run services list  --project #{project_id} | grep #{worker_name} | awk '{print $4}'`
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end

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

@@ -13,12 +13,13 @@ module Souls
       db_type = options[:mysql] ? "MYSQL_8_0" : "POSTGRES_13"
 
       zone = "#{region}-b"
+      system("gcloud config set project #{project_id}")
       system(
         "gcloud sql instances create #{instance_name} \
               --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
+      instance_ip = `gcloud sql instances list | grep #{instance_name} | awk '{print $5}'`.strip
       Dir.chdir(Souls.get_api_path.to_s) do
         file_path = ".env"
         File.open(file_path, "w") do |line|

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

@@ -7,6 +7,8 @@ module Souls
         puts(Paint["`souls new souls-app`", :yellow])
         exit
       end
+      file_dir = "./#{app_name}"
+      raise(StandardError, "Directory Already Exist!") if Dir.exist?(file_dir)
 
       service_name = "api"
       download_souls(app_name: app_name, service_name: service_name)

data/lib/souls/cli/upgrade/config.rb

@@ -0,0 +1,29 @@
+module Souls
+  class Upgrade < Thor
+    desc "config", "Update config/souls.rb"
+    def config
+      souls = Souls.configuration
+      prompt = TTY::Prompt.new
+      regions = `gcloud app regions list | awk '{print $1}'`.split("\n")
+      regions.shift
+      project_id = prompt.ask("Project ID:", default: souls.project_id)
+      region = prompt.select("Region:", regions, default: souls.region)
+      endpoint = prompt.ask("Endpoint:", default: souls.endpoint)
+
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        mother_conf_path = "config/souls.rb"
+        api_conf_path = "apps/api/config/souls.rb"
+        mother_conf = File.readlines(mother_conf_path)
+        api_conf = File.readlines(api_conf_path)
+        mother_conf[2] = "  config.project_id = \"#{project_id}\"\n"
+        mother_conf[3] = "  config.region = \"#{region}\"\n"
+        mother_conf[4] = "  config.endpoint = \"#{endpoint}\"\n"
+        api_conf[2] = "  config.project_id = \"#{project_id}\"\n"
+        api_conf[3] = "  config.region = \"#{region}\"\n"
+        api_conf[4] = "  config.endpoint = \"#{endpoint}\"\n"
+        File.open(mother_conf_path, "w") { |f| f.write(mother_conf.join) }
+        File.open(api_conf_path, "w") { |f| f.write(api_conf.join) }
+      end
+    end
+  end
+end

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

@@ -1,2 +1,3 @@
 require_relative "./gemfile"
 require_relative "./submodule"
+require_relative "./config"

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.5.2
+1.5.6

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.5.2
+1.5.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.6
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -217,6 +217,7 @@ files:
 - lib/souls/cli/update/rspec_resolver.rb
 - lib/souls/cli/update/type.rb
 - lib/souls/cli/update/type_rbs.rb
+- lib/souls/cli/upgrade/config.rb
 - lib/souls/cli/upgrade/gemfile.rb
 - lib/souls/cli/upgrade/index.rb
 - lib/souls/cli/upgrade/submodule.rb