souls 0.25.16 → 0.25.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e8b0af25e3d9a42b03bba36beefe296a3ad4071e42afdba29bdb611f45bc4c5
-  data.tar.gz: ae642be3d64d0d5da50c0547de050e7d5e58d55bbcdf991ba0e8c7e90063f2f1
+  metadata.gz: 66e0b6654b29ea6a361da6bece2be252de22550bb07c844ad7790fcd548a2ff5
+  data.tar.gz: e29b9acf01284142e562e8889743fd696fcf56600aed6c116c7bdb9aa4f3e7d2
 SHA512:
-  metadata.gz: 95a0d969315e1a81c5ed126fba58d5929aa78ad9311d89dd8671472b07bf98da92b7f7047843b4a50ac2601a01eec41228ca4707e3e64222c41a7aceb2fd6dec
-  data.tar.gz: c693b388d8b5123ff9ac3b6610fe8cbe661158d5bcde0a7781c0b9dffe4a84fa4c2df1a639e84b8b42ceb8e035bb81148694220be68fcaf477092ae8c0a52735
+  metadata.gz: cfd541e08f629d71834914a18ee30c87bf1b25464897e4f6d8b82130d5fcedfbcab9b9ac972f693ee8f0c355b168b097289e82d3bd16bfd79606e529a6532b71
+  data.tar.gz: abd69b5e9843eb059268d584830ba7892a583566791f4f77537473df3c5c156cf1c5c345ed625e9f639f1c6c24978f0094be6eb03b301ec7c855c24fd2d2142c

data/README.md

@@ -22,19 +22,16 @@
 Welcome to SOULs Serverless Application Framework!
 
 SOULs is a Serverless Application Framework with Ruby GraphQL. 
-SOULs has six strains, API, Worker, Console, Admin, Media, Doc, and 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. No more infra problems.
+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.
 
 ![画像](https://storage.googleapis.com/souls-bucket/imgs/souls-structure.jpg)
 
-SOULs creates 6 types of framework.
+SOULs creates 3 types of framework.
 
 1. API - GraphQL (Ruby) - Simple API - Cloud Run
 2. Worker - Google Pub/Sub Worker API (Ruby) - Cloud Run
-3. Console Web Client - User Console and CMS (TypeScript)
-4. Admin Web Client - Admin Console and CMS (TypeScript)
-5. Media Web Client - Media web client with SSG (TypeScript)
-6. Doc Web Client - Doc web client with SSG (TypeScript)
+3. Frontend - React Application (TypeScript) - Firebase
 
 ## Dependency
 
@@ -81,10 +78,7 @@ And Create Your APP
 Select Strain:
 1. SOULs GraphQL API
 2. SOULs Worker
-3. SOULs Console Web
-4. SOULs Admin Web
-5. SOULs Media Web
-6. SOULs Doc Web
+3. SOULs Frontend Web
 
 
 ## Gemfile 自動更新アップデート

data/exe/souls

@@ -9,32 +9,8 @@ begin
   souls_command = ARGV[0]
   case souls_command
   when "new"
-    STRAINS = %w[api worker console admin media doc].freeze
-    app_name = ARGV[1]
-    if app_name.nil?
-      puts(Paint["you need to specify your app name", :red])
-      puts(Paint["`souls new app_name`", :yellow])
-      exit
-    end
-
-    prompt = TTY::Prompt.new
-    choices = [
-      "1. SOULs GraphQL API",
-      "2. SOULs Pub/Sub Worker",
-      "3. SOULs Console Web",
-      "4. SOULs Admin Web",
-      "5. SOULs Media Web",
-      "6. SOULs Doc Web"
-    ]
-    choice_num = prompt.select(Paint["Select Strain: ", :cyan], choices)[0].to_i
-    case choice_num
-    when 1, 2
-      service_name = (STRAINS[choice_num.to_i - 1]).to_s
-      Souls::Init.download_souls(app_name: app_name, service_name: service_name)
-      Souls::Init.initial_config_init(app_name: app_name, service_name: service_name)
-    else
-      puts(Paint["Coming Soon...", :blue])
-    end
+    args = ARGV
+    Souls::Init.return_method(args)
   when "s", "server"
     strain = Souls.configuration.strain
     case strain
@@ -184,7 +160,7 @@ begin
     system("rm -rf ../#{other_app}/db/*")
     system("cp -r ./db/* ../#{other_app}/db/*")
   when "t", "test"
-    system("rubocop -a")
+    system("rubocop -A")
     system("bundle exec rspec")
   when "run"
     system("docker build . -t souls -f Dockerfile.dev")

data/lib/souls/generate/methods.rb

@@ -53,6 +53,8 @@ module Souls
         when "update"
           Souls::Generate.update_delete(class_name: class_name)
           Souls::Generate.migrate(class_name: class_name)
+        when "worker"
+          Souls::Init.download_worker
         else
           "SOULs!"
         end

data/lib/souls/generate/mutation.rb

@@ -12,7 +12,7 @@ module Souls
           module Mutations
             module Base::#{singularized_class_name.camelize}
               class Create#{singularized_class_name.camelize} < BaseMutation
-                field :#{singularized_class_name}_edge, Types::#{singularized_class_name.camelize}.edge_type, null: false
+                field :#{singularized_class_name}_edge, Types::#{singularized_class_name.camelize}Type.edge_type, null: false
                 field :error, String, null: true
 
         TEXT
@@ -104,9 +104,9 @@ module Souls
       File.open(file_path, "w") do |new_line|
         new_line.write(<<~TEXT)
           module Mutations
-            module #{class_name.camelize}
+            module Base::#{class_name.camelize}
               class Update#{class_name.camelize} < BaseMutation
-                field :#{class_name}_edge, Types::#{class_name.camelize}.edge_type, null: false
+                field :#{class_name}_edge, Types::#{class_name.camelize}Type.edge_type, null: false
 
                 argument :id, String, required: true
         TEXT
@@ -211,7 +211,7 @@ module Souls
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
           module Mutations
-            module #{class_name.camelize}
+            module Base::#{class_name.camelize}
               class Delete#{class_name.camelize} < BaseMutation
                 field :#{class_name}, Types::#{class_name.camelize}Type, null: false
                 argument :id, String, required: true
@@ -240,7 +240,7 @@ module Souls
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
           module Mutations
-            module #{class_name.camelize}
+            module Base::#{class_name.camelize}
               class DestroyDelete#{class_name.camelize} < BaseMutation
                 field :#{class_name}, Types::#{class_name.camelize}Type, null: false
                 argument :id, String, required: true

data/lib/souls/init.rb

@@ -10,13 +10,15 @@ module Souls
     end
 
     def self.initial_config_init(app_name: "souls", service_name: "api")
-      FileUtils.touch("./#{app_name}/#{service_name}/config/souls.rb")
-      file_path = "./#{app_name}/#{service_name}/config/souls.rb"
+      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 = "souls-api"
+            config.project_id = "souls-app"
             config.strain = "#{service_name}"
             config.worker_endpoint = "https://worker.com"
             config.fixed_gems = ["excluded_gem"]
@@ -27,13 +29,59 @@ module Souls
       puts(e)
     end
 
+    def self.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 = "souls-app"
+            config.strain = "mother"
+            config.api = true
+            config.worker = false
+            config.frontend = false
+            config.worker_endpoint = ""
+            config.fixed_gems = ["excluded_gem"]
+          end
+        TEXT
+      end
+    rescue StandardError => e
+      puts(e)
+    end
+
+    def self.return_method(args)
+      strains = %w[api worker console admin media doc].freeze
+      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
+
+      prompt = TTY::Prompt.new
+      choices = ["1. SOULs GraphQL API", "2. SOULs Pub/Sub Worker", "3. SOULs Frontend Web"]
+      choice_num = prompt.select(Paint["Select Strain: ", :cyan], choices)[0].to_i
+      case choice_num
+      when 1, 2
+        service_name = (strains[choice_num.to_i - 1]).to_s
+        Souls::Init.download_souls(app_name: app_name, service_name: service_name)
+        Souls::Init.mother_config_init(app_name: app_name)
+        Souls::Init.initial_config_init(app_name: app_name, service_name: service_name)
+      else
+        puts(Paint["Coming Soon...", :blue])
+      end
+    end
+
     def self.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}/#{service_name}")
-      system("tar -zxvf ./#{file_name} -C #{app_name}/")
+      system("mkdir -p #{app_name}/apps/#{service_name}")
+      system("tar -zxvf ./#{file_name} -C #{app_name}/apps/")
       FileUtils.rm(file_name)
       line = Paint["====================================", :yellow]
       puts("\n")
@@ -59,8 +107,53 @@ module Souls
       puts(line)
       endroll = <<~TEXT
         Easy to Run
-        $ cd #{app_name}/#{service_name}
+        $ cd #{app_name}/app/#{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
+
+    def self.download_worker
+      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("mkdir -p ./apps/worker")
+      system("tar -zxvf ./#{file_name} -C ./apps/worker")
+      FileUtils.rm(file_name)
+      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["SOULs Worker Activated!", :white]
+      puts(welcome)
+      souls_ver = Paint["SOULs Version: #{Souls::VERSION}", :white]
+      puts(souls_ver)
+      puts(line)
+      endroll = <<~TEXT
+        Easy to Run
+        $ cd ./apps/worker
         $ bundle
+        $ souls model:update
         $ souls s
         Go To : http://localhost:3000
 

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.4.19
+0.4.23

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.4.19
+0.4.23

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.25.16
+  version: 0.25.20
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,8 +10,36 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.1.4
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.6
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -55,9 +83,10 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 description: |-
-  SOULs is a Serverless Application Framework.
-    SOULs has four strains, API, Worker, Console, Media, and can be used in combination according to the purpose.
-    SOULs Backend GraphQL Ruby & Frontend Relay are Scalable and Easy to deploy to Google Cloud and Amazon Web Services
+  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.
 email:
 - f.kawasaki@elsoul.nl
 - s.kishi@elsoul.nl
@@ -123,8 +152,8 @@ requirements: []
 rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: SOULs is a Serverless Application Framework. SOULs has four strains, API,
-  Worker, Console, Media, and can be used in combination according to the purpose.
-  SOULs Backend GraphQL Ruby & Frontend Relay are Scalable and Easy to deploy to Google
-  Cloud and Amazon Web Services
+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.
 test_files: []