souls 0.8.0 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 560643126ebd83bbba6b537f3df4ff4dab5e071a4f5eaf95c4c80b41dfad178c
-  data.tar.gz: 82f2814417af32ed219cd812c5f3f03239f6e612bbe357b70b98f61e31570ca3
+  metadata.gz: a57b96797a0a477562740a5cf08fbd5c4183f2fe493a70cb69566f5f1cda980b
+  data.tar.gz: 8a029707d19eda050c020c36600dda592d3f0a0451d05f51667343a5d6a8ad2f
 SHA512:
-  metadata.gz: ee757a67e212e058cc07b35bc8d4c74af030e9e60a7e58312623349ea5c5a6bed113ff769dcdc2eb755a7445bad7e13ba5a069636be6be18f30bfe4f34f69486
-  data.tar.gz: 97327b26bba04c5f4c8699540fa6a4708084c7d01a34730fb463d66a1b70ee41833c306cf4d8a9c3cc6daeff7a3d7c835ea15a7146d96f93a5dafba415369045
+  metadata.gz: f46f143cc597d71e62948f95226c7bbee91541063d8d6ea03f8fc77e46bdbeeff35373e709ba663b9c5b745e4a2524413ba0c11b4254738792f7265794d7c110
+  data.tar.gz: 0c608d8eda05af23a06ae4767e2b19d38e4c98f72a0136bded4e86c48ddc0c08731e5d07d99e3355f30135337fe70f1b9f457dd010216cb618f06d693af06d13

data/Gemfile.lock

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

data/config/initializers/souls.rb

@@ -1,13 +1,14 @@
 Souls.configure do |config|
-  config.project_id = "el-quest"
-  config.app = "el-quest"
-  config.namespace = "souls"
-  config.service_name = "blog-service"
-  config.network = "elsoul"
-  config.machine_type = "elsoul"
-  config.zone = "elsoul"
-  config.domain = "elsoul"
-  config.google_application_credentials = "./config/credentials.json"
-  config.strain = "service"
+  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

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" || ARGV[0] == "init"
+  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"

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:

data/lib/souls/init.rb

@@ -41,14 +41,16 @@ module Souls
           confirm = STDIN.gets.chomp
           raise StandardError, "Retry" unless confirm == ""
           download_souls app_name: app_name, repository_name: "souls_#{STRAINS[strain.to_i - 1]}"
-          config_init app_name: app_name, project: project if config_needed.include?(strain)
+          initial_config_init app_name: app_name, project: project if config_needed.include?(strain)
         rescue StandardError => error
           puts error
           retry
         end
       end
 
-      def config_init app_name: "souls", project: {}
+      def initial_config_init app_name: "souls", project: {}
+        puts "Generating souls conf..."
+        `touch "#{app_name}/config/initializers/souls.rb"`
         file_path = "#{app_name}/config/initializers/souls.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
@@ -70,6 +72,33 @@ module Souls
         end
       end
 
+      def config_init app_name: "souls", project: {}
+        `touch ./config/initializers/souls.rb`
+        file_path = "./config/initializers/souls.rb"
+        puts "Generating souls conf..."
+        sleep(rand(0.1..0.3))
+        puts "Generated!"
+        puts "Let's Edit SOULs Conf: `#{file_path}`"
+        File.open(file_path, "w") do |f|
+          f.write <<~EOS
+            Souls.configure do |config|
+              config.main_project_id = "#{project[:main_project_id]}"
+              config.project_id = "#{project[:project_id]}"
+              config.app = "#{app_name}"
+              config.namespace = "#{project[:namespace]}"
+              config.service_name = "#{project[:service_name]}"
+              config.network = "#{project[:network]}"
+              config.machine_type = "#{project[:machine_type]}"
+              config.zone = "#{project[:zone]}"
+              config.domain = "#{project[:domain]}"
+              config.google_application_credentials = "#{project[:google_application_credentials]}"
+              config.strain = "#{project[:strain]}"
+              config.proto_package_name = "souls"
+            end
+          EOS
+        end
+      end
+
       def get_version repository_name: "souls_service"
         data = JSON.parse `curl \
         -H "Accept: application/vnd.github.v3+json" \
@@ -83,7 +112,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 +132,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 +142,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 +172,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.8.0"
+  VERSION = "0.8.5"
 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.8.0
+  version: 0.8.5
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
+- James Neve
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-08 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: []