souls 0.26.3 → 0.26.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de4eff0876018a8bd7068f3b5f3e8241813a15abb9e6cb1af26a40d8c4d559d9
-  data.tar.gz: a0116cd30e3d448d26aeb37e39330efb93b8fcbce48a52dc4c18e4e45e70e947
+  metadata.gz: 07a268eb135f4ca4ea45eb8249231c9fc816695012de869aeb4b1df50fa2b25f
+  data.tar.gz: 994e784b8ecf513a97df0c2227a96b26c115d1dacc85c989d002e9f714deb204
 SHA512:
-  metadata.gz: cf81a79b321003740af706da0e81818ca92f5663b154c83045cd9fb52768df0eecea14dc85d8d3851064a489bd0181ebd0177f7212bc3ce69fb41ec2ec47d6e5
-  data.tar.gz: 922a6620c36b865eb47c2625425818669144f04b7472177adf99084795d036075ccce430c49cda6818a7805826310df803af010969e420830f512626144a5b93
+  metadata.gz: 27f41b2976489276d4597fce40e333f2bb314c34a6aa89178d4a74bc3ea9a45d74d635583a82c62ab8e6b2e11a836172d71afbb7edbb3cf01ba48d50d47d05b6
+  data.tar.gz: 2a2c09c4df16367eebd6144f2955d12782d3d6add3f7d37ebfa404ef02bd7e449775c54cc2698466ab7b1b9ff3559d9a2f8d84f08f7e7f27c4d6502f46e7ce57

data/exe/souls

@@ -54,37 +54,7 @@ begin
       Whirly.status = "Done!"
     end
   when "release"
-    system("gem install souls")
-    sleep(3)
-    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
-      %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)
-      puts("before add")
-      system("git add .")
-      puts("before commit")
-      system("git commit -m 'souls update v#{souls_new_ver}'")
-      puts("before build")
-      system("rake build")
-      system("rake release")
-      Whirly.status = Paint["soul-v#{souls_new_ver} successfully updated!"]
-    end
+    Souls::Release.return_method
   when "update"
     puts(Paint["Coming soon..", :cyan])
   when "add"

data/lib/souls.rb

@@ -3,6 +3,7 @@ require "active_support/core_ext/string/inflections"
 require_relative "souls/init"
 require_relative "souls/generate"
 require_relative "souls/gcloud"
+require_relative "souls/release"
 require "dotenv/load"
 require "json"
 require "fileutils"
@@ -174,7 +175,6 @@ module Souls
       bucket_url = "gs://souls-bucket/boilerplates"
       file_name = "#{service_name}-v#{new_ver}.tgz"
       release_name = "#{service_name}-latest.tgz"
-      update_service_gemfile(service_name: service_name)
 
       case current_dir_name
       when "souls"
@@ -257,7 +257,7 @@ module Souls
       end
     end
 
-    def update_service_gemfile(service_name: "api")
+    def update_service_gemfile(service_name: "api", version: "0.0.1")
       file_dir = "./apps/#{service_name}"
       file_path = "#{file_dir}/Gemfile"
       gemfile_lock = "#{file_dir}/Gemfile.lock"
@@ -269,7 +269,7 @@ module Souls
             if gem[0] == "souls"
               old_ver = gem[1].split(".")
               old_ver[2] = (old_ver[2].to_i + 1).to_s
-              new_line.write("  gem \"souls\", \"#{old_ver.join('.')}\"\n")
+              new_line.write("  gem \"souls\", \"#{version}\"\n")
             else
               new_line.write(line)
             end

data/lib/souls/init.rb

@@ -33,8 +33,8 @@ module Souls
       file_name = "github.tgz"
       url = "https://storage.googleapis.com/souls-bucket/github_actions/github.tgz"
       system("curl -OL #{url}")
-      FileUtils.mkdir("github")
-      system("tar -zxvf ./#{file_name} -C #{app_name}/github/")
+      FileUtils.mkdir_p("#{app_name}/github")
+      system("tar -zxvf ./#{file_name} -C #{app_name}/")
       FileUtils.rm(file_name)
     end
 
@@ -74,12 +74,13 @@ module Souls
       choices = ["1. SOULs GraphQL API", "2. SOULs Pub/Sub Worker", "3. SOULs Frontend Web"]
       choice_num = prompt.select(Paint["Select Strain: ", :cyan], choices)[0].to_i
       case choice_num
-      when 1, 2
+      when 1
         service_name = (strains[choice_num.to_i - 1]).to_s
         Souls::Init.download_souls(app_name: app_name, service_name: service_name)
         Souls::Init.mother_config_init(app_name: app_name)
         Souls::Init.download_github_actions(app_name: app_name)
         Souls::Init.initial_config_init(app_name: app_name, service_name: service_name)
+        Souls::Init.souls_api_credit(app_name: app_name, service_name: service_name)
       else
         puts(Paint["Coming Soon...", :blue])
       end
@@ -93,6 +94,9 @@ module Souls
       system("mkdir -p #{app_name}/apps/#{service_name}")
       system("tar -zxvf ./#{file_name} -C #{app_name}/apps/")
       FileUtils.rm(file_name)
+    end
+
+    def self.souls_api_credit(app_name: "souls", service_name: "api")
       line = Paint["====================================", :yellow]
       puts("\n")
       puts(line)

data/lib/souls/release.rb

@@ -0,0 +1,6 @@
+require_relative "./release/methods"
+
+module Souls
+  module Release
+  end
+end

data/lib/souls/release/methods.rb

@@ -0,0 +1,39 @@
+module Souls
+  module Release
+    class << self
+      def return_method
+        system("gem install souls")
+        sleep(3)
+        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
+          %w[api worker].each do |s_name|
+            Souls.update_service_gemfile(service_name: s_name, version: souls_new_ver)
+            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)
+          puts("before add")
+          system("git add .")
+          puts("before commit")
+          system("git commit -m 'souls update v#{souls_new_ver}'")
+          puts("before build")
+          system("rake build")
+          system("rake release")
+          Whirly.status = Paint["soul-v#{souls_new_ver} successfully updated!"]
+        end
+      end
+    end
+  end
+end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.5.3
+0.5.7

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.5.3
+0.5.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.26.7
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,6 +124,8 @@ files:
 - lib/souls/generate/rspec_resolver.rb
 - lib/souls/generate/type.rb
 - lib/souls/init.rb
+- lib/souls/release.rb
+- lib/souls/release/methods.rb
 - lib/souls/version.rb
 - lib/souls/versions/.souls_api_version
 - lib/souls/versions/.souls_worker_version