pais_legacy 2.6.16 → 2.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b14cd12b4599a01e634b5402905338ea560ed612fb3e741353996f803681edf
-  data.tar.gz: 7b09991342fb3d5a32f44038813ecc1ac6d10be4b268f39dcbfaa8ebe8ab6d01
+  metadata.gz: 4bc027926acd33cf21596f062b32a7df8e255025e55ee0d91430efc731b24eaf
+  data.tar.gz: 6cdb3bad8eff90e4e092f5ee5b8ac7bfa5157c80e9902ae8eaecf33e96fcfb2b
 SHA512:
-  metadata.gz: 717c645f192c85c726a43cfbc5e3407044fe17dc2555c49b71bed9517ecfce4917787cc1a4440259c9e35126c19f1631d4a1dd198934a26f175d8428bbf7c4f2
-  data.tar.gz: 37ef988bcc0f47a31dcc47f612dd9f0af0c3429984b71b1ce4bd4ed788dd15507f22df5884e35243354ed4ea344c072746063ec2a851b67df43ce0b99a38ac35
+  metadata.gz: 69c8e7b80e89a51907efeeae410cb387453b46884bc573ba00ea8a488c054f05f954b5801bc19cfc8b9a0aa3c782a6781df1ec23b3ad5e1ed091e55c8c6be849
+  data.tar.gz: 1a86989dbb53199054fed3d54bc795595a8c41c4a941c68ca9f41d0bda64c70656302c1afe5ff91ea193d54b999aeb3ef423edb31cd5354379e4190f9ea675dc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pais_legacy (2.6.15)
+    pais_legacy (2.6.17)
       net-ssh
       pastel (~> 0.8)
 

data/lib/pais_legacy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PaisLegacy
-  VERSION = "2.6.16"
+  VERSION = "2.6.17"
 end

data/lib/pais_legacy.rb

@@ -31,36 +31,50 @@ module PaisLegacy
     end
 
     def self.execute_ssh_command(command)
-      output = ''
+      stdout = ''
+      stderr = ''
+      exit_status = nil
       retries = 0
 
       begin
-
-        # Start an SSH session
+        stdout = ''
+        stderr = ''
+        exit_status = nil
+
+        # Start an SSH session.
+        #
+        # No pty is requested, deliberately. A pty merges the remote stderr
+        # into stdout, so any notice from the remote side (a `docker compose`
+        # "variable is not set" WARN, an ANSI colour code, a 4GL error) lands
+        # in the middle of the JSON we are about to parse. A pty also sets
+        # SSH_TTY, which makes the remote `fglgo` wrapper take its interactive
+        # branch: it names the 4GL container after the tty number and stops
+        # whatever already holds that name, so two callers landing on the same
+        # recycled tty number collide with each other.
         Net::SSH.start(SERVER,USER,keys: [KEY]) do |ssh|
           # Open a new SSH channel
           ssh.open_channel do |channel|
-            # Request a pseudo-tty
-            channel.request_pty do |ch, success|
-              raise 'Could not obtain pty' unless success
-
-              # Execute the command
-              ch.exec(command) do |ch, success|
-                raise 'Could not execute command' unless success
-
-                # Collect the data received from the command's standard output
-                ch.on_data do |c, data|
-                  output += data
-                end
-
-                # Collect the data received from the command's standard error
-                ch.on_extended_data do |c, type, data|
-                  output += "stderr: #{data}"
-                end
-
-                ch.on_close do
-                  puts 'Command execution finished' if ENV['DEBUG'] == 'true'
-                end
+            # Execute the command
+            channel.exec(command) do |ch, success|
+              raise 'Could not execute command' unless success
+
+              # Collect the data received from the command's standard output
+              ch.on_data do |c, data|
+                stdout += data
+              end
+
+              # Collect the data received from the command's standard error,
+              # kept apart from stdout so it cannot corrupt the payload
+              ch.on_extended_data do |c, type, data|
+                stderr += data
+              end
+
+              ch.on_request('exit-status') do |c, data|
+                exit_status = data.read_long
+              end
+
+              ch.on_close do
+                puts 'Command execution finished' if ENV['DEBUG'] == 'true'
               end
             end
           end
@@ -69,31 +83,27 @@ module PaisLegacy
           ssh.loop
         end
 
-      rescue Net::SSH::ConnectionTimeout => e
+      rescue Net::SSH::ConnectionTimeout, Errno::ECONNRESET => e
         retries += 1
         if retries <= MAX_RETRIES
-          puts "Connection timed out, retrying (#{retries}/#{MAX_RETRIES})..." if ENV['DEBUG'] == 'true'
+          puts "#{e.class}, retrying (#{retries}/#{MAX_RETRIES})..." if ENV['DEBUG'] == 'true'
           sleep RETRY_DELAY
           retry
-        else
-          puts 'Max retries reached. Could not connect.' if ENV['DEBUG'] == 'true'
         end
+        raise Error, "#{command}: #{e.class} after #{MAX_RETRIES} retries"
+      end
 
-      rescue Errno::ECONNRESET => e
-        retries += 1
-        if retries <= MAX_RETRIES
-          puts "Connection reset by peer, retrying (#{retries}/#{MAX_RETRIES})..." if ENV['DEBUG'] == 'true'
-          sleep RETRY_DELAY
-          retry
-        else
-          puts 'Max retries reached. Could not connect.' if ENV['DEBUG'] == 'true'
-        end
+      # Fail loudly rather than handing back a partial or empty payload for
+      # the caller to trip over in JSON.parse.
+      unless exit_status.nil? || exit_status.zero?
+        raise Error, "#{command} exited #{exit_status}: #{stderr.strip}"
+      end
 
-      rescue StandardError => e
-        puts "An error occurred: #{e.message}" if ENV['DEBUG'] == 'true'
+      if stdout.empty? && !stderr.empty?
+        raise Error, "#{command} produced no output: #{stderr.strip}"
       end
 
-      output
+      stdout
     end
 
     # delegate :execute_ssh_command, to: :class

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pais_legacy
 version: !ruby/object:Gem::Version
-  version: 2.6.16
+  version: 2.6.17
 platform: ruby
 authors:
 - Michael Pope
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.2
 specification_version: 4
 summary: PAIS Legacy API Wrapper
 test_files: []