souls 0.30.9 → 0.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f0f0cd6d520941962959bc7639c20ab07d701a37f95bcc47834f5a714c3ec3c
-  data.tar.gz: 61b2b8f0290548229391880a915aa90b756760acb51a8b72461d51dcb7d2f636
+  metadata.gz: 6efcfd5a262a33c5d1323e9e2e423a8abf4d4e8f86783ce13bd1332bfe4c7fa7
+  data.tar.gz: 1553a17298b0c55dc273f6b18eacd3165868346501c2431f85ecc7e4444519b1
 SHA512:
-  metadata.gz: c9b4126cf1c69be736cfae30d67b85bd9a254911b884b16ddabbb33e7e4c82aa6783e4862bdae984dbe5d5ccd1ee68e7d352e0efb2aae562eae22a8b15feb6d5
-  data.tar.gz: 223dc66153880ebe293fab5d1e14e1b32d1c76635467352477396c9e056c5f37eb55f0fbc42060f7d0ed82cbeb91df732062ec65973f234061877afeb1d61b0a
+  metadata.gz: 7e3b02ca9c947f4a9784ee07500fc2ed470e7d77f8a47e6d6ffe846860f8a769aa7a27d4ad84d735029445cd80e8e1f697959039049f771c00061948825d52ac
+  data.tar.gz: 6f4649ee64d7ccb0300a51ed87c0107ed12b696e4f212a4fac088b588766c709fe660f88fb6b3dc1b23452b0cedb8218e7e2f675ec62aee6065164e0a8ca0ab6

data/README.md

@@ -21,12 +21,18 @@
 
 Welcome to SOULs Serverless Application Framework!
 
-SOULs is a Serverless Application Framework with Ruby GraphQL. 
-SOULs has 3 strains, API, Worker, and Frontend. It can be used in combination according to the purpose. SOULs Backend GraphQL Ruby & Frontend Relay are Scalable and Easy to deploy to Google Cloud. No more routing for Backends!
-You can focus on your business logic.
+SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
+クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。
+
+SOULs バックエンドには `API` と `Worker` の 2 つのタイプがあります。
+`API` は主にデータをフロントエンドへ提供します。`Worker` は主に `タスク` の処理を行います
 
 ![画像](https://storage.googleapis.com/souls-bucket/imgs/souls-structure.jpg)
 
+現在のバージョンでは SOULs `API` と `Worker` を Github Actions を使って Google Cloud Run へそれぞれデプロイします。
+
+SOULs フレームワークでは [Monorepo](https://en.wikipedia.org/wiki/Monorepo) によって一つのパッケージでアプリケーションを管理します。
+
 SOULs creates 3 types of framework.
 
 1. API - GraphQL (Ruby) - Simple API - Cloud Run
@@ -72,13 +78,11 @@ Or install it yourself as:
 And Create Your APP
 
     $ souls new app_name
+    $ cd apps/api/app_name
+    $ bundle
+    $ souls s
 
-## Choose SOULs Type:
 
-Select Strain:
-1. SOULs GraphQL API
-2. SOULs Worker
-3. SOULs Frontend Web
 
 
 ## Gemfile 自動更新アップデート
@@ -99,7 +103,7 @@ Souls.configure do |config|
   config.app = "souls-api"
   config.project_id = "souls-api"
   config.strain = "api"
-  config.worker_endpoint = "https://worker.com"
+  config.github_repo = "elsoul/souls"
   config.fixed_gems = ["selenium-webdriver", "pg"]
 end
 ```

data/exe/souls

@@ -20,7 +20,7 @@ begin
         Souls::Api::Generate.public_send(method_name, class_name: class_name)
         Whirly.status = "Done!"
       end
-    when "schema:update"
+    when "update"
       class_name = ARGV[2]
       status = Paint["Running SOULs Update Commands...", :yellow]
       Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
@@ -34,6 +34,9 @@ begin
         Souls::Api::Update.rspec_resolver(class_name: class_name)
         Whirly.status = "Done!"
       end
+    when "d", "delete"
+      class_name = ARGV[2]
+      Souls::Api::Generate.delete_all(class_name: class_name)
     else
       puts(Paint["Comannd doesn't exist.Check you command again!...", :red])
     end
@@ -73,7 +76,7 @@ begin
         system("bundle exec irb")
       end
     end
-  when "i", "infra", "docker"
+  when "docker"
     send_method = ARGV[1]
     Souls::Docker.public_send(send_method)
   when "gcloud"
@@ -86,49 +89,42 @@ begin
     end
   when "-v", "--version", "v", "version", "-version", "--v"
     puts(Paint[Souls::VERSION, :white])
-  when "gem:update", "gemfile:update"
-    status = Paint["Checking for updates...", :yellow]
-    Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
-      Whirly.status = status
-      Souls.update_gemfile
-      Whirly.status = "Done!"
+  when "upgrade"
+    method_command = ARGV[1]
+    case method_command
+    when "gemfile", "gem"
+      status = Paint["Checking for updates...", :yellow]
+      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+        Whirly.status = status
+        Souls::Upgrade.update_gemfile
+        Whirly.status = "Done!"
+      end
+    else
+      puts(Paint["Comannd doesn't exist.Check you command again!...", :red])
     end
   when "release"
     Souls::Release.gem_release
-  when "model:update"
-    status = Paint["Syncing Models...", :yellow]
-    Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
-      Whirly.status = status
-      Souls.update_models
-      Whirly.status = "API and Worker Both Models Synced!"
-    end
-  when "add"
-    graphql_class = ARGV[1]
-    case graphql_class
-    when "mutation"
-      Souls::Init.add_mutation(class_name: "user", file_name: "hoi")
-    when "type"
-      Souls::Init.add_type(class_name: "user", file_name: "hoi")
-    when "connection"
-      Souls::Init.add_connection(class_name: "user", file_name: "hoi")
-    when "edge"
-      Souls::Init.add_edge(class_name: "user", file_name: "hoi")
-    when "rspec_mutation"
-      Souls::Init.add_rspec_mutation(class_name: "user", file_name: "hoi")
+  when "sync"
+    target = ARGV[1]
+    case target
+    when "model", "m"
+      status = Paint["Syncing Models...", :yellow]
+      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+        Whirly.status = status
+        Souls::Sync.model
+        Whirly.status = "API and Worker Both Models Synced!"
+      end
     else
-      puts(Paint["Wrong Argument!", :red])
+      puts(Paint["Comannd doesn't exist.Check you command again!...", :red])
     end
-  when "g", "generate"
-    g_command = ARGV[1]
-    case g_command
+  when "create"
+    service_name = ARGV[1]
+    case service_name
     when "worker"
       Souls::Init.download_worker
     else
       puts(Paint["Coming Soon...", :green])
     end
-  when "d", "delete"
-    class_name = ARGV[1]
-    Souls::Api::Generate.delete_all(class_name: class_name)
   when "db:create"
     rack_env = ARGV[1]
     case rack_env
@@ -164,9 +160,6 @@ begin
   when "t", "test"
     system("rubocop -A")
     system("bundle exec rspec")
-  when "run"
-    system("docker build . -t souls -f Dockerfile.dev")
-    system("docker run --rm --env-file .env -p 3000:3000 souls:latest")
   when "deploy"
     project_id = Souls.configuration.project_id
     system("gcloud builds submit --config=cloudbuild.yml --project #{project_id}")

data/lib/souls.rb

@@ -3,11 +3,8 @@ require "active_support/core_ext/string/inflections"
 require_relative "souls/init"
 require_relative "souls/api"
 require_relative "souls/worker"
-require_relative "souls/gcloud"
-require_relative "souls/release"
-require_relative "souls/docker"
+require_relative "souls/cli"
 require "date"
-require "dotenv/load"
 require "json"
 require "fileutils"
 require "net/http"
@@ -35,108 +32,6 @@ module Souls
   class << self
     attr_accessor :configuration
 
-    def gemfile_latest_version
-      file_path = "./Gemfile"
-      updated_gems = []
-      updated_gem_versions = []
-      updated_lines = []
-      from_dev = false
-      File.open(file_path, "r") do |f|
-        f.each_line do |line|
-          from_dev = true if line.include?("group")
-          next unless line.include?("gem ")
-
-          gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
-          url = URI("https://rubygems.org/api/v1/versions/#{gem[0]}/latest.json")
-          res = Net::HTTP.get_response(url)
-          data = JSON.parse(res.body)
-          next if Souls.configuration.fixed_gems.include?(gem[0].to_s)
-          next if data["version"].to_s == gem[1].to_s
-
-          updated_lines << if from_dev
-                             "  gem \"#{gem[0]}\", \"#{data['version']}\""
-                           else
-                             "gem \"#{gem[0]}\", \"#{data['version']}\""
-                           end
-          updated_gems << (gem[0]).to_s
-          updated_gem_versions << data["version"]
-          system("gem update #{gem[0]}")
-        end
-      end
-      {
-        gems: updated_gems,
-        lines: updated_lines,
-        updated_gem_versions: updated_gem_versions
-      }
-    end
-
-    def update_gemfile
-      file_path = "./Gemfile"
-      tmp_file = "./tmp/Gemfile"
-      new_gems = gemfile_latest_version
-      logs = []
-      message = Paint["\nAlready Up to date!", :green]
-      return "Already Up to date!" && puts(message) if new_gems[:gems].blank?
-
-      @i = 0
-      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 new_gems[:gems].include?(gem[0])
-              old_ver = gem[1].split(".")
-              new_ver = new_gems[:updated_gem_versions][@i].split(".")
-              if old_ver[0] < new_ver[0]
-                logs << Paint % [
-                  "#{gem[0]} v#{gem[1]} → %{red_text}",
-                  :white,
-                  {
-                    red_text: ["v#{new_gems[:updated_gem_versions][@i]}", :red]
-                  }
-                ]
-              elsif old_ver[1] < new_ver[1]
-                logs << Paint % [
-                  "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.%{yellow_text}",
-                  :white,
-                  {
-                    yellow_text: ["#{new_ver[1]}.#{new_ver[2]}", :yellow]
-                  }
-                ]
-              elsif old_ver[2] < new_ver[2]
-                logs << Paint % [
-                  "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.#{new_ver[1]}.%{green_text}",
-                  :white,
-                  {
-                    green_text: [(new_ver[2]).to_s, :green]
-                  }
-                ]
-              end
-              if gem[0] == "souls"
-                logs << Paint % [
-                  "\nSOULs Doc: %{cyan_text}",
-                  :white,
-                  { cyan_text: ["https://souls.elsoul.nl\n", :cyan] }
-                ]
-              end
-              new_line.write("#{new_gems[:lines][@i]}\n")
-              @i += 1
-            else
-              new_line.write(line)
-            end
-          end
-        end
-      end
-      FileUtils.rm("./Gemfile")
-      FileUtils.rm("./Gemfile.lock")
-      FileUtils.mv("./tmp/Gemfile", "./Gemfile")
-      system("bundle update")
-      success = Paint["\n\nSuccessfully Updated These Gems!\n", :green]
-      puts(success)
-      logs.each do |line|
-        puts(line)
-      end
-    end
-
     def update_repo(service_name: "api", update_kind: "patch")
       current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
       current_ver = get_latest_version_txt(service_name: service_name)
@@ -252,86 +147,6 @@ module Souls
       puts(Paint["\nSuccessfully Updated #{service_name} Gemfile!", :green])
     end
 
-    def update_models
-      current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
-      permitted_dirs = %w[worker api]
-      unless permitted_dirs.include?(current_dir_name)
-        raise(StandardError, "You are at wrong directory!Go to API or Worker Directory!")
-      end
-
-      cp_dir = get_models_path(service_name: current_dir_name)
-      cp_dir.each do |path|
-        cp_and_dl_files(api_dir: path[:api], worker_dir: path[:worker])
-      end
-    end
-
-    def cp_and_dl_files(api_dir: "", worker_dir: "")
-      if Dir["#{worker_dir}/*.rb"].blank?
-
-        api_latest_date = 1
-        worker_latest_date = 0
-      else
-        api_file_data = file_diff(Dir["#{api_dir}/*.rb"])
-        worker_file_data = file_diff(Dir["#{worker_dir}/*.rb"])
-
-        api_latest_date = Date.parse(api_file_data.max)
-        worker_latest_date = Date.parse(worker_file_data.max)
-      end
-
-      if api_latest_date < worker_latest_date
-        FileUtils.rm_rf(api_dir) if Dir.exist?(api_dir)
-        FileUtils.mkdir(api_dir) unless Dir.exist?(api_dir)
-        system("cp -r #{worker_dir}/* #{api_dir}")
-      else
-        FileUtils.rm_rf(worker_dir) if Dir.exist?(worker_dir)
-        FileUtils.mkdir(worker_dir) unless Dir.exist?(worker_dir)
-        system("cp -r #{api_dir}/* #{worker_dir}")
-      end
-    end
-
-    def get_models_path(service_name: "api")
-      case service_name
-      when "api"
-        api_path = "."
-        worker_path = "../worker"
-      when "worker"
-        api_path = "../api"
-        worker_path = "."
-      end
-      [
-        {
-          api: "#{api_path}/db",
-          worker: "#{worker_path}/db"
-        },
-        {
-          api: "#{api_path}/app/models",
-          worker: "#{worker_path}/app/models"
-        },
-        {
-          api: "#{api_path}/spec/factories",
-          worker: "#{worker_path}/spec/factories"
-        }
-      ]
-    end
-
-    def file_diff(paths = [])
-      paths.map do |path|
-        stat(path)[:last_update]
-      end
-    end
-
-    def stat(path)
-      s = File::Stat.new(path)
-      last_update = s.mtime.to_s
-      last_status_change = s.ctime.to_s
-      last_access = s.atime.to_s
-      {
-        last_update: last_update,
-        last_status_change: last_status_change,
-        last_access: last_access
-      }
-    end
-
     def check_schema(class_name: "user")
       schema_data = get_columns_num(class_name: class_name)
       create_migration_data = get_create_migration_type(class_name: class_name)

data/lib/souls/api/generate/application.rb

@@ -109,7 +109,7 @@ module Souls
       false
     end
 
-    def self.migrate(class_name: "souls")
+    def self.scaffold(class_name: "souls")
       singularized_class_name = class_name.singularize
       model(class_name: singularized_class_name)
       type(class_name: singularized_class_name)
@@ -130,10 +130,10 @@ module Souls
       raise(StandardError, e)
     end
 
-    def self.migrate_all
+    def self.scaffold_all
       puts(Paint["Let's Go SOULs AUTO CRUD Assist!\n", :cyan])
       Souls::Api::Generate.get_tables.each do |table|
-        Souls::Api::Generate.migrate(class_name: table.singularize)
+        Souls::Api::Generate.scaffold(class_name: table.singularize)
         puts(Paint["Generated #{table.camelize} CRUD Files\n", :yellow])
       end
     end
@@ -160,23 +160,5 @@ module Souls
     rescue StandardError => e
       raise(StandardError, e)
     end
-
-    def self.update_delete(class_name: "souls")
-      singularized_class_name = class_name.singularize.underscore
-      pluralized_class_name = class_name.pluralize.underscore
-      FileUtils.rm_rf("./app/graphql/mutations/#{singularized_class_name}")
-      FileUtils.rm("./app/graphql/queries/#{singularized_class_name}.rb")
-      FileUtils.rm("./app/graphql/queries/#{pluralized_class_name}.rb")
-      FileUtils.rm("./app/graphql/resolvers/#{singularized_class_name}_search.rb")
-      FileUtils.rm("./app/graphql/types/#{singularized_class_name}_type.rb")
-      FileUtils.rm("./app/graphql/types/edges/#{singularized_class_name}_edge.rb")
-      FileUtils.rm("./app/graphql/types/connections/#{singularized_class_name}_connection.rb")
-      FileUtils.rm("./spec/mutations/#{singularized_class_name}_spec.rb")
-      FileUtils.rm("./spec/queries/#{singularized_class_name}_spec.rb")
-      FileUtils.rm("./spec/resolvers/#{singularized_class_name}_search_spec.rb")
-      puts("deleted #{class_name.camelize} CRUD!")
-    rescue StandardError => e
-      raise(StandardError, e)
-    end
   end
 end

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

@@ -45,7 +45,7 @@ module Souls
           FileUtils.mv(new_file_path, file_path)
           puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
         rescue StandardError => e
-          p(e.backtrace)
+          p(e)
         end
 
         def check_resolver_argument(class_name: "user", action: "argument")

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

@@ -49,8 +49,6 @@ module Souls
                     type = Souls::Api::Generate.type_check(col[:type])
                     text =
                       case type
-                      when "String"
-                        col[:array] ? "be_all(String)" : "be_a(String)"
                       when "Integer", "Float"
                         col[:array] ? "be_all(Integer)" : "be_a(Integer)"
                       when "Boolean"
@@ -59,7 +57,7 @@ module Souls
                         col[:array] ? "be_all(String)" : "be_a(String)"
                       end
                     unless test_args.include?(col[:column_name])
-                      new_line.write("         \"#{col[:column_name].camelize(:lower)}\" => #{text},\n")
+                      new_line.write("        \"#{col[:column_name].camelize(:lower)}\" => #{text},\n")
                     end
                   end
                   test_res = false

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

@@ -33,8 +33,6 @@ module Souls
                     type = Souls::Api::Generate.type_check(col[:type])
                     text =
                       case type
-                      when "String"
-                        col[:array] ? "be_all(String)" : "be_a(String)"
                       when "Integer", "Float"
                         col[:array] ? "be_all(Integer)" : "be_a(Integer)"
                       when "Boolean"

data/lib/souls/cli.rb

@@ -0,0 +1,8 @@
+require_relative "./cli/docker"
+require_relative "./cli/gcloud"
+require_relative "./cli/release"
+require_relative "./cli/sync"
+require_relative "./cli/upgrade"
+
+module Souls
+end

data/lib/souls/{docker → cli/docker}/docker.rb

@@ -26,6 +26,18 @@ module Souls
         )
         system("docker ps")
       end
+
+      def run
+        current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
+        port =
+          if current_dir_name == "api"
+            "4000:4000"
+          else
+            "3000:3000"
+          end
+        system("docker build . -t souls-app -f Dockerfile.dev")
+        system("docker run --name souls-app --rm --env-file .env -p #{port} souls-app:latest")
+      end
     end
   end
 end

data/lib/souls/cli/sync.rb

@@ -0,0 +1,6 @@
+require_relative "./sync/model"
+
+module Souls
+  module Sync
+  end
+end

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

@@ -0,0 +1,87 @@
+module Souls
+  module Sync
+    class << self
+      def model
+        current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
+        permitted_dirs = %w[worker api]
+        unless permitted_dirs.include?(current_dir_name)
+          raise(StandardError, "You are at wrong directory!Go to API or Worker Directory!")
+        end
+
+        cp_dir = get_models_path(service_name: current_dir_name)
+        cp_dir.each do |path|
+          cp_and_dl_files(api_dir: path[:api], worker_dir: path[:worker])
+        end
+      end
+
+      private
+
+      def file_diff(paths = [])
+        paths.map do |path|
+          stat(path)[:last_update]
+        end
+      end
+
+      def stat(path)
+        s = File::Stat.new(path)
+        last_update = s.mtime.to_s
+        last_status_change = s.ctime.to_s
+        last_access = s.atime.to_s
+        {
+          last_update: last_update,
+          last_status_change: last_status_change,
+          last_access: last_access
+        }
+      end
+
+      def cp_and_dl_files(api_dir: "", worker_dir: "")
+        if Dir["#{worker_dir}/*.rb"].blank?
+
+          api_latest_date = 1
+          worker_latest_date = 0
+        else
+          api_file_data = file_diff(Dir["#{api_dir}/*.rb"])
+          worker_file_data = file_diff(Dir["#{worker_dir}/*.rb"])
+
+          api_latest_date = Date.parse(api_file_data.max)
+          worker_latest_date = Date.parse(worker_file_data.max)
+        end
+
+        if api_latest_date < worker_latest_date
+          FileUtils.rm_rf(api_dir) if Dir.exist?(api_dir)
+          FileUtils.mkdir(api_dir) unless Dir.exist?(api_dir)
+          system("cp -r #{worker_dir}/* #{api_dir}")
+        else
+          FileUtils.rm_rf(worker_dir) if Dir.exist?(worker_dir)
+          FileUtils.mkdir(worker_dir) unless Dir.exist?(worker_dir)
+          system("cp -r #{api_dir}/* #{worker_dir}")
+        end
+      end
+
+      def get_models_path(service_name: "api")
+        case service_name
+        when "api"
+          api_path = "."
+          worker_path = "../worker"
+        when "worker"
+          api_path = "../api"
+          worker_path = "."
+        end
+        [
+          {
+            api: "#{api_path}/db",
+            worker: "#{worker_path}/db"
+          },
+          {
+            api: "#{api_path}/app/models",
+            worker: "#{worker_path}/app/models"
+          },
+          {
+            api: "#{api_path}/spec/factories",
+            worker: "#{worker_path}/spec/factories"
+          }
+        ]
+      end
+    end
+  end
+end

data/lib/souls/cli/upgrade.rb

@@ -0,0 +1,5 @@
+require_relative "./upgrade/gem_update"
+module Souls
+  module Upgrade
+  end
+end

data/lib/souls/cli/upgrade/gem_update.rb

@@ -0,0 +1,107 @@
+module Souls
+  module Upgrade
+    class << self
+      def gemfile_latest_version
+        file_path = "./Gemfile"
+        updated_gems = []
+        updated_gem_versions = []
+        updated_lines = []
+        from_dev = false
+        File.open(file_path, "r") do |f|
+          f.each_line do |line|
+            from_dev = true if line.include?("group")
+            next unless line.include?("gem ")
+
+            gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
+            url = URI("https://rubygems.org/api/v1/versions/#{gem[0]}/latest.json")
+            res = Net::HTTP.get_response(url)
+            data = JSON.parse(res.body)
+            next if Souls.configuration.fixed_gems.include?(gem[0].to_s)
+            next if data["version"].to_s == gem[1].to_s
+
+            updated_lines << if from_dev
+                               "  gem \"#{gem[0]}\", \"#{data['version']}\""
+                             else
+                               "gem \"#{gem[0]}\", \"#{data['version']}\""
+                             end
+            updated_gems << (gem[0]).to_s
+            updated_gem_versions << data["version"]
+            system("gem update #{gem[0]}")
+          end
+        end
+        {
+          gems: updated_gems,
+          lines: updated_lines,
+          updated_gem_versions: updated_gem_versions
+        }
+      end
+
+      def update_gemfile
+        file_path = "./Gemfile"
+        tmp_file = "./tmp/Gemfile"
+        new_gems = gemfile_latest_version
+        logs = []
+        message = Paint["\nAlready Up to date!", :green]
+        return "Already Up to date!" && puts(message) if new_gems[:gems].blank?
+
+        @i = 0
+        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 new_gems[:gems].include?(gem[0])
+                old_ver = gem[1].split(".")
+                new_ver = new_gems[:updated_gem_versions][@i].split(".")
+                if old_ver[0] < new_ver[0]
+                  logs << Paint % [
+                    "#{gem[0]} v#{gem[1]} → %{red_text}",
+                    :white,
+                    {
+                      red_text: ["v#{new_gems[:updated_gem_versions][@i]}", :red]
+                    }
+                  ]
+                elsif old_ver[1] < new_ver[1]
+                  logs << Paint % [
+                    "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.%{yellow_text}",
+                    :white,
+                    {
+                      yellow_text: ["#{new_ver[1]}.#{new_ver[2]}", :yellow]
+                    }
+                  ]
+                elsif old_ver[2] < new_ver[2]
+                  logs << Paint % [
+                    "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.#{new_ver[1]}.%{green_text}",
+                    :white,
+                    {
+                      green_text: [(new_ver[2]).to_s, :green]
+                    }
+                  ]
+                end
+                if gem[0] == "souls"
+                  logs << Paint % [
+                    "\nSOULs Doc: %{cyan_text}",
+                    :white,
+                    { cyan_text: ["https://souls.elsoul.nl\n", :cyan] }
+                  ]
+                end
+                new_line.write("#{new_gems[:lines][@i]}\n")
+                @i += 1
+              else
+                new_line.write(line)
+              end
+            end
+          end
+        end
+        FileUtils.rm("./Gemfile")
+        FileUtils.rm("./Gemfile.lock")
+        FileUtils.mv("./tmp/Gemfile", "./Gemfile")
+        system("bundle update")
+        success = Paint["\n\nSuccessfully Updated These Gems!\n", :green]
+        puts(success)
+        logs.each do |line|
+          puts(line)
+        end
+      end
+    end
+  end
+end

data/lib/souls/version.rb

@@ -1,4 +1,4 @@
 module Souls
-  VERSION = "0.30.9".freeze
+  VERSION = "0.31.1".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.9.9
+0.10.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.9.9
+0.10.1

data/lib/souls/worker/generate.rb

@@ -1,4 +1,3 @@
-require_relative "./generate/application"
 require_relative "./generate/mailer"
 
 module Souls

data/lib/souls/worker/generate/mailer.rb

@@ -3,7 +3,6 @@ module Souls
     module Generate
       class << self
         def mailer(class_name: "mailer", option: "")
-          puts(option)
           if option.to_sym == :sendgrid
             sendgrid_mailer(class_name: class_name)
           else
@@ -52,10 +51,6 @@ module Souls
           puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
           file_path
         end
-
-        def sendgrid_mailer(class_name: "mailer")
-          p("Coming Soon..")
-        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.30.9
+  version: 0.31.1
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -27,19 +27,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 6.1.4
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.6
+        version: 0.87.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.6
+        version: 0.87.2
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -83,10 +83,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 description: |-
-  SOULs is a Serverless Application Framework with Ruby GraphQL.
-    SOULs has 3 strains, API, Worker, and Frontend. It can be used in combination according to the purpose.
-    SOULs Ruby GraphQL API / Worker and Easy to deploy to Google Cloud. No more routing for Backends!
-    You can focus on your business logic.
+  SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
+    クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。
 email:
 - f.kawasaki@elsoul.nl
 - s.kishi@elsoul.nl
@@ -127,23 +125,27 @@ files:
 - lib/souls/api/update/rspec_mutation.rb
 - lib/souls/api/update/rspec_resolver.rb
 - lib/souls/api/update/type.rb
-- lib/souls/docker.rb
-- lib/souls/docker/docker.rb
-- lib/souls/gcloud.rb
-- lib/souls/gcloud/compute.rb
-- lib/souls/gcloud/iam.rb
-- lib/souls/gcloud/methods.rb
-- lib/souls/gcloud/pubsub.rb
-- lib/souls/gcloud/run.rb
+- lib/souls/cli.rb
+- lib/souls/cli/docker.rb
+- lib/souls/cli/docker/docker.rb
+- lib/souls/cli/gcloud.rb
+- lib/souls/cli/gcloud/compute.rb
+- lib/souls/cli/gcloud/iam.rb
+- lib/souls/cli/gcloud/methods.rb
+- lib/souls/cli/gcloud/pubsub.rb
+- lib/souls/cli/gcloud/run.rb
+- lib/souls/cli/release.rb
+- lib/souls/cli/release/release.rb
+- lib/souls/cli/sync.rb
+- lib/souls/cli/sync/model.rb
+- lib/souls/cli/upgrade.rb
+- lib/souls/cli/upgrade/gem_update.rb
 - lib/souls/init.rb
-- lib/souls/release.rb
-- lib/souls/release/release.rb
 - lib/souls/version.rb
 - lib/souls/versions/.souls_api_version
 - lib/souls/versions/.souls_worker_version
 - lib/souls/worker.rb
 - lib/souls/worker/generate.rb
-- lib/souls/worker/generate/application.rb
 - lib/souls/worker/generate/mailer.rb
 homepage: https://souls.elsoul.nl
 licenses:
@@ -170,8 +172,6 @@ requirements: []
 rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: SOULs is a Serverless Application Framework with Ruby GraphQL. SOULs has
-  3 strains, API, Worker, and Frontend. It can be used in combination according to
-  the purpose. SOULs Ruby GraphQL API / Worker and Easy to deploy to Google Cloud.
-  No more routing for Backends! You can focus on your business logic.
+summary: SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
+  クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。
 test_files: []

data/lib/souls/worker/generate/application.rb

@@ -1,150 +0,0 @@
-module Souls
-  module Worker
-    module Generate
-      ## Common Methods
-      def self.generated_paths(class_name: "user")
-        singularized_class_name = class_name.singularize.underscore
-        pluralized_class_name = class_name.pluralize.underscore
-        [
-          "./app/models/#{singularized_class_name}.rb",
-          "./app/policies/#{singularized_class_name}_policy.rb",
-          "./app/graphql/mutations/create_#{singularized_class_name}.rb",
-          "./app/graphql/mutations/delete_#{singularized_class_name}.rb",
-          "./app/graphql/mutations/destroy_delete_#{singularized_class_name}.rb",
-          "./app/graphql/mutations/update_#{singularized_class_name}.rb",
-          "./app/graphql/queries/#{singularized_class_name}.rb",
-          "./app/graphql/queries/#{pluralized_class_name}.rb",
-          "./app/graphql/resolvers/#{singularized_class_name}_search.rb",
-          "./app/graphql/types/#{singularized_class_name}_type.rb",
-          "./app/graphql/types/edges/#{singularized_class_name}_edge.rb",
-          "./app/graphql/types/connections/#{singularized_class_name}_connection.rb",
-          "./spec/factories/#{pluralized_class_name}.rb",
-          "./spec/mutations/#{singularized_class_name}_spec.rb",
-          "./spec/models/#{singularized_class_name}_spec.rb",
-          "./spec/queries/#{singularized_class_name}_spec.rb",
-          "./spec/policies/#{singularized_class_name}_policy_spec.rb",
-          "./spec/resolvers/#{singularized_class_name}_search_spec.rb"
-        ]
-      end
-
-      def self.get_type_and_name(line)
-        line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-      end
-
-      def self.get_tables
-        path = "./db/schema.rb"
-        tables = []
-        File.open(path, "r") do |f|
-          f.each_line.with_index do |line, _i|
-            tables << line.split("\"")[1] if line.include?("create_table")
-          end
-        end
-        tables
-      end
-
-      def self.type_check(type)
-        {
-          bigint: "Integer",
-          string: "String",
-          float: "Float",
-          text: "String",
-          datetime: "String",
-          date: "String",
-          boolean: "Boolean",
-          integer: "Integer"
-        }[type.to_sym]
-      end
-
-      def self.get_test_type(type)
-        {
-          bigint: 1,
-          float: 4.2,
-          string: '"MyString"',
-          text: '"MyString"',
-          datetime: "Time.now",
-          date: "Time.now",
-          boolean: false,
-          integer: 1
-        }[type.to_sym]
-      end
-
-      def self.table_check(line: "", class_name: "")
-        if line.include?("create_table") && (line.split[1].gsub("\"", "").gsub(",", "") == class_name.pluralize.to_s)
-
-          return true
-        end
-
-        false
-      end
-
-      def self.migrate(class_name: "souls")
-        singularized_class_name = class_name.singularize
-        model(class_name: singularized_class_name)
-        type(class_name: singularized_class_name)
-        edge(class_name: singularized_class_name)
-        connection(class_name: singularized_class_name)
-        resolver(class_name: singularized_class_name)
-        rspec_factory(class_name: singularized_class_name)
-        rspec_model(class_name: singularized_class_name)
-        rspec_mutation(class_name: singularized_class_name)
-        rspec_query(class_name: singularized_class_name)
-        rspec_resolver(class_name: singularized_class_name)
-        query(class_name: singularized_class_name)
-        mutation(class_name: singularized_class_name)
-        policy(class_name: singularized_class_name)
-        rspec_policy(class_name: singularized_class_name)
-      rescue StandardError => e
-        raise(StandardError, e)
-      end
-
-      def self.migrate_all
-        puts(Paint["Let's Go SOULs AUTO CRUD Assist!\n", :cyan])
-        Souls::Api::Generate.get_tables.each do |table|
-          Souls::Api::Generate.migrate(class_name: table.singularize)
-          puts(Paint["Generated #{table.camelize} CRUD Files\n", :yellow])
-        end
-      end
-
-      def self.delete_all(class_name: "souls")
-        singularized_class_name = class_name.singularize.underscore
-        pluralized_class_name = class_name.pluralize.underscore
-        FileUtils.rm("./app/models/#{singularized_class_name}.rb")
-        FileUtils.rm("./app/policies/#{singularized_class_name}_policy.rb")
-        FileUtils.rm_rf("./app/graphql/mutations/base/#{singularized_class_name}")
-        FileUtils.rm("./app/graphql/queries/#{singularized_class_name}.rb")
-        FileUtils.rm("./app/graphql/queries/#{pluralized_class_name}.rb")
-        FileUtils.rm("./app/graphql/resolvers/#{singularized_class_name}_search.rb")
-        FileUtils.rm("./app/graphql/types/#{singularized_class_name}_type.rb")
-        FileUtils.rm("./app/graphql/types/edges/#{singularized_class_name}_edge.rb")
-        FileUtils.rm("./app/graphql/types/connections/#{singularized_class_name}_connection.rb")
-        FileUtils.rm("./spec/factories/#{pluralized_class_name}.rb")
-        FileUtils.rm("./spec/mutations/base/#{singularized_class_name}_spec.rb")
-        FileUtils.rm("./spec/models/#{singularized_class_name}_spec.rb")
-        FileUtils.rm("./spec/queries/#{singularized_class_name}_spec.rb")
-        FileUtils.rm("./spec/policies/#{singularized_class_name}_policy_spec.rb")
-        FileUtils.rm("./spec/resolvers/#{singularized_class_name}_search_spec.rb")
-        puts(Paint["deleted #{class_name.camelize} CRUD!", :yellow])
-      rescue StandardError => e
-        raise(StandardError, e)
-      end
-
-      def self.update_delete(class_name: "souls")
-        singularized_class_name = class_name.singularize.underscore
-        pluralized_class_name = class_name.pluralize.underscore
-        FileUtils.rm_rf("./app/graphql/mutations/#{singularized_class_name}")
-        FileUtils.rm("./app/graphql/queries/#{singularized_class_name}.rb")
-        FileUtils.rm("./app/graphql/queries/#{pluralized_class_name}.rb")
-        FileUtils.rm("./app/graphql/resolvers/#{singularized_class_name}_search.rb")
-        FileUtils.rm("./app/graphql/types/#{singularized_class_name}_type.rb")
-        FileUtils.rm("./app/graphql/types/edges/#{singularized_class_name}_edge.rb")
-        FileUtils.rm("./app/graphql/types/connections/#{singularized_class_name}_connection.rb")
-        FileUtils.rm("./spec/mutations/#{singularized_class_name}_spec.rb")
-        FileUtils.rm("./spec/queries/#{singularized_class_name}_spec.rb")
-        FileUtils.rm("./spec/resolvers/#{singularized_class_name}_search_spec.rb")
-        puts("deleted #{class_name.camelize} CRUD!")
-      rescue StandardError => e
-        raise(StandardError, e)
-      end
-    end
-  end
-end