souls 1.7.20 → 1.7.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34b25f2c644f5d5282f7a2b4d5bfdebae37bf830a6c25a9215b5df98402e3cbc
-  data.tar.gz: 776ef9e852a9a55f6e3fca1b7adaaa0008f663067608eebdd371deb5c29e1f21
+  metadata.gz: 7f1736fff66eb0bdd349eafd3b60078309b0e51389223376f783ed21fb97c0bc
+  data.tar.gz: 50c2333fae0fd7e94ff18661990df02b059e385e76cad90d7886643285ba3b69
 SHA512:
-  metadata.gz: 2ac929b5e3c41c98ef439573182a33d12f152314a2584e3aae9393929f11338b74fa12bdce8521a4ffac1a23159a10385d179ac11ac90bf15c98941efcbf5ffc
-  data.tar.gz: cf166802fe6302bb7cc4cf4a413f2cd958678097f59a8c90eec554f3c9b9db0297ccef99ad3210a15f4e89d8493c4480661f73039b84496446faef97f88b6c20
+  metadata.gz: bc8113fde23630ec893dec10fabafaf611c5cdd67c02447f79ce934ba114a63c8a6011553dafd62ca367ddcd50ab6657d5eaa33751bf5198a89e100e61dafbdd
+  data.tar.gz: 22447d85e057a9221bcdae949f5504bbdfdfe14caa32d0290f800ca47d1d148eadf228c140d29e9c6cb4ae61ebcee2762cd3018322add8967d1379e8b2954e8a

data/lib/souls/cli/cli_exception.rb

@@ -7,4 +7,24 @@ 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/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: :close) 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: :close) or raise(Souls::GcloudException)
       system("gcloud config set project #{project_id}")
     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/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.7.20
+1.7.21

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.7.20
+1.7.21

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.7.20
+  version: 1.7.21
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2021-11-16 00:00:00.000000000 Z
@@ -226,8 +226,8 @@ licenses:
 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.20
-post_install_message: 
+  changelog_uri: https://github.com/elsoul/souls/releases/tag/v1.7.21
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -243,7 +243,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.