uffizzi-cli 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d24e9582d66d329f45ab42194dfefbf1558843fbc94578dfc8b2127f0d7f3122
-  data.tar.gz: fa901b1e7257fc8c9384bcf11c4f41490f767dabbecbf039056aa8b0ed488f38
+  metadata.gz: 9f1280afea82284077769e8545880e7420aede5c114a837f3ae2e21482637bac
+  data.tar.gz: e9f5235cb793d83b710c291c62f5027f0226d400aa836f9ea56c18f95b474d06
 SHA512:
-  metadata.gz: cda766f7ab21158e56cfb5e5ea3dabd0416de0fd1d1671c268347465db66ce4a3864f3aa51be04a6fd789848fd6d86cbf2c3e62437aaaf63803f633b5ababc2e
-  data.tar.gz: d6e79d2994cc487a7986315371715e15a85d5d42659a4ea21361ac7e289219441ba6ee5e77468dd5380e1ee5a8b9214fed0a4894bb2b7c4f26353647c3954fcc
+  metadata.gz: ca04830842f417cb76799ae64c1106866a4d91a7774a07fa3c63fbbe726eac5ab78381c2059ef23a6157948b457984e723bc0e4273d6dbeda48d406379ebe3e4
+  data.tar.gz: 119bb3460dc17116351d4553400867b6225e6431614bdb6934d5f4dc1c532c0cf21b7d61a254210ac2a0eb0643d7183a6ac301b29ea352d81f6dc6feb6a339f2

data/lib/uffizzi/cli/dev.rb

@@ -222,8 +222,8 @@ module Uffizzi
     def launch_demonise_skaffold(config_path)
       Uffizzi.process.daemon(true)
 
-      at_exit do
-        DevService.delete_pid
+      Uffizzi.at_exit do
+        DevService.stop_process
       end
 
       DevService.save_pid
@@ -235,8 +235,8 @@ module Uffizzi
     end
 
     def launch_basic_skaffold(config_path)
-      at_exit do
-        DevService.delete_pid
+      Uffizzi.at_exit do
+        DevService.stop_process
       end
 
       DevService.save_pid

data/lib/uffizzi/services/dev_service.rb

@@ -32,13 +32,27 @@ class DevService
       dev_pid = running_pid
       skaffold_pid = running_skaffold_pid
 
-      Uffizzi.process.kill('INT', skaffold_pid)
-      Uffizzi.process.kill('INT', dev_pid)
+      begin
+        Uffizzi.process.kill('INT', skaffold_pid)
+      rescue Errno::ESRCH
+      end
+
+      wait_process_stop(skaffold_pid)
       delete_pid
+
+      Uffizzi.process.kill('INT', dev_pid)
     rescue Errno::ESRCH
       delete_pid
     end
 
+    def wait_process_stop(pid)
+      loop do
+        Uffizzi.process.kill(0, pid)
+        sleep(1)
+      end
+    rescue Errno::ESRCH
+    end
+
     def process_running?
       pid = running_pid
       return false unless pid.positive?
@@ -50,9 +64,9 @@ class DevService
     end
 
     def start_check_pid_file_existence
-      Thread.new do
+      Uffizzi.thread.new do
         loop do
-          Uffizzi.process.kill('QUIT', Uffizzi.process.pid) unless File.exist?(pid_path)
+          stop_process unless File.exist?(pid_path)
           sleep(1)
         end
       end
@@ -62,6 +76,8 @@ class DevService
       Uffizzi.ui.say('Start skaffold')
       cmd = build_skaffold_dev_command(config_path, options)
 
+      Uffizzi.signal.trap('INT') {}
+
       Uffizzi.ui.popen2e(cmd) do |_stdin, stdout_and_stderr, wait_thr|
         pid = wait_thr.pid
         skaffold_pid = find_skaffold_pid(pid)
@@ -198,13 +214,29 @@ class DevService
       Uffizzi::ConfigHelper.dev_environment
     end
 
-    def find_skaffold_pid(ppid)
-      ppid_regex = /\w*\s+\d+\s+#{ppid}.*\sskaffold dev/
-      pid_regex = /\w*\s+(\d+)\s+#{ppid}.*\sskaffold dev/
-
+    def find_skaffold_pid(pid)
+      pid_regex = /\w*#{pid}.*skaffold dev/
       io = Uffizzi.ui.popen('ps -ef')
-      ps = io.readlines.detect { |l| l.match?(ppid_regex) }
-      ps.match(pid_regex)[1]
+      processes = io.readlines.select { |l| l.match?(pid_regex) }
+
+      if processes.count.zero?
+        raise StandardError.new('Can\'t find skaffold process pid')
+      end
+
+      # HACK: For MacOS
+      if processes.count == 1
+        current_pid = processes[0].gsub(/\s+/, ' ').lstrip.split[1]
+        return pid if current_pid.to_s == pid.to_s
+
+        raise StandardError.new('Can\'t find skaffold process pid')
+      end
+
+      # HACK: For Linux
+      parent_process = processes
+        .map { |ps| ps.gsub(/\s+/, ' ').lstrip.split }
+        .detect { |ps| ps[2].to_s == pid.to_s }
+
+      parent_process[1]
     end
   end
 end

data/lib/uffizzi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uffizzi
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end

data/lib/uffizzi.rb

@@ -38,7 +38,19 @@ module Uffizzi
     end
 
     def process
-      @process ||= Process
+      Process
+    end
+
+    def signal
+      Signal
+    end
+
+    def thread
+      Thread
+    end
+
+    def at_exit(&block)
+      Kernel.at_exit(&block)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport