run_tasks 3.0.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 857247c762c39960c83e5689ec558c8e39a5b36aafc84db9a8fd08931697df22
-  data.tar.gz: 90dd7fd4183acee7232f3c881c2fe550deeb4c326ca23c0c10fd7330b60d2b54
+  metadata.gz: '084c1d78bfaaba922584b490202ecae778d7a43cc5258193635f2446aa5ad1b0'
+  data.tar.gz: 3986f2395f46c5e70895d38d711e04a2b314d000d5239c8417273c076fbe1632
 SHA512:
-  metadata.gz: cb448955e6889e99bdf60235edb7294af0c381a90c8dddf7d805fbcc7ce56d307dbafcf128ec2ff66f786184df5324743b4d60925894bb44012e6737f511ccc1
-  data.tar.gz: f96b6ea0d728dcaff2b851163bf173af427729dab2df12bbddaf6adef442117b88b77a4d3255d185384ffbe3521a36beb34470f4545e0a4d9b9f570216c4ae54
+  metadata.gz: 59e1e18beec130b63051e7f782b2f5f1e7c2a3316469b293870ffea871b61ba1ea70497fc5d4346a04355ca3ffad5b8594a6eb0de8baeca309f0dbbb29b7a234
+  data.tar.gz: a21c4d793c954ce6b017257b2fd6b946221ef2ce7d10b404d13daa7eb954bcc2bd90c869c9b703ad9ea556d5d8d0418a87fa7f5adbe3038a72a25d8f316ddfaa

data/src/run/core.rb

@@ -157,13 +157,7 @@ module Run
 
     # @return [String]
     def self.version
-      gemspec_files = Dir.glob(File.join(Dir.pwd, "*.gemspec"))
-
-      if gemspec_files.first
-        Gem::Specification::load(gemspec_files.first).version.to_s
-      else
-        Gemspec::Metadata.new("run_tasks").read.version
-      end
+      Gemspec::Metadata.new("run_tasks").read.version
     end
 
     # @return [Boolean]

data/src/run/helper/bind_helper.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
+require 'fiddle'
+
 module Run
   module Helper
     class BindHelper
       TERM_TIMEOUT = 3
       COLORS = %i[cyan magenta yellow green blue]
 
-      def initialize(*names)
+      def initialize(*names, stdin: nil)
         @names = names
+        @stdin_name = stdin
       end
 
       def run
@@ -15,10 +18,15 @@ module Run
         threads = []
         mutex = Mutex.new
         shutting_down = false
+        use_terminal = @stdin_name && $stdin.isatty
+
+        # Prevent SIGTTOU when the parent writes to the terminal while in background.
+        Signal.trap('TTOU', 'IGNORE') if use_terminal
 
         shutdown = lambda do
           return if shutting_down
           shutting_down = true
+          tcsetpgrp(Process.getpgrp) if use_terminal
           pgids.each_value { |pgid| Process.kill('TERM', -pgid) rescue nil }
           Thread.new do
             sleep TERM_TIMEOUT
@@ -31,13 +39,17 @@ module Run
 
         @names.each_with_index do |name, index|
           prefix = "[#{name}]".send(COLORS[index % COLORS.size])
-          rd, wr = IO.pipe
+          is_stdin_task = name == @stdin_name
+          rd, wr = IO.pipe unless is_stdin_task
 
           pid = fork do
-            rd.close
-            $stdout.reopen(wr)
-            $stderr.reopen(wr)
-            wr.close
+            unless is_stdin_task
+              rd.close
+              $stdout.reopen(wr)
+              $stderr.reopen(wr)
+              $stdin.reopen('/dev/null')
+              wr.close
+            end
             Process.setpgrp
             Signal.trap('TERM') { exit 0 }
             begin
@@ -50,12 +62,20 @@ module Run
             end
           end
 
-          wr.close
+          unless is_stdin_task
+            wr.close
+          end
+          # Set pgid from the parent too to avoid a race with tcsetpgrp below.
+          Process.setpgid(pid, pid) rescue nil
           pgids[name] = pid
 
-          threads << Thread.new(rd, prefix) do |pipe, pre|
-            pipe.each_line { |line| mutex.synchronize { STDOUT.write("#{pre} #{line}") } }
-            pipe.close
+          if is_stdin_task
+            tcsetpgrp(pid) if use_terminal
+          else
+            threads << Thread.new(rd, prefix) do |pipe, pre|
+              pipe.each_line { |line| mutex.synchronize { STDOUT.write("#{pre} #{line}") } }
+              pipe.close
+            end
           end
         end
 
@@ -69,6 +89,16 @@ module Run
 
         threads.each(&:join)
       end
+
+      private
+
+      def tcsetpgrp(pgid)
+        @_tcsetpgrp ||= begin
+          libc = Fiddle.dlopen(nil)
+          Fiddle::Function.new(libc['tcsetpgrp'], [Fiddle::TYPE_INT, Fiddle::TYPE_INT], Fiddle::TYPE_INT)
+        end
+        @_tcsetpgrp.call(0, pgid)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run_tasks
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Aurélien Delogu