souls 0.53.3 → 0.54.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e40337225252207ee584a0792eb682563c6ff954e52f3e5da2f149556472028d
-  data.tar.gz: 4ea2367b590925117d927bf9e0098d11d93e0ad8e407f48dad8a630628147cb9
+  metadata.gz: f3aff8743cd6a7080752c35676b1350aa519a18bd46643d086f16933b42eb13b
+  data.tar.gz: e1b9ce625e9a5b90dd9a5892d6263b5cde76b86e33d110a7205a015cf735d759
 SHA512:
-  metadata.gz: 15c47b58b66cf2a6765baca1027580ab3850ca8687c8e443323a1d37f1026a70c148184d86eb39d550e0f053765e63c8b53b493a700d7ceea9fdad7305fdef2c
-  data.tar.gz: cc5b188f99c0a82572c9a4f3abefd1ec743d3e973111a329b7765737967c90d8cee5f9cd58dcd4b8ff68c3f8ac771022142b97ca55584d87a1dc96579c972133
+  metadata.gz: ed4b2fdfcbef0f9821ae3b3747acdc9e67645b00baf4d67861f1f67ed9a7b87aa620ac4c16e631d527cb4e1624a3e7412616166b5c6a1ffe13f0bf25cf7bd36f
+  data.tar.gz: 75b8be0b7cbcfecb026dc500e0d0efca3f14871b99c6a2c5960566995f6153f51aabedfe4fecdbc51a2e9674c16cb4fc8d391771b2dbd1c1413d6735b3d83e86

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,8 +22,10 @@ module Souls
 
     desc "get_endpoint", "Show Worker's Endpoint"
     def get_endpoint(worker_name: "")
-      project_id = Souls.configuration.project_id if project_id.blank?
-      `gcloud run services list  --project #{project_id} --platform managed | 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(

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.32.3
+0.33.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.32.3
+0.33.1

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,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.53.3
+  version: 0.54.1
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -192,7 +192,7 @@ metadata:
   homepage_uri: https://souls.elsoul.nl
   source_code_uri: https://github.com/elsoul/souls
   changelog_uri: https://github.com/elsoul/souls
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key:
+signing_key: 
 specification_version: 4
 summary: SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
   クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。