souls 0.36.1 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6a59673cbe8fbbc5fd02e75a7ca5d04d5e190e0555be86f721c3ef3c1d33624
-  data.tar.gz: c4f4e094d3bc26d79c9d1bc37c2f15361f191335cc15fcc29a74e3c85af392ae
+  metadata.gz: 7f843f3295ec17169c7824a495e36bd0575a598622dd0f103e1f7aed2bf9336b
+  data.tar.gz: ce6c1e59f43dc68b4ec422a882afe5fe3181e45de743470c3c836caf137edf43
 SHA512:
-  metadata.gz: 1957d2a8a3a1389a2c6306c3a695f2c4e5e7b6ff03c46c9e552961a77c8f277a9a58c12a92ba27b5dc6d2791bfdf2a85a888decab54c0481ac2df8464fcdf6c4
-  data.tar.gz: 936917a7190919b9fb48b0aa69a08e09cfa9225b12bbbf94209bfc70e6acbca4a0e1d3f2568851e2dba2c88906315ca3673d7f676c4c436a974611fdf3be6558
+  metadata.gz: 2508e23509136d0ca103d9b818d51c36f570d7d0c5795121fe30eace9be3d514f9e8f3f72e90dc20b180d060b71260ea747f5c4284a31d3af1556fa945701d71
+  data.tar.gz: 38abb11be46fb55b3fea8a1bee97bfbf81fb8abd08b767bc706066e282dc3f992fb44f26bbc91677eca18ebe0142beb2cb35d52b565bbbc6011a1399e2eac172

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

@@ -2,6 +2,9 @@ module Souls
   module Create
     class << self
       def worker(worker_name: "mailer")
+        file_dir = "apps/#{worker_name}"
+        raise(StandardError, "Same Worker Already Exist!") if Dir.exist?(file_dir)
+
         workers = Souls.configuration.workers
         port = 3000 + workers.size
         download_worker(worker_name: worker_name)
@@ -10,6 +13,7 @@ module Souls
         workflow(worker_name: worker_name)
         procfile(worker_name: worker_name, port: port)
         mother_procfile(worker_name: worker_name)
+        souls_config_init(worker_name: worker_name)
       end
 
       def procfile(worker_name: "mailer", port: 3000)
@@ -173,6 +177,28 @@ end
         raise(StandardError, e)
       end
 
+      def souls_config_init(worker_name: "mailer")
+        app_name = Souls.configuration.app
+        project_id = Souls.configuration.project_id
+        config_dir = "apps/#{worker_name}/config"
+        FileUtils.mkdir_p(config_dir) unless Dir.exist?(config_dir)
+        FileUtils.touch("#{config_dir}/souls.rb")
+        file_path = "#{config_dir}/souls.rb"
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            Souls.configure do |config|
+              config.app = "#{app_name}"
+              config.project_id = "#{project_id}"
+              config.strain = "worker"
+              config.fixed_gems = ["excluded_gem"]
+              config.workers = []
+            end
+          TEXT
+        end
+      rescue StandardError => e
+        puts(e)
+      end
+
       def download_worker(worker_name: "mailer")
         raise(StandardError, "Can't use `worker` for worker. Change Name.") if worker_name == "worker"
 

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

@@ -2,88 +2,23 @@ module Souls
   module Sync
     class << self
       def model
-        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])
+        cp_dir = %w[db app/models spec/factories]
+        cp_dir.each do |dir|
+          cp_and_dl_files(dir: dir)
         end
       end
 
       private
 
-      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 cp_and_dl_files(api_dir: "", worker_dir: "")
-        if Dir["#{worker_dir}/*.rb"].blank?
-
-          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"])
-          # rubocop:disable Style/DateTime
-          api_latest_date = DateTime.parse(api_file_data.max)
-          worker_latest_date = DateTime.parse(worker_file_data.max)
-          # rubocop:enable Style/DateTime
-        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)
-          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)
-          system("cp -r #{api_dir}/* #{worker_dir}")
-        end
-      rescue StandardError => e
-        puts(Paint[e, :red])
-      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 = "."
+      def cp_and_dl_files(dir: "db")
+        worker_paths = Souls.configuration.workers.map { |n| n[:name] }
+        worker_paths.each do |path|
+          cp_path = "./apps/api/#{dir}"
+          old_path = "./apps/#{path}/#{dir}"
+          FileUtils.rm_rf(old_path) if Dir.exist?(old_path)
+          FileUtils.mkdir(old_path) unless Dir.exist?(old_path)
+          system("cp -r #{cp_path}/* #{old_path}", chdir: Souls.get_mother_path)
         end
-        [
-          {
-            api: "#{api_path}/db",
-            worker: "#{worker_path}/db"
-          },
-          {
-            api: "#{api_path}/app/models",
-            worker: "#{worker_path}/app/models"
-          },
-          {
-            api: "#{api_path}/spec/factories",
-            worker: "#{worker_path}/spec/factories"
-          }
-        ]
       end
     end
   end

data/lib/souls/index.rb

@@ -3,6 +3,7 @@ require_relative "./cli/index"
 require_relative "./init"
 require_relative "./version"
 require_relative "./worker/index"
+require_relative "./utils/index"
 
 module Souls
   module Api

data/lib/souls/utils/index.rb

@@ -0,0 +1,11 @@
+module Souls
+  module Utils
+    def get_mother_path
+      FileUtils.pwd.split(Souls.configuration.app)[0] + Souls.configuration.app
+    end
+
+    def get_api_path
+      FileUtils.pwd.split(Souls.configuration.app)[0] + Souls.configuration.app + "/apps/api"
+    end
+  end
+end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.15.1
+0.16.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.15.1
+0.16.0

data/lib/souls.rb

@@ -9,6 +9,7 @@ require "whirly"
 require "tty-prompt"
 
 module Souls
+  extend Souls::Utils
   SOULS_METHODS = %w[
     model
     query

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.36.1
+  version: 0.37.0
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -144,6 +144,7 @@ files:
 - lib/souls/cli/upgrade/index.rb
 - lib/souls/index.rb
 - lib/souls/init.rb
+- lib/souls/utils/index.rb
 - lib/souls/version.rb
 - lib/souls/versions/.souls_api_version
 - lib/souls/versions/.souls_worker_version
@@ -158,7 +159,7 @@ metadata:
   homepage_uri: https://souls.elsoul.nl
   source_code_uri: https://github.com/elsoul/souls
   changelog_uri: https://github.com/elsoul/souls
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -174,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key:
+signing_key: 
 specification_version: 4
 summary: SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
   クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。