souls 0.53.0 → 0.53.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18fee033db0ba1d965c475ccfcc7b214a638ca5a1717bfe2a4c4ff84941794e0
-  data.tar.gz: cd106d0797aa4c5ee1b077629ba0d36e3c78acc653fdfb20f478e5d413d77fda
+  metadata.gz: 564e0bedd2c3f6d26daad5f9bc4307051b042ce2867e16fe0667372e70b3b432
+  data.tar.gz: 5a4fef479822068f0e49405c7b5b974adfe9c68845681454e6ec0a2d1aa35904
 SHA512:
-  metadata.gz: c73f2318078f8c543fef42718868603ff4503fcbfa64c3b277ea1242d07b4038e348acd7e69949d6c74b7d8a7b70571494f3260d10b59c66e97d7c419604f710
-  data.tar.gz: 642d8cdca074b5234b7179b815f17912347bb17d211d827a5c7198b8e8f8f0bcdb915b6cb37ce2a41ef2b54f408805ba0b8178f376cc296fa3ff204b1a5e9e14
+  metadata.gz: 467f58902722373ee1ee48af87a1b59383d4f71117c64a9242118b487aca907384fc5d8c9c5128f358852c6d29090de7274eb8719e7780e0e5d150e91d976920
+  data.tar.gz: 23b9061872e797e8e6803848e21dc30a29919519f4b929776aee8d87ae95e7b41cde8aa5a0fade7f8723a571cbb7d09ea934f172ced208f830c3d3af943f9a65

data/README.md

@@ -1,4 +1,4 @@
-[![SOULs](https://storage.googleapis.com/souls/souls-ogp-vertical.jpg)](https://rubygems.org/gems/souls)
+[![SOULs](https://souls.elsoul.nl/ogp.jpg)](https://souls.elsoul.nl)
 
 <p align="center">
   <a aria-label="Ruby logo" href="https://el-soul.com">
@@ -27,7 +27,7 @@ SOULs はサーバーレスフルスタックフレームワークです。柔
 SOULs バックエンドには `API` と `Worker` の 2 つのタイプがあります。
 `API` は主にデータをフロントエンドへ提供します。`Worker` は主に `タスク` の処理を行います
 
-![画像](https://storage.googleapis.com/souls-bucket/imgs/souls-structure.jpg)
+![画像](https://souls.elsoul.nl/imgs/docs/SOULs.jpg)
 
 現在のバージョンでは SOULs `API` と `Worker` を Github Actions を使って Google Cloud Run へそれぞれデプロイします。
 
@@ -86,8 +86,6 @@ Check your GraphQL PlayGround
 
 (localhost:4000/playground)[localhost:4000/playground]
 
-
-
 ## Gemfile 自動更新アップデート
 
 `Gemfile`, `Gemfile.lock` を最新のバージョンに自動更新します。
@@ -96,11 +94,9 @@ Check your GraphQL PlayGround
 souls upgrade gemfile
 ```
 
-
 除外したい `gem` は `config/souls.rb` 内の
 `config.fixed_gems` の配列に追加します。
 
-
 ```ruby
 Souls.configure do |config|
   config.app = "souls-api"
@@ -113,15 +109,12 @@ Souls.configure do |config|
 end
 ```
 
-
-
 ## SOULs Serverless Application Framework Document
 
 SOULs サーバーレスアプリケーションフレームワーク
 ドキュメントはこちらから
-- [SOULs Document](https://souls.elsoul.nl/)
-
 
+- [SOULs Document](https://souls.elsoul.nl/)
 
 ## Development
 

data/exe/souls

@@ -3,7 +3,19 @@ require "souls"
 require "thor"
 begin
   souls_command = ARGV[0]
-  require("./config/souls") unless ["new", "docker", "-v", "deploy"].include?(souls_command)
+  require("./config/souls") unless [
+    "new",
+    "docker",
+    "-v",
+    "deploy",
+    "help",
+    "api",
+    "create",
+    "gcloud",
+    "worker",
+    "",
+    nil
+  ].include?(souls_command)
 rescue StandardError
   raise(StandardError, "No confif! Please make `./config/souls.rb` File!")
 end

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

@@ -32,6 +32,12 @@ module Souls
       raise(Thor::Error, e)
     end
 
+    desc "config_set", "gcloud config set"
+    def config_set
+      project_id = Souls.configuration.project_id
+      system("gcloud config set project #{project_id}")
+    end
+
     desc "enable_permissions", "Enable Google Cloud APIs for SOULs Framework"
     def enable_permissions
       system("gcloud services enable compute.googleapis.com")

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

@@ -13,8 +13,8 @@ module Souls
     end
 
     desc "list", "Show Google Cloud Run List"
-    def list(project_id: "")
-      project_id = Souls.configuration.project_id if project_id.blank?
+    def list
+      project_id = Souls.configuration.project_id
       system("gcloud run services list --project #{project_id} --platform managed")
     rescue Thor::Error => e
       raise(Thor::Error, e)
@@ -22,7 +22,9 @@ module Souls
 
     desc "get_endpoint", "Show Worker's Endpoint"
     def get_endpoint(worker_name: "")
-      `gcloud run services list | grep #{worker_name} | awk '{print $4}'`
+      app_name = Souls.configuration.app
+      project_id = Souls.configuration.project_id
+      `gcloud run services list  --project #{project_id} --platform managed | grep #{app_name}-souls-#{worker_name} | awk '{print $4}'`
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end

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

@@ -2,6 +2,7 @@ module Souls
   class Sync < Thor
     desc "conf", "Sync config/souls.rb Endpoint with Google Cloud Run"
     def conf
+      Souls::Gcloud.new.config_set
       update_conf
       update_conf(strain: "api")
       puts(
@@ -36,7 +37,7 @@ module Souls
 
               new_line.write("  config.workers = [\n")
               workers.each_with_index do |worker, i|
-                base_url = Souls::Gcloud::Run.new.get_endpoint(worker_name: worker[:name])
+                base_url = Souls::CloudRun.new.get_endpoint(worker_name: worker[:name])
                 endpoint = Souls.configuration.endpoint
                 if (i + 1) == workers.size
                   new_line.write(<<-TEXT)

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

@@ -2,6 +2,7 @@ module Souls
   class Sync < Thor
     desc "pubsub", "Sync Worker Jobs & Google Cloud Pubsub Subscriptions"
     def pubsub
+      Souls::Gcloud.new.config_set
       get_topics(workers: get_workers)
       puts(Paint["All Jobs Synced with PubSub Subscription!", :green])
     rescue Thor::Error => e

data/lib/souls/cli.rb

@@ -1,25 +1,25 @@
 require "souls"
 module Souls
   class CLI < Thor
-    desc "api [COMMAND]", "souls api Commands"
+    desc "api [COMMAND]", "SOULs API Commands"
     subcommand "api", API
 
-    desc "gcloud [COMMAND]", "souls gcloud Commands"
+    desc "gcloud [COMMAND]", "SOULs Gcloud Commands"
     subcommand "gcloud", Gcloud
 
-    desc "docker [COMMAND]", "souls docker Commands"
+    desc "docker [COMMAND]", "SOULs Docker Commands"
     subcommand "docker", Docker
 
-    desc "create [COMMAND]", "souls create worker $worker_name"
+    desc "create [COMMAND]", "SOULs Create Worker"
     subcommand "create", Create
 
-    desc "sync", "souls sync Commands"
+    desc "sync", " SOULs Sync Commands"
     subcommand "sync", Sync
 
-    desc "upgrade", "souls upgrade Commands"
+    desc "upgrade", "SOULs Upgrade Commands"
     subcommand "upgrade", Upgrade
 
-    desc "worker [COMMAND]", "souls worker Commands"
+    desc "worker [COMMAND]", "SOULs Worker Commands"
     subcommand "worker", Worker
 
     # rubocop:disable Style/StringHashKeys

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.32.0
+0.32.4

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.32.0
+0.32.4

metadata

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