souls 0.24.12 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d48e0a3a83651cde61d75e10cc328149003f760ff7769f98a5a157e7262a629d
-  data.tar.gz: 2eaf2809ed0f1af546890ec8d608666e0aa1540769d402a091a061dc12d2ea0c
+  metadata.gz: 3f73a6a473684a5d688beb6d15bac89fd33cc1171dae5d05eb3e918fe29ece6a
+  data.tar.gz: aa7f06e7eff9e7f5a3aa2622eb1c80141d8aa7add8ba13539e8f91ac95fe591c
 SHA512:
-  metadata.gz: b81b75f1a0cd48680ba5e38fc58882254574f9fb57e7aa9ec68379a4cb1ca210fe6850c68eb17fbf18f9aae46ee5be601016f5762a8ff5da9ffb92933dfefd8d
-  data.tar.gz: 15b2b5da3f4dae44e7a708decf4f02adba6cf10ebde8616c3cf29ae2c64222665c3ae5dbe7eb6499e6ccc935da2abcb1ff25646dbcc9b493f555a84054393dad
+  metadata.gz: 48784f76405d18f2036137f2b2104c8cb30cf28f9b61856e258af2974e6a144ceed1c62f6c99af9df6c32985ce4e324d5aabffe9252f7ed2113aec7f82cc1eee
+  data.tar.gz: cd360972fa54174227b1d1b34cf260dac35a3db3094f5c36778ab180774fb0600af7cbd7dd131dba92e141707fb0ec3c379c096571d10b7e13abd0ac8db45ada

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

@@ -177,10 +177,10 @@ module Souls
 
       case current_dir_name
       when "souls"
-        system("echo 'v#{new_ver}' > lib/souls/versions/.souls_#{service_name}_version")
+        system("echo '#{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("echo '#{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!")
@@ -216,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

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.12".freeze
+  VERSION = "0.25.1".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-v0.24.12
+v0.4.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-v0.24.12
+v0.4.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.24.12
+  version: 0.25.1
 platform: ruby
 authors:
 - POPPIN-FUMI