souls 1.19.0 → 1.19.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02be7d892a5a7f988aa1d288eff6b847276d9462308d202752efc05e67b3accb
-  data.tar.gz: 8ada002457f6c26f80d6fca80b104f5f6c92916a4582d8a95ff8e24523b80f21
+  metadata.gz: 6cd5ddd6a55b4b803fc8e815afdf4fbb27d638ae1ef7cd6714d1205b8c4c3818
+  data.tar.gz: 00f110a29e05dda4a3790c128ba9f9ff0b019057874009766e2cd18cab426dc4
 SHA512:
-  metadata.gz: bab193ff10c201eacbdbdfc99bb986f090c82e07be29390bd95c36a4dee4a8f0ec07c970aff7721d5bebe67140ed68b79dc2a284614a5c233f568a077539ec1c
-  data.tar.gz: 965f2d31ed0964ccfd2b6ebb00dc67de567ac17c13beb07c5452acf27b1d57119d4ea0b7dee1c5e0577a820affd59b8c2bdbf857cdcdaccd535c424682aeab3f
+  metadata.gz: fcaa0f1b6d9f1ca3dc20ef00a8550362c3bed338141cdb60cdde0e655dcc93185d4f8af738fac82a549ed27cf3198532c94009f27e8522eade002bd82cb2b109
+  data.tar.gz: c6c7a35a0d1ba0f8fb5797e61081f567a4627935d465e1756da524e983a81f1136623b95e98067248393be75b13129efab3d627d67ab27043bc0322d68e748fa

data/lib/souls/cli/create/functions.rb

@@ -21,7 +21,7 @@ module SOULs
       version = prompt.select("Select Version?", supported_languages[runtime.downcase.to_sym].sort.reverse)
       version_string = "#{runtime_downcased}#{version.gsub('.', '')}"
       runtime_methods = get_runtime_create_method(runtime: runtime_downcased)
-      file_dir = "./apps/cf_#{version_string}_#{function_name}"
+      file_dir = "./apps/cf-#{version_string}-#{function_name}"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
 
       runtime_methods.each do |method|

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

@@ -170,12 +170,12 @@ end
                   bundle exec rake db:migrate RACK_ENV=test
                   bundle exec rspec
 
-              - name: Sync Tasks
-                run: cd apps/#{worker_name} && souls gcloud scheduler sync_schedules --timezone=${{ secrets.TZ }}
-
               - name: Sync PubSub
                 run: cd apps/#{worker_name} && souls sync pubsub
 
+              - name: Sync Tasks
+                run: cd apps/#{worker_name} && souls gcloud scheduler sync_schedules --timezone=${{ secrets.TZ }}
+
               - name: Configure Docker
                 run: gcloud auth configure-docker --quiet
 

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

@@ -1,6 +1,7 @@
 module Template
   module Go
     def self.function(file_name)
+      file_name.underscore.camelize
       <<~APP
         // Package p contains an HTTP Cloud Function.
         package p

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

@@ -1,6 +1,7 @@
 module Template
   module Nodejs
     def self.index(file_name)
+      file_name.underscore.camelize(:lower)
       <<~APP
         const express = require('express');
         const bodyParser = require('body-parser');

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

@@ -1,6 +1,7 @@
 module Template
   module Python
     def self.main(file_name)
+      file_name.underscore
       <<~APP
         def #{file_name}(request):
           """Responds to any HTTP request.

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

@@ -5,12 +5,12 @@ module SOULs
       require(SOULs.get_mother_path.to_s + "/config/souls")
       project_id = SOULs.configuration.project_id
       current_dir = FileUtils.pwd.split("/").last
-      unless current_dir.match?(/^cf_/)
+      unless current_dir.match?(/^cf-/)
         SOULs::Painter.error("You are at wrong dir!\nPlease go to `apps/functions` dir!")
         return false
       end
 
-      runtime = current_dir.match(/cf_(\D+\d+)_/)[1]
+      runtime = current_dir.match(/cf-(\D+\d+)-/)[1]
       system(
         "
           gcloud functions deploy #{current_dir} --project=#{project_id} \
@@ -22,11 +22,12 @@ module SOULs
     desc "describe", "Describe SOULs Functions"
     def describe
       require(SOULs.get_mother_path.to_s + "/config/souls")
+      current_dir = FileUtils.pwd.split("/").last
       project_id = SOULs.configuration.project_id
-      system("gcloud functions describe souls_functions --project=#{project_id}")
+      system("gcloud functions describe #{current_dir} --project=#{project_id}")
     end
 
-    desc "delete", "Delete SOULs Functions"
+    desc "delete [name]", "Delete SOULs Functions"
     def delete(name)
       require(SOULs.get_mother_path.to_s + "/config/souls")
       project_id = SOULs.configuration.project_id
@@ -50,7 +51,7 @@ module SOULs
       require(SOULs.get_mother_path.to_s + "/config/souls")
       project_id = SOULs.configuration.project_id
       Dir.chdir(SOULs.get_mother_path.to_s) do
-        souls_functions = Dir["apps/cf_*"]
+        souls_functions = Dir["apps/cf-*"]
         cf_dir = souls_functions.map { |n| n.split("/").last }
         cf_dir.each do |dir|
           SOULs::Painter.success(`gcloud functions describe #{dir} --project=#{project_id}| grep url`)

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

@@ -2,23 +2,28 @@ module SOULs
   class Iam < Thor
     desc "setup_key", "Create Google Cloud IAM Service Account Key And Set All Permissions"
     def setup_key
-      region = SOULs.configuration.region
-      SOULs::Gcloud.new.auth_login
-      SOULs::Upgrade.new.config
-      create_service_account
-      create_service_account_key
-      SOULs::Gcloud.new.enable_permissions
-      add_permissions
-      begin
-        system("gcloud app create --region=#{region} --quiet")
-      rescue StandardError, error
-        puts("gcloud app region is Already exist! - SOULs::Gcloud::Iam.setup_key")
-      end
-      begin
-        set_gh_secret_json
-      rescue StandardError
-        export_key_to_console
+      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+        Whirly.status = "Setting up credentials and permissions..."
+        region = SOULs.configuration.region
+        SOULs::Gcloud.new.auth_login
+        SOULs::Upgrade.new.config
+        create_service_account
+        create_service_account_key
+        SOULs::Gcloud.new.enable_permissions
+        add_permissions
+        begin
+          system("gcloud app create --region=#{region} --quiet")
+        rescue StandardError, error
+          puts("gcloud app region is Already exist! - SOULs::Gcloud::Iam.setup_key")
+        end
+        begin
+          set_gh_secret_json
+        rescue StandardError
+          export_key_to_console
+        end
       end
+      SOULs::Painter.success("You're all set!")
+      true
     end
 
     private

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

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

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

@@ -6,7 +6,6 @@ module SOULs
     def create_instance
       prompt = TTY::Prompt.new
       password = prompt.mask("Set DB PassWord:")
-      app_name = SOULs.configuration.app
       project_id = SOULs.configuration.project_id
       instance_name = SOULs.configuration.instance_name
       region = SOULs.configuration.region if options[:region].blank?
@@ -20,43 +19,57 @@ module SOULs
                 --database-version=#{db_type} --cpu=1 --memory=4096MB --zone=#{zone} \
                 --root-password='#{password}' --database-flags cloudsql.iam_authentication=on"
         )
-        instance_ip = `gcloud sql instances list | grep #{instance_name} | awk '{print $5}'`.strip
-        Dir.chdir(SOULs.get_api_path.to_s) do
-          file_path = ".env"
-          File.open(file_path, "w") do |line|
-            line.write(<<~TEXT)
-              GOOGLE_AUTH_SUPPRESS_CREDENTIALS_WARNINGS=1
-              SOULS_DB_HOST=#{instance_ip}
-              SOULS_DB_PW=#{password}
-              SOULS_DB_USER=postgres
-              SOULS_GCP_PROJECT_ID=#{project_id}
-              SOULS_SECRET_KEY_BASE='#{SecureRandom.base64(64)}'
-              TZ="#{region_to_timezone(region: region)}"
-            TEXT
-          end
-        end
-        Dir.chdir(SOULs.get_mother_path.to_s) do
-          file_path = ".env.production"
-          File.open(file_path, "w") do |line|
-            line.write(<<~TEXT)
-              SOULS_DB_HOST="/cloudsql/#{project_id}:#{region}:#{instance_name}"
-              SOULS_DB_PW=#{password}
-              SOULS_DB_USER=postgres
-              SOULS_APP_NAME=#{app_name}
-              SOULS_GCP_PROJECT_ID=#{project_id}
-              SOULS_GCP_REGION=#{region}
-              SOULS_GCLOUDSQL_INSTANCE="#{project_id}:#{region}:#{instance_name}"
-              SOULS_SECRET_KEY_BASE='#{SecureRandom.base64(64)}'
-              TZ="#{region_to_timezone(region: region)}"
-            TEXT
-          end
-        end
+        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
       true
     end
 
+    desc "env", "Generate .env.production file to deploy"
+    def env(password: "Password")
+      require(SOULs.get_mother_path.to_s + "/config/souls")
+      project_id = SOULs.configuration.project_id
+      instance_name = SOULs.configuration.instance_name
+      region = SOULs.configuration.region
+      app_name = SOULs.configuration.app
+      prompt = TTY::Prompt.new
+      db_password = password == "Password" ? prompt.mask("Set DB PassWord:") : password
+      instance_ip = `gcloud sql instances list --project=#{project_id} | grep #{instance_name} | awk '{print $5}'`.strip
+      Dir.chdir(SOULs.get_api_path.to_s) do
+        file_path = ".env"
+        File.open(file_path, "w") do |line|
+          line.write(<<~TEXT)
+            GOOGLE_AUTH_SUPPRESS_CREDENTIALS_WARNINGS=1
+            SOULS_DB_HOST=#{instance_ip}
+            SOULS_DB_PW=#{db_password}
+            SOULS_DB_USER=postgres
+            SOULS_GCP_PROJECT_ID=#{project_id}
+            SOULS_SECRET_KEY_BASE='#{SecureRandom.base64(64)}'
+            TZ="#{region_to_timezone(region: region)}"
+          TEXT
+        end
+        SOULs::Painter.create_file(file_path)
+      end
+      Dir.chdir(SOULs.get_mother_path.to_s) do
+        file_path = ".env.production"
+        File.open(file_path, "w") do |line|
+          line.write(<<~TEXT)
+            SOULS_DB_HOST="/cloudsql/#{project_id}:#{region}:#{instance_name}"
+            SOULS_DB_PW=#{db_password}
+            SOULS_DB_USER=postgres
+            SOULS_APP_NAME=#{app_name}
+            SOULS_GCP_PROJECT_ID=#{project_id}
+            SOULS_GCP_REGION=#{region}
+            SOULS_GCLOUDSQL_INSTANCE="#{project_id}:#{region}:#{instance_name}"
+            SOULS_SECRET_KEY_BASE='#{SecureRandom.base64(64)}'
+            TZ="#{region_to_timezone(region: region)}"
+          TEXT
+        end
+        SOULs::Painter.create_file(file_path)
+      end
+    end
+
     desc "list", "Show Cloud SQL Instances List"
     def list
       system("gcloud sql instances list")
@@ -111,6 +124,7 @@ module SOULs
     desc "assgin_ip", "Add Current Grobal IP to White List"
     method_option :ip, default: "", aliases: "--ip", desc: "Adding IP to Google Cloud SQL White List: e.g.'11.11.1.1'"
     def assign_ip
+      require(SOULs.get_mother_path.to_s + "/config/souls")
       project_id = SOULs.configuration.project_id
       instance_name = SOULs.configuration.instance_name
       ips = []
@@ -126,12 +140,15 @@ module SOULs
         -H "Authorization: Bearer "$(gcloud auth print-access-token) \
         "https://sqladmin.googleapis.com/v1/projects/#{project_id}/instances/#{instance_name}?fields=settings"`
       )
-      unless cloud_sql["settings"]["ipConfiguration"]["authorizedNetworks"].blank?
+      begin
+        cloud_sql["settings"]["ipConfiguration"]["authorizedNetworks"].blank?
         white_ips =
           cloud_sql["settings"]["ipConfiguration"]["authorizedNetworks"].map do |sql_ips|
             sql_ips["value"]
           end
         ips = (ips + white_ips).uniq
+      rescue StandardError => e
+        puts(e)
       end
       ips = ips.join(",")
       Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do

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

@@ -2,6 +2,7 @@ module SOULs
   class Sync < Thor
     desc "pubsub", "Sync Worker Jobs & Google Cloud Pubsub Topics/Subscriptions"
     def pubsub
+      project_id = SOULs.configuration.project_id
       worker_name = FileUtils.pwd.split("/").last
 
       unless worker_name.match(/^worker-(\d|\w)+(-)*(\d|\w)+$/)
@@ -9,7 +10,8 @@ module SOULs
         return false
       end
 
-      url = `gcloud run services list |grep souls-#{project_id}-#{worker_name}| awk '{print $4}'`.strip
+      url = `gcloud run services list --platform=managed \
+       --project=#{project_id} |grep souls-#{project_id}-#{worker_name}| awk '{print $4}'`.strip
       return false if url.blank?
 
       worker_file_names = get_workers_file_paths
@@ -55,7 +57,7 @@ module SOULs
       project_id = SOULs.configuration.project_id
       pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
       topic = pubsub.create_topic(topic_id.to_s)
-      puts("Topic #{topic.name} created.")
+      SOULs::Painter.success("Topic #{topic.name} created.")
     end
 
     def delete_topic(topic_id: "worker-mailer")
@@ -63,7 +65,7 @@ module SOULs
       pubsub = Google::Cloud::Pubsub.new(project_id: project_id)
       topic = pubsub.topic(topic_id.to_s)
       topic.delete
-      puts("Topic #{topic_id} deleted.")
+      SOULs::Painter.error("Topic #{topic_id} deleted.")
     end
 
     def delete_subscription(topic_id: "worker-mailer")
@@ -85,7 +87,7 @@ module SOULs
       topic = pubsub.topic(topic_id)
       sub = topic.subscribe(subscription_id, endpoint: endpoint, deadline: 20)
       sub.expires_in = nil
-      puts("Push subscription #{subscription_id} created.")
+      SOULs::Painter.success("Push subscription #{subscription_id} created.")
     end
 
     def get_workers_file_paths

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.19.0
+1.19.4

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.19.0
+1.19.4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.19.4
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport