souls 0.7.9 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f5bbeaad6e7ccce929325b5a2bf909a4a6e1d5836c00856b0fa04cd373a5b61
-  data.tar.gz: df3ade898f6d605d1b372136701b8d72b7509e91f0be594e2ea5a8cb91e4aa0c
+  metadata.gz: 8b74eb05a7580c397e60b046e42396460e5420d458e8d59c14dfc83ea7321336
+  data.tar.gz: 75f8d7fdc50574b803729dae7d494b9a9d734041a33d23d917ad4dfa3cafe5ee
 SHA512:
-  metadata.gz: 4c8c11a33a54a4e37f47b0201154158b0c4849a8a28e932dd5bd084910a345ae24ad28ae26fe7ff33778e4547767faa3285e735ede3a0d23cbd3b1659a280e1f
-  data.tar.gz: 37c09659fc9e1702438e2a79528c268b0839cec5af64323ea658ffada6129070ec306f669ccaa95923ccd6bd1cd51c9eabf7c09997ef6f403f726fa23cfd11a5
+  metadata.gz: cc4d537ffd2fc5356aa9c5b09cbd7ff5f90f81632543374678ae9dfca77fed20e589cd2879fbfa73a546c733eaf01de12d4b37377dd9a094e1aff1dcc9f03c7a
+  data.tar.gz: c91f880c56d08b41e99964ef5c8cdc5b30ed1c52f49ddc78ed5e0237f7c1fa7ad68d3d9aeb87b5e65e2dd6238d96407c5e27107f41020c00ce7b762f4243a1e2

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.5)
+    souls (0.8.3)
 
 GEM
   remote: https://rubygems.org/

data/exe/souls

@@ -2,7 +2,11 @@
 require "souls"
 
 begin
-  require "./config/initializers/souls" unless ARGV[0] == "new"
+  begin
+    require "./config/initializers/souls" unless ARGV[0] == "new"
+  rescue
+    Souls::Init.config_init
+  end
   case ARGV[0]
   when "new"
     if ARGV[1].nil?
@@ -38,7 +42,7 @@ begin
   when "p", "proto"
     Souls::Init.proto proto_package_name: "souls", service: ARGV[1]
   when "init"
-    Souls::Init.config
+    Souls::Init.config_init
   when "-v", "--version"
     puts Souls::VERSION
   when "g", "generate"
@@ -57,11 +61,12 @@ begin
       `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

@@ -125,7 +125,7 @@ module Souls
       def export_network_group
         app = Souls.configuration.app
         system "NEG_NAME=$(gcloud compute network-endpoint-groups list | grep #{app} | awk '{print $1}')"
-        `echo $NEG_NAME > ./infra/config/neg_name`
+        `echo $NEG_NAME > ./config/neg_name`
       end
 
       def delete_network_group_list neg_name:
@@ -149,11 +149,6 @@ module Souls
         system "gcloud config set project #{project_id}"
       end
 
-      def config_set
-        project_id = Souls.configuration.project_id
-        system "gcloud config set project #{project_id}"
-      end
-
       def create_cluster
         app = Souls.configuration.app
         network = Souls.configuration.network
@@ -266,6 +261,9 @@ module Souls
         `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
@@ -376,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" \
@@ -392,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" \
@@ -399,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 \
@@ -406,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
@@ -49,6 +49,7 @@ module Souls
       end
 
       def config_init app_name: "souls", project: {}
+        puts "Generating souls conf..."
         file_path = "#{app_name}/config/initializers/souls.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
@@ -83,7 +84,7 @@ module Souls
         system "tar -zxvf ./#{version}.tar.gz"
         system "mkdir #{app_name}"
         folder = version.delete "v"
-        system "cp -aiv #{repository_name}-#{folder}/* #{app_name}/"
+        system "cp -r #{repository_name}-#{folder}/ #{app_name}/"
         system "rm -rf #{version}.tar.gz && rm -rf #{repository_name}-#{folder}"
         txt = <<~TEXT
            _____ ____  __  ____        
@@ -103,13 +104,6 @@ module Souls
 
       def proto proto_package_name: "souls", service: "blog"
         system "grpc_tools_ruby_protoc -I ./protos --ruby_out=./app/services --grpc_out=./app/services ./protos/#{service}.proto"
-        file_path = "./app/services/#{service}_pb.rb"
-        File.open(file_path, "a") do |f|
-          f.write <<~EOS
-            module #{service.capitalize}Pb
-            end
-          EOS
-        end
         service_pb_path = "./app/services/#{service}_services_pb.rb"
         new_file = "./app/services/#{proto_package_name}.rb"
         File.open(new_file, "w") do |new_line|
@@ -120,8 +114,6 @@ module Souls
                 new_line.write "# Generated by the SOULs protocol buffer compiler.  DO NOT EDIT!\n"
               when 3
                 next
-              when 4
-                new_line.write "require_relative \"#{service}_pb\""
               else
                 puts "#{i}: #{line}"
                 new_line.write line.to_s
@@ -152,7 +144,7 @@ module Souls
         Souls.create_firewall_rule firewall_rule_name: firewall_rule_name
         Souls.create_backend_service service_name: service_name, health_check_name: health_check_name
         Souls.export_network_group
-        file_path = "./infra/config/neg_name"
+        file_path = "./config/neg_name"
         File.open(file_path) do |f|
           Souls.add_backend_service service_name: service_name, neg_name: f.gets.to_s, zone: zone
         end

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.7.9"
+  VERSION = "0.8.4"
 end

data/souls.gemspec

@@ -3,8 +3,8 @@ require_relative 'lib/souls/version'
 Gem::Specification.new do |spec|
   spec.name          = "souls"
   spec.version       = Souls::VERSION
-  spec.authors       = ["POPPIN-FUMI", "KishiTheMechanic"]
-  spec.email         = ["fumitake.kawasaki@el-soul.com", "shota.kishi@el-soul.com"]
+  spec.authors       = ["POPPIN-FUMI", "KishiTheMechanic", "James Neve"]
+  spec.email         = ["fumitake.kawasaki@el-soul.com", "shota.kishi@el-soul.com", "jamesoneve@gmail.com"]
 
   spec.summary       = "SOULS is a Web Application Framework for Microservices on Multi Cloud Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud. Auto deploy with scalable condition. You can focus on business logic. No more infra problems."
   spec.description   = "SOULS is a Web Application Framework for Microservices on Multi Cloud Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud. Auto deploy with scalable condition. You can focus on business logic. No more infra problems."

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.4
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
+- James Neve
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-01-19 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.
@@ -18,6 +19,7 @@ description: SOULS is a Web Application Framework for Microservices on Multi Clo
 email:
 - fumitake.kawasaki@el-soul.com
 - shota.kishi@el-soul.com
+- jamesoneve@gmail.com
 executables:
 - souls
 extensions: []