souls 0.47.1 → 0.49.0

data/lib/souls/api/update/rspec_mutation.rb

@@ -22,7 +22,7 @@ module Souls
 
                 if line.include?('#{') && !argument
                   new_cols.each do |col|
-                    type = Souls::Api::Generate.type_check(col[:type])
+                    type = Souls.type_check(col[:type])
                     next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
 
                     type_line =
@@ -46,7 +46,7 @@ module Souls
                 elsif test_res && line.include?("=> be_")
                   test_args = check_rspec_mutation_argument(class_name: class_name, action: "test_args")
                   new_cols.each do |col|
-                    type = Souls::Api::Generate.type_check(col[:type])
+                    type = Souls.type_check(col[:type])
                     text =
                       case type
                       when "Integer", "Float"

data/lib/souls/api/update/rspec_resolver.rb

@@ -30,7 +30,7 @@ module Souls
                 elsif test_res && line.include?("=> be_")
                   test_args = check_rspec_resolver_argument(class_name: class_name, action: "test_args")
                   new_cols.each do |col|
-                    type = Souls::Api::Generate.type_check(col[:type])
+                    type = Souls.type_check(col[:type])
                     text =
                       case type
                       when "Integer", "Float"

data/lib/souls/api/update/type.rb

@@ -16,7 +16,7 @@ module Souls
                 next unless line.include?("field") && !argument
 
                 new_cols.each do |col|
-                  type = Souls::Api::Generate.get_type(col[:type])
+                  type = Souls.get_type(col[:type])
                   type = "[#{type}]" if col[:array]
                   args = check_type_argument(class_name: class_name)
                   unless args.include?(col[:column_name])

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

@@ -0,0 +1,4 @@
+module Souls
+  module Console
+  end
+end

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

@@ -204,20 +204,12 @@ end
       end
 
       def download_worker(worker_name: "mailer")
-        raise(StandardError, "Can't use `worker` for worker. Change Name.") if worker_name == "worker"
-
-        current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
-        wrong_dir = %w[apps api worker]
-        if wrong_dir.include?(current_dir_name)
-          raise(StandardError, "You are at wrong directory!Go to Mother Directory!")
-        end
-
         version = Souls.get_latest_version_txt(service_name: "worker").join(".")
         file_name = "worker-v#{version}.tgz"
         url = "https://storage.googleapis.com/souls-bucket/boilerplates/workers/#{file_name}"
         system("curl -OL #{url}")
-        system("tar -zxvf ./#{file_name} -C ./apps/")
-        system("mv apps/worker apps/#{worker_name}")
+        system("tar -zxvf ./#{file_name}")
+        system("mv ./worker apps/#{worker_name}")
         system("cp ./apps/api/config/database.yml ./apps/#{worker_name}/config/")
         FileUtils.rm(file_name)
       end

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

@@ -0,0 +1,4 @@
+module Souls
+  module Db
+  end
+end

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

@@ -21,6 +21,10 @@ module Souls
           )
         end
 
+        def subscription_list
+          system("gcloud pubsub subscriptions list")
+        end
+
         def update_subscription(
           topic_name: "send-user-mail",
           endpoint: "https:://test.com"

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

@@ -5,6 +5,10 @@ module Souls
         def create_topic(topic_name: "send-user-mail")
           system("gcloud pubsub topics create #{topic_name}")
         end
+
+        def topic_list
+          system("gcloud pubsub topics list")
+        end
       end
     end
   end

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

@@ -11,12 +11,20 @@ module Souls
           )
         end
 
-        def setup_private_ip(instance_name: "")
-          app_name = Souls.configuration.app
-          instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
-          project_id = Souls.configuration.project_id
+        def list
+          system("gcloud sql instances list")
+        end
+
+        def setup_private_ip
           create_ip_range
           create_vpc_connector
+          assign_network
+        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
 

data/lib/souls/cli/index.rb

@@ -1,6 +1,7 @@
 require_relative "./create/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"
@@ -15,6 +16,9 @@ module Souls
   module Gcloud
   end
 
+  module Init
+  end
+
   module Release
   end
 

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

@@ -0,0 +1,155 @@
+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"]
+      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
+
+      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}-project"
+              config.endpoint = "/endpoint"
+              config.strain = "api"
+              config.fixed_gems = ["excluded_gem"]
+              config.workers = []
+            end
+          TEXT
+        end
+      rescue StandardError => e
+        puts(e)
+      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
+
+      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}-project"
+              config.endpoint = "/endpoint"
+              config.strain = "mother"
+              config.fixed_gems = ["excluded_gem"]
+              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
+
+        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)
+      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
+
+          Doc: https://souls.elsoul.nl
+        TEXT
+        cd = Paint[endroll, :white]
+        puts(cd)
+        puts(line)
+      end
+    end
+  end
+end

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

@@ -19,11 +19,11 @@ module Souls
         Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
           Whirly.status = status
           %w[api worker].each do |s_name|
-            Souls.update_service_gemfile(service_name: s_name, version: souls_new_ver)
-            result = Paint[Souls.update_repo(service_name: s_name, update_kind: update_kind), :green]
+            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
-          Souls.overwrite_version(new_version: souls_new_ver)
+          overwrite_version(new_version: souls_new_ver)
           puts("before add")
           system("git add .")
           puts("before commit")
@@ -34,6 +34,94 @@ module Souls
           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"
+
+        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
+
+        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
+        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)
+      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
+        end
+        FileUtils.rm(file_path)
+        FileUtils.mv(new_file_path, file_path)
+      end
     end
   end
 end

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

@@ -0,0 +1,4 @@
+module Souls
+  module Server
+  end
+end

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

@@ -24,16 +24,26 @@ module Souls
                 next unless worker_switch
 
                 new_line.write("  config.workers = [\n")
-                workers.each do |worker|
+                workers.each_with_index do |worker, i|
                   base_url = Souls::Gcloud::Run.get_endpoint(worker_name: worker[:name])
                   endpoint = Souls.configuration.endpoint
-                  new_line.write(<<-TEXT)
-      {
-        name: "#{worker[:name]}",
-        endpoint: "#{base_url.strip}#{endpoint}",
-        port: #{worker[:port]}
-      },
-                  TEXT
+                  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)
+    {
+      name: "#{worker[:name]}",
+      endpoint: "#{base_url.strip}#{endpoint}",
+      port: #{worker[:port]}
+    },
+                    TEXT
+                  end
                 end
                 break
               end