souls 0.53.2 → 0.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20dd660767b217c4102790845036b7a3de0616dbe046f5e17162db74d06a3481
-  data.tar.gz: efabbaace9cea8e00187016ee71f7743a6955da090c51e9e90f16e43693f3f9c
+  metadata.gz: 03e2a30c13d2d7dade4f9d5dd6a7ba08c6812c18bcb6f96520dc4f2a61018f80
+  data.tar.gz: 8a03989b99ed64d76ac4a3c7d2dbc170660d1ea417058249cf22bd60bd8dc9d1
 SHA512:
-  metadata.gz: a5bb3e33daf9c1ad8a12aa2dc2c7c3bbeb949df3b86d24cb8d5ac07cb63d7b6735666189739e4e41fa7f9ef602175f02e5345a21aa1c04152e4f98b67022f721
-  data.tar.gz: 4c2365dd95422055ee7f67155b9fcd461b40e24b3499bffa44df7426039e846746100fea2ec02038fc0cefa012ae995354cd68b9b7a362d02c57a0fbe5772c31
+  metadata.gz: be5fc71729fa8921edbb79ca27d4698598ae399690e28cf287955355c9965e90d961a2ff532a8b81996177f22286fd689e8d13a9dff10d82a04ccee1b2e2ba68
+  data.tar.gz: 809ebfa9484852965896d3e0bfc7731abd005b6d3ced814335be755917c3de4a9f5053d8b664cad14b4fa242e7f46c34fa25a348f1bf431398135ced5f829c8e

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/lib/souls/api/generate/application.rb

@@ -17,6 +17,7 @@ module Souls
       mutation(singularized_class_name)
       policy(singularized_class_name)
       rspec_policy(singularized_class_name)
+      true
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
@@ -25,15 +26,16 @@ module Souls
     def scaffold_all
       puts(Paint["Let's Go SOULs AUTO CRUD Assist!\n", :cyan])
       Souls.get_tables.each do |table|
-        Souls::Api::Generate.scaffold(class_name: table.singularize)
+        Souls::Generate.new.scaffold(table.singularize)
         puts(Paint["Generated #{table.camelize} CRUD Files\n", :yellow])
       end
+      true
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
 
     desc "delete_all  [CLASS_NAME]", "Generate Scaffold All Tables from schema.rb"
-    def delete_all(class_name: "user")
+    def delete_all(class_name)
       singularized_class_name = class_name.singularize.underscore
       pluralized_class_name = class_name.pluralize.underscore
       FileUtils.rm("./app/models/#{singularized_class_name}.rb")

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/create/index.rb

@@ -18,6 +18,7 @@ module Souls
         mother_procfile(worker_name: options[:name])
         souls_config_init(worker_name: options[:name])
       end
+      true
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end

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

@@ -10,6 +10,7 @@ module Souls
         system("rake db:migrate")
         system("rake db:migrate RACK_ENV=test")
       end
+      true
     rescue Thor::Error => e
       raise(Thor::Error, e)
     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,10 @@ 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/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.32.2
+0.33.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.32.2
+0.33.0

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.2
+  version: 0.54.0
 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