souls 0.24.5 → 0.24.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67f7e7198ec3b50441d76d83f17500df4a1f92f7c49e23143626a6229279aaae
-  data.tar.gz: c20d8e26c040f6132a06e854f30c9c5ea2f15c87945407df1e0d8effac427c88
+  metadata.gz: b1eddf3455b6b592a0b5869a295150fe848d62d4c395b73abed0b7520822d1c7
+  data.tar.gz: 4fed41cea680904ce08806eddaad728ed5bb29275f65f6548f58d85cf8f38b63
 SHA512:
-  metadata.gz: e5790b5cde1a9f507df76250ec89896b43b747eaaffdf17c3a7c8533bdca27a50afe2185585f37fbdca34cdfc48a1add8a4b42f0069f41ab867352ed836d7c74
-  data.tar.gz: 63d1cb575a722d2e045039bf6e7f091c48dfff4a57b76cbf3752009250c87d090ec31c48fa17607c3782aabc148ac12c0509b365cd1d7c27fb424ede32541c62
+  metadata.gz: a745a0786ab85cb9aeaf47dd3250c9c725177263adf2aa01d2f3b7daf94f964ba86b6857a44bd99b6a1b364b59f55daabf07a8d61631b8c2777966f4c0dd92c8
+  data.tar.gz: c73802b5be44d1d38b9b57c7c880fc86b0e8b1a1a37e00188f00ba72a129d029bc8a4d08a097c3dae9f01609d779f12c5cb7b199881734014b18883d6c44b3c8

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

@@ -32,8 +32,9 @@ begin
     strain = $stdin.gets.chomp.to_i
     case strain
     when 1, 2
-      Souls::Init.download_souls(app_name: app_name, service_name: (STRAINS[strain.to_i - 1]).to_s)
-      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,17 +95,34 @@ 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)
+      system("git add . && git commit -m 'souls update v#{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
@@ -233,4 +251,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,37 +168,73 @@ 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!")
       end
 
       system("gsutil cp #{service_name}.tgz #{bucket_url}/#{service_name.pluralize}/#{file_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)
+      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_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")
@@ -219,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/init.rb

@@ -9,15 +9,15 @@ 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.project_id = "souls-api"
-            config.strain = "#{strain}"
+            config.strain = "#{service_name}"
             config.worker_endpoint = "https://worker.com"
             config.fixed_gems = ["excluded_gem"]
           end
@@ -28,9 +28,9 @@ module Souls
     end
 
     def self.download_souls(app_name: "souls", service_name: "api")
-      latest_gem = Souls.get_latest_version(service_name: service_name)
-      file_name = latest_gem[:file_url].to_s.match(%r{/([^/]+)/?$})[1]
-      system("curl -OL #{latest_gem[:file_url]}")
+      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)

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

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

data/lib/souls/versions/.souls_worker_version

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.24.5
+  version: 0.24.9
 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