souls 0.28.2 → 0.28.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d998ceff4fd026479911457cd01fdb510ee712d7b913c7576170f76ae20cf8df
-  data.tar.gz: 774c3cfa49798c62581f069694704c20040ffac2780f4c4fa8e8a2616820e166
+  metadata.gz: a7d285b6cc65c31bf256621732e25cf82a154d894bd842c7925cf4d9a2436d0b
+  data.tar.gz: b01e120cb0f88735771573afe76d35dfe20997ebb151e8d2fe487b4444a38945
 SHA512:
-  metadata.gz: f702cfa528b2a4abdf725dd49bdeb9dcdb3f76d15d9c56b520982a764093ca1bc4995eff55538e344959d5bebaa9ab1273f750254add6520f6c19087c8c5245f
-  data.tar.gz: ca50aaf1df8823a741b785cbf28f0ade3010409d21b025d519d94f9b6ecf0d535ec4447911dfa932bc962c88a1025181447f0ef7d5343bf580bbadeeae6b758c
+  metadata.gz: a35c8eb77e9284149d4e172eb0edbf9484a9515226f9f5e653e9917f8029faf18d76b609fd9e592ea98fc83afdcb37057fd0856aaa4c11a1f483de5b40e7b422
+  data.tar.gz: 273aca15999564d3d79555653a44e68979b79f9b39648a6e0da8283fcf9da1128af4e651fa634fcf2a0f48a4dbdfbc6017b4dbbde09a54bff296b9033c8616b4

data/lib/souls/gcloud/iam.rb

@@ -61,12 +61,13 @@ module Souls
 
       def add_permissions(service_account: "souls-app", project_id: "souls-app")
         roles = [
-          "roles/cloudsql.serviceAgent",
+          "roles/cloudsql.instanceUser",
           "roles/containerregistry.ServiceAgent",
           "roles/pubsub.serviceAgent",
           "roles/firestore.serviceAgent",
           "roles/iam.serviceAccountUser",
-          "roles/storage.objectAdmin"
+          "roles/storage.objectAdmin",
+          "roles/run.admin"
         ]
         roles.each do |role|
           add_service_account_role(service_account: service_account, project_id: project_id, role: role)

data/lib/souls/gcloud/methods.rb

@@ -15,7 +15,10 @@ module Souls
           project_id = Souls.configuration.project_id
           Souls::Gcloud.auth_login(project_id: project_id)
         when "enable_permissions"
+          service_account = Souls.configuration.app
+          project_id = Souls.configuration.project_id
           Souls::Gcloud.enable_permissions
+          Souls::Gcloud.add_permissions(service_account: service_account, project_id: project_id)
         when "create_pubsub_topic"
           topic_name = args[2] || "send-user-mail"
           Souls::Gcloud.create_pubsub_topic(topic_name: topic_name)

data/lib/souls/generate/mutation.rb

@@ -30,7 +30,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              if line.include?("end") || line.include?("t.index")
+              if line.include?("t.index") || line.strip == "end"
                 if @user_exist
                   new_line.write(<<-TEXT)
 
@@ -124,7 +124,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              if line.include?("end") || line.include?("t.index")
+              if line.include?("t.index") || line.strip == "end"
                 if @user_exist
                   new_line.write(<<-TEXT)
 

data/lib/souls/generate/resolver.rb

@@ -30,11 +30,12 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              break if line.include?("end") || line.include?("t.index")
+              break if line.include?("t.index") || line.strip == "end"
 
               field = "[String]" if line.include?("array: true")
               type, name = get_type_and_name(line)
               field ||= type_check(type)
+              puts(line)
               case name
               when "user_id"
                 @user_exist = true
@@ -57,21 +58,21 @@ module Souls
       file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.rb"
       File.open(file_path, "a") do |f|
         f.write(<<-TEXT)
-    argument :start_date, String, required: false
-    argument :end_date, String, required: false
-  end
+      argument :start_date, String, required: false
+      argument :end_date, String, required: false
+    end
 
-  option :filter, type: #{class_name.camelize}Filter, with: :apply_filter
-  option :first, type: types.Int, with: :apply_first
-  option :skip, type: types.Int, with: :apply_skip
+    option :filter, type: #{class_name.camelize}Filter, with: :apply_filter
+    option :first, type: types.Int, with: :apply_first
+    option :skip, type: types.Int, with: :apply_skip
 
-  def apply_filter(scope, value)
-    branches = normalize_filters(value).inject { |a, b| a.or(b) }
-    scope.merge branches
-  end
+    def apply_filter(scope, value)
+      branches = normalize_filters(value).inject { |a, b| a.or(b) }
+      scope.merge branches
+    end
 
-  def normalize_filters(value, branches = [])
-    scope = ::#{class_name.camelize}.all
+    def normalize_filters(value, branches = [])
+      scope = ::#{class_name.camelize}.all
         TEXT
       end
     end
@@ -86,7 +87,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              break if line.include?("end") || line.include?("t.index")
+              break if line.include?("t.index") || line.strip == "end"
 
               type, name = get_type_and_name(line)
               if line.include?("array: true")

data/lib/souls/generate/rspec_factory.rb

@@ -20,7 +20,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              new_line.write("\n" && break) if line.include?("end") || line.include?("t.index")
+              new_line.write("\n" && break) if line.include?("t.index") || line.strip == "end"
               field = '["tag1", "tag2", "tag3"]' if line.include?("array: true")
               type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
               field ||= get_test_type(type)

data/lib/souls/generate/rspec_mutation.rb

@@ -23,7 +23,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              if line.include?("end") || line.include?("t.index")
+              if line.include?("t.index") || line.strip == "end"
                 if @relation_params.empty?
                   new_line.write(<<-TEXT)
   let(:#{class_name}) { FactoryBot.attributes_for(:#{class_name}) }
@@ -72,7 +72,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              if line.include?("end") || line.include?("t.index")
+              if line.include?("t.index") || line.strip == "end"
                 new_line.write("        }) {\n            #{class_name.singularize.camelize(:lower)}Edge {\n          node {\n")
                 new_line.write("              id\n")
                 break
@@ -113,7 +113,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              if line.include?("end") || line.include?("t.index")
+              if line.include?("t.index") || line.strip == "end"
                 if @user_exist
                   new_line.write(<<-TEXT)
             }
@@ -193,7 +193,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              if line.include?("end") || line.include?("t.index")
+              if line.include?("t.index") || line.strip == "end"
                 new_line.write(<<~TEXT)
                           )
                       end

data/lib/souls/generate/rspec_query.rb

@@ -23,7 +23,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              if line.include?("end") || line.include?("t.index")
+              if line.include?("t.index") || line.strip == "end"
                 if @relation_params.empty?
                   new_line.write(<<-TEXT)
     let!(:#{class_name}) { FactoryBot.create(:#{class_name}) }
@@ -69,7 +69,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              if line.include?("end") || line.include?("t.index")
+              if line.include?("t.index") || line.strip == "end"
                 new_line.write(<<-TEXT)
           }
         }
@@ -114,7 +114,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              if line.include?("end") || line.include?("t.index")
+              if line.include?("t.index") || line.strip == "end"
                 new_line.write(<<~TEXT)
                           )
                       end

data/lib/souls/generate/rspec_resolver.rb

@@ -23,7 +23,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              if line.include?("end") || line.include?("t.index")
+              if line.include?("t.index") || line.strip == "end"
                 if @relation_params.empty?
                   new_line.write(<<-TEXT)
     let!(:#{class_name}) { FactoryBot.create(:#{class_name}) }
@@ -77,7 +77,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              if line.include?("end") || line.include?("t.index")
+              if line.include?("t.index") || line.strip == "end"
                 new_line.write(<<-TEXT)
               }
             }
@@ -133,7 +133,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              if line.include?("end") || line.include?("t.index")
+              if line.include?("t.index") || line.strip == "end"
                 new_line.write(<<~TEXT)
                         )
                       end

data/lib/souls/generate/type.rb

@@ -24,7 +24,7 @@ module Souls
           File.open(path, "r") do |f|
             f.each_line.with_index do |line, _i|
               if @on
-                new_line.write("\n" && break) if line.include?("end") || line.include?("t.index")
+                new_line.write("\n" && break) if line.include?("t.index") || line.strip == "end"
                 field = "[String]" if line.include?("array: true")
                 type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
                 field ||= type_check(type)

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.7.2
+0.7.6

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.7.2
+0.7.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.28.2
+  version: 0.28.6
 platform: ruby
 authors:
 - POPPIN-FUMI