souls 1.6.12 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 065d14af420a73c8712aae6b48ce788d16f98460f0a12f9af644017b4df340d7
-  data.tar.gz: d2635fa6926284b42b5b0c6497cc245be925cbf880ddb392b6ea189ef5eeecf8
+  metadata.gz: 32302ba2e0fd1c7f83b719c9dce0ab98c34a38f988f7f2b6f384fab8819a9990
+  data.tar.gz: cdd9b060a8fdbf9ced59a1ec2398387a7a44ad6d885d4027c0d4c75ada92c065
 SHA512:
-  metadata.gz: b9f9393a64f65e3619ab554ba2cfaaef9437a7a4bb6d1aa5f22b3920caedc528b7ba6c26b9e19f9d68aa15954d84d55d59eb5e64ec93e0bd2a8d57c5742467da
-  data.tar.gz: b83e4d07bf53e99fd6b304fac760d839dbed8e6c8d51094e115399aa89c9377326eabe7425ea9b9915a5cc537d4ae3bb7f47af69b1ee70c7e97adfdd72501109
+  metadata.gz: 90b63307663021f3885fa96f09a49b784a3a5fd7c22f260e2602442342ad8fd630ef9e6ba76361548fce88afcb50240dec170cc3d895988b0b84d3dd8daf5e54
+  data.tar.gz: 2546afbd6fce7bd1c08beb29b622cb851bc3ccb0fa138f6f729b05af7c38e1af168f57cb6c6d3634730a2f246c9c8787bb8ca7c89cc862996e1102de44d1102a

data/lib/souls/cli/gcloud/compute/index.rb

@@ -3,6 +3,8 @@ module Souls
     desc "setup_vpc_nat", "Set Up VPC Cloud Nat"
     method_option :range, default: "10.124.0.0/28", aliases: "--range", desc: "GCP VPC Network IP Range"
     def setup_vpc_nat
+      puts(Paint["Initializing NAT Setup This process might take about 10 min...", :yellow])
+      Souls::Gcloud.new.config_set
       create_network
       create_firewall_tcp(range: options[:range])
       create_firewall_ssh
@@ -11,13 +13,35 @@ module Souls
       create_router
       create_external_ip
       create_nat
-      nat_credit
+      Souls::Sql.new.invoke(:setup_private_ip)
+      update_workflows
+      update_env
+      puts(Paint["Cloud NAT is All Set!", :green])
+      puts(Paint["\nYou need to deploy to update production DB_HOST environment!", :yellow])
+      true
     rescue Thor::Error => e
       raise(Thor::Error, e)
     end
 
     private
 
+    def update_env
+      instance_name = Souls.configuration.instance_name
+      private_instance_ip = `gcloud sql instances list | grep #{instance_name} | awk '{print $6}'`.strip
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_path = ".env.production"
+        env_production = File.readlines(file_path)
+        env_production[0] = "SOULS_DB_HOST=#{private_instance_ip}\n"
+        File.open(file_path, "w") { |f| f.write(env_production.join) }
+      end
+      system("gh secret set DB_HOST -b #{private_instance_ip}")
+    end
+
+    def get_external_ip
+      app_name = Souls.configuration.app
+      `gcloud compute addresses list | grep #{app_name}-worker-ip | awk '{print $2}'`.strip
+    end
+
     def create_network
       app_name = Souls.configuration.app
       system("gcloud compute networks create #{app_name}")
@@ -88,40 +112,24 @@ module Souls
       system("gcloud compute networks list")
     end
 
-    def nat_credit
+    def update_workflows
       app_name = Souls.configuration.app
-      line = Paint["====================================", :yellow]
-      puts("\n")
-      puts(line)
-      txt2 = <<~TEXT
-           _____ ____  __  ____#{'        '}
-          / ___// __ \\/ / / / /   %{red1}
-          \\__ \\/ / / / / / / /   %{red2}
-         ___/ / /_/ / /_/ / /___%{red3}#{' '}
-        /____/\\____/\\____/_____%{red4}#{'  '}
-      TEXT
-      red1 = ["_____", :red]
-      red2 = ["/ ___/", :red]
-      red3 = ["(__  )", :red]
-      red4 = ["/____/", :red]
-      ms = Paint % [txt2, :cyan, { red1: red1, red2: red2, red3: red3, red4: red4 }]
-      puts(ms)
-      puts(line)
-      welcome = Paint["VPC Network is All Set!", :white]
-      puts(welcome)
-      puts(line)
-      endroll = <<~TEXT
-
-        Edit  `.github/workflow/worker.yml`
-
-        Add these 2 options in \n`- name: Deploy to Cloud Run` step
-        \n--vpc-connector=#{app_name}-connector \
-        \n--vpc-egress=all \
-
-      TEXT
-      cd = Paint[endroll, :white]
-      puts(cd)
-      puts(line)
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        api_workflow_path = ".github/workflows/api.yml"
+        worker_workflow_paths = Dir[".github/workflows/*.yml"]
+        worker_workflow_paths.delete(api_workflow_path)
+        File.open(api_workflow_path, "a") do |line|
+          line.write(" \\ \n            --vpc-connector=#{app_name}-connector")
+        end
+        puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [api_workflow_path.to_s, :white] }])
+        worker_workflow_paths.each do |file_path|
+          File.open(file_path, "a") do |line|
+            line.write(" \\             --vpc-connector=#{app_name}-connector \\")
+            line.write("\n            --vpc-egress=all")
+          end
+          puts(Paint % ["Updated file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+        end
+      end
     end
   end
 end

data/lib/souls/cli/gcloud/sql/index.rb

@@ -122,7 +122,7 @@ module Souls
       instance_name = Souls.configuration.instance_name if instance_name.blank?
       system(
         "
-            gcloud beta sql instances patch #{instance_name} \
+            gcloud sql instances patch #{instance_name} \
               --project=#{project_id} \
               --assign-ip \
               --authorized-networks=#{ip}

data/lib/souls/cli/init/index.rb

@@ -115,6 +115,8 @@ module Souls
 
     def get_latest_gem(app_name)
       file_path = "./#{app_name}/Gemfile"
+      souls_gem = "gem \"souls\", \"#{Souls::VERSION}\""
+      souls_gem = "gem \"souls\", \"#{Souls::VERSION}\", path: \"~/.local_souls/\"" if Souls::VERSION.length > 20
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
           source "https://rubygems.org"
@@ -130,7 +132,7 @@ module Souls
           gem "rubocop", "1.22.3"
           gem "sinatra-activerecord", "2.0.23"
           gem "solargraph", "0.44.0"
-          gem "souls", "#{Souls::VERSION}"
+          #{souls_gem}
           gem "steep", "0.46.0"
           gem "thor", "1.1.0"
           gem "tty-prompt", "0.23.1"

data/lib/souls/cli/release/release.rb

@@ -1,3 +1,5 @@
+require "securerandom"
+
 module Souls
   class CLI < Thor
     desc "release", "Release Gem"
@@ -22,7 +24,7 @@ module Souls
         Whirly.status = status
         %w[api worker].each do |s_name|
           update_service_gemfile(service_name: s_name, version: souls_new_ver)
-          result = Paint[update_repo(service_name: s_name, update_kind: update_kind), :green]
+          result = Paint[update_repo(service_name: s_name, version: souls_new_ver), :green]
           Whirly.status = result
         end
         overwrite_version(new_version: souls_new_ver)
@@ -40,6 +42,46 @@ module Souls
       end
     end
 
+    desc "release_local", "Release gem for local use"
+    def release_local
+      unless `git status`.include?("nothing to commit")
+        raise(
+          StandardError,
+          "You can only release to local with a clean working directory. Please commit your changes."
+        )
+      end
+
+      local_dir = "~/.local_souls/"
+
+      system("mkdir -p #{local_dir}")
+      souls_local_ver = generate_local_version
+
+      status = Paint["Saving Repo...", :yellow]
+      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+        Whirly.status = status
+
+        %w[api worker].each do |s_name|
+          update_service_gemfile(service_name: s_name, version: souls_local_ver, local: true)
+          result = Paint[update_repo(service_name: s_name, version: souls_local_ver), :green]
+          Whirly.status = result
+        end
+
+        Whirly.status = Paint["Creating local gem..."]
+
+        overwrite_version(new_version: souls_local_ver)
+        system("gem build souls.gemspec --output #{local_dir}souls-#{souls_local_ver}.gem")
+        Whirly.status = Paint["Done. Created gem at #{local_dir}souls-#{souls_local_ver}.gem"]
+        Whirly.status = Paint["Removing previous versions...", :white]
+        system("gem uninstall souls -x --force")
+
+        Whirly.status = Paint["Installing local gem..."]
+        system("gem install #{local_dir}souls-#{souls_local_ver}.gem")
+
+        Whirly.status = Paint["Cleaning up..."]
+        system("git checkout .")
+      end
+    end
+
     private
 
     def write_changelog(current_souls_ver:)
@@ -50,7 +92,7 @@ module Souls
       md = ""
       doc.each_line do |l|
         md << if l.include?("Merge pull request")
-                "## #{l}"
+                "### #{l}"
               else
                 l
               end
@@ -58,22 +100,20 @@ module Souls
       File.open("./CHANGELOG.md", "w") { |f| f.write(md) }
     end
 
-    def update_repo(service_name: "api", update_kind: "patch")
+    def update_repo(service_name: "api", version: "0.0.1")
       current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
-      current_ver = Souls.get_latest_version_txt(service_name: service_name)
-      new_ver = Souls.version_detector(current_ver: current_ver, update_kind: update_kind)
       bucket_url = "gs://souls-bucket/boilerplates"
-      file_name = "#{service_name}-v#{new_ver}.tgz"
+      file_name = "#{service_name}-v#{version}.tgz"
       release_name = "#{service_name}-latest.tgz"
 
       case current_dir_name
       when "souls"
-        system("echo '#{new_ver}' > lib/souls/versions/.souls_#{service_name}_version")
-        system("echo '#{new_ver}' > apps/#{service_name}/.souls_#{service_name}_version")
+        system("echo '#{version}' > lib/souls/versions/.souls_#{service_name}_version")
+        system("echo '#{version}' > apps/#{service_name}/.souls_#{service_name}_version")
         system("cd apps/ && tar -czf ../#{service_name}.tgz #{service_name}/ && cd ..")
       when "api", "worker", "console", "admin", "media"
-        system("echo '#{new_ver}' > lib/souls/versions/.souls_#{service_name}_version")
-        system("echo '#{new_ver}' > .souls_#{service_name}_version")
+        system("echo '#{version}' > lib/souls/versions/.souls_#{service_name}_version")
+        system("echo '#{version}' > .souls_#{service_name}_version")
         system("cd .. && tar -czf ../#{service_name}.tgz #{service_name}/ && cd #{service_name}")
       else
         raise(StandardError, "You are at wrong directory!")
@@ -83,31 +123,33 @@ module Souls
       system("gsutil cp #{service_name}.tgz #{bucket_url}/#{service_name.pluralize}/#{release_name}")
       system("gsutil cp .rubocop.yml #{bucket_url}/.rubocop.yml")
       FileUtils.rm("#{service_name}.tgz")
-      "#{service_name}-v#{new_ver} Succefully Stored to GCS! "
+      "#{service_name}-v#{version} Succefully Stored to GCS! "
     end
 
-    def update_service_gemfile(service_name: "api", version: "0.0.1")
+    def update_service_gemfile(service_name: "api", version: "0.0.1", local: false)
       file_dir = "./apps/#{service_name}"
       file_path = "#{file_dir}/Gemfile"
-      gemfile_lock = "#{file_dir}/Gemfile.lock"
-      tmp_file = "#{file_dir}/tmp/Gemfile"
+
+      write_txt = ""
       File.open(file_path, "r") do |f|
-        File.open(tmp_file, "w") do |new_line|
-          f.each_line do |line|
-            gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
+        f.each_line do |line|
+          gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
+          write_txt +=
             if gem[0] == "souls"
-              old_ver = gem[1].split(".")
-              old_ver[2] = (old_ver[2].to_i + 1).to_s
-              new_line.write("  gem \"souls\", \"#{version}\"\n")
+              if local
+                "  gem \"souls\", \"#{version}\", path: \"~/.local_souls/\"\n"
+              else
+                "  gem \"souls\", \"#{version}\"\n"
+              end
             else
-              new_line.write(line)
+              line
             end
-          end
         end
       end
-      FileUtils.rm(file_path)
+      File.open(file_path, "w") { |f| f.write(write_txt) }
+
+      gemfile_lock = "#{file_dir}/Gemfile.lock"
       FileUtils.rm(gemfile_lock) if File.exist?(gemfile_lock)
-      FileUtils.mv(tmp_file, file_path)
       puts(Paint["\nSuccessfully Updated #{service_name} Gemfile!", :green])
     end
 
@@ -145,5 +187,14 @@ module Souls
       FileUtils.rm(file_path)
       FileUtils.mv(new_file_path, file_path)
     end
+
+    def generate_local_version
+      max = 99_999_999_999
+      a = SecureRandom.random_number(max) + 9999
+      b = SecureRandom.random_number(max)
+      c = SecureRandom.random_number(max)
+
+      "#{a}.#{b}.#{c}"
+    end
   end
 end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.6.12
+1.7.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.6.12
+1.7.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.6.12
+  version: 1.7.0
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -232,7 +232,7 @@ licenses:
 metadata:
   homepage_uri: https://souls.elsoul.nl
   source_code_uri: https://github.com/elsoul/souls
-  changelog_uri: https://github.com/elsoul/souls/releases/tag/v1.6.12
+  changelog_uri: https://github.com/elsoul/souls/releases/tag/v1.7.0
 post_install_message: 
 rdoc_options: []
 require_paths: