souls 0.24.11 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08ded47eabab02b392e0032917f4209d1fa6c33e799df1490313e6e7d7458da2'
-  data.tar.gz: 83ef4754681c0e077ebce313e6ee23882a84ad69deaa9d5536d2011dbf7d0dc5
+  metadata.gz: 7e7d74e98984ccebf46062ee39be4e7c1890ede05098dffbf1fe59c58418bd22
+  data.tar.gz: cba8facd32490a3952e6b08b6743e6ce8ce747a4a3f9a9bebff86f1cb41a197c
 SHA512:
-  metadata.gz: 4bf499775966a57709d93f1094f2fd03a06439b524ab3d3c00a385b46d8caaeb628a3b58f59caa93bf0828672670035772ccb524ee9937db2f2a21c23274634e
-  data.tar.gz: a7ed6ebf27577490cb63f1c3eb64b9c5573c3714491e3c664029488aa26e0fb03a384478b84449304026e382b55ac7857e622ed0aa0d1b0abd37690d6be43e8d
+  metadata.gz: f718fd780c2af351f2863cab9dd60665c389a5f0c07fe5ab84edb3bf13c638084921870c0ca4f2aa48c986917027e829a296744ebdf9d112043d3f9ab66303c4
+  data.tar.gz: be7e472b3577cd9fecd08fe5c4a8d97c572a97d2c92676675188daa701d77ef7c4e0110a7fcfa814caf11907febec20c62f1459ccc4b5d9a445a7979671edfcf

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(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")

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/init.rb

@@ -28,7 +28,8 @@ module Souls
     end
 
     def self.download_souls(app_name: "souls", service_name: "api")
-      file_name = "#{service_name}-latest.tgz"
+      version = get_latest_version_txt(service_name: service_name).join(".")
+      file_name = "#{service_name}-v#{version}.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}")
@@ -56,8 +57,16 @@ module Souls
       souls_ver = Paint["SOULs Version: #{Souls::VERSION}", :white]
       puts(souls_ver)
       puts(line)
-      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]
+      endroll = <<~TEXT
+        Easy to Run
+        $ cd #{app_name}/#{service_name}
+        $ bundle
+        $ souls s
+        Go To : http://localhost:3000
+
+        Doc: https://souls.elsoul.nl
+      TEXT
+      cd = Paint[endroll, :white]
       puts(cd)
       puts(line)
     end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-v0.24.11
+v0.25.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-v0.24.11
+v0.31.0

metadata

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