souls 0.17.9 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 163a0612fcb59636db008669eb27569e63fe1e4a3701fc211ae5ff92690be49e
-  data.tar.gz: 3850ab3b22daedd286886373963807e46af14040d7a021d6dedb9968801c40e0
+  metadata.gz: 07ae098b20cac4d8ec86d5e48051d6c56da16dc277531457a477f27a8a96a9a5
+  data.tar.gz: f249eeeac5666263becc47793d265a35e2e44e528672c54a71a35549db9c9b7a
 SHA512:
-  metadata.gz: dd2cb7901bc22a359f6cced93fafe7f28ee4f978ab798c85eb8d39365270e8fb34bd193efb7614f3a6f550c3c062e9d2740ab8e70a51cc8b821c6b21af999baa
-  data.tar.gz: 1307838fc825c08cfc91b0f72bf4b28d0742c3c2594f4e3a7c07bd1e48058c323fe721c509cf9c1ca4657f4033e40ce100ca3ad123656fd94561ba175e3b7abf
+  metadata.gz: 11b4afc23bb847933b18a945a01dbda983986ecbcf6ebe38404998e045a884957a04b80364fdf23aeb97129be896829b61e155e8ff0377f23f7ab8cd03c2e557
+  data.tar.gz: 6178ab087eefc04c1860c142b8954a1e51ced120204f84ce197d368f3ebc323c0aba1219a99129344de674b96fc3cd1d85d81a48747db0aaba71ff673dc3bc0e

data/config/souls.rb

@@ -0,0 +1,4 @@
+Souls.configure do |config|
+  config.app = "souls"
+  config.strain = "api"
+end

data/exe/souls

@@ -1,6 +1,11 @@
 #!/usr/bin/env ruby
 require "souls"
 STRAINS = ["graph", "worker", "media", "admin"]
+begin
+  require "./config/souls" unless ARGV[0] == "new" || ARGV[0] == "i"
+rescue
+  Souls::Init.config_init
+end
 begin
   case ARGV[0]
   when "new"
@@ -12,6 +17,7 @@ begin
     strain = STDIN.gets.chomp.to_i
     (1..4).include?(strain) ? puts("Generating SOULs.. \n") : raise(StandardError, "Choose Number 1..4")
     Souls::Init.download_souls app_name: ARGV[1], repository_name: "souls_#{STRAINS[strain.to_i - 1]}"
+    initial_config_init app_name: "souls", project: { strain: STRAINS[strain.to_i - 1] }
   when "s", "server"
     strain = Souls.configuration.strain
     case strain
@@ -37,8 +43,6 @@ begin
     end
   when "i", "infra"
     Souls.send ARGV[1]
-  when "init"
-    Souls::Init.config_init
   when "-v", "--version"
     puts Souls::VERSION
   when "add"

data/lib/souls/init.rb

@@ -8,6 +8,19 @@ module Souls
         data[0]["tag_name"]
       end
 
+      def initial_config_init app_name: "souls", project: {}
+        `touch "#{app_name}/config/souls.rb"`
+        file_path = "#{app_name}/config/souls.rb"
+        File.open(file_path, "w") do |f|
+          f.write <<~EOS
+            Souls.configure do |config|
+              config.app = "#{app_name}"
+              config.strain = "#{project[:strain]}"
+            end
+          EOS
+        end
+      end
+
       def download_souls app_name: "souls", repository_name: "souls_service"
         version = get_version repository_name: repository_name
         system "curl -OL https://github.com/elsoul/#{repository_name}/archive/#{version}.tar.gz"

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.17.9"
+  VERSION = "0.18.0"
 end

data/lib/souls.rb

@@ -11,19 +11,19 @@ module Souls
       attr_accessor :configuration
 
       def run_psql
-        `docker run --rm -d \
+        system "docker run --rm -d \
           -p 5433:5432 \
           -v postgres-tmp:/var/lib/postgresql/data \
           -e POSTGRES_USER=postgres \
           -e POSTGRES_PASSWORD=postgres \
           -e POSTGRES_DB=souls_test \
-          postgres:13-alpine`
-        puts `docker ps`
+          postgres:13-alpine"
+        system "docker ps"
       end
 
-      def run_awake
+      def run_awake url
         app = Souls.configuration.app
-        `gcloud scheduler jobs create http #{app}-awake --schedule "0,10,20,30,40,50 * * * *" --uri "https://#{app}.el-soul.com" --http-method GET`
+        system "gcloud scheduler jobs create http #{app}-awake --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
       end
 
       def deploy_local

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.17.9
+  version: 0.18.0
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -40,7 +40,7 @@ files:
 - Steepfile
 - bin/console
 - bin/setup
-- config/initializers/souls.rb
+- config/souls.rb
 - exe/souls
 - lib/souls.rb
 - lib/souls/generate.rb

data/config/initializers/souls.rb

@@ -1,14 +0,0 @@
-Souls.configure do |config|
-  config.main_project_id = ""
-  config.project_id = ""
-  config.app = "souls"
-  config.namespace = ""
-  config.service_name = ""
-  config.network = ""
-  config.machine_type = ""
-  config.zone = ""
-  config.domain = ""
-  config.google_application_credentials = ""
-  config.strain = ""
-  config.proto_package_name = "souls"
-end