souls 0.25.10 → 0.25.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6131ac7dbacce29869acdddcbf7f95fdeffd648e2bc05e91e24b506a97549c10
-  data.tar.gz: 60fabbac02cd1bb688c8304feb1889a7dd2c881dad20a3ed2fe59e092607a208
+  metadata.gz: 5caa0fe7566de9ec8291055f08ebc39b40501714c26295f1debd2f5ddb00702c
+  data.tar.gz: edc4cb906800b7bc5e49596d94ba454c5f37c14002d9957c777572a9ed195e40
 SHA512:
-  metadata.gz: 57e1edbcc388c5256dfebc4ce277ab29c63bb7c45e0369db616e33a1e8098933ae14bf410ab049dfb8aec72dc34c66107bb799c7845e6b2964976cd2b995bc7b
-  data.tar.gz: '019f27084234e886327fb84f431bd70fd0a0b3fa7616b5feccccb0b387c9f796c1c724bb816be8f1a314d1581f0e49db86b56c8d698155571c59d02cad1df64c'
+  metadata.gz: bcc7bf94b49ae7714e58984e127bfd18407f517396028bbeb23835bbfd2816d13627b9d84736383c17391b74478c16104be46e84eb87c18aa7e2960ad0b88396
+  data.tar.gz: 261660b4920a2bbd3a033f93ff132b24eeff51a9a1ceb7831072fb4a86fd7b628d6daaed958a59e0d033d2001e8ded128e5c1efec73a074a80c684c2516125f5

data/README.md

@@ -21,10 +21,12 @@
 
 Welcome to SOULs Serverless Application Framework!
 
-SOULs is a Serverless Application Framework with GraphQL. 
+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.
 
+![画像](https://storage.googleapis.com/souls-bucket/imgs/souls-structure.jpg)
+
 SOULs creates 6 types of framework.
 
 1. API - GraphQL (Ruby) - Simple API - Cloud Run

data/exe/souls

@@ -78,8 +78,6 @@ begin
       Whirly.status = "Done!"
     end
   when "release"
-    `gem uninstall -x --force`
-    sleep(1)
     system("gem install souls")
     sleep(3)
     current_souls_ver = Souls::VERSION.strip.split(".").map(&:to_i)
@@ -130,57 +128,15 @@ begin
       puts(Paint["Wrong Argument!", :red])
     end
   when "g", "generate"
-    graphql_class = ARGV[1]
-    class_name = ARGV[2]
-    case graphql_class
-    when "test_dir"
-      Souls::Generate.test_dir
-    when "model"
-      Souls::Generate.model(class_name: class_name)
-    when "mutation"
-      Souls::Generate.mutation(class_name: class_name)
-    when "query"
-      Souls::Generate.query(class_name: class_name)
-    when "type"
-      Souls::Generate.type(class_name: class_name)
-    when "edge"
-      Souls::Generate.edge(class_name: class_name)
-    when "connection"
-      Souls::Generate.connection(class_name: class_name)
-    when "resolver"
-      Souls::Generate.resolver(class_name: class_name)
-    when "policy"
-      Souls::Generate.policy(class_name: class_name)
-    when "rspec_factory"
-      Souls::Generate.rspec_factory(class_name: class_name)
-    when "rspec_model"
-      Souls::Generate.rspec_model(class_name: class_name)
-    when "rspec_mutation"
-      Souls::Generate.rspec_mutation(class_name: class_name)
-    when "rspec_query"
-      Souls::Generate.rspec_query(class_name: class_name)
-    when "rspec_resolver"
-      Souls::Generate.rspec_resolver(class_name: class_name)
-    when "rspec_policy"
-      Souls::Generate.rspec_policy(class_name: class_name)
-    when "node_type"
-      Souls::Generate.node_type(class_name: class_name)
-    when "job"
-      Souls::Generate.job(class_name: class_name)
-    when "migrate"
-      Souls::Generate.single_migrate(class_name: class_name)
-    when "migrate_all"
-      Souls::Generate.migrate_all
-    when "migration"
-      pluralized_class_name = class_name.underscore.pluralize
-      system("rake db:create_migration NAME=create_#{pluralized_class_name}")
-    when "update"
-      Souls::Generate.update_delete(class_name: class_name)
-      Souls::Generate.single_migrate(class_name: class_name)
-    else
-      "SOULs!"
+    args = ARGV
+    status = Paint["Generating Files...", :yellow]
+    done = Paint["Generated SOULs CRUD Files☻", :yellow]
+    Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+      Whirly.status = status
+      Souls::Generate.return_method(args)
+      Whirly.status = done
     end
-  when "d"
+  when "d", "delete"
     class_name = ARGV[1]
     Souls::Generate.delete_all(class_name: class_name)
   when "db:create"

data/lib/souls.rb

@@ -174,10 +174,12 @@ module Souls
       bucket_url = "gs://souls-bucket/boilerplates"
       file_name = "#{service_name}-v#{new_ver}.tgz"
       release_name = "#{service_name}-latest.tgz"
+      update_backend_gemfile
 
       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")
@@ -255,6 +257,37 @@ module Souls
       end
     end
 
+    def update_backend_gemfile
+      %w[api worker].each do |service_name|
+        update_service_gemfile(service_name: service_name)
+      end
+    end
+
+    def update_service_gemfile(service_name: "api")
+      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\", \"#{old_ver.join('.')}\"\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 detect_change
       git_status = `git status`
       result =

data/lib/souls/generate.rb

@@ -15,6 +15,7 @@ require_relative "./generate/type"
 require_relative "./generate/edge"
 require_relative "./generate/connection"
 require_relative "./generate/application"
+require_relative "./generate/methods"
 
 module Souls
   module Generate

data/lib/souls/generate/application.rb

@@ -121,7 +121,7 @@ module Souls
       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/#{singularized_class_name}")
+      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")
@@ -129,14 +129,14 @@ module Souls
       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/#{singularized_class_name}_spec.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("deleted #{class_name.camelize} CRUD!")
+      puts(Paint["deleted #{class_name.camelize} CRUD!", :yellow])
     rescue StandardError => e
-      puts(e)
+      raise(StandardError, e)
     end
 
     def self.update_delete(class_name: "souls")
@@ -154,27 +154,7 @@ module Souls
       FileUtils.rm("./spec/resolvers/#{singularized_class_name}_search_spec.rb")
       puts("deleted #{class_name.camelize} CRUD!")
     rescue StandardError => e
-      puts(e)
-    end
-
-    def self.single_migrate(class_name: "user")
-      puts("◆◆◆ Let's Auto Generate CRUD API SET ◆◆◆\n")
-      migrate(class_name: class_name)
-      puts("Generated #{class_name.camelize} CRUD Files\n")
-      Souls::Generate.generated_paths(class_name: class_name).each { |f| puts(f) }
-      puts("\nAll files created from ./db/schema.rb")
-      puts("\n\n")
-    end
-
-    def self.migrate_all
-      puts("◆◆◆ SOULs CRUD Assist  ◆◆◆\n")
-      get_tables.each do |class_name|
-        migrate(class_name: class_name.singularize)
-        puts("Generated #{class_name.camelize} CRUD Files\n")
-        Souls::Generate.generated_paths(class_name: class_name).each { |f| puts(f) }
-        puts("\n")
-      end
-      puts("\nAll files created from ./db/schema.rb\n\n You're all set ;)")
+      raise(StandardError, e)
     end
   end
 end

data/lib/souls/generate/connection.rb

@@ -1,6 +1,8 @@
 module Souls
   module Generate
     def self.connection(class_name: "souls")
+      file_dir = "./app/graphql/types/connections/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       singularized_class_name = class_name.underscore.singularize
       file_path = "./app/graphql/types/connections/#{singularized_class_name}_connection.rb"
       File.open(file_path, "w") do |f|

data/lib/souls/generate/edge.rb

@@ -1,6 +1,8 @@
 module Souls
   module Generate
     def self.edge(class_name: "souls")
+      file_dir = "./app/graphql/types/edges"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       singularized_class_name = class_name.underscore.singularize
       file_path = "./app/graphql/types/edges/#{singularized_class_name}_edge.rb"
       File.open(file_path, "w") do |f|

data/lib/souls/generate/methods.rb

@@ -0,0 +1,62 @@
+module Souls
+  module Generate
+    class << self
+      def return_method(args)
+        graphql_class = args[1]
+        class_name = args[2]
+        case graphql_class
+        when "test_dir"
+          Souls::Generate.test_dir
+        when "model"
+          Souls::Generate.model(class_name: class_name)
+        when "mutation"
+          Souls::Generate.mutation(class_name: class_name)
+        when "query"
+          Souls::Generate.query(class_name: class_name)
+        when "type"
+          Souls::Generate.type(class_name: class_name)
+        when "edge"
+          Souls::Generate.edge(class_name: class_name)
+        when "connection"
+          Souls::Generate.connection(class_name: class_name)
+        when "resolver"
+          Souls::Generate.resolver(class_name: class_name)
+        when "policy"
+          Souls::Generate.policy(class_name: class_name)
+        when "rspec_factory"
+          Souls::Generate.rspec_factory(class_name: class_name)
+        when "rspec_model"
+          Souls::Generate.rspec_model(class_name: class_name)
+        when "rspec_mutation"
+          Souls::Generate.rspec_mutation(class_name: class_name)
+        when "rspec_query"
+          Souls::Generate.rspec_query(class_name: class_name)
+        when "rspec_resolver"
+          Souls::Generate.rspec_resolver(class_name: class_name)
+        when "rspec_policy"
+          Souls::Generate.rspec_policy(class_name: class_name)
+        when "node_type"
+          Souls::Generate.node_type(class_name: class_name)
+        when "job"
+          Souls::Generate.job(class_name: class_name)
+        when "migrate"
+          Souls::Generate.migrate(class_name: class_name)
+        when "migrate_all"
+          puts(Paint["Let's Go SOULs AUTO CRUD Assist!\n", :cyan])
+          Souls::Generate.get_tables.each do |table|
+            Souls::Generate.migrate(class_name: table.singularize)
+            puts(Paint["Generated #{table.camelize} CRUD Files\n", :yellow])
+          end
+        when "migration"
+          pluralized_class_name = class_name.underscore.pluralize
+          system("rake db:create_migration NAME=create_#{pluralized_class_name}")
+        when "update"
+          Souls::Generate.update_delete(class_name: class_name)
+          Souls::Generate.migrate(class_name: class_name)
+        else
+          "SOULs!"
+        end
+      end
+    end
+  end
+end

data/lib/souls/generate/mutation.rb

@@ -265,6 +265,8 @@ module Souls
 
     def self.mutation(class_name: "souls")
       singularized_class_name = class_name.singularize
+      file_dir = "./app/graphql/mutations/base"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "./app/graphql/mutations/base/#{singularized_class_name}/create_#{singularized_class_name}.rb"
       return "Mutation already exist! #{file_path}" if File.exist?(file_path)
 

data/lib/souls/generate/query.rb

@@ -54,6 +54,8 @@ module Souls
     end
 
     def self.query(class_name: "souls")
+      file_dir = "./app/graphql/queries/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       singularized_class_name = class_name.singularize
       create_query(class_name: singularized_class_name)
       create_queries(class_name: singularized_class_name)

data/lib/souls/generate/rspec_model.rb

@@ -2,6 +2,8 @@ module Souls
   module Generate
     ## Generate Rspec Model
     def self.rspec_model(class_name: "souls")
+      file_dir = "./spec/models/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "./spec/models/#{class_name}_spec.rb"
       return "RspecModel already exist! #{file_path}" if File.exist?(file_path)
 

data/lib/souls/generate/rspec_mutation.rb

@@ -2,6 +2,8 @@ module Souls
   module Generate
     ## Generate  Rspec Mutation
     def self.rspec_mutation_head(class_name: "souls")
+      file_dir = "./spec/mutations/base/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "./spec/mutations/base/#{class_name.singularize}_spec.rb"
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)

data/lib/souls/generate/rspec_query.rb

@@ -2,6 +2,8 @@ module Souls
   module Generate
     ## Generate Rspec Query
     def self.rspec_query_head(class_name: "souls")
+      file_dir = "./spec/queries/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "./spec/queries/#{class_name.singularize}_spec.rb"
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)

data/lib/souls/generate/rspec_resolver.rb

@@ -2,6 +2,8 @@ module Souls
   module Generate
     ## Generate Rspec Resolver
     def self.rspec_resolver_head(class_name: "souls")
+      file_dir = "./spec/resolvers/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "./spec/resolvers/#{class_name.singularize}_search_spec.rb"
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
@@ -170,7 +172,7 @@ module Souls
 
     def self.rspec_resolver(class_name: "souls")
       singularized_class_name = class_name.singularize
-      file_path = "#{Dir.pwd}/spec/resolvers/#{singularized_class_name}_search_spec.rb"
+      file_path = "./spec/resolvers/#{singularized_class_name}_search_spec.rb"
       return "Resolver already exist! #{file_path}" if File.exist?(file_path)
 
       rspec_resolver_head(class_name: singularized_class_name)

data/lib/souls/generate/type.rb

@@ -3,6 +3,8 @@ module Souls
     class << self
       ## Generate Type
       def create_type_head(class_name: "souls")
+        file_dir = "./app/graphql/types/"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
         file_path = "./app/graphql/types/#{class_name}_type.rb"
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.4.13
+0.4.17

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.4.13
+0.4.17

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.25.10
+  version: 0.25.14
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-27 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -81,6 +81,7 @@ files:
 - lib/souls/generate/application.rb
 - lib/souls/generate/connection.rb
 - lib/souls/generate/edge.rb
+- lib/souls/generate/methods.rb
 - lib/souls/generate/model.rb
 - lib/souls/generate/mutation.rb
 - lib/souls/generate/policy.rb