souls 1.19.6 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b5f7b94188e33045595ee50df3761dc486c786992aea9f803560f27500f4aae
-  data.tar.gz: 6d0659f46eb9ca1f9154c4cec5b97381cc04ca2f773b2bd1752eb82c0f6dac2e
+  metadata.gz: 690c4e033ba2db83f5f7889ac33cd199dbd4cd6b9b69f83c9d55cdd97ff5d3b3
+  data.tar.gz: aaf41d5d0ffaf0610c1cf99f26eb67df7e8c1d59e0bf40dd4b2eb525e3839ae4
 SHA512:
-  metadata.gz: 3ff3dcf7fa1cf290a4998ec3bf1428f2c4fc94973095e9d7a678ccd7b528fdbdaf5f8c5f58149784f97a0219467c992bc0ccbd75b989fefd428a88d0d248ec4a
-  data.tar.gz: 20e054999324d5d082544a4ca31e11bdde030aec3f664bf127df8a8912fbffa62864eb8ece8a701f75e0df37bf7126105438b44ef13c4d5ed4ab19836d85ab67
+  metadata.gz: f0a118b3bedfa8fdf60f6f7125b05dd05a9a49d2e818dad1bcfab50f98586fa173fdbbaa0417083dc0fa857c12461a18e54d628b365b40e57d693d6aa9323f96
+  data.tar.gz: ec064cf74ce3992b7169aca42b2f208eb3c81ce7dd2855df4b0c9f1a474028ca8d1b1631ac057d0864e81214fec48c71786bb8ebf6c6f1d358a48567d3d13818

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/functions.rb

@@ -1,6 +1,6 @@
-require_relative "./templates/functions_env_yaml"
+require_relative "./templates/functions/functions_env_yaml"
 
-Dir["#{SOULs::SOULS_PATH}/lib/souls/cli/create/templates/*/*.rb"].map do |f|
+Dir["#{SOULs::SOULS_PATH}/lib/souls/cli/create/templates/functions/*/*.rb"].map do |f|
   require f
 end
 
@@ -62,7 +62,7 @@ module SOULs
     end
 
     def get_runtime_create_method(runtime:)
-      Dir["#{SOULs::SOULS_PATH}/lib/souls/cli/create/templates/#{runtime}/*"].map do |n|
+      Dir["#{SOULs::SOULS_PATH}/lib/souls/cli/create/templates/functions/#{runtime}/*"].map do |n|
         n.split("/").last.gsub(".rb", "")
       end
     end

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

@@ -11,9 +11,21 @@ module SOULs
       end
 
       runtime = current_dir.match(/cf-(\D+\d+)-/)[1]
+      runtime_lang = current_dir.match(/^cf-(\D+)\d+-/)
+      entry_point =
+        case runtime_lang
+        when "nodejs"
+          current_dir.underscore.camelize(:lower)
+        when "python"
+          current_dir.underscore
+        when "go"
+          current_dir.underscore.camelize
+        else
+          current_dir
+        end
       system(
         "
-          gcloud functions deploy #{current_dir} --project=#{project_id} \
+          gcloud functions deploy #{current_dir} --entry-point=#{entry_point} --project=#{project_id} \
           --runtime #{runtime} --trigger-http --allow-unauthenticated --env-vars-file .env.yaml
           "
       )

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,21 +36,30 @@ module SOULs
       souls_topics = topic_names.select { |n| n.include?("souls-#{worker_name}") }
 
       souls_topics.each do |name|
-        file_name = name.gsub("-", "_")
-        value = workers[file_name.to_sym] || 0
-        workers[file_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
 
-      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")
@@ -66,7 +74,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")
@@ -100,7 +108,7 @@ module SOULs
         end
       workers.delete("base_query")
       workers.each do |file|
-        response[:"souls_#{worker_name}_#{file}"] = 1
+        response["souls_#{worker_name.underscore}_#{file}".to_sym] = 1
       end
       response
     end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.19.6
+1.20.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.19.6
+1.20.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.19.6
+  version: 1.20.0
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -190,15 +190,15 @@ files:
 - lib/souls/cli/console/index.rb
 - lib/souls/cli/create/functions.rb
 - lib/souls/cli/create/index.rb
-- lib/souls/cli/create/templates/functions_env_yaml.rb
-- lib/souls/cli/create/templates/go/function.rb
-- lib/souls/cli/create/templates/go/go.rb
-- lib/souls/cli/create/templates/nodejs/index.rb
-- lib/souls/cli/create/templates/nodejs/package.rb
-- lib/souls/cli/create/templates/python/main.rb
-- lib/souls/cli/create/templates/python/requirements.rb
-- lib/souls/cli/create/templates/ruby/app.rb
-- lib/souls/cli/create/templates/ruby/gemfile.rb
+- lib/souls/cli/create/templates/functions/functions_env_yaml.rb
+- lib/souls/cli/create/templates/functions/go/function.rb
+- lib/souls/cli/create/templates/functions/go/go.rb
+- lib/souls/cli/create/templates/functions/nodejs/index.rb
+- lib/souls/cli/create/templates/functions/nodejs/package.rb
+- lib/souls/cli/create/templates/functions/python/main.rb
+- lib/souls/cli/create/templates/functions/python/requirements.rb
+- lib/souls/cli/create/templates/functions/ruby/app.rb
+- lib/souls/cli/create/templates/functions/ruby/gemfile.rb
 - lib/souls/cli/db/create_migration.rb
 - lib/souls/cli/db/create_migration_rbs.rb
 - lib/souls/cli/db/index.rb