souls 0.24.10 → 0.24.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94bced269c42744e87f03e45ad6b5ff2c184ede2b13d3f2102062eb9be38b4c4
-  data.tar.gz: 14f7168e17187e4a890541b1b6688f68da17c7d8480fdea1a47e3af92873a372
+  metadata.gz: 7b1972d2bb8426dd17d949c9e9591839719f4102430bb7304ca5e2d5e7984dc4
+  data.tar.gz: 67ed1ab03422b7f7d9e1b4af1436d793b43f30f18bbe903453bfd70a26ea6c9a
 SHA512:
-  metadata.gz: b1c13bf43152ad05fc7d2112c1288634b1f7f0b179d8612b12ee7b1dde7b11ce8520bb759ecf16d6287e02f4bb6bd5052e73d21ba88eb01dad6b820a732f2c93
-  data.tar.gz: c97c690506015c0902b6bff57bd4420e5de893bfdedab3424214f28da147136bf8c43fe5f05f96d478c764a375b98b5c1a0eeb221e98b88c58ca5e8da350556b
+  metadata.gz: 41d23c206071e562ac1c04561fa1d9c741a2fa1e06567f57107c59100accdc46e217ba5b8e139e1cb564e72f57e0ea2639cab444df59aacd86f55b3f716a83fd
+  data.tar.gz: d04ad678e51bec934aee45c3b7fa6313af6424acef3e9b59cafbdd1511122cfdc80ced1c06b53b325209757fcb2b04a36517f5155966d959283dd56fb3983467

data/exe/souls

@@ -16,23 +16,20 @@ begin
       puts(Paint["`souls new app_name`", :yellow])
       exit
     end
-    first_message = Paint % [
-      "Select Strain: %{red_text} %{yellow_text} %{green_text} %{blue_text} %{cyan_text} %{magenta_text}",
-      :white,
-      {
-        red_text: ["\n1. SOULs GraphQL API", :red],
-        yellow_text: ["\n2. SOULs Pub/Sub Worker", :yellow],
-        green_text: ["\n3. SOULs Console Web", :green],
-        blue_text: ["\n4. SOULs Admin Web", :blue],
-        cyan_text: ["\n5. SOULs Media Web", :cyan],
-        magenta_text: ["\n6. SOULs Doc Web", :magenta]
-      }
+
+    prompt = TTY::Prompt.new
+    choices = [
+      "1. SOULs GraphQL API",
+      "2. SOULs Pub/Sub Worker",
+      "3. SOULs Console Web",
+      "4. SOULs Admin Web",
+      "5. SOULs Media Web",
+      "6. SOULs Doc Web"
     ]
-    puts(first_message)
-    strain = $stdin.gets.chomp.to_i
-    case strain
+    choice_num = prompt.select(Paint["Select Strain: ", :cyan], choices)[0].to_i
+    case choice_num
     when 1, 2
-      service_name = (STRAINS[strain.to_i - 1]).to_s
+      service_name = (STRAINS[choice_num.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
@@ -116,13 +113,10 @@ begin
         Whirly.status = result
       end
       Souls.overwrite_version(new_version: souls_new_ver)
-      sleep(10)
       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")

data/lib/souls.rb

@@ -9,7 +9,6 @@ require "fileutils"
 require "net/http"
 require "paint"
 require "whirly"
-require "google/cloud/firestore"
 require "tty-prompt"
 
 module Souls
@@ -217,18 +216,36 @@ module Souls
           end
         TEXT
       end
+      overwrite_gemfile_lock(new_version: new_version)
       true
     rescue StandardError, e
       raise(StandardError, e)
     end
 
+    def overwrite_gemfile_lock(new_version: "0.1.1")
+      file_path = "Gemfile.lock"
+      new_file_path = "Gemfile.lock.tmp"
+      File.open(file_path, "r") do |f|
+        File.open(new_file_path, "w") do |new_line|
+          f.each_line.with_index do |line, i|
+            if i == 3
+              new_line.write("    souls (#{new_version})\n")
+            else
+              new_line.write(line)
+            end
+          end
+        end
+      end
+      FileUtils.rm(file_path)
+      FileUtils.mv(new_file_path, file_path)
+    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"
+      case service_name
+      when "gem"
         return Souls::VERSION.split(".").map(&:to_i)
       when "api", "worker", "console", "admin", "media"
-        file_path = ".../lib/souls/versions/.souls_#{service_name}_version"
+        file_path = "./lib/souls/versions/.souls_#{service_name}_version"
       else
         raise(StandardError, "You are at wrong directory!")
       end
@@ -237,25 +254,6 @@ module Souls
       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 =

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-v0.24.10
+v0.24.17

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-v0.24.10
+v0.30.17

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.24.10
+  version: 0.24.14
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -12,20 +12,6 @@ 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