et_full_system 1.0.1.pre4 → 1.0.1.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6beef42f9d18b4c7e277eb13c29ac2cd7e6c7faf8509f03479cf39db6c6a0516
-  data.tar.gz: 7c34827c01f39d2994555cb7429cd62a482c93cc5810a811aaa5684785637895
+  metadata.gz: ab79cfecf5e5450243e72e99999218e039ab75a473e87027b8f7f55ab189db48
+  data.tar.gz: 033e42be58542400d78c095f88f988d92a226249457d770cba93bb18d4a45b06
 SHA512:
-  metadata.gz: e2b5cc72dac96c68b58f7389b9c91b8a5de3bcf8ed562b7f411e07a7c94568cf6625cf3fd428b6aded5958b131ed41d38fcf534c0e969b4959f0f41e9f8e2ed0
-  data.tar.gz: a3de0af6328cb80a45e460bd5fccc1317c26569b51156a72bb7e255009149c69563fb869a7bb4fcb160b1353b6b663c296b1d0edd6a80a882e8906c91900da24
+  metadata.gz: 41fc8e7f1200d3861c00f5f95005c063b3afef3f2648e23bf476a924024626e768ce3635fc37035da49cbf9ea82bab02af4d2518a8933658b9d9ab804a92af9e
+  data.tar.gz: 63125fee8f0e26f4b6ccb034961edd1696ae5aeb6c9c01ab067ea23df94437b7a0873e902feb5514800fcd0cabce99018dc8548772b4b0dbc1f5469f12389f6d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (1.0.1.pre4)
+    et_full_system (1.0.1.pre5)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)

data/lib/et_full_system/cli/local.rb

@@ -101,15 +101,19 @@ module EtFullSystem
         end
         cmd = "CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} AZURITE_STORAGE_PATH=\"#{options[:azurite_storage_path]}\" MINIO_STORAGE_PATH=\"#{options[:minio_storage_path]}\" FS_ROOT_PATH=#{PROJECT_PATH} FOREMAN_PATH=#{GEM_PATH}/foreman godotenv -f #{GEM_PATH}/foreman/.env invoker start \"#{GEM_PATH}/foreman/Procfile\" --port=4000"
         STDERR.puts cmd
-        puts `#{cmd}`
-        return if without.empty?
-
-
-        stop_cmds = without.reduce([]) do |acc, service|
-          acc.concat(invoker_processes_for(service))
+        unless without.empty?
+          stop_cmds = without.reduce([]) do |acc, service|
+            acc.concat(invoker_processes_for(service))
+          end.map do |proc|
+            "invoker remove #{proc}"
+          end
+          stop_cmd = stop_cmds.join(' && ')
+          Thread.new do
+            sleep 5
+            puts `#{stop_cmd}`
+          end
         end
-        stop_cmd = stop_cmds.join(' && ')
-        puts `#{stop_cmd}`
+        exec cmd
       end
     end
 
@@ -164,6 +168,18 @@ module EtFullSystem
 
     private
 
+    def invoker_processes_for(service)
+      case service
+      when 'et1' then ['et1_web', 'et1_sidekiq']
+      when 'et3' then ['et3_web']
+      when 'api' then ['api_web', 'api_sidekiq']
+      when 'admin' then ['admin_web']
+      when 'atos_api' then ['atos_api_web']
+      when 'ccd_export' then ['et_ccd_export_web']
+      else raise "Unknown service #{service}"
+      end
+    end
+
     def procfile_services
       File.readlines("#{GEM_PATH}/foreman/Procfile").inject([]) do |acc, line|
         next if line.strip.start_with?('#')

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "1.0.1.pre4"
+  VERSION = "1.0.1.pre5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 1.0.1.pre4
+  version: 1.0.1.pre5
 platform: ruby
 authors:
 - Gary Taylor