souls 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88330b37a9727d21e018e0415ee1c9fb13954d78397dd099d7c7273e99831369
-  data.tar.gz: edb15c60919ef2a5ba510652e546fb7438cdd5dc32760f10cdd8e729d4aa3f92
+  metadata.gz: 9586ab30b5189eaa4af5cbd037ad0650d78a0ce8c89fd1591528d7ec4da70d8a
+  data.tar.gz: 14087a6358389fdc3f0de14ac3cde00233add048add040f379e229239d0f954f
 SHA512:
-  metadata.gz: 4252ee302de5e2cbd99cbb67f33d868ecb38929d0dd4af71e58c7d20aae2b44f26b8071af3f4ae1ead6bac67aaa2f8d47ebb1ead5b8c3b6ad9cddbe87f87cece
-  data.tar.gz: 42a8d5649089e2212cbe79c9e4e3a8496acbb32374707defc1f67f7f2eb53ff2e8abb9bc20219cb73df5289f78e9adb2d1f1d9da4945dae1c7e88429272e82c6
+  metadata.gz: e28e330548810a8804c51b287e4991c973fc918a5c2b8dab694a9998e6d5e930dc7a53cff8b33fb23db5f4ba501bea42bd931fb0c6d769f7f1bd6f287b91a768
+  data.tar.gz: eafd2c306469f2685fa93acd474afd51c729469bcc0721b7157c269a760364d84271ba7698f3bb20fcdd1872c2bf9ea1c20ddf583f5ce6deff795e879769ad64

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-#{Souls.configuration.app}-db" 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
@@ -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")
@@ -14,7 +7,7 @@ module Souls
       File.open(file_path, "r") do |file|
         file.each_line do |line|
           key_and_value = line.split("=")
-          system("gh secret set #{key_and_value[0]} -b \"#{key_and_value[1]}\"")
+          system("gh secret set #{key_and_value[0]} -b \"#{key_and_value[1].strip}\"")
         end
       end
     end

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.0".freeze
+  VERSION = "1.3.1".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.2.0
+1.3.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.2.0
+1.3.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport