souls 1.19.2 → 1.19.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d34dd296dbaef9fa83496bd0852788632d5bab73be62f8f7d84c0744e375a22
-  data.tar.gz: 81793aee8d0aaa76547323a6e3e45459886bcbd551f332b69025c020b3ff2388
+  metadata.gz: 0b5f7b94188e33045595ee50df3761dc486c786992aea9f803560f27500f4aae
+  data.tar.gz: 6d0659f46eb9ca1f9154c4cec5b97381cc04ca2f773b2bd1752eb82c0f6dac2e
 SHA512:
-  metadata.gz: 385f0ad586025224e72bd16e9e189083dda45866de8a65354e8479968495867b5d7d42b06504e12de3716439b011536c02d5ac4771bda25420766cadc2085c17
-  data.tar.gz: 83893626fca09f93ed3ac0ca9535da89e963e9a1de1e4a29b05272e096fd91a05f85c0e2a36dabc8ccadf63b60a1ffa15437ca39b83c56188edd8754f5269bb9
+  metadata.gz: 3ff3dcf7fa1cf290a4998ec3bf1428f2c4fc94973095e9d7a678ccd7b528fdbdaf5f8c5f58149784f97a0219467c992bc0ccbd75b989fefd428a88d0d248ec4a
+  data.tar.gz: 20e054999324d5d082544a4ca31e11bdde030aec3f664bf127df8a8912fbffa62864eb8ece8a701f75e0df37bf7126105438b44ef13c4d5ed4ab19836d85ab67

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,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/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,8 @@ 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")
+      system("gcloud services enable cloudbuild.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/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

@@ -10,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
@@ -36,8 +37,9 @@ 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.gsub("-", "_")
+        value = workers[file_name.to_sym] || 0
+        workers[file_name.to_sym] = value - 1
       end
 
       workers.each do |key, value|
@@ -56,7 +58,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")
@@ -64,7 +66,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")
@@ -78,7 +80,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)
@@ -86,7 +88,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.2".freeze
+  VERSION = "1.19.6".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.19.2
+1.19.6

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.19.2
+1.19.6

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.2
+  version: 1.19.6
 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