souls 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0823980d65837aead6add63c442e3c750572c64289f926e5f1b0ed361ce634ab'
-  data.tar.gz: be2292aa74d90857fffe33cc5b24af875311db2c25a94c16955c16515f57736d
+  metadata.gz: 560643126ebd83bbba6b537f3df4ff4dab5e071a4f5eaf95c4c80b41dfad178c
+  data.tar.gz: 82f2814417af32ed219cd812c5f3f03239f6e612bbe357b70b98f61e31570ca3
 SHA512:
-  metadata.gz: 9a8fd3de8cd42aa0997d5f8691fcc028ecae4443443f712e40eb61a1fa412f04468e636acbaceeab19c84b3db7ef953a4b345c201a1e2b151cb82f438fe916d2
-  data.tar.gz: a1c928ce66ef6dc9e240f5e96f5693fc9dc19a7c1193b763b94ebd1d4ff7ffafdaabf45d414a9b22236ce3990b6eaad4139d7fdc95d683dd8b6fe19a741a1201
+  metadata.gz: ee757a67e212e058cc07b35bc8d4c74af030e9e60a7e58312623349ea5c5a6bed113ff769dcdc2eb755a7445bad7e13ba5a069636be6be18f30bfe4f34f69486
+  data.tar.gz: 97327b26bba04c5f4c8699540fa6a4708084c7d01a34730fb463d66a1b70ee41833c306cf4d8a9c3cc6daeff7a3d7c835ea15a7146d96f93a5dafba415369045

data/.irbrc

@@ -1,2 +0,0 @@
-require "souls"
-require "./config/initialize/souls"

data/.rubocop.yml

@@ -194,4 +194,8 @@ Style/RedundantFileExtensionInRequire:
 Style/ClassMethodsDefinitions:
   Enabled: false
 Style/GlobalStdStream:
+  Enabled: false
+Layout/IndentationConsistency:
+  Enabled: false
+Layout/IndentationWidth:
   Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.7.4)
+    souls (0.7.9)
 
 GEM
   remote: https://rubygems.org/

data/exe/souls

@@ -47,13 +47,22 @@ begin
     `touch .gitignore`
     `touch .irbrc`
   when "t", "test"
-    `bundle exec rspec`
+    case ARGV[1]
+    when "-r"
+      `bundle exec rspec`
+    when "-s"
+      `bundle exec steep check`
+    else
+      `bundle exec steep check`
+      `bundle exec rspec`
+    end
   when "deploy"
-    `gcloud builds submit --config=cloudbuild.yml --project $PROJECT_ID`
+    project_id = Souls.configuration.project_id
+    `gcloud builds submit --config=cloudbuild.yml --project #{project_id}`
   else
     puts "Welcome to Souls!Yeah!"
   end
 rescue StandardError => error
   puts error
   puts "Thank you!Souls!"
-end
+end

data/lib/souls.rb

@@ -1,5 +1,6 @@
 require "souls/version"
 require "souls/init"
+require "json"
 
 module Souls
   class Error < StandardError; end
@@ -192,8 +193,8 @@ module Souls
       end
 
       def create_namespace
-        app = Souls.configuration.app
-        system("kubectl create namespace #{app}")
+        namespace = Souls.configuration.namespace
+        system("kubectl create namespace #{namespace}")
       end
 
       def create_ip
@@ -245,13 +246,24 @@ module Souls
         app = Souls.configuration.app
         namespace = Souls.configuration.namespace
         domain = Souls.configuration.domain
-        `echo "#{domain}. 300 IN A $(kubectl get ingress --namespace #{namespace} | grep #{app} | awk '{print $3}')" >> ./infra/config/dns_conf`
+        `echo "#{domain}. 300 IN A $(kubectl get ingress --namespace #{namespace} | grep #{app} | awk '{print $3}')" >> ./infra/dns_conf`
         "created dns file!"
       end
 
       def set_dns
-        project_id = Souls.configuration.project_id
-        `gcloud dns record-sets import -z=#{project_id} --zone-file-format ./infra/config/dns_conf`
+        project_id = Souls.configuration.main_project_id
+        `gcloud dns record-sets import -z=#{project_id} --zone-file-format ./infra/dns_conf`
+      end
+
+      def service_api_enable
+        `gcloud services enable iam.googleapis.com`
+        `gcloud services enable dns.googleapis.com`
+        `gcloud services enable container.googleapis.com`
+        `gcloud services enable containerregistry.googleapis.com`
+        `gcloud services enable servicenetworking.googleapis.com`
+        `gcloud services enable sqladmin.googleapis.com`
+        `gcloud services enable sql-component.googleapis.com`
+        `gcloud services enable cloudbuild.googleapis.com`
       end
 
       def update_container zone: :asia
@@ -362,13 +374,19 @@ module Souls
           -v postgres-tmp:/var/lib/postgresql/data \
           -e POSTGRES_USER=postgres \
           -e POSTGRES_PASSWORD=postgres \
-          -e POSTGRES_DB=souls_dev \
-          postgres:12-alpine`
-        system "docker ps"
+          -e POSTGRES_DB=souls_test \
+          postgres:13-alpine`
+        `docker ps`
+      end
+
+      def run_awake
+        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`
       end
 
       def deploy_local
         `docker network create --driver bridge shared`
+
         `docker run -d --name proxy \
          -p 80:80 -p 443:443 \
          -v "/var/run/docker.sock:/tmp/docker.sock:ro" \
@@ -378,6 +396,7 @@ module Souls
          --network shared \
          --restart always \
          jwilder/nginx-proxy`
+
         `docker run -d --name letsencrypt \
         -v "/home/certs:/etc/nginx/certs" \
         -v "/var/run/docker.sock:/var/run/docker.sock:ro" \
@@ -385,6 +404,7 @@ module Souls
         --network shared \
         --restart always \
         jrcs/letsencrypt-nginx-proxy-companion`
+
         `docker run -d --name nginx \
         -p 80:80 \
         -e VIRTUAL_HOST=souls.el-soul.com \
@@ -392,11 +412,12 @@ module Souls
         -e LETSENCRYPT_EMAIL=info@gmail.com \
         --network shared \
         --link web \
-        poppinfumi/nginx-http:latest`
+        poppinfumi/ruby-nginx:latest`
+
         `docker run -d --name web \
          -p 3000:3000 \
          --network shared \
-         asia.gcr.io/kaien-elixir/kaien:v2`
+         poppinfumi/souls_api`
       end
     end
 

data/lib/souls/init.rb

@@ -12,7 +12,7 @@ module Souls
           project[:main_project_id] == "" ? project[:main_project_id] = "elsoul2" : true
           puts "Google Cloud PROJECT_ID:      (default: elsoul2)"
           project[:project_id] = STDIN.gets.chomp
-          project[:project_id] == "" ? project[:project_id] = "elsoul2" : true
+          project[:project_id] = "elsoul2" if project[:project_id] == ""
           puts "VPC Network Name:          (default: default)"
           project[:network] = STDIN.gets.chomp
           project[:network] == "" ? project[:network] = "default" : true
@@ -163,6 +163,7 @@ module Souls
       end
 
       def api_deploy
+        Souls.service_api_enable
         Souls.create_service_account
         Souls.create_service_account_key
         Souls.add_service_account_role

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.7.5"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies: []
 description: SOULS is a Web Application Framework for Microservices on Multi Cloud
   Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud.
@@ -45,6 +45,7 @@ files:
 - lib/souls/version.rb
 - rbs/init.rbs
 - souls.gemspec
+- v0.0.8.tar.gz
 homepage: https://github.com/elsoul/souls
 licenses:
 - Apache-2.0