souls 0.51.1 → 0.52.2

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

@@ -1,127 +1,128 @@
 module Souls
-  module Release
-    class << self
-      def gem_release
-        system("gem install souls")
-        sleep(3)
-        current_souls_ver = Souls::VERSION.strip.split(".").map(&:to_i)
-        prompt = TTY::Prompt.new
-        choices = [
-          "1. Patch(#{Souls.version_detector(current_ver: current_souls_ver, update_kind: 'patch')})",
-          "2. Minor(#{Souls.version_detector(current_ver: current_souls_ver, update_kind: 'minor')})",
-          "3. Major(#{Souls.version_detector(current_ver: current_souls_ver, update_kind: 'major')})"
-        ]
-        choice_num = prompt.select("Select Version: ", choices)[0].to_i
-        update_kinds = %w[patch minor major]
-        update_kind = update_kinds[choice_num - 1]
-        souls_new_ver = Souls.version_detector(current_ver: current_souls_ver, update_kind: update_kind)
-        status = Paint["Saving Repo...", :yellow]
-        Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
-          Whirly.status = status
-          %w[api worker].each do |s_name|
-            update_service_gemfile(service_name: s_name, version: souls_new_ver)
-            result = Paint[update_repo(service_name: s_name, update_kind: update_kind), :green]
-            Whirly.status = result
-          end
-          overwrite_version(new_version: souls_new_ver)
-          puts("before add")
-          system("git add .")
-          puts("before commit")
-          system("git commit -m 'souls update v#{souls_new_ver}'")
-          puts("before build")
-          system("rake build")
-          system("rake release")
-          Whirly.status = Paint["soul-v#{souls_new_ver} successfully updated!"]
+  class CLI < Thor
+    desc "release", "Release Gem"
+    def release
+      system("gem install souls")
+      sleep(3)
+      current_souls_ver = Souls::VERSION.strip.split(".").map(&:to_i)
+      prompt = TTY::Prompt.new
+      choices = [
+        "1. Patch(#{Souls.version_detector(current_ver: current_souls_ver, update_kind: 'patch')})",
+        "2. Minor(#{Souls.version_detector(current_ver: current_souls_ver, update_kind: 'minor')})",
+        "3. Major(#{Souls.version_detector(current_ver: current_souls_ver, update_kind: 'major')})"
+      ]
+      choice_num = prompt.select("Select Version: ", choices)[0].to_i
+      update_kinds = %w[patch minor major]
+      update_kind = update_kinds[choice_num - 1]
+      souls_new_ver = Souls.version_detector(current_ver: current_souls_ver, update_kind: update_kind)
+      status = Paint["Saving Repo...", :yellow]
+      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+        Whirly.status = status
+        %w[api worker].each do |s_name|
+          update_service_gemfile(service_name: s_name, version: souls_new_ver)
+          result = Paint[update_repo(service_name: s_name, update_kind: update_kind), :green]
+          Whirly.status = result
         end
+        overwrite_version(new_version: souls_new_ver)
+        puts("before add")
+        system("git add .")
+        puts("before commit")
+        system("git commit -m 'souls update v#{souls_new_ver}'")
+        puts("before build")
+        system("rake build")
+        system("rake release")
+        Whirly.status = Paint["soul-v#{souls_new_ver} successfully updated!"]
       end
+    end
 
-      def update_repo(service_name: "api", update_kind: "patch")
-        current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
-        current_ver = Souls.get_latest_version_txt(service_name: service_name)
-        new_ver = Souls.version_detector(current_ver: current_ver, update_kind: update_kind)
-        bucket_url = "gs://souls-bucket/boilerplates"
-        file_name = "#{service_name}-v#{new_ver}.tgz"
-        release_name = "#{service_name}-latest.tgz"
+    private
 
-        case current_dir_name
-        when "souls"
-          system("echo '#{new_ver}' > lib/souls/versions/.souls_#{service_name}_version")
-          system("echo '#{new_ver}' > apps/#{service_name}/.souls_#{service_name}_version")
-          system("cd apps/ && tar -czf ../#{service_name}.tgz #{service_name}/ && cd ..")
-        when "api", "worker", "console", "admin", "media"
-          system("echo '#{new_ver}' > lib/souls/versions/.souls_#{service_name}_version")
-          system("echo '#{new_ver}' > .souls_#{service_name}_version")
-          system("cd .. && tar -czf ../#{service_name}.tgz #{service_name}/ && cd #{service_name}")
-        else
-          raise(StandardError, "You are at wrong directory!")
-        end
+    def update_repo(service_name: "api", update_kind: "patch")
+      current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
+      current_ver = Souls.get_latest_version_txt(service_name: service_name)
+      new_ver = Souls.version_detector(current_ver: current_ver, update_kind: update_kind)
+      bucket_url = "gs://souls-bucket/boilerplates"
+      file_name = "#{service_name}-v#{new_ver}.tgz"
+      release_name = "#{service_name}-latest.tgz"
 
-        system("gsutil cp #{service_name}.tgz #{bucket_url}/#{service_name.pluralize}/#{file_name}")
-        system("gsutil cp #{service_name}.tgz #{bucket_url}/#{service_name.pluralize}/#{release_name}")
-        system("gsutil cp .rubocop.yml #{bucket_url}/.rubocop.yml")
-        FileUtils.rm("#{service_name}.tgz")
-        "#{service_name}-v#{new_ver} Succefully Stored to GCS! "
+      case current_dir_name
+      when "souls"
+        system("echo '#{new_ver}' > lib/souls/versions/.souls_#{service_name}_version")
+        system("echo '#{new_ver}' > apps/#{service_name}/.souls_#{service_name}_version")
+        system("cd apps/ && tar -czf ../#{service_name}.tgz #{service_name}/ && cd ..")
+      when "api", "worker", "console", "admin", "media"
+        system("echo '#{new_ver}' > lib/souls/versions/.souls_#{service_name}_version")
+        system("echo '#{new_ver}' > .souls_#{service_name}_version")
+        system("cd .. && tar -czf ../#{service_name}.tgz #{service_name}/ && cd #{service_name}")
+      else
+        raise(StandardError, "You are at wrong directory!")
       end
 
-      def update_service_gemfile(service_name: "api", version: "0.0.1")
-        file_dir = "./apps/#{service_name}"
-        file_path = "#{file_dir}/Gemfile"
-        gemfile_lock = "#{file_dir}/Gemfile.lock"
-        tmp_file = "#{file_dir}/tmp/Gemfile"
-        File.open(file_path, "r") do |f|
-          File.open(tmp_file, "w") do |new_line|
-            f.each_line do |line|
-              gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
-              if gem[0] == "souls"
-                old_ver = gem[1].split(".")
-                old_ver[2] = (old_ver[2].to_i + 1).to_s
-                new_line.write("  gem \"souls\", \"#{version}\"\n")
-              else
-                new_line.write(line)
-              end
+      system("gsutil cp #{service_name}.tgz #{bucket_url}/#{service_name.pluralize}/#{file_name}")
+      system("gsutil cp #{service_name}.tgz #{bucket_url}/#{service_name.pluralize}/#{release_name}")
+      system("gsutil cp .rubocop.yml #{bucket_url}/.rubocop.yml")
+      FileUtils.rm("#{service_name}.tgz")
+      "#{service_name}-v#{new_ver} Succefully Stored to GCS! "
+    end
+
+    def update_service_gemfile(service_name: "api", version: "0.0.1")
+      file_dir = "./apps/#{service_name}"
+      file_path = "#{file_dir}/Gemfile"
+      gemfile_lock = "#{file_dir}/Gemfile.lock"
+      tmp_file = "#{file_dir}/tmp/Gemfile"
+      File.open(file_path, "r") do |f|
+        File.open(tmp_file, "w") do |new_line|
+          f.each_line do |line|
+            gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
+            if gem[0] == "souls"
+              old_ver = gem[1].split(".")
+              old_ver[2] = (old_ver[2].to_i + 1).to_s
+              new_line.write("  gem \"souls\", \"#{version}\"\n")
+            else
+              new_line.write(line)
             end
           end
         end
-        FileUtils.rm(file_path)
-        FileUtils.rm(gemfile_lock) if File.exist?(gemfile_lock)
-        FileUtils.mv(tmp_file, file_path)
-        puts(Paint["\nSuccessfully Updated #{service_name} Gemfile!", :green])
       end
+      FileUtils.rm(file_path)
+      FileUtils.rm(gemfile_lock) if File.exist?(gemfile_lock)
+      FileUtils.mv(tmp_file, file_path)
+      puts(Paint["\nSuccessfully Updated #{service_name} Gemfile!", :green])
+    end
 
-      def overwrite_version(new_version: "0.1.1")
-        FileUtils.rm("./lib/souls/version.rb")
-        file_path = "./lib/souls/version.rb"
-        File.open(file_path, "w") do |f|
-          f.write(<<~TEXT)
-            module Souls
-              VERSION = "#{new_version}".freeze
-              public_constant :VERSION
-            end
-          TEXT
-        end
-        overwrite_gemfile_lock(new_version: new_version)
-        true
-      rescue StandardError, e
-        raise(StandardError, e)
+    def overwrite_version(new_version: "0.1.1")
+      FileUtils.rm("./lib/souls/version.rb")
+      file_path = "./lib/souls/version.rb"
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          module Souls
+            VERSION = "#{new_version}".freeze
+            public_constant :VERSION
+          end
+        TEXT
       end
+      overwrite_gemfile_lock(new_version: new_version)
+      true
+    rescue StandardError, e
+      raise(StandardError, e)
+    end
 
-      def overwrite_gemfile_lock(new_version: "0.1.1")
-        file_path = "Gemfile.lock"
-        new_file_path = "Gemfile.lock.tmp"
-        File.open(file_path, "r") do |f|
-          File.open(new_file_path, "w") do |new_line|
-            f.each_line.with_index do |line, i|
-              if i == 3
-                new_line.write("    souls (#{new_version})\n")
-              else
-                new_line.write(line)
-              end
+    def overwrite_gemfile_lock(new_version: "0.1.1")
+      file_path = "Gemfile.lock"
+      new_file_path = "Gemfile.lock.tmp"
+      File.open(file_path, "r") do |f|
+        File.open(new_file_path, "w") do |new_line|
+          f.each_line.with_index do |line, i|
+            if i == 3
+              new_line.write("    souls (#{new_version})\n")
+            else
+              new_line.write(line)
             end
           end
         end
-        FileUtils.rm(file_path)
-        FileUtils.mv(new_file_path, file_path)
       end
+      FileUtils.rm(file_path)
+      FileUtils.mv(new_file_path, file_path)
     end
   end
 end

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

@@ -1,4 +1,15 @@
 module Souls
-  module Server
+  class CLI < Thor
+    desc "server", "Run SOULs APP"
+    method_option all: :boolean, alias: "--all", default: false, desc: "Run All API & Workers"
+    def server
+      if options[:all]
+        Dir.chdir(Souls.get_mother_path.to_s) do
+          system("foreman start -f Procfile.dev")
+        end
+      else
+        system("foreman start -f Procfile.dev")
+      end
+    end
   end
 end

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

@@ -1,61 +1,62 @@
 module Souls
-  module Sync
-    class << self
-      def conf
-        update_conf
-        update_conf(strain: "api")
-      end
+  class Sync < Thor
+    desc "conf", "Sync config/souls.rb Endpoint with Google Cloud Run"
+    def conf
+      update_conf
+      update_conf(strain: "api")
+    end
+
+    private
 
-      def update_conf(strain: "mother")
-        require("#{Souls.get_mother_path}/config/souls")
-        workers = Souls.configuration.workers
-        Dir.chdir(Souls.get_mother_path.to_s) do
-          file_path = strain == "mother" ? "config/souls.rb" : "apps/api/config/souls.rb"
-          new_file_path = "souls.rb"
-          worker_switch = false
-          File.open(new_file_path, "w") do |new_line|
-            File.open(file_path, "r") do |f|
-              f.each_line do |line|
-                worker_switch = true if line.include?("config.workers")
-                next if line.strip == "end"
+    def update_conf(strain: "mother")
+      require("#{Souls.get_mother_path}/config/souls")
+      workers = Souls.configuration.workers
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_path = strain == "mother" ? "config/souls.rb" : "apps/api/config/souls.rb"
+        new_file_path = "souls.rb"
+        worker_switch = false
+        File.open(new_file_path, "w") do |new_line|
+          File.open(file_path, "r") do |f|
+            f.each_line do |line|
+              worker_switch = true if line.include?("config.workers")
+              next if line.strip == "end"
 
-                new_line.write(line) unless worker_switch
+              new_line.write(line) unless worker_switch
 
-                next unless worker_switch
+              next unless worker_switch
 
-                new_line.write("  config.workers = [\n")
-                workers.each_with_index do |worker, i|
-                  base_url = Souls::Gcloud::Run.get_endpoint(worker_name: worker[:name])
-                  endpoint = Souls.configuration.endpoint
-                  if (i + 1) == workers.size
-                    new_line.write(<<-TEXT)
+              new_line.write("  config.workers = [\n")
+              workers.each_with_index do |worker, i|
+                base_url = Souls::Gcloud::Run.new.get_endpoint(worker_name: worker[:name])
+                endpoint = Souls.configuration.endpoint
+                if (i + 1) == workers.size
+                  new_line.write(<<-TEXT)
     {
       name: "#{worker[:name]}",
       endpoint: "#{base_url.strip}#{endpoint}",
       port: #{worker[:port]}
     }
-                    TEXT
-                  else
-                    new_line.write(<<-TEXT)
+                  TEXT
+                else
+                  new_line.write(<<-TEXT)
     {
       name: "#{worker[:name]}",
       endpoint: "#{base_url.strip}#{endpoint}",
       port: #{worker[:port]}
     },
-                    TEXT
-                  end
+                  TEXT
                 end
-                break
               end
+              break
             end
-            new_line.write(<<~TEXT)
-                ]
-              end
-            TEXT
           end
-          FileUtils.rm(file_path)
-          FileUtils.mv(new_file_path, file_path)
+          new_line.write(<<~TEXT)
+              ]
+            end
+          TEXT
         end
+        FileUtils.rm(file_path)
+        FileUtils.mv(new_file_path, file_path)
       end
     end
   end

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

@@ -1,27 +1,26 @@
 module Souls
-  module Sync
-    class << self
-      def model
-        cp_dir = %w[db app/models spec/factories]
-        cp_dir.each do |dir|
-          cp_and_dl_files(dir: dir)
-        end
+  class Sync < Thor
+    desc "model", "Sync Model, DB, Factory Files with API"
+    def model
+      cp_dir = %w[db app/models spec/factories]
+      cp_dir.each do |dir|
+        cp_and_dl_files(dir: dir)
       end
+    end
 
-      private
+    private
 
-      def cp_and_dl_files(dir: "db")
-        require("#{Souls.get_mother_path}/config/souls")
-        worker_paths = Souls.configuration.workers.map { |n| n[:name] }
-        worker_paths.each do |path|
-          cp_path = "./apps/api/#{dir}"
-          old_path = "./apps/#{path}/#{dir}"
-          system("rm -rf #{old_path}", chdir: Souls.get_mother_path)
-          system("mkdir -p #{old_path}", chdir: Souls.get_mother_path)
-          system("cp -r #{cp_path}/* #{old_path}", chdir: Souls.get_mother_path)
-        rescue StandardError
-          # Do nothing
-        end
+    def cp_and_dl_files(dir: "db")
+      require("#{Souls.get_mother_path}/config/souls")
+      worker_paths = Souls.configuration.workers.map { |n| n[:name] }
+      worker_paths.each do |path|
+        cp_path = "./apps/api/#{dir}"
+        old_path = "./apps/#{path}/#{dir}"
+        system("rm -rf #{old_path}", chdir: Souls.get_mother_path)
+        system("mkdir -p #{old_path}", chdir: Souls.get_mother_path)
+        system("cp -r #{cp_path}/* #{old_path}", chdir: Souls.get_mother_path)
+      rescue StandardError
+        # Do nothing
       end
     end
   end

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

@@ -1,93 +1,92 @@
 module Souls
-  module Sync
-    class << self
-      def pubsub
-        get_topics(workers: get_workers)
-      end
-
-      private
-
-      def get_topics(workers: {})
-        project_id = Souls.configuration.project_id
-        pubsub = Google::Cloud::Pubsub.new
-        topics = pubsub.topics
+  class Sync < Thor
+    desc "pubsub", "Sync Worker Jobs & Google Cloud Pubsub Subscriptions"
+    def pubsub
+      get_topics(workers: get_workers)
+    end
 
-        topic_names =
-          topics.map do |topic|
-            topic.name.gsub("projects/#{project_id}/topics/", "")
-          end
+    private
 
-        topic_names.each do |name|
-          value = workers[name.to_sym] || 0
-          workers[name.to_sym] = value - 1
-        end
+    def get_topics(workers: {})
+      project_id = Souls.configuration.project_id
+      pubsub = Google::Cloud::Pubsub.new
+      topics = pubsub.topics
 
-        workers.each do |key, value|
-          if value == 1
-            create_topic(topic_id: key.to_s)
-            create_push_subscription(topic_id: key.to_s)
-          end
-          delete_topic(topic_id: key.to_s) if value == -1
+      topic_names =
+        topics.map do |topic|
+          topic.name.gsub("projects/#{project_id}/topics/", "")
         end
-        workers
-      end
 
-      def create_topic(topic_id: "mailer")
-        pubsub = Google::Cloud::Pubsub.new
-        topic = pubsub.create_topic(topic_id)
-        puts("Topic #{topic.name} created.")
+      topic_names.each do |name|
+        value = workers[name.to_sym] || 0
+        workers[name.to_sym] = value - 1
       end
 
-      def delete_topic(topic_id: "mailer")
-        pubsub = Google::Cloud::Pubsub.new
-        topic = pubsub.topic(topic_id)
-        topic.delete
-        puts("Topic #{topic_id} deleted.")
+      workers.each do |key, value|
+        if value == 1
+          create_topic(topic_id: key.to_s)
+          create_push_subscription(topic_id: key.to_s)
+        end
+        delete_topic(topic_id: key.to_s) if value == -1
       end
+      workers
+    end
 
-      def create_push_subscription(topic_id: "mailer")
-        require("#{Souls.get_mother_path}/config/souls")
-        worker_name = topic_id.split("_")[0]
+    def create_topic(topic_id: "mailer")
+      pubsub = Google::Cloud::Pubsub.new
+      topic = pubsub.create_topic(topic_id)
+      puts("Topic #{topic.name} created.")
+    end
 
-        subscription_id = "#{topic_id}_sub"
-        endpoint = ""
-        worker_paths = Souls.configuration.workers
-        worker_paths.each do |worker|
-          endpoint = worker[:endpoint] if worker[:name] == worker_name
-        end
+    def delete_topic(topic_id: "mailer")
+      pubsub = Google::Cloud::Pubsub.new
+      topic = pubsub.topic(topic_id)
+      topic.delete
+      puts("Topic #{topic_id} deleted.")
+    end
 
-        pubsub = Google::Cloud::Pubsub.new
+    def create_push_subscription(topic_id: "mailer")
+      require("#{Souls.get_mother_path}/config/souls")
+      worker_name = topic_id.split("_")[0]
 
-        topic = pubsub.topic(topic_id)
-        sub = topic.subscribe(subscription_id, endpoint: endpoint, deadline: 20)
-        sub.expires_in = nil
-        puts("Push subscription #{subscription_id} created.")
+      subscription_id = "#{topic_id}_sub"
+      endpoint = ""
+      worker_paths = Souls.configuration.workers
+      worker_paths.each do |worker|
+        endpoint = worker[:endpoint] if worker[:name] == worker_name
       end
 
-      def get_workers
-        require("#{Souls.get_mother_path}/config/souls")
-        worker_paths = Souls.configuration.workers.map { |n| n[:name] }
-        response = {}
-        Dir.chdir(Souls.get_mother_path.to_s) do
-          worker_paths.each do |worker|
-            mailers =
-              Dir["apps/#{worker}/app/graphql/mutations/mailers/*.rb"].map do |file|
-                file.gsub("apps/#{worker}/app/graphql/mutations/mailers/", "").gsub(".rb", "")
-              end
+      pubsub = Google::Cloud::Pubsub.new
+
+      topic = pubsub.topic(topic_id)
+      sub = topic.subscribe(subscription_id, endpoint: endpoint, deadline: 20)
+      sub.expires_in = nil
+      puts("Push subscription #{subscription_id} created.")
+    end
+
+    def get_workers
+      require("#{Souls.get_mother_path}/config/souls")
+      worker_paths = Souls.configuration.workers.map { |n| n[:name] }
+      response = {}
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        worker_paths.each do |worker|
+          mailers =
+            Dir["apps/#{worker}/app/graphql/mutations/mailers/*.rb"].map do |file|
+              file.gsub("apps/#{worker}/app/graphql/mutations/mailers/", "").gsub(".rb", "")
+            end
 
-            workers =
-              Dir["apps/#{worker}/app/graphql/mutations/*.rb"].map do |file|
-                file.gsub("apps/#{worker}/app/graphql/mutations/", "").gsub(".rb", "")
-              end
-            workers.delete("base_mutation")
-            local_files = mailers + workers
-            local_files.each do |file|
-              response[:"#{worker}_#{file}"] = 1
+          workers =
+            Dir["apps/#{worker}/app/graphql/mutations/*.rb"].map do |file|
+              file.gsub("apps/#{worker}/app/graphql/mutations/", "").gsub(".rb", "")
             end
+          workers.delete("base_mutation")
+          local_files = mailers + workers
+          local_files.each do |file|
+            response[:"#{worker}_#{file}"] = 1
           end
         end
-        response
       end
+      response
     end
   end
 end