souls 1.19.4 → 1.19.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cd5ddd6a55b4b803fc8e815afdf4fbb27d638ae1ef7cd6714d1205b8c4c3818
-  data.tar.gz: 00f110a29e05dda4a3790c128ba9f9ff0b019057874009766e2cd18cab426dc4
+  metadata.gz: 3bfb5aba9ee1c61c94280607df87f643dca9ca4b24a97ad098d005d10ccad65f
+  data.tar.gz: 801641e0e9bb8fff4908f4b3febfd0f8024b836b3a16f338b2cafd1f6728aeba
 SHA512:
-  metadata.gz: fcaa0f1b6d9f1ca3dc20ef00a8550362c3bed338141cdb60cdde0e655dcc93185d4f8af738fac82a549ed27cf3198532c94009f27e8522eade002bd82cb2b109
-  data.tar.gz: c6c7a35a0d1ba0f8fb5797e61081f567a4627935d465e1756da524e983a81f1136623b95e98067248393be75b13129efab3d627d67ab27043bc0322d68e748fa
+  metadata.gz: eea9d1f2ce11a802eb81cfe5b43bf1db40baed767dce82da0d9fc4f845a6ed26972fcc9808a904dfdab4ec0ff9787b28a5e902cf15f7eb521f950ca4fbb56a46
+  data.tar.gz: 38b3bea572fd8792b7e1a67e2d12930d86637aad9ea45bfeb233e89b3c1b6753212971dae8018001a7dd4f7162509b6afa0e8954a40a5d396c8abdb6858ca23c

data/lib/souls/app/utils/painter.rb

@@ -13,16 +13,28 @@ module SOULs
         puts(Paint % ["✓ %{white_text}", :red, { white_text: ["Deleted file #{text}", :white] }])
       end
 
-      def error(text)
-        puts(Paint["🚨 #{text}", :red])
+      def error(text, emoji = nil)
+        if emoji
+          puts(Paint["#{emoji} #{text}", :red])
+        else
+          puts(Paint["🚨 #{text}", :red])
+        end
       end
 
-      def warning(text)
-        puts(Paint["🚨 #{text}", :yellow])
+      def warning(text, emoji = nil)
+        if emoji
+          puts(Paint["#{emoji} #{text}", :yellow])
+        else
+          puts(Paint["🚨 #{text}", :yellow])
+        end
       end
 
-      def success(text)
-        puts(Paint["🎉 #{text}", :green])
+      def success(text, emoji = nil)
+        if emoji
+          puts(Paint["#{emoji} #{text}", :green])
+        else
+          puts(Paint["🎉 #{text}", :green])
+        end
       end
 
       def sync(text)

data/lib/souls/cli/create/templates/go/function.rb

@@ -1,7 +1,6 @@
 module Template
   module Go
     def self.function(file_name)
-      file_name.underscore.camelize
       <<~APP
         // Package p contains an HTTP Cloud Function.
         package p
@@ -17,7 +16,7 @@ module Template
 
         // HelloWorld prints the JSON encoded "message" field in the body
         // of the request or "Hello, World!" if there isn't one.
-        func #{file_name}(w http.ResponseWriter, r *http.Request) {
+        func #{file_name.underscore.camelize}(w http.ResponseWriter, r *http.Request) {
           var d struct {
             Message string `json:"message"`
           }

data/lib/souls/cli/create/templates/nodejs/index.rb

@@ -1,7 +1,6 @@
 module Template
   module Nodejs
     def self.index(file_name)
-      file_name.underscore.camelize(:lower)
       <<~APP
         const express = require('express');
         const bodyParser = require('body-parser');
@@ -20,7 +19,7 @@ module Template
         app.post('/souls-functions-post', (req, res)=>{
           res.json(req.body)
         });
-        exports.#{file_name} = app;
+        exports.#{file_name.underscore.camelize(:lower)} = app;
       APP
     end
   end

data/lib/souls/cli/create/templates/python/main.rb

@@ -1,9 +1,8 @@
 module Template
   module Python
     def self.main(file_name)
-      file_name.underscore
       <<~APP
-        def #{file_name}(request):
+        def #{file_name.underscore}(request):
           """Responds to any HTTP request.
           Args:
               request (flask.Request): HTTP request object.

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

@@ -63,6 +63,7 @@ module SOULs
       system("gcloud services enable translate.googleapis.com")
       system("gcloud services enable firestore.googleapis.com")
       system("gcloud services enable cloudfunctions.googleapis.com")
+      system("gcloud services enable cloudbuild.googleapis.com")
     end
   end
 end

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

@@ -1,4 +1,3 @@
-require "google/cloud/pubsub"
 require_relative "./model"
 require_relative "./pubsub"
 require_relative "./conf"

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

@@ -15,15 +15,14 @@ module SOULs
       return false if url.blank?
 
       worker_file_names = get_workers_file_paths
-      return false if worker_file_names.blank?
 
-      sync_pubsub_topics_and_subscriptions(workers: worker_file_names, worker_url: url)
+      sync_pubsub_topics_and_subscriptions(worker_file_names: worker_file_names, worker_url: url)
       SOULs::Painter.sync("All Jobs with PubSub Subscription!")
     end
 
     private
 
-    def sync_pubsub_topics_and_subscriptions(worker_url:, workers: {})
+    def sync_pubsub_topics_and_subscriptions(worker_url:, worker_file_names: {})
       project_id = SOULs.configuration.project_id
       pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
       topics = pubsub.topics
@@ -37,20 +36,31 @@ module SOULs
       souls_topics = topic_names.select { |n| n.include?("souls-#{worker_name}") }
 
       souls_topics.each do |name|
-        value = workers[name.to_sym] || 0
-        workers[name.to_sym] = value - 1
+        file_name = name.underscore
+        value = worker_file_names[file_name.to_sym] || 0
+        worker_file_names[file_name.to_sym] = value - 1
       end
+      puts(worker_file_names)
 
-      workers.each do |key, value|
-        topic_id = key.to_s.gsub("_", "-")
-        if value == 1
-          create_topic(topic_id: topic_id)
-          create_push_subscription(worker_url: worker_url, topic_id: topic_id)
+      if worker_file_names.blank?
+        return if souls_topics.blank?
+
+        souls_topics.each do |topic_id|
+          delete_topic(topic_id: topic_id)
+          delete_subscription(topic_id: topic_id)
+        end
+      else
+        worker_file_names.each do |key, value|
+          topic_id = key.to_s.gsub("_", "-")
+          if value == 1
+            create_topic(topic_id: topic_id)
+            create_push_subscription(worker_url: worker_url, topic_id: topic_id)
+          end
+          delete_topic(topic_id: topic_id) if value == -1
+          delete_subscription(topic_id: topic_id) if value == -1
         end
-        delete_topic(topic_id: topic_id) if value == -1
-        delete_subscription(topic_id: topic_id) if value == -1
       end
-      workers
+      worker_file_names
     end
 
     def create_topic(topic_id: "worker-mailer")
@@ -65,7 +75,7 @@ module SOULs
       pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
       topic = pubsub.topic(topic_id.to_s)
       topic.delete
-      SOULs::Painter.error("Topic #{topic_id} deleted.")
+      SOULs::Painter.warning("Topic #{topic_id} deleted.", "✨")
     end
 
     def delete_subscription(topic_id: "worker-mailer")
@@ -79,7 +89,7 @@ module SOULs
     def create_push_subscription(worker_url:, topic_id: "worker-mailer")
       souls_endpoint = SOULs.configuration.endpoint
       subscription_id = "#{topic_id}-sub"
-      endpoint = "#{worker_url}/#{souls_endpoint}"
+      endpoint = "#{worker_url}#{souls_endpoint}"
 
       project_id = SOULs.configuration.project_id
       pubsub = Google::Cloud::Pubsub.new(project_id: project_id)

data/lib/souls/version.rb

@@ -1,4 +1,4 @@
 module SOULs
-  VERSION = "1.19.4".freeze
+  VERSION = "1.19.8".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.19.4
+1.19.8

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.19.4
+1.19.8

data/lib/souls.rb

@@ -9,6 +9,7 @@ require "whirly"
 require "tty-prompt"
 require "thor"
 require "resolv"
+require "google/cloud/pubsub"
 
 module SOULs
   extend SOULs::Utils

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.19.4
+  version: 1.19.8
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -124,6 +124,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement