souls 0.51.2 → 0.52.3

data/lib/souls/cli/gcloud/pubsub/subscriptions.rb

@@ -1,37 +1,50 @@
 module Souls
-  module Gcloud
-    module Pubsub
-      class << self
-        def create_subscription(
-          topic_name: "send-user-mail",
-          project_id: "",
-          service_account: "",
-          endpoint: "https:://test.com"
-        )
-          project_id = Souls.configuration.project_id if project_id.blank?
-          service_account = "#{Souls.configuration.app}@#{project_id}.iam.gserviceaccount.com" if service_account.blank?
-          system(
-            "gcloud pubsub subscriptions create #{topic_name}-sub \
-            --topic #{topic_name} \
+  class Pubsub < Thor
+    desc "create_subscription", "Create Google Cloud PubSub Subscription"
+    method_option :topic_name,
+                  default: "send-user-mailer",
+                  aliases: "--topic_name",
+                  desc: "Google Cloud Pubsub Topic Name"
+    method_option :endpoint,
+                  default: "https:://test.com",
+                  aliases: "--endpoint",
+                  desc: "Google Cloud Pubsub Push Subscription Endpoint"
+    def create_subscription
+      project_id = Souls.configuration.project_id
+      service_account = "#{Souls.configuration.app}@#{project_id}.iam.gserviceaccount.com"
+      system(
+        "gcloud pubsub subscriptions create #{options[:topic_name]}-sub \
+            --topic #{options[:topic_name]} \
             --topic-project #{project_id} \
             --push-auth-service-account #{service_account} \
-            --push-endpoint #{endpoint} \
+            --push-endpoint #{options[:endpoint]} \
             --expiration-period never
             "
-          )
-        end
+      )
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
 
-        def subscription_list
-          system("gcloud pubsub subscriptions list")
-        end
+    desc "subscription_list", "Show Google Cloud Pubsub Subscription List"
+    def subscription_list
+      system("gcloud pubsub subscriptions list")
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
 
-        def update_subscription(
-          topic_name: "send-user-mail",
-          endpoint: "https:://test.com"
-        )
-          system("gcloud pubsub subscriptions update #{topic_name}-sub --push-endpoint #{endpoint} ")
-        end
-      end
+    desc "update_subscription", "Update Google Cloud Pubsub Subscription Endpoint"
+    method_option :topic_name,
+                  default: "send-user-mailer",
+                  aliases: "--topic_name",
+                  desc: "Google Cloud Pubsub Topic Name"
+    method_option :endpoint,
+                  default: "https:://test.com",
+                  aliases: "--endpoint",
+                  desc: "Google Cloud Pubsub Push Subscription Endpoint"
+    def update_subscription
+      system("gcloud pubsub subscriptions update #{options[:topic_name]}-sub --push-endpoint #{options[:endpoint]} ")
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
     end
   end
 end

data/lib/souls/cli/gcloud/pubsub/topics.rb

@@ -1,15 +1,21 @@
 module Souls
-  module Gcloud
-    module Pubsub
-      class << self
-        def create_topic(topic_name: "send-user-mail")
-          system("gcloud pubsub topics create #{topic_name}")
-        end
+  class Pubsub < Thor
+    desc "create_topic", "Create Google Cloud Pubsub Topic"
+    method_option :topic_name,
+                  default: "send-user-mailer",
+                  aliases: "--topic_name",
+                  desc: "Google Cloud Pubsub Topic Name"
+    def create_topic
+      system("gcloud pubsub topics create #{options[:topic_name]}")
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
 
-        def topic_list
-          system("gcloud pubsub topics list")
-        end
-      end
+    desc "topic_list", "Show Google Cloud Topic List"
+    def topic_list
+      system("gcloud pubsub topics list")
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
     end
   end
 end

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

@@ -1,24 +1,30 @@
 module Souls
-  module Gcloud
-    module Run
-      class << self
-        def awake(app_name: "", url: "")
-          app_name = Souls.configuration.app if app_name.blank?
-          system(
-            "gcloud scheduler jobs create http #{app_name}-awake
+  class CloudRun < 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
+      app_name = Souls.configuration.app
+      system(
+        "gcloud scheduler jobs create http #{app_name}-awake
             --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
-          )
-        end
+      )
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
 
-        def list(project_id: "")
-          project_id = Souls.configuration.project_id if project_id.blank?
-          system("gcloud run services list --project #{project_id} --platform managed")
-        end
+    desc "list", "Show Google Cloud Run List"
+    def list(project_id: "")
+      project_id = Souls.configuration.project_id if project_id.blank?
+      system("gcloud run services list --project #{project_id} --platform managed")
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
 
-        def get_endpoint(worker_name: "")
-          `gcloud run services list | grep #{worker_name} | awk '{print $4}'`
-        end
-      end
+    desc "get_endpoint", "Show Worker's Endpoint"
+    def get_endpoint(worker_name: "")
+      `gcloud run services list | grep #{worker_name} | awk '{print $4}'`
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
     end
   end
 end

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

@@ -1,39 +1,52 @@
 module Souls
-  module Gcloud
-    module Sql
-      class << self
-        def create_instance(root_pass: "PassWord")
-          instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
-          region = Souls.configuration.region
-          zone = "#{region}-b"
-          system(
-            "gcloud sql instances create #{instance_name} \
+  class Sql < Thor
+    desc "create_instance", "Create Google Cloud SQL - PostgreSQL13"
+    method_option :region, default: "", aliases: "--region", desc: "Google Cloud Platform Region"
+    method_option :root_password, default: "", aliases: "--root-password", desc: "Set Cloud SQL Root Password"
+    def create_instance
+      instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
+      region = Souls.configuration.region if options[:region].blank?
+      zone = "#{region}-b"
+      system(
+        "gcloud sql instances create #{instance_name} \
               --database-version=POSTGRES_13 --cpu=2 --memory=7680MB --zone=#{zone} \
-              --root-password='#{root_pass}' --database-flags cloudsql.iam_authentication=on"
-          )
-        end
+              --root-password='#{options[:root_password]}' --database-flags cloudsql.iam_authentication=on"
+      )
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
 
-        def list
-          system("gcloud sql instances list")
-        end
+    desc "list", "Show Cloud SQL Instances List"
+    def list
+      system("gcloud sql instances list")
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
 
-        def setup_private_ip
-          create_ip_range
-          create_vpc_connector
-          assign_network
-        end
+    desc "setup_private_ip", "Enable Private IP"
+    def setup_private_ip
+      create_ip_range
+      create_vpc_connector
+      assign_network
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
 
-        def assign_network
-          app_name = Souls.configuration.app
-          instance_name = "#{Souls.configuration.app}-db"
-          project_id = Souls.configuration.project_id
-          system("gcloud beta sql instances patch #{instance_name} --project=#{project_id} --network=#{app_name}")
-        end
+    desc "assign_network", "Assign Network"
+    def assign_network
+      app_name = Souls.configuration.app
+      instance_name = "#{Souls.configuration.app}-db"
+      project_id = Souls.configuration.project_id
+      system("gcloud beta sql instances patch #{instance_name} --project=#{project_id} --network=#{app_name}")
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
 
-        def create_ip_range
-          app_name = Souls.configuration.app
-          system(
-            "
+    desc "create_ip_range", "Create VPC Adress Range"
+    def create_ip_range
+      app_name = Souls.configuration.app
+      system(
+        "
             gcloud compute addresses create #{app_name}-ip-range \
               --global \
               --purpose=VPC_PEERING \
@@ -41,37 +54,43 @@ module Souls
               --description='peering range for SOULs' \
               --network=#{app_name} \
               --project=#{app_name}"
-          )
-        end
+      )
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
 
-        def create_vpc_connector
-          app_name = Souls.configuration.app
-          system(
-            "
+    desc "create_vpc_connector", "Create VPC-PEERING Connect"
+    def create_vpc_connector
+      app_name = Souls.configuration.app
+      system(
+        "
             gcloud services vpc-peerings connect \
               --service=servicenetworking.googleapis.com \
               --ranges=#{app_name}-ip-range \
               --network=#{app_name} \
               --project=#{app_name}
             "
-          )
-        end
+      )
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
 
-        def assign_ip(instance_name: "", ip: "")
-          ip = `curl inet-ip.info` if ip.blank?
-          project_id = Souls.configuration.project_id
-          instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
-          system(
-            "
+    desc "assgin_ip", "Add Current Grobal IP to White List"
+    def assign_ip(instance_name: "", ip: "")
+      ip = `curl inet-ip.info` if ip.blank?
+      project_id = Souls.configuration.project_id
+      instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
+      system(
+        "
             gcloud beta sql instances patch #{instance_name} \
               --project=#{project_id} \
               --assign-ip \
               --authorized-networks=#{ip} \
               --quiet
             "
-          )
-        end
-      end
+      )
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
     end
   end
 end

data/lib/souls/cli/index.rb

@@ -1,30 +1,13 @@
+require_relative "./console/index"
 require_relative "./create/index"
+require_relative "./db/index"
 require_relative "./docker/index"
 require_relative "./gcloud/index"
 require_relative "./init/index"
 require_relative "./release/index"
 require_relative "./sync/index"
 require_relative "./upgrade/index"
+require_relative "./server/index"
 
 module Souls
-  module Create
-  end
-
-  module Docker
-  end
-
-  module Gcloud
-  end
-
-  module Init
-  end
-
-  module Release
-  end
-
-  module Sync
-  end
-
-  module Upgrade
-  end
 end

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

@@ -1,157 +1,157 @@
 module Souls
-  module Init
-    class << self
-      def get_version(repository_name: "souls_api")
-        data = JSON.parse(
-          `curl \
-        -H "Accept: application/vnd.github.v3+json" \
-        -s https://api.github.com/repos/elsoul/#{repository_name}/releases`
-        )
-        data[0]["tag_name"]
+  class CLI < Thor
+    desc "new [APP_NAME]", "Create SOULs APP"
+    def new(app_name)
+      if app_name.nil?
+        puts(Paint["you need to specify your app name", :red])
+        puts(Paint["`souls new souls-app`", :yellow])
+        exit
       end
 
-      def generate_cd
-        shell = `echo $SHELL`.strip
-        rc =
-          if shell.include?("zsh")
-            "zshrc"
-          else
-            "bash"
-          end
-        system("echo '\nalias api=\'cd apps/api\'' >> ~/.#{rc}")
-        system("echo 'alias mother=\'...\'' >> ~/.#{rc}")
-        system("echo 'alias worker=\'cd apps/worker\'' >> ~/.#{rc}")
-        puts(Paint["run `source ~/.#{rc}` to reflect your .#{rc}", :yellow])
-        puts(Paint["You can move to mother/api/worker just type", :green])
-        puts(Paint["\nmother\n", :white])
-        puts(
-          Paint["to go back to mother dir from api/worker\n\nYou can also go to api/worker from mother dir by typing",
-                :green]
-        )
-        puts(Paint["\napi\n", :white])
-        puts(Paint["or\n", :green])
-        puts(Paint["worker", :white])
-      end
+      service_name = "api"
+      download_souls(app_name: app_name, service_name: service_name)
+      mother_config_init(app_name: app_name)
+      download_github_actions(app_name: app_name)
+      initial_config_init(app_name: app_name, service_name: service_name)
+      souls_api_credit(app_name: app_name, service_name: service_name)
+    end
 
-      def initial_config_init(app_name: "souls", service_name: "api")
-        config_dir = "./#{app_name}/apps/#{service_name}/config"
-        FileUtils.mkdir_p(config_dir) unless Dir.exist?(config_dir)
-        FileUtils.touch("#{config_dir}/souls.rb")
-        file_path = "#{config_dir}/souls.rb"
-        File.open(file_path, "w") do |f|
-          f.write(<<~TEXT)
-            Souls.configure do |config|
-              config.app = "#{app_name}"
-              config.project_id = "#{app_name}"
-              config.region = "asia-northeast1"
-              config.endpoint = "/endpoint"
-              config.strain = "api"
-              config.fixed_gems = ["spring"]
-              config.workers = []
-            end
-          TEXT
-        end
-      rescue StandardError => e
-        puts(e)
-      end
+    private
 
-      def download_github_actions(app_name: "souls-app")
-        file_name = "github.tgz"
-        url = "https://storage.googleapis.com/souls-bucket/github_actions/github.tgz"
-        system("curl -OL #{url}")
-        FileUtils.mkdir_p("#{app_name}/github")
-        system("tar -zxvf ./#{file_name} -C #{app_name}/")
-        FileUtils.rm(file_name)
-      end
+    def get_version(repository_name: "souls_api")
+      data = JSON.parse(
+        `curl \
+        -H "Accept: application/vnd.github.v3+json" \
+        -s https://api.github.com/repos/elsoul/#{repository_name}/releases`
+      )
+      data[0]["tag_name"]
+    end
 
-      def mother_config_init(app_name: "souls-app")
-        config_dir = "./#{app_name}/config"
-        FileUtils.mkdir_p(config_dir) unless Dir.exist?(config_dir)
-        FileUtils.touch("#{config_dir}/souls.rb")
-        file_path = "#{config_dir}/souls.rb"
-        File.open(file_path, "w") do |f|
-          f.write(<<~TEXT)
-            Souls.configure do |config|
-              config.app = "#{app_name}"
-              config.project_id = "#{app_name}"
-              config.region = "asia-northeast1"
-              config.endpoint = "/endpoint"
-              config.strain = "mother"
-              config.fixed_gems = ["spring"]
-              config.workers = []
-            end
-          TEXT
+    def generate_cd
+      shell = `echo $SHELL`.strip
+      rc =
+        if shell.include?("zsh")
+          "zshrc"
+        else
+          "bash"
         end
-      rescue StandardError => e
-        puts(e)
+      system("echo '\nalias api=\'cd apps/api\'' >> ~/.#{rc}")
+      system("echo 'alias mother=\'...\'' >> ~/.#{rc}")
+      system("echo 'alias worker=\'cd apps/worker\'' >> ~/.#{rc}")
+      puts(Paint["run `source ~/.#{rc}` to reflect your .#{rc}", :yellow])
+      puts(Paint["You can move to mother/api/worker just type", :green])
+      puts(Paint["\nmother\n", :white])
+      puts(
+        Paint["to go back to mother dir from api/worker\n\nYou can also go to api/worker from mother dir by typing",
+              :green]
+      )
+      puts(Paint["\napi\n", :white])
+      puts(Paint["or\n", :green])
+      puts(Paint["worker", :white])
+    end
+
+    def initial_config_init(app_name: "souls", service_name: "api")
+      config_dir = "./#{app_name}/apps/#{service_name}/config"
+      FileUtils.mkdir_p(config_dir) unless Dir.exist?(config_dir)
+      FileUtils.touch("#{config_dir}/souls.rb")
+      file_path = "#{config_dir}/souls.rb"
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          Souls.configure do |config|
+            config.app = "#{app_name}"
+            config.project_id = "#{app_name}"
+            config.region = "asia-northeast1"
+            config.endpoint = "/endpoint"
+            config.strain = "api"
+            config.fixed_gems = ["spring"]
+            config.workers = []
+          end
+        TEXT
       end
+    rescue StandardError => e
+      puts(e)
+    end
 
-      def start(args)
-        app_name = args[1]
-        if app_name.nil?
-          puts(Paint["you need to specify your app name", :red])
-          puts(Paint["`souls new souls-app`", :yellow])
-          exit
-        end
+    def download_github_actions(app_name: "souls-app")
+      file_name = "github.tgz"
+      url = "https://storage.googleapis.com/souls-bucket/github_actions/github.tgz"
+      system("curl -OL #{url}")
+      FileUtils.mkdir_p("#{app_name}/github")
+      system("tar -zxvf ./#{file_name} -C #{app_name}/")
+      FileUtils.rm(file_name)
+    end
 
-        service_name = "api"
-        Souls::Init.download_souls(app_name: app_name, service_name: service_name)
-        Souls::Init.mother_config_init(app_name: app_name)
-        Souls::Init.download_github_actions(app_name: app_name)
-        Souls::Init.initial_config_init(app_name: app_name, service_name: service_name)
-        Souls::Init.souls_api_credit(app_name: app_name, service_name: service_name)
+    def mother_config_init(app_name: "souls-app")
+      config_dir = "./#{app_name}/config"
+      FileUtils.mkdir_p(config_dir) unless Dir.exist?(config_dir)
+      FileUtils.touch("#{config_dir}/souls.rb")
+      file_path = "#{config_dir}/souls.rb"
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          Souls.configure do |config|
+            config.app = "#{app_name}"
+            config.project_id = "#{app_name}"
+            config.region = "asia-northeast1"
+            config.endpoint = "/endpoint"
+            config.strain = "mother"
+            config.fixed_gems = ["spring"]
+            config.workers = []
+          end
+        TEXT
       end
+    rescue StandardError => e
+      puts(e)
+    end
 
-      def download_souls(app_name: "souls", service_name: "api")
-        version = Souls.get_latest_version_txt(service_name: service_name).join(".")
-        file_name = "#{service_name}-v#{version}.tgz"
-        url = "https://storage.googleapis.com/souls-bucket/boilerplates/#{service_name.pluralize}/#{file_name}"
-        system("curl -OL #{url}")
-        system("mkdir -p #{app_name}/apps/#{service_name}")
-        system("tar -zxvf ./#{file_name} -C #{app_name}/apps/")
-        system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/.rubocop.yml")
-        system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Gemfile")
-        system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Procfile.dev")
-        system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Procfile")
-        FileUtils.rm(file_name)
-      end
+    def download_souls(app_name: "souls", service_name: "api")
+      version = Souls.get_latest_version_txt(service_name: service_name).join(".")
+      file_name = "#{service_name}-v#{version}.tgz"
+      url = "https://storage.googleapis.com/souls-bucket/boilerplates/#{service_name.pluralize}/#{file_name}"
+      system("curl -OL #{url}")
+      system("mkdir -p #{app_name}/apps/#{service_name}")
+      system("tar -zxvf ./#{file_name} -C #{app_name}/apps/")
+      system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/.rubocop.yml")
+      system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Gemfile")
+      system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Procfile.dev")
+      system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Procfile")
+      FileUtils.rm(file_name)
+    end
 
-      def souls_api_credit(app_name: "souls", service_name: "api")
-        line = Paint["====================================", :yellow]
-        puts("\n")
-        puts(line)
-        txt2 = <<~TEXT
-             _____ ____  __  ____#{'        '}
-            / ___// __ \\/ / / / /   %{red1}
-            \\__ \\/ / / / / / / /   %{red2}
-           ___/ / /_/ / /_/ / /___%{red3}#{' '}
-          /____/\\____/\\____/_____%{red4}#{'  '}
-        TEXT
-        red1 = ["_____", :red]
-        red2 = ["/ ___/", :red]
-        red3 = ["(__  )", :red]
-        red4 = ["/____/", :red]
-        ms = Paint % [txt2, :cyan, { red1: red1, red2: red2, red3: red3, red4: red4 }]
-        puts(ms)
-        puts(line)
-        welcome = Paint["Welcome to SOULs!", :white]
-        puts(welcome)
-        souls_ver = Paint["SOULs Version: #{Souls::VERSION}", :white]
-        puts(souls_ver)
-        puts(line)
-        endroll = <<~TEXT
-          Easy to Run
-          $ cd #{app_name}/apps/#{service_name}
-          $ bundle
-          $ souls s
-          Go To : http://localhost:4000
+    def souls_api_credit(app_name: "souls", service_name: "api")
+      line = Paint["====================================", :yellow]
+      puts("\n")
+      puts(line)
+      txt2 = <<~TEXT
+           _____ ____  __  ____#{'        '}
+          / ___// __ \\/ / / / /   %{red1}
+          \\__ \\/ / / / / / / /   %{red2}
+         ___/ / /_/ / /_/ / /___%{red3}#{' '}
+        /____/\\____/\\____/_____%{red4}#{'  '}
+      TEXT
+      red1 = ["_____", :red]
+      red2 = ["/ ___/", :red]
+      red3 = ["(__  )", :red]
+      red4 = ["/____/", :red]
+      ms = Paint % [txt2, :cyan, { red1: red1, red2: red2, red3: red3, red4: red4 }]
+      puts(ms)
+      puts(line)
+      welcome = Paint["Welcome to SOULs!", :white]
+      puts(welcome)
+      souls_ver = Paint["SOULs Version: #{Souls::VERSION}", :white]
+      puts(souls_ver)
+      puts(line)
+      endroll = <<~TEXT
+        Easy to Run
+        $ cd #{app_name}/apps/#{service_name}
+        $ bundle
+        $ souls s
+        Go To : http://localhost:4000
 
-          Doc: https://souls.elsoul.nl
-        TEXT
-        cd = Paint[endroll, :white]
-        puts(cd)
-        puts(line)
-      end
+        Doc: https://souls.elsoul.nl
+      TEXT
+      cd = Paint[endroll, :white]
+      puts(cd)
+      puts(line)
     end
   end
 end