souls 0.26.4 → 0.26.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae0f756645176179171c222fa964f834b33eabb0682c9e52746ab04190cc50fa
-  data.tar.gz: 6bc7df88728c49e170403ee72cacf2d3201d1ff2f19f8df4aa80d00ac3bf646b
+  metadata.gz: a5e58498e4d755e83b5b9244c9eebdfa08e9c9bbd2f6d006cbea2e87be99a463
+  data.tar.gz: 3148268dccdb03f49bd29105867ac5dcca44fdef43ed85855e93b0d9f30199d4
 SHA512:
-  metadata.gz: 35bb79ed3fe0403f4653d363b9cfa8c787c3d5320bdec04beb2b86920a61e10cb7b9f4ad844898a7859b6096e52543f314aa47a7966d0b8ea859aad7345188f3
-  data.tar.gz: 6a806db17149e8cbabcd06b840611a4c0b3e83e0442198e83a60a80ad979cc827ff42ebed93b23a7299493cc83f4002f67a515ad44f8832d8929ff70f67a5288
+  metadata.gz: 2ab89d13dc49261853b81780a105e672830410b3dc836e8a605e37f5359bffb82abfe4bb8ff8abcf813a0089efea78536cd6c113663bf7d033584f2f8da2611d
+  data.tar.gz: 9aa074b6bb0d4ff2c2f50808abcc4b6750d88c55ec6f7d2381535001e73c6c813e34a84cda7d87a173619c26a1f61aa9193d44bafe5a21af707f19b57b01b168

data/exe/souls

@@ -54,39 +54,14 @@ 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]
+    Souls::Release.return_method
+  when "model:update"
+    status = Paint["Updating Models...", :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!"]
+      Souls.update_models
+      Whirly.status = "Done!"
     end
-  when "update"
-    puts(Paint["Coming soon..", :cyan])
   when "add"
     graphql_class = ARGV[1]
     case graphql_class

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
@@ -282,6 +282,72 @@ module Souls
       puts(Paint["\nSuccessfully Updated #{service_name} Gemfile!", :green])
     end
 
+    def update_models
+      current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
+      permitted_dirs = %w[worker api]
+      unless permitted_dirs.include?(current_dir_name)
+        raise(StandardError, "You are at wrong directory!Go to API or Worker Directory!")
+      end
+
+      cp_dir = get_models_path(service_name: current_dir_name)
+      cp_dir.each do |path|
+        cp_and_dl_files(api_dir: path[:api], worker_dir: path[:worker])
+      end
+    end
+
+    def cp_and_dl_files(api_dir: "", worker_dir: "")
+      api_file_data = file_diff(Dir["#{api_dir}/*.rb"])
+      worker_file_data = file_diff(Dir["#{worker_dir}/*.rb"])
+
+      api_latest_date = Date.parse(api_file_data.max)
+      worker_latest_date = Date.parse(worker_file_data.max)
+
+      if api_latest_date > worker_latest_date
+        FileUtils.rm_rf(api_dir)
+        FileUtils.mkdir(api_dir) unless Dir.exist?(api_dir)
+        system("cp -r #{worker_dir}/* #{api_dir}")
+      else
+        FileUtils.rm_rf(worker_dir)
+        FileUtils.mkdir(worker_dir) unless Dir.exist?(worker_dir)
+        system("cp -r #{api_dir}/* #{worker_dir}")
+      end
+    end
+
+    def get_models_path(service_name: "api")
+      [
+        {
+          api: "../#{service_name}/db",
+          worker: "./db"
+        },
+        {
+          api: "../#{service_name}/app/models",
+          worker: "./app/models"
+        },
+        {
+          api: "../#{service_name}/spec/factories",
+          worker: "./spec/factories"
+        }
+      ]
+    end
+
+    def file_diff(paths = [])
+      paths.map do |path|
+        stat(path)[:last_update]
+      end
+    end
+
+    def stat(path)
+      s = File::Stat.new(path)
+      last_update = s.mtime.to_s
+      last_status_change = s.ctime.to_s
+      last_access = s.atime.to_s
+      {
+        last_update: last_update,
+        last_status_change: last_status_change,
+        last_access: last_access
+      }
+    end
+
     def detect_change
       git_status = `git status`
       result =

data/lib/souls/init.rb

@@ -34,7 +34,7 @@ module Souls
       url = "https://storage.googleapis.com/souls-bucket/github_actions/github.tgz"
       system("curl -OL #{url}")
       FileUtils.mkdir_p("#{app_name}/github")
-      system("tar -zxvf ./#{file_name} -C #{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)
@@ -131,6 +135,9 @@ module Souls
 
     def self.download_worker
       current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
+      wrong_dir = %w[apps api worker]
+      raise(StandardError, "You are at wrong directory!Go to Mother Directory!") if wrong_dir.include?(current_dir_name)
+
       version = Souls.get_latest_version_txt(service_name: "worker").join(".")
       file_name = "worker-v#{version}.tgz"
       url = "https://storage.googleapis.com/souls-bucket/boilerplates/workers/#{file_name}"

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.5.4
+0.5.8

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.5.4
+0.5.8

metadata

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