souls 0.30.10 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 662fb44f2b3215a7d00391f43f1634b30252c7906fb46a41e7aa3433e90b80dc
-  data.tar.gz: ab691832bb96a5b741d7a0408cd235d4b0fb543579d206594a40273d72e1c56b
+  metadata.gz: 629d9272b1d1b1f8c09898cb928b72a7ff0077713386911b5e6dd6449b50b919
+  data.tar.gz: d67c0a7542abf5daaf1c9c909343ba133a40cd46d576a01e89da432960aa11c0
 SHA512:
-  metadata.gz: 8714483b126cd1ee860ef4993c85b2c096532deba10380cee55fbfc00f7d6f65009a9bb4b50995ebab41c7fcc94579425b61eabac8e3909aba5915c919080bb7
-  data.tar.gz: 98f558afb85dcda6e7ae347622c603683a40c607e4403388743d61439f4895c2c5de0c84e98a5a3857f7352afe8b3ee189e9e102278f66cec6bc4e29720819d5
+  metadata.gz: 8a7177bc0f0b933516487a0ebf238c54c9d4ca4a711fa2804c48d5b2bebdb03d10e7ccf81c8989ddcb99a5e089537aab5ab025b8a452ec8b3a5eb5855f844d3f
+  data.tar.gz: a50e58aba5430903013f8334922032ef900698a6866fc1b6547bbf3692e945ff90fe82908a5b18f1034e803997a5cd7585f67f5bd031c53f52986c5b681f02d5

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,62 +76,78 @@ 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"
-    args = ARGV
+    command = ARGV[1]
     status = Paint["Running Gcloud Commands...", :yellow]
     Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
       Whirly.status = status
-      Souls::Gcloud.return_method(args)
+      case command
+      when "get_iam_key"
+        app_name = Souls.configuration.app
+        project_id = Souls.configuration.project_id
+        Souls::Gcloud::Iam.create_service_account(service_account: app_name)
+        Souls::Gcloud::Iam.create_service_account_key(service_account: app_name, project_id: project_id)
+        Souls::Gcloud::Iam.export_key_to_console
+        Souls::Gcloud.enable_permissions
+        Souls::Gcloud::Iam.add_permissions(service_account: app_name, project_id: project_id)
+      when "auth_login"
+        project_id = Souls.configuration.project_id
+        Souls::Gcloud.auth_login(project_id: project_id)
+      else
+        module_name = ARGV[1]
+        method_name = ARGV[2]
+        ARGV.shift(3)
+        key_strings = []
+        keys = []
+        ARGV.each { |n| n.include?(":") ? keys << n.gsub(":", "").to_sym : key_strings << n }
+        raise(StandardError, "wrong arguments!") unless keys.size == key_strings.size
+
+        params = keys.zip(key_strings).to_h
+        Object.const_get("Souls::Gcloud::#{module_name.camelize}").public_send(method_name.to_sym, **params)
+      end
       Whirly.status = "Done!"
     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 +183,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

@@ -5,7 +5,6 @@ require_relative "souls/api"
 require_relative "souls/worker"
 require_relative "souls/cli"
 require "date"
-require "dotenv/load"
 require "json"
 require "fileutils"
 require "net/http"
@@ -33,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)
@@ -250,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