pais_legacy 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 137cd19045ff9caec78e7a880fff8977cc11e948695f423248a153aca9bc6a57
-  data.tar.gz: 6a58fc1f86ce0d878ebc08545f158142d5f573d9359dd92fe384e89aadb37574
+  metadata.gz: a9f69175d350cb7e66382799b7fe36e26161394599e0060abb5139019ddfd165
+  data.tar.gz: 900892b5404050052d8e3963f3e31be6c0ea843ccd6ab27b289ac19ef0c36ba2
 SHA512:
-  metadata.gz: d78b12afd356b6cc43aa342119fd179a2ae0b9564522cec6b25068adb62c2f4078703fbf12cb7eecfe7c40d76757ebc22a3e61440a8a03e66412c7b8d1cedd71
-  data.tar.gz: d163add0cd7db3fbb08d238a3da0997d7d260750d1c7ff22fd4767182b94a46c9f6e37910597080feaa1d2218ff729b5b9b9c3a551d67f2335b07086c8d79d9c
+  metadata.gz: 02f01d3ffd046c32215fde925367e8aee9b59f844c018e515fed8646cd25c225ba66272a125d100d88d1c900b55620f15e0506a58a18a3cbbdc1f35715d4230a
+  data.tar.gz: 7d3aff622d67f4a4f44cfc159513733303aa7997542420c718ea86a33b615d0b2413d8d84e1d97a12e1dbb6d7a24d89fb0b8ffa9b8dfc3fdbe9fb2cac8a855ad

data/lib/pais_legacy/version.rb

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

data/lib/pais_legacy.rb

@@ -4,6 +4,8 @@ require 'date'
 require 'json'                  # Output
 require "open3"                 # File I/O
 require 'pastel'                # TTY Color
+require 'net/ssh'
+require 'byebug'
 
 require_relative "pais_legacy/trial_balance"
 require_relative "pais_legacy/version"
@@ -18,6 +20,45 @@ module PaisLegacy
     CLEARING_ACCOUNT=5199
     TB_DIRECT_ACCOUNT=8999
     
+    def self.execute_ssh_command(command)
+      output = ""
+
+      # Start an SSH session
+      Net::SSH.start(SERVER) 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"
+              end
+            end
+          end
+        end
+
+        # Keep the session open until the command execution is finished
+        ssh.loop
+      end
+
+      output
+    end
+
     # --------------------------------------------------------------------------------
     # Client
     # --------------------------------------------------------------------------------
@@ -30,7 +71,7 @@ module PaisLegacy
     end
 
     def self.clfi_read(client=nil)
-      out,_,_=Open3.capture2(clfi_read_cmd(client.to_s))
+      out=execute_ssh_command(clfi_read_cmd(client.to_s))
       JSON.parse(out)
     end
 
@@ -46,7 +87,9 @@ module PaisLegacy
     end
 
     def self.glfi_read(ledger=nil)
-      out,_,_=Open3.capture2(glfi_read_cmd(ledger.to_s))
+      # out,stderr,status=Open3.capture2(glfi_read_cmd(ledger.to_s))
+      out=execute_ssh_command(glfi_read_cmd(ledger.to_s))
+
       JSON.parse(out)
     end
 
@@ -58,7 +101,7 @@ module PaisLegacy
     end
 
     def self.glch_read(ledger)
-      # out,_,_=Open3.capture2(glch_read_cmd(ledger.to_s))
+      # out=execute_ssh_command(glch_read_cmd(ledger.to_s))
       # out.
       #   split("\n").
       #   map{|line| line.split(",")}.
@@ -67,7 +110,8 @@ module PaisLegacy
     end
 
     def self.glch_read_all(ledger)
-      out,_,_=Open3.capture2(glch_read_cmd(ledger.to_s))
+      puts glch_read_cmd(ledger.to_s)
+      out=execute_ssh_command(glch_read_cmd(ledger.to_s))
       JSON.parse(out)
     end
 
@@ -76,15 +120,17 @@ module PaisLegacy
     def self.raw(params,program="rdefi00a")
       params = params.gsub(" "," \\")
 
-      cmd = ssh + ' "bash -c \"'+ fglgo("rptrun") +' pgs 1 pais '+program+' \''+ params + ' \' \""'
-      out,_,_=Open3.capture2(cmd)
+      # cmd = ssh + ' "bash -c \"'+ fglgo("rptrun") +' pgs 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")
       params = params.gsub(" "," \\")
 
-      cmd = 'zsh -c "'+ fglgo("rptrun") +' pgs 1 pais '+program+' \''+ params + ' \' "'
+      cmd = 'zsh -c "'+ fglgo("rptrun") +' api 1 pais '+program+' \''+ params + ' \' "'
       stdout, stderr, status_=Open3.capture3(cmd)
       [stdout]
     end
@@ -100,7 +146,7 @@ module PaisLegacy
       date_to = Date.parse("30/06/#{date_to.year}")
       date_from = Date.parse("01/07/#{date_to.year - 1}")
 
-      cmd = ssh + ' "bash -c \"'+ 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")
@@ -112,7 +158,7 @@ module PaisLegacy
         .gsub("{{report_type}}","1")
         .gsub("{{subaccs}}","N")
 
-      out,_,_=Open3.capture2(cmd)
+      out=execute_ssh_command(cmd)
       [out]
     end
 
@@ -126,7 +172,7 @@ module PaisLegacy
         program="rglch01a"
       end
 
-      cmd = ssh + ' "bash -c \"'+ fglgo("rptrun") +' pgs 1 pais {{program}} \'\{{printer}} \{{ccode}} \{{ledger}} \spar \{{account_from}} \{{account_to}} \{{date}}\ \1 \N\' \""'
+      cmd = fglgo("rptrun") +' pgs 1 pais {{program}} \'\{{printer}} \{{ccode}} \{{ledger}} \spar \{{account_from}} \{{account_to}} \{{date}}\ \1 \N\' '
         .gsub("{{program}}",program)
         .gsub("{{printer}}","SCREEN")
         .gsub("{{ccode}}","T1")
@@ -137,7 +183,7 @@ module PaisLegacy
         .gsub("{{report_type}}","1")
         .gsub("{{subaccs}}","N")
 
-      out,_,_=Open3.capture2(cmd)
+      out=execute_ssh_command(cmd)
 
       # if from and to
       #   out.split("\n").each_with_index do |line,index|
@@ -217,7 +263,11 @@ module PaisLegacy
     end
 
     def self.pais_api(file,ledger,options="")
-      ssh + ' "bash -c \"' + fglgo(file) + ' {{ccode}} {{ledger}} {{options}}\""'
+      # ssh + ' "bash -c \"' + fglgo(file) + ' {{ccode}} {{ledger}} {{options}}\""'
+      #   .gsub("{{ccode}}","T1")
+      #   .gsub("{{ledger}}",ledger.to_s)
+      #   .gsub("{{options}}",options)
+      fglgo(file) + ' {{ccode}} {{ledger}} {{options}}'
         .gsub("{{ccode}}","T1")
         .gsub("{{ledger}}",ledger.to_s)
         .gsub("{{options}}",options)
@@ -228,18 +278,18 @@ module PaisLegacy
     end
 
     def self.lasttrnno_read(ledger)
-      out,_,_=Open3.capture2(lasttrnno_read_cmd(ledger.to_s))
+      out=execute_ssh_command(lasttrnno_read_cmd(ledger.to_s))
       out.strip
     end
 
     def self.gltr_read_all(ledger,start_date,end_date)
-      cmd=ssh + ' "bash -c \"' + fglgo("gltr_read") + ' {{ccode}} {{ledger}} {{start_date}} {{end_date}}\""'
+      cmd=fglgo("gltr_read") + ' {{ccode}} {{ledger}} {{start_date}} {{end_date}}'
         .gsub("{{ccode}}","T1")
         .gsub("{{ledger}}",ledger.to_s)
         .gsub("{{start_date}}",start_date)
         .gsub("{{end_date}}",end_date)
 
-      out,_,_=Open3.capture2(cmd)
+      out=execute_ssh_command(cmd)
       JSON.parse(out)
     end
     
@@ -259,7 +309,7 @@ module PaisLegacy
     # Example of P&L for ledger 336 with 2 periods
     # '\SCREEN \T1 \336 \spar \N \2 \1 \Y \3 \4 \5 \N \01/07/2021 \30/06/2022 \N \ALL \ALL \N \2'
     def self.rptrun(ledger,date_to,from="0001",to="9999",program="rglch01a")
-      ssh + ' "bash -c \"'+ fglgo("rptrun") +' pgs 1 pais {{program}} \'\{{printer}} \{{ccode}} \{{ledger}} \spar \N \{{account_from}} \{{account_to}} \1 \{{report_type}} \{{subaccs}} \{{date}}\' N\""'
+      fglgo("rptrun") +' pgs 1 pais {{program}} \'\{{printer}} \{{ccode}} \{{ledger}} \spar \N \{{account_from}} \{{account_to}} \1 \{{report_type}} \{{subaccs}} \{{date}}\' N'
         .gsub("{{program}}",program)
         .gsub("{{printer}}","SCREEN")
         .gsub("{{ccode}}","T1")
@@ -288,7 +338,7 @@ module PaisLegacy
     end
 
     def self.common_ledger_date(cmd,ledger,end_date)
-      cmd=ssh + ' "bash -c \"' + fglgo(cmd) + ' {{ccode}} {{ledger}} {{end_date}}\""'
+      cmd=fglgo(cmd) + ' {{ccode}} {{ledger}} {{end_date}}'
         .gsub("{{ccode}}","T1")
         .gsub("{{ledger}}",ledger.to_s)
         .gsub("{{end_date}}",end_date)
@@ -309,13 +359,13 @@ module PaisLegacy
     # Invoice related
     # --------------------------------------------------------------------------------
     def legacy_import_invoices(ledger,date)
-      cmd=PaisLegacy::Pais.ssh + ' "bash -c \"' + PaisLegacy::Pais.fglgo("invo_read") + ' {{ccode}} {{ledger}} {{date}}\""'
+      cmd=PaisLegacy::Pais.fglgo("invo_read") + ' {{ccode}} {{ledger}} {{date}}'
         .gsub("{{ccode}}","T1")
         .gsub("{{ledger}}",ledger.to_s)
         .gsub("{{date}}",date)
 
       puts cmd
-      out,_,_=Open3.capture2(cmd)
+      out=execute_ssh_command(cmd)
       out.delete!("\\\\")
       begin
         out = JSON.parse(out)
@@ -332,7 +382,7 @@ module PaisLegacy
 
       date = Date.parse(date).strftime("%d/%m/%Y")
 
-      cmd=PaisLegacy::Pais.ssh + ' "bash -c \"' + PaisLegacy::Pais.fglgo("invo_read") + ' {{ccode}} {{ledger}} {{date}} {{inv_no}} {{client}}\""'
+      cmd=PaisLegacy::Pais.fglgo("invo_read") + ' {{ccode}} {{ledger}} {{date}} {{inv_no}} {{client}}'
         .gsub("{{ccode}}","T1")
         .gsub("{{ledger}}",ledger.to_s)
         .gsub("{{date}}",date)
@@ -340,7 +390,7 @@ module PaisLegacy
         .gsub("{{client}}",client)
 
       puts cmd
-      out,_,_=Open3.capture2(cmd)
+      out=execute_ssh_command(cmd)
 
       begin
         out = JSON.parse(out)
@@ -366,21 +416,21 @@ module PaisLegacy
     # --------------------------------------------------------------------------------
 
     def self.table_indexes_cmd(table)
-      ssh + ' "bash -c \"' + fglgo("db") + ' indexes\""'
+      fglgo("db") + ' indexes'
     end
 
     def self.table_indexes(table)
-      out,_,_=Open3.capture2(table_indexes_cmd(table))
+      out=execute_ssh_command(table_indexes_cmd(table))
       out.split("\n").select{|i| i =~ /^#{table}_/}
     end
 
     def self.table_schema_cmd(table)
-      ssh + ' "bash -c \"' + fglgo("db") + ' schema {{table}}\""'
+      fglgo("db") + ' schema {{table}}'
         .gsub("{{table}}",table)
     end
 
     def self.table_schema_raw(table)
-      out,_,_=Open3.capture2(table_schema_cmd(table))
+      out=execute_ssh_command(table_schema_cmd(table))
       out.split("\n")
     end
 
@@ -392,12 +442,12 @@ module PaisLegacy
     end
 
     def self.table_data_cmd(table)
-      ssh_with_tty + ' "bash -c \"' + fglgo("db") + ' data {{table}}\""'
+      fglgo("db") + ' data {{table}}'
         .gsub("{{table}}",table)
     end
 
     def self.table_data_raw(table)
-      out,_,_=Open3.capture2(table_data_cmd(table))
+      out=execute_ssh_command(table_data_cmd(table))
       out.split("\n")
     end
 
@@ -416,20 +466,20 @@ module PaisLegacy
     end
 
     def self.table_unload_cmd(table)
-      ssh + ' "bash -c \"' + fglgo("db") + ' unload {{table}}\""'
+      fglgo("db") + ' unload {{table}}'
         .gsub("{{table}}",table)
     end
 
     def self.table_unload(table)
-      out,_,_=Open3.capture2(table_unload_cmd(table))
+      out=execute_ssh_command(table_unload_cmd(table))
     end
 
     def self.tables_cmd
-      ssh + ' "bash -c \"' + fglgo("db") + ' tables\""'
+      fglgo("db") + ' tables'
     end
 
     def self.tables
-      out,_,_=Open3.capture2(tables_cmd)
+      out=execute_ssh_command(tables_cmd)
       out.split("\n")
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pais_legacy
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Michael Pope
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug