souls 0.48.1 → 0.48.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa05b4d9e6f1e1dcfa5dc51d60048bf7724cf9bec95febac0426b3a6ea362b9f
-  data.tar.gz: edcac235aa2f1f760df232a4a2e77805428f1380a26dbafc52257ffa2f7d3c81
+  metadata.gz: 58f55a316abed31c0fe01f91343cb1922319cf65d6840f32bbb630a87fe002c2
+  data.tar.gz: 0b0fe15d1c23524def03a6457ab63b1dc78675f596fc015b3f8b35b674d215a3
 SHA512:
-  metadata.gz: 302038e0b74ebe5552a08708c1f0d483ce0709ec75fee545bed16d056497fcd452d35d3d9f7b7b34b1cc43962fd5117cebe5b95f74f55139ab52e63ec74eafb3
-  data.tar.gz: 6ee9dc50622a972abc5a2d68b6c006babc4f50c3eb12267697a02e2ebd381e8f0ff635da1e4dadb5b003369f8c7c18dd752b9c9304f7a866b88f25dc3a668176
+  metadata.gz: 45a71d9f2e3fc0d1efe7737df6ff09c55600363643a5d8163e4818e159e0bf7fb7e7679bfb76e1405e034cc105efb4b80efe2ec59945f21e5382446910f048f4
+  data.tar.gz: 200dfcc6a26f1c94503ebbc8afae3c7db8f1d2740e90bfe594c67a0e4c628d7e3d7b10a760c5c3616d3d9900859c1b16147a5bbe945c308f24824a8aeb810089

data/exe/souls

@@ -10,37 +10,39 @@ begin
   case souls_command
   when "api"
     api_command = ARGV[1]
-    case api_command
-    when "generate", "g"
-      method_name = ARGV[2]
-      class_name = ARGV[3]
-      args = { class_name: class_name }
-      args[:mutation] = ARGV[4] if ARGV.size > 4
-      status = Paint["Running SOULs Generate Commands...", :yellow]
-      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
-        Whirly.status = status
-        Souls::Api::Generate.public_send(method_name, **args)
-        Whirly.status = "Done!"
-      end
-    when "update"
-      class_name = ARGV[2]
-      status = Paint["Running SOULs Update Commands...", :yellow]
-      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
-        Whirly.status = status
-        Souls::Api::Update.create_mutation(class_name: class_name)
-        Souls::Api::Update.update_mutation(class_name: class_name)
-        Souls::Api::Update.resolver(class_name: class_name)
-        Souls::Api::Update.type(class_name: class_name)
-        Souls::Api::Update.rspec_factory(class_name: class_name)
-        Souls::Api::Update.rspec_mutation(class_name: class_name)
-        Souls::Api::Update.rspec_resolver(class_name: class_name)
-        Whirly.status = "Done!"
+    Dir.chdir(Souls.get_api_path.to_s) do
+      case api_command
+      when "generate", "g"
+        method_name = ARGV[2]
+        class_name = ARGV[3]
+        args = { class_name: class_name }
+        args[:mutation] = ARGV[4] if ARGV.size > 4
+        status = Paint["Running SOULs Generate Commands...", :yellow]
+        Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+          Whirly.status = status
+          Souls::Api::Generate.public_send(method_name, **args)
+          Whirly.status = "Done!"
+        end
+      when "update"
+        class_name = ARGV[2]
+        status = Paint["Running SOULs Update Commands...", :yellow]
+        Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+          Whirly.status = status
+          Souls::Api::Update.create_mutation(class_name: class_name)
+          Souls::Api::Update.update_mutation(class_name: class_name)
+          Souls::Api::Update.resolver(class_name: class_name)
+          Souls::Api::Update.type(class_name: class_name)
+          Souls::Api::Update.rspec_factory(class_name: class_name)
+          Souls::Api::Update.rspec_mutation(class_name: class_name)
+          Souls::Api::Update.rspec_resolver(class_name: class_name)
+          Whirly.status = "Done!"
+        end
+      when "d", "delete"
+        class_name = ARGV[2]
+        Souls::Api::Generate.delete_all(class_name: class_name)
+      else
+        puts(Paint["Comannd doesn't exist.Check you command again!...", :red])
       end
-    when "d", "delete"
-      class_name = ARGV[2]
-      Souls::Api::Generate.delete_all(class_name: class_name)
-    else
-      puts(Paint["Comannd doesn't exist.Check you command again!...", :red])
     end
   when "worker"
     api_command = ARGV[1]

data/lib/souls/cli/create/index.rb

@@ -204,20 +204,12 @@ end
       end
 
       def download_worker(worker_name: "mailer")
-        raise(StandardError, "Can't use `worker` for worker. Change Name.") if worker_name == "worker"
-
-        current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
-        wrong_dir = %w[apps api worker]
-        if wrong_dir.include?(current_dir_name)
-          raise(StandardError, "You are at wrong directory!Go to Mother Directory!")
-        end
-
         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}"
         system("curl -OL #{url}")
-        system("tar -zxvf ./#{file_name} -C ./apps/")
-        system("mv apps/worker apps/#{worker_name}")
+        system("tar -zxvf ./#{file_name}")
+        system("mv ./worker apps/#{worker_name}")
         system("cp ./apps/api/config/database.yml ./apps/#{worker_name}/config/")
         FileUtils.rm(file_name)
       end

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

@@ -24,16 +24,26 @@ module Souls
                 next unless worker_switch
 
                 new_line.write("  config.workers = [\n")
-                workers.each do |worker|
+                workers.each_with_index do |worker, i|
                   base_url = Souls::Gcloud::Run.get_endpoint(worker_name: worker[:name])
                   endpoint = Souls.configuration.endpoint
-                  new_line.write(<<-TEXT)
-      {
-        name: "#{worker[:name]}",
-        endpoint: "#{base_url.strip}#{endpoint}",
-        port: #{worker[:port]}
-      },
-                  TEXT
+                  if (i + 1) == workers.size
+                    new_line.write(<<-TEXT)
+    {
+      name: "#{worker[:name]}",
+      endpoint: "#{base_url.strip}#{endpoint}",
+      port: #{worker[:port]}
+    }
+                    TEXT
+                  else
+                    new_line.write(<<-TEXT)
+    {
+      name: "#{worker[:name]}",
+      endpoint: "#{base_url.strip}#{endpoint}",
+      port: #{worker[:port]}
+    },
+                    TEXT
+                  end
                 end
                 break
               end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.27.1
+0.27.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.27.1
+0.27.2

metadata

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