sandbox-adapter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5d358100e225bf920045edf88deedbeaacb2d1f90c57d83b9b6865d70df356a
-  data.tar.gz: 7b0744d3df1da971ae6d149845544735fb55cdaeea933ac9ff41811374d5f0c6
+  metadata.gz: 8621cc441678bf373fa97d36a3f9c34545c0482a306f6a15da3e9f873d486cec
+  data.tar.gz: d51db640d37a85125008f8ab5a71324e04fa4bdb514724792e4c9c0b1828d69a
 SHA512:
-  metadata.gz: a7839666cd9fb2a1b33c8d2ab83b9df921f196a830fa89523f9aa3338588d390ce20c9f2d8a1e08257a3313fabe24f0e95ea86a977f54f34556896e1d4b31bc1
-  data.tar.gz: 3ecb9325f46085582afe337c36bea87a375a71f5e9056b2ff8c99976bfc355fa86bade972f8eab6db0d003e3da63eeffe707dc3b625c51d72389b8fcec2448a1
+  metadata.gz: fd94042bf70fa5df59e241c48f4437136d8edd19a8946fe9710df436f344ae0847969da8fa90ca0fea7374964d19bb6ed44f95cd4d2fbafbb2517ff4bccba5ef
+  data.tar.gz: 8d53d6726db2b45498f9e3a2b1aa27516bc1443a53cae2e7af26c9f3cc040c62baae39814bcd69bdaa62e0ddb8db019836d9c5e6b7e309cf8ee034bb6b1d43d3

data/lib/sandbox/adapter/box.rb

@@ -30,20 +30,35 @@ class Sandbox::Adapter::Box
   end
 
   # Returns the exit status. env (symbol-keyed) is exported, dir is the working directory.
-  def run(command, env: {}, dir: nil, &)
-    @transport.exec(shell(script(command, env:, dir:)), &)
+  # `within` bounds a command that must not outlive a round (starting or following a detached one), on a
+  # transport that can.
+  def run(command, env: {}, dir: nil, within: nil, &)
+    line = shell(script(command, env:, dir:))
+    return @transport.exec(line, within:, &) if within && @transport.respond_to?(:bounded?)
+    @transport.exec(line, &)
   end
 
-  def run!(command, **, &)
-    status = run(command, **, &)
-    raise Failed, "exit #{status}: #{self.class.headline(command)}" unless status == 0
+  def run!(command, **, &block)
+    said = []
+    status = run(command, **) { |line| keep(said, line); block&.call(line) }
+    raise Failed, self.class.failure(status, command, said) unless status == 0
+  end
+
+  # How many of the last lines a failure carries.
+  TAIL = 5
+
+  # "exit 1: what the script does", then the last lines it printed: they say what went wrong.
+  def self.failure(status, command, said)
+    [ "exit #{status}: #{headline(command)}", said.join("\n").strip.presence ].compact.join("\n")
   end
 
   # The first line of a script that says what it does. A shell directive is not one: every script here
-  # opens with `set -e`, and a failure named after it says nothing about what failed.
+  # opens with `set -e`, and a failure named after it says nothing about what failed. A comment first
+  # names a script whose first command would not (a function it defines).
   DIRECTIVE = /\A(set|shopt|export|umask)\b/
   def self.headline(script)
-    script.to_s.lines.map(&:strip).reject { _1.empty? || _1.match?(DIRECTIVE) }.first.to_s
+    line = script.to_s.lines.map(&:strip).reject { _1.empty? || _1.match?(DIRECTIVE) }.first.to_s
+    line.start_with?("#") ? line.delete_prefix("#").strip : line
   end
 
   # Starts `command` in its own process group under `id`, survives this connection, and streams its output from
@@ -72,9 +87,10 @@ class Sandbox::Adapter::Box
     end
   end
 
-  def exec!(id, command, **, &)
-    status = exec(id, command, **, &)
-    raise Failed, "exit #{status}: #{self.class.headline(command)}" unless status == 0
+  def exec!(id, command, **, &block)
+    said = []
+    status = exec(id, command, **) { |line| keep(said, line); block&.call(line) }
+    raise Failed, self.class.failure(status, command, said) unless status == 0
   end
 
   # The bytes of a file on the box, over SFTP on a fresh connection.
@@ -104,6 +120,11 @@ class Sandbox::Adapter::Box
 
   private
 
+    def keep(said, line)
+      said << line
+      said.shift while said.size > TAIL
+    end
+
     # The script runs under `as` when there is one; the login stays what it is. A login shell, for the PATH
     # a box's profile sets, unless the transport brings its own environment (this machine).
     def shell(script)
@@ -141,15 +162,16 @@ class Sandbox::Adapter::Box
     end
 
     # The script and its log live under scratch/id. setsid makes the wrapper the group leader (its pid is the pgid);
-    # nohup keeps it alive when this session ends; the wrapper records the exit status last. Started already
+    # nohup keeps it alive when this session ends; the wrapper records the exit status last, and a handler
+    # on TERM keeps it alive through a cancel to record the command's 143. Started already
     # (a link dropped after the launch) is left alone.
     def start(id, script)
       d = "#{@dir}/#{id}"
-      run!(<<~SH, env: { NVOI_SCRIPT: script })
+      run!(<<~SH, env: { NVOI_SCRIPT: script }, within: ROUND)
       if [ -f #{d}/pid ] && [ ! -f #{d}/exit ] && kill -0 -- -$(cat #{d}/pid) 2>/dev/null; then exit 0; fi
       mkdir -p -m 700 #{d} && rm -f #{d}/exit
       printf '%s\\n' "$NVOI_SCRIPT" > #{d}/script && chmod 600 #{d}/script
-      setsid nohup bash -c 'echo $$ > #{d}/pid; bash #{d}/script > #{d}/log 2>&1; echo $? > #{d}/exit' >/dev/null 2>&1 &
+      setsid nohup bash -c 'trap : TERM; echo $$ > #{d}/pid; bash #{d}/script > #{d}/log 2>&1; echo $? > #{d}/exit' >/dev/null 2>&1 &
       for i in $(seq 1 50); do [ -f #{d}/pid ] && exit 0; sleep 0.1; done; exit 1
     SH
     end
@@ -173,7 +195,7 @@ class Sandbox::Adapter::Box
       # A round can end while the command is mid-line - apt prints "Generating locales..." and waits - and
       # the marker is then written onto the end of that line. What comes before it is output; the marker is
       # still the marker. Reading it only at the start of a line loses the round's status altogether.
-      run(cmd) do |line|
+      run(cmd, within: ROUND + 30) do |line|
         out, marker, code = line.match(MARKER)&.captures
         yield out if out.present? && status.nil? && !more
         if marker == "more" then more = true

data/lib/sandbox/adapter/version.rb

@@ -1,5 +1,5 @@
 module Sandbox
   module Adapter
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sandbox-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - nvoi