souls 2.0.4 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 899d49fe03ae5aef43ac836183bbb52fa412672e43f1272c36c1d8e245811ba5
-  data.tar.gz: 52aeb96d5cf888af76f1164f6746d558a7df42c1e7c48246aa0f051871c5c539
+  metadata.gz: ea9e81a5be437072444963dddf1db155d22dedd554cef2672cbd1434c3474315
+  data.tar.gz: e3f1c4282ce26557cac726ed499f7f32428ab197b4d5c64efd5a86c633450686
 SHA512:
-  metadata.gz: 29a62975b2aaebf415764a99846c422a2efea6fbbdc6d1124df7db6e1c3666cc569dea3a52f67536db4583cdb774ab56448a72e21cdbf5c78465262e38c60f24
-  data.tar.gz: 2fac0e1c7be1fafc4a20b33a44fb82657bebfebfba7b7e493a1e7c5ddfefc0ded37fa4fa0ba38aa7aade439b04793db42f4fe514922f05ee0fe1cb99270ec669
+  metadata.gz: 8202aebea137646209eb74899b3cc13905bb04affaac8f34fdd197c8bdcdda7d8839fd27b55c8040b8eb3ff4af31dbb7e8a9247fbad99c3325d3786e335339d3
+  data.tar.gz: 409193f29cd8cba0ec0021e0febae5eb4cef35de9a50841a0402edbaea202b60dceedbab5b7f2114fc3a5886c5fd57753e550d3b1339f3ed67037f9b67f1d987

data/README.md

@@ -1,11 +1,11 @@
-[![SOULs](https://souls.elsoul.nl/ogp.jpg)](https://souls.elsoul.nl)
+[![SOULs](https://storage.googleapis.com/souls-bucket/imgs/SOULs-ogp.jpg)](https://souls.elsoul.nl)
 
 <p align="center">
   <a aria-label="Ruby logo" href="https://el-soul.com">
     <img src="https://badgen.net/badge/icon/Made%20by%20ELSOUL?icon=ruby&label&color=black&labelColor=black">
   </a>
-  <a href="https://twitter.com/intent/follow?screen_name=SOULsOpenSource">
-    <img src="https://img.shields.io/twitter/follow/SOULsOpenSource.svg?label=Follow%20@SOULsOpenSource" alt="Follow @SOULsOpenSource" />
+  <a href="https://twitter.com/intent/follow?screen_name=ELSOUL_LABO2">
+    <img src="https://img.shields.io/twitter/follow/ELSOUL_LABO2.svg?label=Follow%20@ELSOUL_LABO2" alt="Follow @ELSOUL_LABO2" />
   </a>
   <br/>
 
@@ -33,7 +33,7 @@
 
 <p>
   <a aria-label="Ruby Serverless Application Framework SOULs Document" href="https://souls.elsoul.nl/">
-    <img src="https://souls.elsoul.nl/imgs/gifs/souls-new-video.gif">
+    <img src="https://storage.googleapis.com/souls-bucket/imgs/souls-new-video.gif">
   </a>
 </p>
 
@@ -44,13 +44,13 @@ Ruby Serverless Framework 'SOULs'.
 The SOULs project was launched with the goal of reducing software development, operation and maintenance costs. 
 
 Build Serverless Apps faster like Rails.
-Powered by Ruby GraphQL, RBS/Steep, Active Record, RSpec, RuboCop, and Google Cloud. 
+Powered by Ruby GraphQL, Active Record, RSpec, RuboCop, and Google Cloud. 
 
 - Focus on business logic in serverless environment
 - Maximize development efficiency with CI / CD standard schema-driven Scaffold
 - Achieve global scale with lower management costs
 
-![SOULs Architecture](https://souls.elsoul.nl/imgs/docs/SOULs-architecture.jpg)
+![SOULs Architecture](https://storage.googleapis.com/souls-bucket/imgs/SOULs-architecture.jpg)
 
 SOULs creates 3 types of App.
 
@@ -58,23 +58,6 @@ SOULs creates 3 types of App.
 2. Worker - Google Pub/Sub Messaging Worker API (Ruby) - Cloud Run
 3. Functions - Google Cloud Functions
 
-## Ruby type checking
-The SOULs framework uses RBS / Steep, which appeared in Ruby 3.0.
-
-- [RBS](https://github.com/ruby/rbs/)
-- [Steep](https://github.com/soutaro/steep/)
-
-As a result, typos, column types, etc.
-
-It is a development environment where you can immediately notice the mistakes that occur frequently.
-
-<p>
-  <a aria-label="RBS Demo" href="https://souls.elsoul.nl/ja/docs/guides/basic/type-check/">
-    <img src="https://souls.elsoul.nl/imgs/gifs/rbs-video.gif">
-  </a>
-</p>
-
-
 ## Dependency
 
 - [Google SDK](https://cloud.google.com/sdk/docs)
@@ -123,11 +106,6 @@ And Create Your APP
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `souls t` to run the tests. You can also run `souls c` for an interactive prompt that will allow you to experiment.
 
-You need to add submodule
-
-```bash
-git submodule add -f https://github.com/ruby/gem_rbs_collection.git vendor/rbs/gem_rbs_collection
-```
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org/gems/souls).
 

data/lib/souls/app/utils/firebase_id_token.rb

@@ -1,4 +1,4 @@
 FirebaseIdToken.configure do |config|
-  config.project_ids = [ENV["SOULS_GCP_PROJECT_ID"]]
+  config.project_ids = [ENV.fetch("SOULS_FB_PROJECT_ID", nil)]
   config.redis = Redis.new
 end

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

@@ -18,8 +18,6 @@ module SOULs
         procfile(worker_name:, port:)
         mother_procfile(worker_name:)
         souls_config_init(worker_name:)
-        steepfile(worker_name:)
-        souls_helper_rbs(worker_name:)
         system("cd #{file_dir} && bundle")
         system("cd #{file_dir} && mv .env.sample .env")
         souls_worker_credit(worker_name:)
@@ -29,25 +27,6 @@ module SOULs
 
     private
 
-    def steepfile(worker_name: "worker-mailer")
-      file_path = "./Steepfile"
-
-      write_txt = ""
-      File.open(file_path, "r") do |f|
-        f.each_line do |line|
-          if line.strip.to_s == "end"
-            ["app", "db/seeds.rb", "constants", "app.rb"].each do |path|
-              write_txt += "  check \"apps/#{worker_name}/#{path}\"\n"
-            end
-            write_txt += "end\n"
-          else
-            write_txt += line
-          end
-        end
-      end
-      File.open(file_path, "w") { |f| f.write(write_txt) }
-    end
-
     def procfile(worker_name: "worker-mailer", port: 123)
       file_path = "apps/#{worker_name}/Procfile.dev"
       File.open(file_path, "w") do |f|
@@ -235,47 +214,6 @@ end
       end
     end
 
-    def souls_helper_rbs(worker_name: "worker-mailer")
-      file_dir = "./sig/#{worker_name}/app/utils"
-      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-      file_path = "#{file_dir}/souls_helper.rbs"
-      File.open(file_path, "w") do |f|
-        f.write(<<~TEXT)
-          module SOULsHelper
-            def self.export_csv: (untyped model_name) -> (String? | StandardError )
-            def self.export_model_to_csv: (untyped model_name) -> (untyped | StandardError )
-            def self.upload_to_gcs: (String file_path, String upload_path) -> untyped
-            def self.get_selenium_driver: (?:chrome mode) -> untyped
-          end
-          module CSV
-            def self.open: (*untyped){(untyped) -> nil} -> untyped
-          end
-          module Selenium
-            module WebDriver
-              def self.for: (*untyped) -> untyped
-              module Chrome
-                module Options
-                  def self.new: ()-> untyped
-                end
-              end
-              module Remote
-                module Capabilities
-                  def self.firefox: ()-> untyped
-                end
-              end
-            end
-          end
-          module Google
-            module Cloud
-              module Storage
-                def self.new: ()-> untyped
-              end
-            end
-          end
-        TEXT
-      end
-    end
-
     def download_worker(worker_name: "worker-mailer")
       version = SOULs.get_latest_version_txt(service_name: "worker").join(".")
       file_name = "worker-v#{version}.tgz"

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

@@ -6,7 +6,6 @@ module SOULs
       singularized_class_name = class_name.underscore.singularize
       SOULs::DB.new.invoke(:model, [singularized_class_name], {})
       SOULs::DB.new.invoke(:rspec_model, [singularized_class_name], {})
-      SOULs::DB.new.invoke(:model_rbs, [singularized_class_name], {})
       SOULs::Painter.create_file("")
       system("rake db:create_migration NAME=create_#{pluralized_class_name}")
       file_path = Dir["db/migrate/*create_#{pluralized_class_name}.rb"].first

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

@@ -1,8 +1,6 @@
 require_relative "./create_migration"
-require_relative "./create_migration_rbs"
 require_relative "./model"
 require_relative "./rspec_model"
-require_relative "./model_rbs"
 require_relative "../cli_exception"
 
 module SOULs

data/lib/souls/cli/delete/application.rb

@@ -1,23 +1,17 @@
 module SOULs
   class Delete < Thor
     desc "scaffold [CLASS_NAME]", "Delete Scaffold"
-    method_option :rbs, type: :boolean, aliases: "--rbs", default: false, desc: "Deletes Only RBS Files"
     def scaffold(class_name)
       singularized_class_name = class_name.singularize
-      if options[:rbs]
-        run_rbs_scaffold(class_name: singularized_class_name)
-      else
-        run_scaffold(class_name: singularized_class_name)
-      end
+      run_scaffold(class_name: singularized_class_name)
       true
     end
 
     desc "scaffold_all", "Delete Scaffold All Tables from schema.rb"
-    method_option :rbs, type: :boolean, aliases: "--rbs", default: false, desc: "Deletes Only RBS Files"
     def scaffold_all
       puts(Paint["Delete All Scaffold Files!\n", :cyan])
       SOULs.get_tables.each do |table|
-        SOULs::Delete.new.invoke(:scaffold, [table.singularize], { rbs: options[:rbs] })
+        SOULs::Delete.new.invoke(:scaffold, [table.singularize], {})
       end
       true
     end
@@ -35,16 +29,6 @@ module SOULs
       rspec_mutation(class_name)
       rspec_query(class_name)
       rspec_resolver(class_name)
-      run_rbs_scaffold(class_name:)
-    end
-
-    def run_rbs_scaffold(class_name: "user")
-      type_rbs(class_name)
-      query_rbs(class_name)
-      mutation_rbs(class_name)
-      edge_rbs(class_name)
-      connection_rbs(class_name)
-      resolver_rbs(class_name)
     end
   end
 end

data/lib/souls/cli/delete/job.rb

@@ -8,7 +8,6 @@ module SOULs
 
       FileUtils.rm_f(file_path)
       SOULs::Painter.delete_file(file_path.to_s)
-      SOULs::Delete.new.invoke(:job_rbs, [class_name], {})
       SOULs::Delete.new.invoke(:rspec_job, [class_name], {})
     end
   end

data/lib/souls/cli/delete/manager.rb

@@ -9,7 +9,6 @@ module SOULs
 
       FileUtils.rm_f(file_path)
       SOULs::Painter.delete_file(file_path.to_s)
-      SOULs::Delete.new.invoke(:manager_rbs, [singularized_class_name], { mutation: options[:mutation] })
       SOULs::Delete.new.invoke(:rspec_manager, [singularized_class_name], { mutation: options[:mutation] })
       file_path
     end

data/lib/souls/cli/delete/migration_file.rb

@@ -8,7 +8,6 @@ module SOULs
         file_paths = {
           model_file_path: "./apps/api/app/models/#{singularized_class_name}.rb",
           rspec_file_path: "./apps/api/spec/models/#{singularized_class_name}_spec.rb",
-          rbs_file_path: "./sig/api/app/models/#{singularized_class_name}.rbs",
           migration_file_path: Dir["db/migrate/*create_#{pluralized_class_name}.rb"].first
         }
         file_paths.each do |_k, v|

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

@@ -2,25 +2,23 @@ module SOULs
   class Iam < Thor
     desc "setup_key", "Create Google Cloud IAM Service Account Key And Set All Permissions"
     def setup_key
-      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
-        Whirly.status = "Setting up credentials and permissions..."
-        region = SOULs.configuration.region
-        SOULs::Gcloud.new.auth_login
-        SOULs::Upgrade.new.config
-        create_service_account
-        create_service_account_key
-        SOULs::Gcloud.new.enable_permissions
-        add_permissions
-        begin
-          system("gcloud app create --region=#{region} --quiet")
-        rescue StandardError, error
-          puts("gcloud app region is Already exist! - SOULs::Gcloud::Iam.setup_key")
-        end
-        begin
-          set_gh_secret_json
-        rescue StandardError
-          export_key_to_console
-        end
+      SOULs::Painter.sync("Setting up credentials and permissions...")
+      region = SOULs.configuration.region
+      SOULs::Gcloud.new.auth_login
+      SOULs::Upgrade.new.config
+      create_service_account
+      create_service_account_key
+      SOULs::Gcloud.new.enable_permissions
+      add_permissions
+      begin
+        system("gcloud app create --region=#{region} --quiet")
+      rescue StandardError, error
+        puts("gcloud app region is Already exist! - SOULs::Gcloud::Iam.setup_key")
+      end
+      begin
+        set_gh_secret_json
+      rescue StandardError
+        export_key_to_console
       end
       SOULs::Painter.success("You're all set!")
       true

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

@@ -68,6 +68,7 @@ module SOULs
             SOULS_DB_PW=#{db_password}
             SOULS_DB_USER=postgres
             SOULS_GCP_PROJECT_ID=#{project_id}
+            SOULS_FB_PROJECT_ID=#{project_id}
             SOULS_SECRET_KEY_BASE='#{SecureRandom.base64(64)}'
             TZ="#{region_to_timezone(region:)}"
           TEXT
@@ -84,6 +85,7 @@ module SOULs
             SOULS_DB_USER=postgres
             SOULS_APP_NAME=#{app_name}
             SOULS_GCP_PROJECT_ID=#{project_id}
+            SOULS_FB_PROJECT_ID=#{project_id}
             SOULS_GCP_REGION=#{region}
             SOULS_GCLOUDSQL_INSTANCE="#{project_id}:#{region}:#{instance_name}"
             SOULS_SECRET_KEY_BASE='#{SecureRandom.base64(64)}'

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

@@ -1,27 +1,17 @@
 module SOULs
   class Generate < Thor
     desc "scaffold [CLASS_NAME]", "Generate Scaffold from schema.rb"
-    method_option :rbs, type: :boolean, aliases: "--rbs", default: false, desc: "Generates Only RBS Files"
     def scaffold(class_name)
       singularized_class_name = class_name.singularize
-      if options[:rbs]
-        run_rbs_scaffold(singularized_class_name)
-      else
-        run_scaffold(singularized_class_name)
-      end
+      run_scaffold(singularized_class_name)
       true
     end
 
     desc "scaffold_all", "Generate Scaffold All Tables from schema.rb"
-    method_option :rbs, type: :boolean, aliases: "--rbs", default: false, desc: "Generates Only RBS All Schema Files"
     def scaffold_all
       puts(Paint["Let's Go SOULs AUTO CRUD Assist!\n", :cyan])
       SOULs.get_tables.each do |table|
-        if options[:rbs]
-          SOULs::Generate.new.invoke(:scaffold, [table.singularize], { rbs: options[:rbs] })
-        else
-          SOULs::Generate.new.invoke(:scaffold, [table.singularize], {})
-        end
+        SOULs::Generate.new.invoke(:scaffold, [table.singularize], {})
       end
       true
     end
@@ -30,32 +20,17 @@ module SOULs
 
     def run_scaffold(class_name)
       type(class_name)
-      type_rbs(class_name)
       query(class_name)
-      query_rbs(class_name)
       mutation(class_name)
-      mutation_rbs(class_name)
       edge(class_name)
-      edge_rbs(class_name)
       connection(class_name)
-      connection_rbs(class_name)
       resolver(class_name)
-      resolver_rbs(class_name)
       rspec_factory(class_name)
       rspec_mutation(class_name)
       rspec_query(class_name)
       rspec_resolver(class_name)
     end
 
-    def run_rbs_scaffold(class_name)
-      type_rbs(class_name)
-      query_rbs(class_name)
-      mutation_rbs(class_name)
-      edge_rbs(class_name)
-      connection_rbs(class_name)
-      resolver_rbs(class_name)
-    end
-
     def generated_paths(class_name)
       singularized_class_name = class_name.singularize.underscore
       pluralized_class_name = class_name.pluralize.underscore

data/lib/souls/cli/generate/job.rb

@@ -10,7 +10,6 @@ module SOULs
         create_job_type(class_name)
         create_job(class_name)
       end
-      SOULs::Generate.new.invoke(:job_rbs, [class_name], {})
       SOULs::Generate.new.invoke(:rspec_job, [class_name], { mailer: options[:mailer] })
     end
 

data/lib/souls/cli/generate/manager.rb

@@ -10,7 +10,6 @@ module SOULs
       end
 
       create_manager(class_name, options[:mutation])
-      SOULs::Generate.new.invoke(:manager_rbs, [singularized_class_name], { mutation: options[:mutation] })
       SOULs::Generate.new.invoke(:rspec_manager, [singularized_class_name], { mutation: options[:mutation] })
     end
 

data/lib/souls/cli/generate/mutation.rb

@@ -24,7 +24,7 @@ module SOULs
       file_dir = "./app/graphql/mutations/base/#{singularized_class_name}"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "#{file_dir}/create_#{singularized_class_name}.rb"
-      raise(Thor::Error, "Mutation RBS already exist! #{file_path}") if File.exist?(file_path)
+      raise(Thor::Error, "Mutation already exist! #{file_path}") if File.exist?(file_path)
 
       params = SOULs.get_relation_params(class_name: singularized_class_name, col: "mutation")
       File.open(file_path, "a") do |f|
@@ -92,7 +92,7 @@ module SOULs
       file_dir = "./app/graphql/mutations/base/#{singularized_class_name}"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "#{file_dir}/update_#{singularized_class_name}.rb"
-      raise(Thor::Error, "Mutation RBS already exist! #{file_path}") if File.exist?(file_path)
+      raise(Thor::Error, "Mutation already exist! #{file_path}") if File.exist?(file_path)
 
       params = SOULs.get_relation_params(class_name: singularized_class_name, col: "mutation")
       File.open(file_path, "w") do |f|

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

@@ -25,7 +25,6 @@ module SOULs
       initial_config_init(app_name:, service_name:)
       system("cd #{app_name}/apps/api && mv .env.sample .env")
       system("cd #{app_name} && git init --initial-branch=main")
-      system("cd #{app_name} && rbs collection init && rbs collection install")
       souls_api_credit(app_name)
     end
 
@@ -136,7 +135,6 @@ module SOULs
           gem "sinatra-activerecord", "2.0.25"
           gem "solargraph", "0.44.3"
           #{souls_gem}
-          gem "steep", "0.49.0"
           gem "thor", "1.2.1"
           gem "tty-prompt", "0.23.1"
           gem "whirly", "0.3.0"
@@ -155,21 +153,14 @@ module SOULs
       system("tar -zxvf ./#{file_name} -C #{app_name}/apps/")
       FileUtils.rm(file_name)
 
-      sig_name = "sig.tgz"
-      url = "#{@bucket_url}/sig/#{sig_name}"
-      system("curl -OL #{url}")
-      system("tar -zxvf ./#{sig_name} -C #{app_name}")
-
       system("cd #{app_name} && curl -OL #{@bucket_url}/rubocop.yml && mv rubocop.yml .rubocop.yml")
       get_latest_gem(app_name)
       system("cd #{app_name} && curl -OL #{@bucket_url}/Procfile.dev")
       system("cd #{app_name} && curl -OL #{@bucket_url}/Procfile")
-      system("cd #{app_name} && curl -OL #{@bucket_url}/Steepfile")
       system("cd #{app_name} && curl -OL #{@bucket_url}/gitignore")
       system("cd #{app_name} && mv gitignore .gitignore")
       system("cd #{app_name} && bundle")
       system("cd #{app_name}/apps/api && bundle")
-      FileUtils.rm(sig_name)
     end
 
     def souls_api_credit(app_name)

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

@@ -1,8 +1,6 @@
 require_relative "./mutation"
-require_relative "./mutation_rbs"
 require_relative "./resolver"
 require_relative "./type"
-require_relative "./type_rbs"
 require_relative "./rspec_factory"
 require_relative "./rspec_mutation"
 require_relative "./rspec_resolver"
@@ -18,11 +16,6 @@ module SOULs
       rspec_factory(class_name)
       rspec_mutation(class_name)
       rspec_resolver(class_name)
-      Dir.chdir(SOULs.get_mother_path.to_s) do
-        create_mutation_rbs(class_name)
-        update_mutation_rbs(class_name)
-        type_rbs(class_name)
-      end
     end
   end
 end

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

@@ -1,3 +1,2 @@
 require_relative "./gemfile"
-require_relative "./submodule"
 require_relative "./config"

data/lib/souls/cli.rb

@@ -50,27 +50,9 @@ module SOULs
     end
 
     desc "test", "Run Rspec & Rubocop"
-    method_option :all, type: :boolean, aliases: "--all", default: false, desc: "Run (Rspec & steep check & Rubocop)"
     def test
-      if options[:all]
-        Dir.chdir(SOULs.get_mother_path.to_s) do
-          system("steep check")
-        end
-        Dir.chdir(SOULs.get_api_path.to_s) do
-          system("rubocop -A")
-          system("bundle exec rspec")
-        end
-      else
-        system("rubocop -A")
-        system("bundle exec rspec")
-      end
-    end
-
-    desc "check", "Run steep check"
-    def check
-      Dir.chdir(SOULs.get_mother_path.to_s) do
-        system("steep check")
-      end
+      system("rubocop -A")
+      system("bundle exec rspec")
     end
 
     def self.exit_on_failure?

data/lib/souls/utils/index.rb

@@ -28,19 +28,6 @@ module SOULs
       }[type.to_sym]
     end
 
-    def rbs_type_check(type)
-      {
-        bigint: "Integer",
-        string: "String",
-        float: "Float",
-        text: "String",
-        datetime: "String",
-        date: "String",
-        boolean: "bool",
-        integer: "Integer"
-      }[type.to_sym]
-    end
-
     def get_type_and_name(line)
       line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
     end

data/lib/souls/version.rb

@@ -1,4 +1,4 @@
 module SOULs
-  VERSION = "2.0.4".freeze
+  VERSION = "3.0.2".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-2.0.4
+3.0.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-2.0.4
+3.0.2