souls 1.7.18 → 1.7.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 243bda089f37cc48e7e1f3b89df0bff779a5efb0b107b10318f467c6c2c1976d
-  data.tar.gz: e20a991e0c5542b463b0bc6232ac96b30c7f94929a33ce11e4e8479190501258
+  metadata.gz: c731aa9244ceb825af39c837fe0be223a8b6d1df9a64cbb16a3767d0650c8147
+  data.tar.gz: 30814435a8d524bc1021bfa2a31dcb88f9f9f4fc373b8d17c219d9ca9b0744a9
 SHA512:
-  metadata.gz: eafa438f3bd09a8986e81405b5dda53cc86bf1467b309febff614d90176914d02e4f9b02e8cfb51b91bb4b3c44f9aa91ffb51ddfdedb23b89337a6023ad16920
-  data.tar.gz: 9ee8c8cb2a4645051c48a15ae870fca9d8620e2d78df08218ed697e312d89d55d577568f22a6f10382c7ccaf0da5663d5d3812e41d410e1f521256717a88231f
+  metadata.gz: 153d93623299b56bbf5e51d343165e7e99025ab5f04cff92674080c3a05140db83d3fc09b428d01d7c4bffc26e96d79a4b7e0260f0828eb3496e8d8432b26169
+  data.tar.gz: f0c04fb0f44d02aff9979f26869aed96be3e059610c4485e392c8e10b95c4f884c0a7341f2b2d163c2d1e726410fb6e6bd9aa6c6a794c0dbf44f80f452c6c0bf

data/lib/souls/cli/cli_exception.rb

@@ -7,4 +7,25 @@ module Souls
       @message = message
     end
   end
+
+  class PSQLException < CLIException
+    attr_reader :message
+
+    def initialize
+      message = "It looks like there was a problem with the DB. Make sure PSQL is running with 'souls docker psql'"
+      super(message)
+      @message = message
+    end
+  end
+
+  class GcloudException < CLIException
+    attr_reader :message
+
+    def initialize
+      message = "You either haven't created or don't have access to a GCP project. " \
+      "Please create a GCP project with the same name as this app."
+      super(message)
+      @message = message
+    end
+  end
 end

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

@@ -3,7 +3,8 @@ module Souls
     desc "console", "Run IRB Console"
     method_option :env, aliases: "--e", default: "development", desc: "Difine APP Enviroment - development | production"
     def console
-      return system("RACK_ENV=production bundle exec irb") if options[:env].eql? "production"
+      return system("RACK_ENV=production bundle exec irb") if options[:env].eql?("production")
+
       system("bundle exec irb")
     end
   end

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

@@ -2,6 +2,8 @@ require_relative "./create_migration_rbs"
 require_relative "./model"
 require_relative "./rspec_model"
 require_relative "./model_rbs"
+require_relative "../cli_exception"
+
 module Souls
   class DB < Thor
     desc "migrate", "Migrate Database"
@@ -9,10 +11,10 @@ module Souls
     def migrate
       case options[:env]
       when "production"
-        system("rake db:migrate RACK_ENV=production")
+        db_system("rake db:migrate RACK_ENV=production")
       else
-        system("rake db:migrate")
-        system("rake db:migrate RACK_ENV=test")
+        db_system("rake db:migrate")
+        db_system("rake db:migrate RACK_ENV=test")
       end
       true
     rescue Thor::Error => e
@@ -24,9 +26,9 @@ module Souls
     def create
       case options[:env]
       when "production"
-        system("rake db:create RACK_ENV=production")
+        db_system("rake db:create RACK_ENV=production")
       else
-        system("rake db:create")
+        db_system("rake db:create")
       end
     rescue Thor::Error => e
       raise(Thor::Error, e)
@@ -37,10 +39,10 @@ module Souls
     def seed
       case options[:env]
       when "production"
-        system("rake db:seed RACK_ENV=production")
+        db_system("rake db:seed RACK_ENV=production")
       else
-        system("rake db:seed")
-        system("rake db:seed RACK_ENV=test")
+        db_system("rake db:seed")
+        db_system("rake db:seed RACK_ENV=test")
       end
     rescue Thor::Error => e
       raise(Thor::Error, e)
@@ -51,9 +53,9 @@ module Souls
     def migrate_reset
       case options[:env]
       when "production"
-        system("rake db:migrate:reset RACK_ENV=production DISABLE_DATABASE_ENVIRONMENT_CHECK=1")
+        db_system("rake db:migrate:reset RACK_ENV=production DISABLE_DATABASE_ENVIRONMENT_CHECK=1")
       else
-        system("rake db:migrate:reset")
+        db_system("rake db:migrate:reset")
       end
     rescue Thor::Error => e
       raise(Thor::Error, e)
@@ -125,5 +127,11 @@ module Souls
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
+
+    private
+
+    def db_system(cmd)
+      system(cmd) or raise(Souls::PSQLException)
+    end
   end
 end

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

@@ -3,6 +3,7 @@ require_relative "./pubsub/index"
 require_relative "./run/index"
 require_relative "./sql/index"
 require_relative "./compute/index"
+require_relative "../cli_exception"
 
 module Souls
   class Gcloud < Thor
@@ -26,6 +27,7 @@ module Souls
     desc "auth_login", "gcloud config set and gcloud auth login"
     def auth_login
       project_id = Souls.configuration.project_id
+      system("gcloud projects describe #{project_id}", out: File::NULL) or raise(Souls::GcloudException)
       system("gcloud config set project #{project_id}")
       system("gcloud auth login")
     rescue Thor::Error => e
@@ -34,8 +36,8 @@ module Souls
 
     desc "config_set", "gcloud config set"
     def config_set
-      require("#{Souls.get_api_path}/config/souls")
       project_id = Souls.configuration.project_id
+      system("gcloud projects describe #{project_id}", out: File::NULL) or raise(Souls::GcloudException)
       system("gcloud config set project #{project_id}")
     end
 

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

@@ -62,14 +62,23 @@ module Souls
             type = "[#{type}]" if param[:array]
             if i.zero?
               if param[:column_name].match?(/$*_id\z/)
-                f.write("        def self.argument: (:#{param[:column_name]}, String, required: false ) -> #{rbs_type}\n")
+                f.write(
+                  "        def self.argument: (:#{param[:column_name]}, String, " \
+                                    "required: false ) -> #{rbs_type}\n"
+                )
               else
-                f.write("        def self.argument: (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+                f.write(
+                  "        def self.argument: (:#{param[:column_name]}, #{type}, " \
+                                    "required: false ) -> #{rbs_type}\n"
+                )
               end
             elsif param[:column_name].match?(/$*_id\z/)
               f.write("                         | (:#{param[:column_name]}, String, required: false ) -> String\n")
             else
-              f.write("                         | (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+              f.write(
+                "                         | (:#{param[:column_name]}, #{type}, " \
+                                "required: false ) -> #{rbs_type}\n"
+              )
             end
           end
         end

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

@@ -13,7 +13,7 @@ module Souls
         exit
       end
       file_dir = "./#{app_name}"
-      raise(StandardError, "Directory Already Exist!") if Dir.exist?(file_dir)
+      raise(StandardError, "Directory already exists and is not empty") if Dir.exist?(file_dir) && !Dir.empty?(file_dir)
 
       service_name = "api"
       download_souls(app_name: app_name, service_name: service_name)

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

@@ -8,8 +8,12 @@ module Souls
       new_cols = Souls.get_columns_num(class_name: singularized_class_name)
       dir_name = "./app/graphql/mutations/base/#{singularized_class_name}"
       file_path = "#{dir_name}/create_#{singularized_class_name}.rb"
-      raise Souls::CLIException.new("File #{file_path} is missing. Please recreate it and then run this command again.") unless
-        File.exist? file_path
+      unless File.exist?(file_path)
+        raise(
+          Souls::CLIException,
+          "File #{file_path} is missing. Please recreate it and then run this command again."
+        )
+      end
 
       mutation_argument = check_mutation_argument(class_name: "user", action: "create")
       overwrite_class_file(mutation_argument: mutation_argument, file_path: file_path, new_cols: new_cols)
@@ -22,8 +26,12 @@ module Souls
       new_cols = Souls.get_columns_num(class_name: singularized_class_name)
       dir_name = "./app/graphql/mutations/base/#{singularized_class_name}"
       file_path = "#{dir_name}/update_#{singularized_class_name}.rb"
-      raise Souls::CLIException.new("File #{file_path} is missing. Please recreate it and then run this command again.") unless
-        File.exist? file_path
+      unless File.exist?(file_path)
+        raise(
+          Souls::CLIException,
+          "File #{file_path} is missing. Please recreate it and then run this command again."
+        )
+      end
 
       mutation_argument = check_mutation_argument(class_name: class_name, action: "update")
       overwrite_class_file(mutation_argument: mutation_argument, file_path: file_path, new_cols: new_cols)

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

@@ -27,11 +27,12 @@ module Souls
               type = "[#{type}]" if col[:array]
               next if col[:column_name] == "created_at" || col[:column_name] == "updated_at"
 
-              if i.zero?
-                write_txt += line
-              else
-                write_txt += "                          #{col[:column_name]}: #{type}?,\n"
-              end
+              write_txt +=
+                if i.zero?
+                  line
+                else
+                  "                          #{col[:column_name]}: #{type}?,\n"
+                end
             end
             resolve = true
           elsif line.include?("def self.argument:") && !argument

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

@@ -28,11 +28,14 @@ module Souls
                 type = Souls.type_check(col[:type])
                 type = "[#{type}]" if col[:array]
 
-                if type.include?("[")
-                  add_line = "      scope = scope.where('#{col[:column_name]} @> ARRAY[?]::#{col[:type]}[]', value[:#{col[:column_name]}]) if value[:#{col[:column_name]}]\n"
-                else
-                  add_line = "      scope = scope.where(#{col[:column_name]}: value[:#{col[:column_name]}]) if value[:#{col[:column_name]}]\n"
-                end
+                add_line =
+                  if type.include?("[")
+                    "      scope = scope.where('#{col[:column_name]} @> ARRAY[?]::#{col[:type]}[]', " \
+                    "value[:#{col[:column_name]}]) if value[:#{col[:column_name]}]\n"
+                  else
+                    "      scope = scope.where(#{col[:column_name]}: value[:#{col[:column_name]}]) if " \
+                    "value[:#{col[:column_name]}]\n"
+                  end
                 new_line.write(add_line) unless scope_args.include?(col[:column_name])
               end
               scope = true

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

@@ -26,9 +26,11 @@ module Souls
 
                 type_line =
                   if type == "String" && !col[:array]
-                    "          #{col[:column_name].camelize(:lower)}: \"\#{#{class_name}[:#{col[:column_name].underscore}]}\"\n"
+                    "          #{col[:column_name].camelize(:lower)}" \
+                    ": \"\#{#{class_name}[:#{col[:column_name].underscore}]}\"\n"
                   else
-                    "          #{col[:column_name].camelize(:lower)}: \#{#{class_name}[:#{col[:column_name].underscore}]}\n"
+                    "          #{col[:column_name].camelize(:lower)}" \
+                    ": \#{#{class_name}[:#{col[:column_name].underscore}]}\n"
                   end
                 args = check_rspec_mutation_argument(class_name: class_name)
                 new_line.write(type_line) unless args.include?(col[:column_name].underscore)

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

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

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.7.18
+1.7.24

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.7.18
+1.7.24

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.7.18
+  version: 1.7.24
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -224,10 +224,8 @@ homepage: https://souls.elsoul.nl
 licenses:
 - Apache-2.0
 metadata:
-  homepage_uri: https://souls.elsoul.nl
-  source_code_uri: https://github.com/elsoul/souls
-  changelog_uri: https://github.com/elsoul/souls/releases/tag/v1.7.18
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -243,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Build Serverless Apps faster like Rails. Powered by Ruby GraphQL, RBS/Steep,
   Active Record, RSpec, RuboCop, and Google Cloud.