pais_legacy 2.6.15 → 2.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01d00fd53c7be1c79d65281b584b0393d0a8557ef909cee4184548dd463e24ff
-  data.tar.gz: b1d83b4364eb008560c59fa526ba7fbeabe595fb5a7c8adb2ad05d965f2fd2f1
+  metadata.gz: 4bc027926acd33cf21596f062b32a7df8e255025e55ee0d91430efc731b24eaf
+  data.tar.gz: 6cdb3bad8eff90e4e092f5ee5b8ac7bfa5157c80e9902ae8eaecf33e96fcfb2b
 SHA512:
-  metadata.gz: 8a93e3969cb80889cef14a1ec588a6295b8b92543ef2d7ca3e1d6eccb1ec3f7766c086beacb2ca40caf4e442eb1c72fd96f1227680405e3849e00d5dc0a43a4d
-  data.tar.gz: 79baa5c6be105b11e83ca2ce2e2588db30b95c671295df430eb35879ecb7c24ba3c30b4b0b3aef543f916db3ca0cf71d98da3ab8538749d0ff6715af8e5c041a
+  metadata.gz: 69c8e7b80e89a51907efeeae410cb387453b46884bc573ba00ea8a488c054f05f954b5801bc19cfc8b9a0aa3c782a6781df1ec23b3ad5e1ed091e55c8c6be849
+  data.tar.gz: 1a86989dbb53199054fed3d54bc795595a8c41c4a941c68ca9f41d0bda64c70656302c1afe5ff91ea193d54b999aeb3ef423edb31cd5354379e4190f9ea675dc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pais_legacy (2.6.13)
+    pais_legacy (2.6.17)
       net-ssh
       pastel (~> 0.8)
 
@@ -10,24 +10,24 @@ GEM
   specs:
     ast (2.4.3)
     byebug (12.0.0)
-    json (2.12.2)
+    json (2.17.1)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
-    minitest (5.25.5)
+    minitest (5.26.2)
     mocha (1.16.1)
     net-ssh (7.3.0)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
     pastel (0.8.0)
       tty-color (~> 0.5)
-    prism (1.4.0)
+    prism (1.6.0)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.3.0)
-    regexp_parser (2.10.0)
-    rubocop (1.77.0)
+    rake (13.3.1)
+    regexp_parser (2.11.3)
+    rubocop (1.81.7)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -35,18 +35,18 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.45.1, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.48.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     ruby-progressbar (1.13.0)
     timecop (0.9.10)
     tty-color (0.6.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
 
 PLATFORMS
   x86_64-linux

data/lib/pais_legacy/version.rb

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

data/lib/pais_legacy.rb

@@ -2,22 +2,22 @@
 
 require 'date'
 require 'json'                  # Output
-require "open3"                 # File I/O
+require 'open3'                 # File I/O
 require 'pastel'                # TTY Color
 require 'net/ssh'
-require 'byebug' unless ENV["RACK_ENV"] == "production" or ENV["RAILS_ENV"] == "production"
+require 'byebug' unless ENV['RACK_ENV'] == 'production' or ENV['RAILS_ENV'] == 'production'
 
-require_relative "pais_legacy/trial_balance"
-require_relative "pais_legacy/version"
+require_relative 'pais_legacy/trial_balance'
+require_relative 'pais_legacy/version'
 
 module PaisLegacy
   class Error < StandardError; end
 
   class Pais
-    #SERVER="192.168.200.4"
-    SERVER="pais.com.au"
-    USER="map7"
-    KEY="/home/map7/.ssh/id_rsa"
+    #SERVER='192.168.200.4'
+    SERVER='pais.com.au'
+    USER='map7'
+    KEY='/home/map7/.ssh/id_rsa'
 
     MAX_RETRIES = 5
     RETRY_DELAY = 1 # seconds
@@ -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
@@ -103,9 +113,9 @@ module PaisLegacy
     # --------------------------------------------------------------------------------
     def self.clfi_read_cmd(client=nil)
       if client
-        pais_api("clfi_read ","10000",client)
+        pais_api('clfi_read ','10000',client)
       else
-        pais_api("clfi_read ","10000")
+        pais_api('clfi_read ','10000')
       end
     end
 
@@ -119,9 +129,9 @@ module PaisLegacy
     # --------------------------------------------------------------------------------
     def self.glfi_read_cmd(ledger=nil)
       if ledger
-        pais_api("glfi_read",ledger)
+        pais_api('glfi_read',ledger)
       else
-        pais_api("glfi_read")
+        pais_api('glfi_read')
       end
     end
 
@@ -136,16 +146,16 @@ module PaisLegacy
     # Accounts
     # --------------------------------------------------------------------------------
     def self.glch_read_cmd(ledger)
-      pais_api("glch_read",ledger)
+      pais_api('glch_read',ledger)
     end
 
     def self.glch_read(ledger)
       # out=execute_ssh_command(glch_read_cmd(ledger.to_s))
       # out.
-      #   split("\n").
-      #   map{|line| line.split(",")}.
+      #   split('\n').
+      #   map{|line| line.split(',')}.
       #   map{|line| {value: line[0], text: "#{line[0]}-#{line[1]}"}}
-      glch_read_all(ledger)["accounts"].map {|h| {value: h["code"], text: "#{h['code']}-#{h['description']}"}}
+      glch_read_all(ledger)['accounts'].map {|h| {value: h['code'], text: "#{h['code']}-#{h['description']}"}}
     end
 
     def self.glch_read_all(ledger)
@@ -156,21 +166,21 @@ module PaisLegacy
 
 
     # SCREEN T1 10000 1 999999 0 0 0 001 0 9999 0 9999 0 3 N Y N 5200 6153 1 6110 6 A 1 30/06/2023
-    def self.raw(params,program="rdefi00a")
+    def self.raw(params,program='rdefi00a')
       params = params.gsub(" "," \\")
 
       # cmd = ssh + ' "bash -c \"'+ fglgo("rptrun") +' pgs 1 pais '+program+' \''+ params + ' \' \""'
-      cmd =  fglgo("rptrun") +' api 1 pais '+program+' \''+ params + ' \' '
+      cmd =  fglgo('rptrun') +' api 1 pais '+program+' \''+ params + ' \' '
 
       out=execute_ssh_command(cmd)
       [out]
     end
 
-    def self.raw_zsh(params,program="rdefi00a")
+    def self.raw_zsh(params,program='rdefi00a')
       params = params.gsub(" "," \\")
 
       cmd = 'zsh -c "'+ fglgo("rptrun") +' api 1 pais '+program+' \''+ params + ' \' "'
-      stdout, stderr, status_=Open3.capture3(cmd)
+      stdout, _stderr, _status = Open3.capture3(cmd)
       [stdout]
     end
 
@@ -178,17 +188,17 @@ module PaisLegacy
     # Performance Report
     # --------------------------------------------------------------------------------
     # '\SCREEN \T1 \336 \spar \N \2 \1 \2 \3 \4 \5 \01/07/2021 \30/06/2022 '
-    def self.get_performance(ledger = "1", date_to = "30/06/2022",prior=false,from=1,to=9999)
-      program="rglch10a"
+    def self.get_performance(ledger = '1', date_to = '30/06/2022',prior=false,from=1,to=9999)
+      program='rglch10a'
 
       date_to = Date.parse(date_to)
       date_to = Date.parse("30/06/#{date_to.year}")
       date_from = Date.parse("01/07/#{date_to.year - 1}")
 
-      cmd = fglgo("rptrun") +' pgs 1 pais {{program}} \'\{{printer}} \{{ccode}} \{{ledger}} \spar \N \2 \1 \2 \3 \4 \5 \{{date_from}} \{{date_to}} \' '
+      cmd = fglgo('rptrun') +' pgs 1 pais {{program}} \'\{{printer}} \{{ccode}} \{{ledger}} \spar \N \2 \1 \2 \3 \4 \5 \{{date_from}} \{{date_to}} \' '
         .gsub("{{program}}",program)
-        .gsub("{{printer}}","SCREEN")
-        .gsub("{{ccode}}","T1")
+        .gsub("{{printer}}",'SCREEN')
+        .gsub("{{ccode}}",'T1')
         .gsub("{{ledger}}",ledger)
         .gsub("{{account_from}}",from.to_s)
         .gsub("{{account_to}}",to.to_s)
@@ -204,7 +214,7 @@ module PaisLegacy
     # --------------------------------------------------------------------------------
     # Trial Balance
     # --------------------------------------------------------------------------------
-    def self.get_trial_balance(ledger = "1", date_to = "30/06/2021",prior=false,from=1,to=9999)
+    def self.get_trial_balance(ledger = '1', date_to = '30/06/2021',prior=false,from=1,to=9999)
       if prior
         program="rglch01p"
       else
@@ -515,7 +525,7 @@ module PaisLegacy
     end
 
     def self.table_unload(table)
-      out=execute_ssh_command(table_unload_cmd(table))
+      _out = execute_ssh_command(table_unload_cmd(table))
     end
 
     def self.tables_cmd

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pais_legacy
 version: !ruby/object:Gem::Version
-  version: 2.6.15
+  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: []