souls 0.53.1 → 0.53.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a1a57c0324e007ec27511a796ffeedbbf109b204b135f7440de0d80bfc03f72
-  data.tar.gz: 1e1b39af5e114b039a3c55f0b18527ba0f356338b50e0302cc7f12643c6927e0
+  metadata.gz: e35280f32390cf55c390b73dbb3e344ab8de636460e5464e1b0ebe5a7830f562
+  data.tar.gz: 3a429067cc9388575fd606ba7d056d6072d1c9c0d63a8231c628c25855c80310
 SHA512:
-  metadata.gz: 1a9b0bec6a228d558600dbea1453d3506fd7af254465eb5e75af1737f0ca87aba5268b7dcaa6df79d3a18268d842f79dcba1ac64fcd24ef5c5483e67bcc9fca9
-  data.tar.gz: bcafca5703d11cbf7d3fd02fac9cf6d161babd9c58df0a8bdc8e0544d3bc1276119c6f28eb05c4621f226294a52f82ffd4e8026d487df95bd985447a6b1eb366
+  metadata.gz: 11eb6b2e3683f6dcdcf45312bbb8ead4ab569e5a999a51c54ca74d94f07c6e5fe1b5527eac12c8286b71b34533e01b5bf307b68b49c7821ebed53a7aa545a8ab
+  data.tar.gz: 58bbefc266178a10f8ee51bcc4f2b6ab203ad2dc6cd4fd84c169b9dd19e75178e64be2f1e0c6b00a5843184b08811685033d8c7e1a492bd4dfb8027e97418940

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

@@ -12,7 +12,9 @@ begin
     "api",
     "create",
     "gcloud",
-    "worker"
+    "worker",
+    "",
+    nil
   ].include?(souls_command)
 rescue StandardError
   raise(StandardError, "No confif! Please make `./config/souls.rb` File!")

data/lib/souls/api/index.rb

@@ -8,6 +8,6 @@ module Souls
     desc "update [COMMAND]", "souls api update Commands"
     subcommand "update", Update
 
-    map "g" => :generate
+    map g: :generate
   end
 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
@@ -11,6 +12,7 @@ module Souls
     private
 
     def get_topics(workers: {})
+      app_name = Souls.configuration.app
       project_id = Souls.configuration.project_id
       pubsub = Google::Cloud::Pubsub.new
       topics = pubsub.topics
@@ -20,6 +22,8 @@ module Souls
           topic.name.gsub("projects/#{project_id}/topics/", "")
         end
 
+      topic_names.select { |n| n.include?("#{app_name}_souls_") }
+
       topic_names.each do |name|
         value = workers[name.to_sym] || 0
         workers[name.to_sym] = value - 1
@@ -36,23 +40,29 @@ module Souls
     end
 
     def create_topic(topic_id: "mailer")
+      app_name = Souls.configuration.app
       pubsub = Google::Cloud::Pubsub.new
-      topic = pubsub.create_topic(topic_id)
+      topic_name = "#{app_name}_souls_#{topic_id}"
+      topic = pubsub.create_topic(topic_name.to_s)
       puts("Topic #{topic.name} created.")
     end
 
     def delete_topic(topic_id: "mailer")
+      app_name = Souls.configuration.app
       pubsub = Google::Cloud::Pubsub.new
-      topic = pubsub.topic(topic_id)
+      topic_name = "#{app_name}_souls_#{topic_id}"
+      topic = pubsub.topic(topic_name.to_s)
       topic.delete
-      puts("Topic #{topic_id} deleted.")
+      puts("Topic #{topic_name} deleted.")
     end
 
     def create_push_subscription(topic_id: "mailer")
       require("#{Souls.get_mother_path}/config/souls")
       worker_name = topic_id.split("_")[0]
+      app_name = Souls.configuration.app
+      topic_name = "#{app_name}_souls_#{topic_id}"
 
-      subscription_id = "#{topic_id}_sub"
+      subscription_id = "#{topic_name}_sub"
       endpoint = ""
       worker_paths = Souls.configuration.workers
       worker_paths.each do |worker|

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.1".freeze
+  VERSION = "0.53.5".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.32.1
+0.32.5

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.32.1
+0.32.5

data/lib/souls/worker/index.rb

@@ -5,6 +5,6 @@ module Souls
     desc "generate [COMMAND]", "souls worker generate Commands"
     subcommand "generate", Generate
 
-    map "g" => :generate
+    map g: :generate
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.53.1
+  version: 0.53.5
 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