souls 1.2.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daa0fac1d0cbc60e712994999aa2cdac65ba83154d003e890cf6f68344beb07c
-  data.tar.gz: decaf9ee99e0916b38760fd8e03ad3405c1919f0e08cac06b165a328aa38d1c1
+  metadata.gz: e903e408a1e67cf84a2817b0e7144eec61a5c07011b9f2299b4d3b01fdcf4c2e
+  data.tar.gz: 0572dec02f099651cdc15625eb75189c454aa3b61bdba20bd551c1f9dfe88bd7
 SHA512:
-  metadata.gz: 18b297acd49876c7f9cbc568dc0f7c1ce2f72ac51c6d783ba6f3d308c422b4b122ccbfc936a02b86eb41bb74b8f901ca6ffdf0bbf6927cd5c13b6d3f3858e3a7
-  data.tar.gz: 81c1fca2ce6888521ad232fb761f4b73785a921942313695c6fdd0daf714ededb61cc34770575966fb9f7230c39ea5deb97b2301e2eae4cfea2b65cef0e1e62a
+  metadata.gz: 775426654c16e931505331ff4cc383c6652244b4fe76f9df41b5e3fefc287ee3a1c38b0adf4234a1c9069abc568678cdebafd06b09f95067f5cf6192264d1d39
+  data.tar.gz: 3602a072188c4f27d7292a8428cbe82d8188b1de2b23a6ef6bf9f8a2675c036fd5ea6a10f68833a5c63753d996144f2cc80cf63a2eb60538fd371716ebe981fa

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

@@ -55,7 +55,6 @@ module Souls
         system("rake db:migrate:reset RACK_ENV=production DISABLE_DATABASE_ENVIRONMENT_CHECK=1")
       else
         system("rake db:migrate:reset")
-        system("rake db:migrate:reset RACK_ENV=test")
       end
     rescue Thor::Error => e
       raise(Thor::Error, e)

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

@@ -3,15 +3,26 @@ module Souls
     desc "create_instance", "Create Google Cloud SQL - PostgreSQL13"
     method_option :region, default: "", aliases: "--region", desc: "Google Cloud Platform Region"
     method_option :root_password, default: "", aliases: "--root-password", desc: "Set Cloud SQL Root Password"
+    method_option :mysql, type: :boolean, default: false, aliases: "--mysql", desc: "Set Cloud SQL Type to MySQL"
     def create_instance
-      instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
+      instance_name = Souls.configuration.instance_name if instance_name.blank?
       region = Souls.configuration.region if options[:region].blank?
+      db_type = options[:mysql] ? "MYSQL_8_0" : "POSTGRES_13"
+
       zone = "#{region}-b"
       system(
         "gcloud sql instances create #{instance_name} \
-              --database-version=POSTGRES_13 --cpu=2 --memory=7680MB --zone=#{zone} \
+              --database-version=#{db_type} --cpu=2 --memory=7680MB --zone=#{zone} \
               --root-password='#{options[:root_password]}' --database-flags cloudsql.iam_authentication=on"
       )
+      Dir.chdir(Souls.get_api_path.to_s) do
+        file_path = ".env"
+        lines = File.readlines(".env")
+        lines[0] = "DB_HOST=#{get_sql_ip.strip}\n"
+        lines[1] = "DB_PW=#{options[:root_password]}\n"
+        lines[2] = "DB_USER=postgres\n"
+        File.open(file_path, "w") { |f| f.write(lines.join) }
+      end
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
@@ -35,7 +46,7 @@ module Souls
     desc "assign_network", "Assign Network"
     def assign_network
       app_name = Souls.configuration.app
-      instance_name = "#{Souls.configuration.app}-db"
+      instance_name = Souls.configuration.instance_name
       project_id = Souls.configuration.project_id
       system("gcloud beta sql instances patch #{instance_name} --project=#{project_id} --network=#{app_name}")
     rescue Thor::Error => e
@@ -80,8 +91,8 @@ module Souls
     desc "assgin_ip", "Add Current Grobal IP to White List"
     def assign_ip(instance_name: "", ip: "")
       ip = `curl inet-ip.info` if ip.blank?
-      project_id = Souls.configuration.project_id
-      instance_name = "#{Souls.configuration.app}-db" if instance_name.blank?
+      project_id = Souls.configuration.project_id if instance_name.blank?
+      instance_name = Souls.configuration.instance_name if instance_name.blank?
       system(
         "
             gcloud beta sql instances patch #{instance_name} \
@@ -94,5 +105,11 @@ module Souls
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
+
+    private
+
+    def get_sql_ip
+      `gcloud sql instances list | grep james | awk '{print $5}'`
+    end
   end
 end

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

@@ -1,12 +1,5 @@
 module Souls
   class Github < Thor
-    desc "auth_login", "gcloud config set and gcloud auth login"
-    def auth_login
-      system("gh auth login")
-    rescue Thor::Error => e
-      raise(Thor::Error, e)
-    end
-
     desc "secret_set", "Github Secret Set by Github CLI"
     def secret_set
       require("#{Souls.get_api_path}/config/souls")

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

@@ -159,6 +159,7 @@ module Souls
       system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Procfile")
       system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Steepfile")
       system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/gitignore")
+      system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/.env.production.sample")
       system("cd #{app_name} && mv gitignore .gitignore")
       system("cd #{app_name} && bundle")
       system("cd #{app_name}/apps/api && bundle")

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.2.1
+1.3.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.2.1
+1.3.2

data/lib/souls.rb

@@ -49,5 +49,9 @@ module Souls
       @fixed_gems = nil
       @workers = nil
     end
+
+    def instance_name
+      "souls-#{@app}-db"
+    end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.2
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -231,7 +231,7 @@ metadata:
   homepage_uri: https://souls.elsoul.nl
   source_code_uri: https://github.com/elsoul/souls
   changelog_uri: https://github.com/elsoul/souls
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -247,7 +247,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.