souls 0.32.15 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42790d633f21b5a6ef881c214e3ed3a1e231ec7ff3649912633ba9584b5068ce
-  data.tar.gz: e98bad2e1ccdaf67fdcb501929410176fccbf10a7905f8aab6d18e0f9f673c36
+  metadata.gz: f1b47e28c2adf758f84a32496804bb599f505117d939614361a1653a504867ee
+  data.tar.gz: 052040ba9f653ab2c7c7c398ed2dd082f6fb3e371738a60792f029c4e261da2b
 SHA512:
-  metadata.gz: f4b248cf180be312dfe9e8dcf9a1f0b1e2bdb11d4287aa3fbbb84fa7dd515c66160d42bd7dd73e5c6e914833331e8af7bc110952dc333bd690721d419ebcd1c2
-  data.tar.gz: 81bdb2f2d87808c3bf17a73fe43e5e07d5e29967fad84b3f54219644441500af9451b39747fdf3fbd4901759d8e846d544eeba33b05b5528e08f581647e7579a
+  metadata.gz: bbb253ebe930a4953e8e469bef9766a26adcfcffff85c1535bccbe8f8c38ed4db64125032b9e24c642245b5b19ff6849c716af08de3d4473167a357659a871a5
+  data.tar.gz: c7e72bf2018d6b6a985cd913f9d034d1899ea86890901ae20e7751dca801b7b4d401d148b9f99a9de986dc666886bd52ef9501c93ad1767f465f1ed64a5058c2

data/exe/souls

@@ -138,7 +138,7 @@ begin
       Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
         Whirly.status = status
         Souls::Sync.model
-        Whirly.status = "API and Worker Both Models Synced!"
+        Whirly.status = Paint["API and Worker Both Models Synced!", :green]
       end
     else
       puts(Paint["Comannd doesn't exist.Check you command again!...", :red])

data/lib/souls/cli/sync/model.rb

@@ -43,27 +43,21 @@ module Souls
           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)
+          api_latest_date = Time.parse(api_file_data.max)
+          worker_latest_date = Time.parse(worker_file_data.max)
         end
 
         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)
-          if api_dir.include?("database.yml")
-            system("cp #{worker_dir} #{api_dir}")
-          else
-            system("cp -r #{worker_dir}/* #{api_dir}")
-          end
+          system("cp -r #{worker_dir}/* #{api_dir}")
         else
           FileUtils.rm_rf(worker_dir) if Dir.exist?(worker_dir)
           FileUtils.mkdir(worker_dir) unless Dir.exist?(worker_dir)
-          if api_dir.include?("database.yml")
-            system("cp #{api_dir} #{worker_dir}")
-          else
-            system("cp -r #{api_dir}/* #{worker_dir}")
-          end
+          system("cp -r #{api_dir}/* #{worker_dir}")
         end
+      rescue StandardError => e
+        puts(Paint["`souls api g scaffold $model` at `api` dir first!", :red])
       end
 
       def get_models_path(service_name: "api")
@@ -87,10 +81,6 @@ module Souls
           {
             api: "#{api_path}/spec/factories",
             worker: "#{worker_path}/spec/factories"
-          },
-          {
-            api: "#{api_path}/config/database.yml",
-            worker: "#{worker_path}/config/database.yml"
           }
         ]
       end

data/lib/souls/init.rb

@@ -9,6 +9,29 @@ module Souls
       data[0]["tag_name"]
     end
 
+    def self.generate_cd
+      shell = `echo $SHELL`.strip
+      rc =
+        if shell.include?("zsh")
+          "zshrc"
+        else
+          "bash"
+        end
+      system("echo 'alias api=\'cd apps/api\'' >> ~/.#{rc}")
+      system("echo 'alias mother=\'...\'' >> ~/.#{rc}")
+      system("echo 'alias worker=\'cd apps/worker\'' >> ~/.#{rc}")
+      puts(Paint["run `source ~/.#{rc}` to reflect your .#{rc}", :yellow])
+      puts(Paint["You can move to mother/api/worker just type", :green])
+      puts(Paint["\nmother\n", :white])
+      puts(
+        Paint["to go back to mother dir from api/worker\n\nYou can also go to api/worker from mother dir by typing",
+              :green]
+      )
+      puts(Paint["\napi\n", :white])
+      puts(Paint["or\n", :green])
+      puts(Paint["worker", :white])
+    end
+
     def self.initial_config_init(app_name: "souls", service_name: "api")
       config_dir = "./#{app_name}/apps/#{service_name}/config"
       FileUtils.mkdir_p(config_dir) unless Dir.exist?(config_dir)
@@ -136,6 +159,7 @@ module Souls
       system("curl -OL #{url}")
       system("mkdir -p ./apps/worker")
       system("tar -zxvf ./#{file_name} -C ./apps/")
+      system("cp ./apps/api/config/database.yml ./apps/worker/config/")
       FileUtils.rm(file_name)
       line = Paint["====================================", :yellow]
       puts("\n")
@@ -163,7 +187,7 @@ module Souls
         Easy to Run
         $ cd ./apps/worker
         $ bundle
-        $ souls model:update
+        $ souls sync model
         $ souls s
         Go To : http://localhost:3000
 

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.11.15
+0.12.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.11.15
+0.12.0

metadata

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