souls 0.26.9 → 0.26.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abb403a2afdcb6e2de2502a8f22ef0977224dbc17cd2145fd8ae6fd1b690595d
-  data.tar.gz: bdaa332725d41ec2e2c267544d17805cf278d908524309acc8c52724593a0b0e
+  metadata.gz: 6ed9ffbee1c79292d85bde12b686954ecdbcb679f7fdde04324d3152d2cc065d
+  data.tar.gz: f9a65837d335c25d873b65d3fe6eb08c9335314ced645c8568b3fce233477a41
 SHA512:
-  metadata.gz: bc0bd6eb6dffcafdb444b41bd68d93822c366280af9c2a9da59e8e5d2eb402041b51765d3e346590e8c0999ec6161081b75733d04b83641d88787e8f147f1e4e
-  data.tar.gz: d55eaa383f6107f409c8c2df0192db434ac6307ba578f36be8d20879ba0ec13b4aee54b14fc020d3a05e3fb6d10fa4ce36324ff5b9c616df67e208c09a702609
+  metadata.gz: 58d4c85fbb4ce6c74dec22a3cb7f4975045798eb5d014a185888e91ac0ae5985b0adeb2a27a535230bc047afcffa8c7b217aa43c122eb6a7974b7d3ea47fd771
+  data.tar.gz: 9e9b6d5849d53895bc80b37cf446cb501548689f2a43c0040b04556708194b0305d650d95fac2229761f65139d73a2b556e49f6ab74169a60d9ab13d7a831386

data/lib/souls.rb

@@ -297,36 +297,50 @@ module Souls
     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"])
+      if Dir["#{worker_dir}/*.rb"].blank?
 
-      api_latest_date = Date.parse(api_file_data.max)
-      worker_latest_date = Date.parse(worker_file_data.max)
+        api_latest_date = 1
+        worker_latest_date = 0
+      else
+        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)
+      end
 
-      if api_latest_date > worker_latest_date
-        FileUtils.rm_rf(api_dir)
+      if api_latest_date < worker_latest_date
+        FileUtils.rm_rf(api_dir) if Dir.exist?(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.rm_rf(worker_dir) if Dir.exist?(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")
+      case service_name
+      when "api"
+        api_path = "."
+        worker_path = "../worker"
+      when "worker"
+        api_path = "../api"
+        worker_path = "."
+      end
       [
         {
-          api: "../#{service_name}/db",
-          worker: "./db"
+          api: "#{api_path}/db",
+          worker: "#{worker_path}/db"
         },
         {
-          api: "../#{service_name}/app/models",
-          worker: "./app/models"
+          api: "#{api_path}/app/models",
+          worker: "#{worker_path}/app/models"
         },
         {
-          api: "../#{service_name}/spec/factories",
-          worker: "./spec/factories"
+          api: "#{api_path}/spec/factories",
+          worker: "#{worker_path}/spec/factories"
         }
       ]
     end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.5.9
+0.5.10

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.5.9
+0.5.10

metadata

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