souls 0.70.5 → 0.71.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45b256b14cfcb5107253f3f651c9c0991ac09f39892aa0d0eecd7fd5ac4cb6d2
-  data.tar.gz: 0dc54c83d05d7a24448bd76f9d5f2a6989924bacdcde536d4a5dec11a0d01a09
+  metadata.gz: b722e511cf4e7f9ca061776be361d4d30a3020fbf08d7df2b31c711960681484
+  data.tar.gz: f5d0d91fad2bfebb573cf996265431fd9fd5f557a2b75e3ccd90e4c93ef46d09
 SHA512:
-  metadata.gz: c497467897603f8bcf9b3e2bcba5cfa73812213d38b637e05de35ef0067eb8f5e9900780b61bc183fac0023a7d2388961c6c21a9207145c73e0c942f9a0a7473
-  data.tar.gz: 48858107441f184987d2b87775a0941699820a9104fe0bd657a1b4a8067bda44ae758cdca5db094fc58cb12558f9e4a0e8d6fe18af1bcc2adb7d27008a44273c
+  metadata.gz: 11dc02dcbac8a8cf91e5dbef64cae38c9b3c60faf42618495b5b26b1f17f595435821cecd048e9aed6d2691652bedafb69ea4de7ba1f645446497791f2e6a2d1
+  data.tar.gz: 2732140c8becba6b20f10dcde04ed23d32f9085ea75f6487cd54d91a063ef83086e1bc2cd10bd355bb1750026c6241d032f44580b71cb1a56bc2023ce71fb900

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

@@ -45,6 +45,7 @@ module Souls
     desc "create_ip_range", "Create VPC Adress Range"
     def create_ip_range
       app_name = Souls.configuration.app
+      project_id = Souls.configuration.project_id
       system(
         "
             gcloud compute addresses create #{app_name}-ip-range \
@@ -53,7 +54,7 @@ module Souls
               --prefix-length=16 \
               --description='peering range for SOULs' \
               --network=#{app_name} \
-              --project=#{app_name}"
+              --project=#{project_id}"
       )
     rescue Thor::Error => e
       raise(Thor::Error, e)
@@ -62,13 +63,14 @@ module Souls
     desc "create_vpc_connector", "Create VPC-PEERING Connect"
     def create_vpc_connector
       app_name = Souls.configuration.app
+      project_id = Souls.configuration.project_id
       system(
         "
             gcloud services vpc-peerings connect \
               --service=servicenetworking.googleapis.com \
               --ranges=#{app_name}-ip-range \
               --network=#{app_name} \
-              --project=#{app_name}
+              --project=#{project_id}
             "
       )
     rescue Thor::Error => e

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

@@ -42,8 +42,8 @@ module Souls
 
         File.open(file_path, "a") do |f|
           f.write(<<~TEXT)
-              def self.edge_type: () -> void
-                def self.connection_type: () -> void
+              def self.edge_type: () -> untyped
+                def self.connection_type: () -> untyped
               end
             end
           TEXT

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

@@ -55,6 +55,7 @@ module Souls
     end
 
     def create_push_subscription(topic_id: "mailer")
+      app = Souls.configuration.app
       require("#{Souls.get_mother_path}/config/souls")
       worker_name = topic_id.split("_")[1]
 
@@ -62,7 +63,7 @@ module Souls
       endpoint = ""
       worker_paths = Souls.configuration.workers
       worker_paths.each do |worker|
-        endpoint = worker[:endpoint] if worker[:name] == worker_name
+        endpoint = worker[:endpoint] if worker[:name] == "souls-#{app}-#{worker_name}"
       end
 
       project_id = Souls.configuration.project_id

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

@@ -1,6 +1,8 @@
 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"
@@ -11,8 +13,11 @@ module Souls
     def scaffold(_class_name)
       invoke(:create_mutation)
       invoke(:update_mutation)
+      invoke(:create_mutation_rbs)
+      invoke(:update_mutation_rbs)
       invoke(:resolver)
       invoke(:type)
+      invoke(:type_rbs)
       invoke(:rspec_factory)
       invoke(:rspec_mutation)
       invoke(:rspec_resolver)

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

@@ -8,22 +8,54 @@ module Souls
       new_file_path = "tmp/create_mutation.rbs"
       file_path = "#{dir_name}/create_#{singularized_class_name}.rbs"
       argument = false
+      resolve = false
       File.open(file_path) do |f|
         File.open(new_file_path, "w") do |new_line|
           f.each_line do |line|
-            new_line.write(line)
-            next unless line.include?("argument") && !argument
+            next if line.include?("| (:") && argument
 
-            new_cols.each do |col|
-              type = Souls.type_check(col[:type])
-              type = "[#{type}]" if col[:array]
-              args = check_mutation_argument(class_name: class_name)
-              next if args.include?(col[:column_name])
-              next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
+            if line.include?("{ :node => String } } | ::GraphQL::ExecutionError )")
+              new_line.write(line)
+              resolve = false
+            elsif resolve
+              next
+            elsif line.include?("def resolve:") && !resolve
+              new_cols.each_with_index do |col, i|
+                type = Souls.type_check(col[:type])
+                type = "[#{type}]" if col[:array]
+                args = check_mutation_argument(class_name: class_name)
+                next if args.include?(col[:column_name])
+                next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
 
-              new_line.write("      argument :#{col[:column_name]}, #{type}, required: false\n")
+                if i.zero?
+                  new_line.write(line)
+                else
+                  new_line.write("                          #{col[:column_name]}: #{type}?,\n")
+                end
+              end
+              resolve = true
+            elsif line.include?("def self.argument:") && !argument
+              new_cols.each_with_index do |col, i|
+                type = Souls.type_check(col[:type])
+                type = "[#{type}]" if col[:array]
+                args = check_mutation_argument(class_name: class_name)
+                next if args.include?(col[:column_name])
+                next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
+
+                if i.zero?
+                  new_line.write(
+                    "        def self.argument: (:#{col[:column_name]}, #{type}, required: false ) -> #{type}\n"
+                  )
+                else
+                  new_line.write(
+                    "                         | (:#{col[:column_name]}, #{type}, required: false ) -> #{type}\n"
+                  )
+                end
+              end
+              argument = true
+            else
+              new_line.write(line)
             end
-            argument = true
           end
         end
       end
@@ -35,29 +67,62 @@ module Souls
     end
 
     desc "update_mutation [CLASS_NAME]", "Update GraphQL Type from schema.rb"
-    def update_mutation(class_name)
+    def update_mutation_rbs(class_name)
       singularized_class_name = class_name.singularize.underscore
       new_cols = Souls.get_columns_num(class_name: singularized_class_name)
-      dir_name = "./app/graphql/mutations/base/#{singularized_class_name}"
-      new_file_path = "tmp/update_mutation.rb"
-      file_path = "#{dir_name}/update_#{singularized_class_name}.rb"
+      dir_name = "./sig/api/app/graphql/mutations/base/#{singularized_class_name}"
+      new_file_path = "tmp/update_mutation.rbs"
+      file_path = "#{dir_name}/update_#{singularized_class_name}.rbs"
       argument = false
+      resolve = false
       File.open(file_path) do |f|
         File.open(new_file_path, "w") do |new_line|
           f.each_line do |line|
-            new_line.write(line)
-            next unless line.include?("argument") && !argument
+            next if line.include?("| (:") && argument
 
-            new_cols.each do |col|
-              type = Souls.type_check(col[:type])
-              type = "[#{type}]" if col[:array]
-              args = check_mutation_argument(class_name: class_name, action: "update")
-              next if args.include?(col[:column_name])
-              next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
+            if line.include?("{ :node => String } } | ::GraphQL::ExecutionError )")
+              new_line.write(line)
+              resolve = false
+            elsif resolve
+              next
+            elsif line.include?("def resolve:") && !resolve
+              new_cols.each_with_index do |col, i|
+                type = Souls.type_check(col[:type])
+                type = "[#{type}]" if col[:array]
+                args = check_mutation_argument(class_name: class_name)
+                next if args.include?(col[:column_name])
+                next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
 
-              new_line.write("      argument :#{col[:column_name]}, #{type}, required: false\n")
+                if i.zero?
+                  new_line.write(line)
+                  new_line.write("                          id: String,\n")
+                else
+                  new_line.write("                          #{col[:column_name]}: #{type}?,\n")
+                end
+              end
+              resolve = true
+            elsif line.include?("def self.argument:") && !argument
+              new_cols.each_with_index do |col, i|
+                type = Souls.type_check(col[:type])
+                type = "[#{type}]" if col[:array]
+                args = check_mutation_argument(class_name: class_name)
+                next if args.include?(col[:column_name])
+                next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
+
+                if i.zero?
+                  new_line.write(
+                    "        def self.argument: (:#{col[:column_name]}, #{type}, required: false ) -> #{type}\n"
+                  )
+                else
+                  new_line.write(
+                    "                         | (:#{col[:column_name]}, #{type}, required: false ) -> #{type}\n"
+                  )
+                end
+              end
+              argument = true
+            else
+              new_line.write(line)
             end
-            argument = true
           end
         end
       end
@@ -72,8 +137,8 @@ module Souls
 
     def check_mutation_argument(class_name: "user", action: "create")
       singularized_class_name = class_name.singularize.underscore
-      dir_name = "./app/graphql/mutations/base/#{singularized_class_name}"
-      file_path = "#{dir_name}/#{action}_#{singularized_class_name}.rb"
+      dir_name = "./sig/api/app/graphql/mutations/base/#{singularized_class_name}"
+      file_path = "#{dir_name}/#{action}_#{singularized_class_name}.rbs"
       args = []
       File.open(file_path) do |f|
         f.each_line do |line|

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

@@ -0,0 +1,43 @@
+module Souls
+  class Update < Thor
+    desc "type_rbs [CLASS_NAME]", "Update GraphQL Type from schema.rb"
+    def type_rbs(class_name)
+      singularized_class_name = class_name.singularize.underscore
+      new_cols = Souls.get_columns_num(class_name: singularized_class_name)
+      dir_name = "./sig/api/app/graphql/types"
+      new_file_path = "tmp/create_type.rbs"
+      file_path = "#{dir_name}/#{singularized_class_name}_type.rbs"
+      argument = false
+      File.open(file_path) do |f|
+        File.open(new_file_path, "w") do |new_line|
+          f.each_line do |line|
+            next if line.include?("| (:") && argument
+
+            if line.include?("    def self.edge_type:")
+              new_line.write(line)
+              argument = false
+            elsif line.include?("def self.argument:") && !argument
+              new_cols.each_with_index do |col, i|
+                type = Souls.get_type(col[:type])
+                type = "[#{type}]" if col[:array]
+                if i.zero?
+                  new_line.write("    def self.field: (:#{col[:column_name]}, #{type}, null: true) -> #{type}\n")
+                else
+                  new_line.write("                  | (:#{col[:column_name]}, #{type}, null: true) -> #{type}\n")
+                end
+              end
+              argument = true
+            else
+              new_line.write(line)
+            end
+          end
+        end
+      end
+      FileUtils.rm(file_path)
+      FileUtils.mv(new_file_path, file_path)
+      puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+  end
+end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.49.5
+0.50.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.49.5
+0.50.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.70.5
+  version: 0.71.0
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -210,11 +210,11 @@ files:
 - lib/souls/cli/update/mutation.rb
 - lib/souls/cli/update/mutation_rbs.rb
 - lib/souls/cli/update/resolver.rb
-- lib/souls/cli/update/resolver_rbs.rb
 - lib/souls/cli/update/rspec_factory.rb
 - lib/souls/cli/update/rspec_mutation.rb
 - lib/souls/cli/update/rspec_resolver.rb
 - lib/souls/cli/update/type.rb
+- lib/souls/cli/update/type_rbs.rb
 - lib/souls/cli/upgrade/gemfile.rb
 - lib/souls/cli/upgrade/index.rb
 - lib/souls/cli/upgrade/submodule.rb