souls 1.19.9 → 1.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47404f43681adfd3c3ee24a1bcec31e7e538f944d4b55b6d43b2024888a9a169
-  data.tar.gz: b883f0d9337e02c3ffc75ec982a156f393618b752991a256303975e80130f362
+  metadata.gz: '0946f596e96e2c08ba61f98665d3fc2bf8c61a8663c4c2b67362b1403e6ab280'
+  data.tar.gz: 8b756a0ef09f8c69b1510efd87c3dc182e21dda316bbb171e1efaa8bc2e75611
 SHA512:
-  metadata.gz: 414619b49aa78b8e735705ee0e4b278d1159345a652d386bbe3cd19f80b6997584968110ce3fee19f6b135b289d0a5544cd1d774b83303dc5d1d0deab3d7e6aa
-  data.tar.gz: 6c98c7ca8c8ac5ed740649dfecb5ab899571b2421d95c5840e68087b1c4fc24aa32b239fbad6989d51afe787b5424a5c6c6cb5d3c0fda98b795cb2a5b6d173d1
+  metadata.gz: 956e561c42dda0190e62098bc92e37c7ed9bf13f8e0a15202309d97dc59d8d2647f001b34bb750df56c62f2018a8ebc4c478c90fe56b51d8ff9bc2b3e2bc7556
+  data.tar.gz: 3ef473d0c5e2e3599039ae56bd4fd717795d50f63ce6fcbe7d356fd4e69b5aef1ec75d8bf48d65b0d3cccfedb976f520b84e94fbc103aa0f744870b5b00fecf4

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

@@ -1,5 +1,24 @@
 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_worker_trigger(query_name:)
+      query_name = query_name.gsub("_", "-")
+      worker_name = FileUtils.pwd.split("/").last
+      topic_name = "souls-#{worker_name}-#{query_name}"
+      query = query_name.underscore.camelize(:lower)
+      query_string = souls_make_graphql_query(query: query)
+      case ENV["RACK_ENV"]
+      when "production"
+        souls_publish_pubsub_queue(topic_name: topic_name, message: query_string)
+      when "development"
+        puts(souls_post_to_dev(worker_name: worker_name, query_string: query_string))
+      end
+    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,19 @@ 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 +75,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,22 @@ 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
+          system("bundle install")
+          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 +48,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?

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.19.9
+1.20.3

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.19.9
+1.20.3

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.19.9
+  version: 1.20.3
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-01-09 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
@@ -299,7 +299,7 @@ licenses:
 - Apache-2.0
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -315,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.32
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby Serverless Framework 'SOULs' | Ruby サーバーレスフレームワーク SOULs. Powered by
   Ruby GraphQL, RBS/Steep, Active Record, RSpec, RuboCop, and Google Cloud.