souls 0.24.7 → 0.24.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2d5b134e45db7243b8abcfcf23622276de3d76f386d63123695dbe07a1359df
-  data.tar.gz: 413356865c3203299c148c8be2ab40be0a1793d08a96ad56d9962868eabcb6af
+  metadata.gz: '08ded47eabab02b392e0032917f4209d1fa6c33e799df1490313e6e7d7458da2'
+  data.tar.gz: 83ef4754681c0e077ebce313e6ee23882a84ad69deaa9d5536d2011dbf7d0dc5
 SHA512:
-  metadata.gz: 0760b5f71c86db10d87a1be895d37ef1fcf00111453d16619531a6d3dc30b895e3dd39a1172d5acb0b9b52001d2136c459918c029e14dbb8b6ce7a683d1a4855
-  data.tar.gz: 15b14c42fce4845c49a7f510f177ca82c41ff065616ce8bb2fdcc738f115b2f094d4cb71e32cffadb5b2661a34b6d75311ce7000d1218e660af66717a5ae03fb
+  metadata.gz: 4bf499775966a57709d93f1094f2fd03a06439b524ab3d3c00a385b46d8caaeb628a3b58f59caa93bf0828672670035772ccb524ee9937db2f2a21c23274634e
+  data.tar.gz: a7ed6ebf27577490cb63f1c3eb64b9c5573c3714491e3c664029488aa26e0fb03a384478b84449304026e382b55ac7857e622ed0aa0d1b0abd37690d6be43e8d

data/README.md

@@ -102,9 +102,7 @@ souls gem:update
 Souls.configure do |config|
   config.app = "souls-api"
   config.project_id = "souls-api"
-  config.strain = "worker"
-  config.api_repo = "elsoul/souls_api"
-  config.worker_repo = "elsoul/souls_worker"
+  config.strain = "api"
   config.worker_endpoint = "https://worker.com"
   config.fixed_gems = ["selenium-webdriver", "pg"]
 end

data/exe/souls

@@ -95,17 +95,41 @@ begin
       Souls.update_gemfile
       Whirly.status = "Done!"
     end
-  when "update"
-    service_name = ARGV[1]
-    permit_services = %w[api worker console admin media]
-    raise(StandardError, "Wrong Service Name!") unless permit_services.include?(service_name)
+  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
-      result = Paint[Souls.update_repo(service_name: service_name), :green]
-      Whirly.status = result
+      %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)
+      sleep(5)
+      puts("before add")
+      system("git add .")
+      sleep(2)
+      puts("before commit")
+      system("git commit -m 'souls update v#{souls_new_ver}'")
+      sleep(2)
+      puts("before build")
+      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
@@ -234,4 +258,5 @@ begin
   end
 rescue StandardError => e
   puts(Paint[e, :red])
+  puts(e.backtrace)
 end

data/lib/souls.rb

@@ -10,6 +10,7 @@ require "net/http"
 require "paint"
 require "whirly"
 require "google/cloud/firestore"
+require "tty-prompt"
 
 module Souls
   SOULS_METHODS = %w[
@@ -167,20 +168,20 @@ module Souls
       end
     end
 
-    def update_repo(service_name: "api")
+    def update_repo(service_name: "api", update_kind: "patch")
       current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
-      latest_gem = get_latest_version(service_name: service_name)
-      new_ver = latest_gem[:version_counter] + 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}' > apps/#{service_name}/.souls_version")
+        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}' > .souls_version")
+        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!")
@@ -188,18 +189,52 @@ module Souls
 
       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}")
-      file_url = "https://storage.googleapis.com/souls-bucket/boilerplates/#{service_name.pluralize}/#{file_name}"
-      version_log(service_name: service_name, version_counter: new_ver, file_url: file_url)
       FileUtils.rm("#{service_name}.tgz")
       "#{service_name}-v#{new_ver} Succefully Stored to GCS! "
     end
 
-    def version_log(service_name: "api", version_counter: 1, file_url: "")
-      version = "v#{version_counter}"
-      time = Time.now.strftime("%F-%H-%M-%S")
-      firestore = Google::Cloud::Firestore.new(project_id: ENV["FIRESTORE_PID"])
-      doc_ref = firestore.doc("#{service_name}/#{version_counter}")
-      doc_ref.set({ version: version, version_counter: version_counter, file_url: file_url, created_at: time })
+    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"
+        return Souls::VERSION.split(".").map(&:to_i)
+      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")
@@ -221,6 +256,19 @@ module Souls
       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/version.rb

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

data/lib/souls/versions/.souls_api_version

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

data/lib/souls/versions/.souls_worker_version

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.24.7
+  version: 0.24.11
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -40,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
@@ -94,6 +108,8 @@ files:
 - lib/souls/generate/type.rb
 - lib/souls/init.rb
 - lib/souls/version.rb
+- lib/souls/versions/.souls_api_version
+- lib/souls/versions/.souls_worker_version
 homepage: https://souls.elsoul.nl
 licenses:
 - Apache-2.0