souls 0.24.4 → 0.24.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 949cc1a83a8fd104832c205db7f8eab135bc3298523751538a7d767769b7ac27
-  data.tar.gz: 2fa4257d0231d0363989a9ec85028276e68e33752c3a57067b1e5f5895dcdb24
+  metadata.gz: 5e1ce66f5d9dc4581e6283e4585ebaaa91dcbbf6595f9c723f1110ecefaf9683
+  data.tar.gz: c6b20a59319f44a24beea293c5ea4c5948d121230d2220cfe6292fa789cfbfdf
 SHA512:
-  metadata.gz: ef3ab7e883db0805b78b41e5f51dfb2666617e99a07b490b84c36622c216efd81ac0346dbb9dd226db06704ca24828dc2cdb40c699516add438c318512736ce9
-  data.tar.gz: 0ec076686c79072c96978a55430d00a59cca6c1978077e8a48dd3108dc074fc2770f4a8a9c42d4b490308380fa5ab7d4cc6c2e410ab34f376fefcd35a87e468b
+  metadata.gz: 301c64176cb961f8e88532e06761c97d894c3c878674773e950275ecf7e83fad4ccd5d8a8985ab9178306d647716679dfcca391081ce59bf838a070e18510888
+  data.tar.gz: 4df80954681e798712153e297c6662d3faf9d8c6241bcb7ac8dc8094b65b204a336f6eeff375743de5fe3715b5045cf07d1daf45a2a2ef3f4a69e52a7fe847ee

data/exe/souls

@@ -32,8 +32,9 @@ begin
     strain = $stdin.gets.chomp.to_i
     case strain
     when 1, 2
-      Souls::Init.download_souls(app_name: app_name, repository_name: "souls_#{STRAINS[strain.to_i - 1]}")
-      Souls::Init.initial_config_init(app_name: app_name, strain: STRAINS[strain.to_i - 1])
+      service_name = (STRAINS[strain.to_i - 1]).to_s
+      Souls::Init.download_souls(app_name: app_name, service_name: service_name)
+      Souls::Init.initial_config_init(app_name: app_name, service_name: service_name)
     else
       puts(Paint["Coming Soon...", :blue])
     end
@@ -94,6 +95,33 @@ begin
       Souls.update_gemfile
       Whirly.status = "Done!"
     end
+  when "release"
+    current_souls_ver = Souls::VERSION.strip.split(".").map(&:to_i)
+    prompt = TTY::Prompt.new
+    choices = [
+      "1. Patch(#{Souls.version_detector(current_ver: current_souls_ver, update_kind: 'patch')})",
+      "2. Minor(#{Souls.version_detector(current_ver: current_souls_ver, update_kind: 'minor')})",
+      "3. Major(#{Souls.version_detector(current_ver: current_souls_ver, update_kind: 'major')})"
+    ]
+    choice_num = prompt.select("Select Version: ", choices)[0].to_i
+    update_kinds = %w[patch minor major]
+    update_kind = update_kinds[choice_num - 1]
+    souls_new_ver = Souls.version_detector(current_ver: current_souls_ver, update_kind: update_kind)
+
+    status = Paint["Saving Repo...", :yellow]
+    Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+      Whirly.status = status
+      %w[api worker].each do |s_name|
+        result = Paint[Souls.update_repo(service_name: s_name, update_kind: update_kind), :green]
+        Whirly.status = result
+      end
+      Souls.overwrite_version(new_version: souls_new_ver)
+      system("rake build")
+      system("rake release")
+      Whirly.status = Paint["soul-v#{souls_new_ver} successfully updated!"]
+    end
+  when "update"
+    puts(Paint["Coming soon..", :cyan])
   when "add"
     graphql_class = ARGV[1]
     case graphql_class
@@ -222,4 +250,5 @@ begin
   end
 rescue StandardError => e
   puts(Paint[e, :red])
+  puts(e.backtrace)
 end

data/lib/souls.rb

@@ -3,11 +3,14 @@ require "active_support/core_ext/string/inflections"
 require_relative "souls/init"
 require_relative "souls/generate"
 require_relative "souls/gcloud"
+require "dotenv/load"
 require "json"
 require "fileutils"
 require "net/http"
 require "paint"
 require "whirly"
+require "google/cloud/firestore"
+require "tty-prompt"
 
 module Souls
   SOULS_METHODS = %w[
@@ -165,6 +168,107 @@ module Souls
       end
     end
 
+    def update_repo(service_name: "api", update_kind: "patch")
+      current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
+      current_ver = get_latest_version_txt(service_name: service_name)
+      new_ver = version_detector(current_ver: current_ver, update_kind: update_kind)
+      bucket_url = "gs://souls-bucket/boilerplates"
+      file_name = "#{service_name}-v#{new_ver}.tgz"
+      release_name = "#{service_name}-latest.tgz"
+
+      case current_dir_name
+      when "souls"
+        system("echo 'v#{new_ver}' > lib/souls/versions/.souls_#{service_name}_version")
+        system("cd apps/ && tar -czf ../#{service_name}.tgz #{service_name}/ && cd ..")
+      when "api", "worker", "console", "admin", "media"
+        system("echo 'v#{new_ver}' > lib/souls/versions/.souls_#{service_name}_version")
+        system("cd .. && tar -czf ../#{service_name}.tgz #{service_name}/ && cd #{service_name}")
+      else
+        raise(StandardError, "You are at wrong directory!")
+      end
+
+      system("gsutil cp #{service_name}.tgz #{bucket_url}/#{service_name.pluralize}/#{file_name}")
+      system("gsutil cp #{service_name}.tgz #{bucket_url}/#{service_name.pluralize}/#{release_name}")
+      FileUtils.rm("#{service_name}.tgz")
+      "#{service_name}-v#{new_ver} Succefully Stored to GCS! "
+    end
+
+    def version_detector(current_ver: [0, 0, 1], update_kind: "patch")
+      case update_kind
+      when "patch"
+        "#{current_ver[0]}.#{current_ver[1]}.#{current_ver[2] + 1}"
+      when "minor"
+        "#{current_ver[0]}.#{current_ver[1] + 1}.0"
+      when "major"
+        "#{current_ver[0] + 1}.0.0"
+      else
+        raise(StandardError, "Wrong version!")
+      end
+    end
+
+    def overwrite_version(new_version: "0.1.1")
+      FileUtils.rm("./lib/souls/version.rb")
+      file_path = "./lib/souls/version.rb"
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          module Souls
+            VERSION = "#{new_version}".freeze
+            public_constant :VERSION
+          end
+        TEXT
+      end
+      true
+    rescue StandardError, e
+      raise(StandardError, e)
+    end
+
+    def get_latest_version_txt(service_name: "api")
+      current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
+      case current_dir_name
+      when "souls"
+        file_path = "./lib/souls/versions/.souls_version"
+      when "api", "worker", "console", "admin", "media"
+        file_path = ".../lib/souls/versions/.souls_#{service_name}_version"
+      else
+        raise(StandardError, "You are at wrong directory!")
+      end
+      File.open(file_path, "r") do |f|
+        f.readlines[0].strip.split(".").map(&:to_i)
+      end
+    end
+
+    def get_latest_version(service_name: "api")
+      firestore = Google::Cloud::Firestore.new(project_id: ENV["FIRESTORE_PID"])
+      versions = firestore.doc("#{service_name}/1")
+      if versions.get.exists?
+        versions = firestore.col(service_name.to_s)
+        query = versions.order("version_counter", "desc").limit(1)
+        query.get do |v|
+          return {
+            version_counter: v.data[:version_counter],
+            version: v.data[:version],
+            file_url: v.data[:file_url],
+            create_at: v.data[:create_at]
+          }
+        end
+      else
+        { version_counter: 0 }
+      end
+    end
+
+    def detect_change
+      git_status = `git status`
+      result =
+        %w[api worker].map do |service_name|
+          if git_status.include?("apps/#{service_name}/")
+            service_name
+          else
+            next
+          end
+        end
+      result.compact
+    end
+
     def configure
       self.configuration ||= Configuration.new
       yield(configuration)

data/lib/souls/init.rb

@@ -9,14 +9,17 @@ module Souls
       data[0]["tag_name"]
     end
 
-    def self.initial_config_init(app_name: "souls", strain: "api")
-      FileUtils.touch("./#{app_name}/config/souls.rb")
-      file_path = "./#{app_name}/config/souls.rb"
+    def self.initial_config_init(app_name: "souls", service_name: "api")
+      FileUtils.touch("./#{app_name}/#{service_name}/config/souls.rb")
+      file_path = "./#{app_name}/#{service_name}/config/souls.rb"
       File.open(file_path, "w") do |f|
         f.write(<<~TEXT)
           Souls.configure do |config|
             config.app = "#{app_name}"
-            config.strain = "#{strain}"
+            config.project_id = "souls-api"
+            config.strain = "#{service_name}"
+            config.worker_endpoint = "https://worker.com"
+            config.fixed_gems = ["excluded_gem"]
           end
         TEXT
       end
@@ -24,33 +27,36 @@ module Souls
       puts(e)
     end
 
-    def self.download_souls(app_name: "souls", repository_name: "souls_api ")
-      version = get_version(repository_name: repository_name)
-      system("curl -OL https://github.com/elsoul/#{repository_name}/archive/#{version}.tar.gz")
-      system("tar -zxvf ./#{version}.tar.gz")
-      system("mkdir #{app_name}")
-      folder = version.delete("v")
-      `cp -r #{repository_name}-#{folder}/. #{app_name}/`
-      `rm -rf #{version}.tar.gz && rm -rf #{repository_name}-#{folder}`
+    def self.download_souls(app_name: "souls", service_name: "api")
+      file_name = "#{service_name}-latest.tgz"
+      url = "https://storage.googleapis.com/souls-bucket/boilerplates/#{service_name.pluralize}/#{file_name}"
+      system("curl -OL #{url}")
+      system("mkdir -p #{app_name}/#{service_name}")
+      system("tar -zxvf ./#{file_name} -C #{app_name}/")
+      FileUtils.rm(file_name)
       line = Paint["====================================", :yellow]
       puts("\n")
       puts(line)
-      txt = <<~TEXT
+      txt2 = <<~TEXT
            _____ ____  __  ____#{'        '}
-          / ___// __ \\/ / / / /   _____
-          \\__ \\/ / / / / / / /   / ___/
-         ___/ / /_/ / /_/ / /___(__  )#{' '}
-        /____/\\____/\\____/_____/____/#{'  '}
+          / ___// __ \\/ / / / /   %{red1}
+          \\__ \\/ / / / / / / /   %{red2}
+         ___/ / /_/ / /_/ / /___%{red3}#{' '}
+        /____/\\____/\\____/_____%{red4}#{'  '}
       TEXT
-      message = Paint[txt, :cyan]
-      puts(message)
+      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["Welcome to SOULs!", :white]
       puts(welcome)
       souls_ver = Paint["SOULs Version: #{Souls::VERSION}", :white]
       puts(souls_ver)
       puts(line)
-      cd = Paint["Easy to Run\n$ cd #{app_name}\n$ bundle\n$ souls s\nGo To : http://localhost:3000\n\nDoc: https://souls.elsoul.nl",
+      cd = Paint["Easy to Run\n$ cd #{app_name}/#{service_name}\n$ bundle\n$ souls s\nGo To : http://localhost:3000\n\nDoc: https://souls.elsoul.nl",
                  :white]
       puts(cd)
       puts(line)

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -0,0 +1 @@
+v0.24.8

data/lib/souls/versions/.souls_version

@@ -0,0 +1 @@
+0.24.7

data/lib/souls/versions/.souls_worker_version

@@ -0,0 +1 @@
+v0.24.8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.24.4
+  version: 0.24.8
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -12,6 +12,20 @@ bindir: exe
 cert_chain: []
 date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: google-cloud-firestore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -26,6 +40,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.23.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: whirly
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +108,9 @@ files:
 - lib/souls/generate/type.rb
 - lib/souls/init.rb
 - lib/souls/version.rb
+- lib/souls/versions/.souls_api_version
+- lib/souls/versions/.souls_version
+- lib/souls/versions/.souls_worker_version
 homepage: https://souls.elsoul.nl
 licenses:
 - Apache-2.0