souls 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfd94cb490b6572839d1bbe81210f365501d29746db52da19b7802a989389f78
-  data.tar.gz: ff24ba19313ef53a5b0be3650902963aa1035e86f26a44819431ec2c9a9290e0
+  metadata.gz: 2a268cc2c1da6a5192359f7ac46028f340b066ba8fd52b79f17639b1e0ee97fd
+  data.tar.gz: 571e1896e5ce83ea3813457cd3f4aa094d295b03340781b08f19b92cef626728
 SHA512:
-  metadata.gz: 71400c705f4fef455e14adf98ac5f2ad51ff98ec751a6ee3ff0f08ad828d238d3383256464f7e9932035ac86dc7bfb10de756c2bb1dc90932ee812304d1bab73
-  data.tar.gz: 0c19435dad07d1e8f69213a52522d8f46c48140b415c3f420eb556a8448d003a70626132d4229a413d5518835bcf2e5c55ffe63a2cb510e2f2bc0d32987a42ec
+  metadata.gz: bcf221fef615359fe8be1f979cf76ae54e773ef8075c49940989df5c2fd0cc37ee104dcfbf0b2ce441cc80316dd2f10a84d051746def38dd2706f51494314c8f
+  data.tar.gz: a5a2fd8e0b9b2374750941656ccd63b3362e159a4cad2df2e00ac8caefd226a9e90d6c54da6b3b7982b61a33ee0dd1d0834872c11fcfc3276913d2550dec926c

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}" << $RS
+        lines[1] = "DB_PW=#{options[:root_password]}" << $RS
+        lines[2] = "DB_USER=#{instance_name}" << $RS
+        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/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.2.2
+1.3.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.2.2
+1.3.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 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