souls 1.19.8 → 1.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bfb5aba9ee1c61c94280607df87f643dca9ca4b24a97ad098d005d10ccad65f
-  data.tar.gz: 801641e0e9bb8fff4908f4b3febfd0f8024b836b3a16f338b2cafd1f6728aeba
+  metadata.gz: cd866432ec0f265187450b3387881c23c5bdff953f5055b6b457cee651e70623
+  data.tar.gz: deb328b90a62d79d2bfacff948de0f010bb98801df986dc02f0a1997821a5024
 SHA512:
-  metadata.gz: eea9d1f2ce11a802eb81cfe5b43bf1db40baed767dce82da0d9fc4f845a6ed26972fcc9808a904dfdab4ec0ff9787b28a5e902cf15f7eb521f950ca4fbb56a46
-  data.tar.gz: 38b3bea572fd8792b7e1a67e2d12930d86637aad9ea45bfeb233e89b3c1b6753212971dae8018001a7dd4f7162509b6afa0e8954a40a5d396c8abdb6858ca23c
+  metadata.gz: 8e370826736549cda4f68b6cac11e253cdc7b10afb535c7e70e0084af29457b3e9519dfe68970e1e38a0f86dd734e24f3ce423475d15d5aa8536486d898eb625
+  data.tar.gz: 3aabbaa8a7873408bfb74c254a71b8ee3b7a4703ee87f4d349509d6ef276bb067a36b966dcd3f74cd618946a71dfe41597990caaf62f9c9b5252d49f413ab3ec

data/lib/souls/app/graphql/souls_mutation.rb

@@ -1,5 +1,10 @@
 module SOULs
   class SOULsMutation < GraphQL::Schema::RelayClassicMutation
+    def self.post(url:, payload: {}, content_type: "application/json")
+      response = Faraday.post(url, payload.to_json, "Content-Type": content_type)
+      response.body
+    end
+
     def self.souls_check_user_permissions(user, obj, method)
       raise(StandardError, "Invalid or Missing Token") unless user
 

data/lib/souls/app/graphql/souls_query.rb

@@ -5,6 +5,11 @@ module SOULs
       attr_accessor :schedule
     end
 
+    def self.post(url:, payload: {}, content_type: "application/json")
+      response = Faraday.post(url, payload.to_json, "Content-Type": content_type)
+      response.body
+    end
+
     def self.check_user_permissions(user, obj, method)
       raise(StandardError, "Invalid or Missing Token") unless user
 

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
 
@@ -47,6 +47,18 @@ module SOULs
         SOULs::Painter.create_file(file_path)
       end
       create_env_yaml(file_dir: file_dir)
+      endroll = <<~TEXT
+        ♤ Deploy Cloud Functions ♤
+
+        $ cd apps/cf-#{version_string}-#{function_name}
+        $ souls functions deploy
+
+        $ souls functions help
+
+
+        Doc: https://souls.elsoul.nl
+      TEXT
+      puts(Paint[endroll, :white])
     end
 
     private
@@ -62,7 +74,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+-/)[1]
+      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
           "
       )
@@ -35,7 +47,7 @@ module SOULs
       Dir.chdir(SOULs.get_mother_path.to_s) do
         FileUtils.rm_rf("apps/#{name}")
       end
-      SOULs::Painter.success("Deleted #{name} functions!")
+      SOULs::Painter.warning("Deleted #{name} functions!", "✨")
     end
 
     desc "url", "Get SOULs Functions URL"

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

@@ -1,12 +1,11 @@
 module SOULs
   class CloudScheduler < Thor
-    desc "awake", "Set Ping Every 15min by Google Cloud Scheduler"
-    method_option :url, default: "https://souls.souls.nl", aliases: "--url", desc: "Set URL"
-    def awake
+    desc "awake [url]", "Set Ping Every 15min by Google Cloud Scheduler"
+    def awake(url)
       app_name = SOULs.configuration.app
       system(
         "gcloud scheduler jobs create http #{app_name}-awake
-            --schedule '0,10,20,30,40,50 * * * *' --uri #{options[:url]} --http-method GET"
+            --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
       )
     end
 
@@ -18,11 +17,11 @@ module SOULs
       project_id = SOULs.configuration.project_id
 
       schedules_list = current_schedules
-      worker_name = FileUtils.pwd.split("/").last
+      worker_name = FileUtils.pwd.split("/").last.underscore
       Queries::BaseQuery.all_schedules.each do |k, v|
         worker_name = FileUtils.pwd.split("/").last
-        job_name = "souls_#{worker_name}_#{k.to_s.underscore}".to_sym
-        topic = "souls_#{worker_name}_#{k.to_s.underscore}"
+        job_name = "souls-#{worker_name}-#{k.to_s.underscore}".to_sym
+        topic = "souls-#{worker_name}-#{k.to_s.underscore}"
         message_body = "query { #{k.to_s.camelize(:lower)} { response }}"
 
         if schedules_list.include?(job_name)
@@ -43,7 +42,7 @@ module SOULs
       end
 
       schedules_list.each do |k, _|
-        next unless k.match?(/^souls_#{worker_name}/)
+        next unless k.match?(/^souls-#{worker_name}/)
 
         system("gcloud scheduler jobs delete #{k} -q >/dev/null 2>&1")
       end

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

@@ -13,19 +13,41 @@ module SOULs
 
       zone = "#{region}-b"
       system("gcloud config set project #{project_id} >/dev/null 2>&1")
-      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
-        system(
-          "gcloud sql instances create #{instance_name} \
+      system(
+        "gcloud sql instances create #{instance_name} \
                 --database-version=#{db_type} --cpu=1 --memory=4096MB --zone=#{zone} \
                 --root-password='#{password}' --database-flags cloudsql.iam_authentication=on"
-        )
-        SOULs::Sql.new.env(password: password)
-        SOULs::Github.new.secret_set
-        Whirly.status = Paint["Cloud SQL #{instance_name} is successfully created! You can push to deploy!", :green]
-      end
+      )
+      SOULs::Sql.new.env(password: password)
+      SOULs::Github.new.secret_set
+      SOULs::Painter.success("Cloud SQL #{instance_name} is successfully created! You can push to deploy!")
       true
     end
 
+    desc "stop", "Stop Cloud SQL Instance"
+    def stop
+      project_id = SOULs.configuration.project_id
+      instance_name = SOULs.configuration.instance_name
+      system("gcloud sql instances patch #{instance_name} --project=#{project_id} --activation-policy=NEVER")
+      SOULs::Painter.warning("Cloud SQL #{instance_name} is stopped!")
+    end
+
+    desc "restart", "Restart Cloud SQL Instance"
+    def restart
+      project_id = SOULs.configuration.project_id
+      instance_name = SOULs.configuration.instance_name
+      system("gcloud sql instances restart #{instance_name} --project=#{project_id}")
+      SOULs::Painter.success("Cloud SQL #{instance_name} is restarted!")
+    end
+
+    desc "delete", "Delete Cloud SQL Instance"
+    def delete
+      project_id = SOULs.configuration.project_id
+      instance_name = SOULs.configuration.instance_name
+      system("gcloud sql instances delete #{instance_name} --project=#{project_id}")
+      SOULs::Painter.warning("Cloud SQL #{instance_name} is deleted!", "✨")
+    end
+
     desc "env", "Generate .env.production file to deploy"
     def env(password: "Password")
       require(SOULs.get_mother_path.to_s + "/config/souls")

data/lib/souls/cli/release/release.rb

@@ -5,6 +5,8 @@ module SOULs
     desc "release", "Release Gem"
     def release
       SOULs::Painter.error("hey! It's Broken!") unless system("rspec")
+      FileUtils.rm("apps/api/Gemfile.lock") if File.exist?("apps/api/Gemfile.lock")
+      FileUtils.rm("apps/worker/Gemfile.lock") if File.exist?("apps/worker/Gemfile.lock")
 
       system("gem install souls")
       sleep(3)

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

@@ -40,7 +40,6 @@ module SOULs
         value = worker_file_names[file_name.to_sym] || 0
         worker_file_names[file_name.to_sym] = value - 1
       end
-      puts(worker_file_names)
 
       if worker_file_names.blank?
         return if souls_topics.blank?
@@ -109,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.8".freeze
+  VERSION = "1.20.2".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.19.8
+1.20.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.19.8
+1.20.2

metadata

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