sapos-print 1.0.7 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6676d897cee608283071d8a13da6989e1db58cbbab4f4ba819be4b6fc9f80b30
-  data.tar.gz: 7c59412ee4b5d748389662823f5b9502d2aee835d1261c21c9673cee0d561da2
+  metadata.gz: 1cf330a4cbd6cebe38d5f2c8226e11527f7f498670988f8803ad2ca36338cb7f
+  data.tar.gz: 7339239ef96714e6f0b7599072eb5b2aa55b9f69f8fa8614a6d9cf78fbf508f9
 SHA512:
-  metadata.gz: cc05e1cdecdca5672a07e874afe94dce4232af5ab3c159352897e61222a24a91a25cbf894fca48cd464fbbbe12d166815e6828fbebece534c12bf27b2b020937
-  data.tar.gz: c1300e4a85fb10fdcba5b1df562b3bcdbb73f612dccea867590ce0fd492fb32b9002c10483c451500a9c8861168f9e97838dc6511f15d76dbd88d5f201924805
+  metadata.gz: 8e740b34123da68ec66c0ba165e9f9e06818e46620aed83796ebfc73bea3aef09dbb970d6ce6b9a7914846d9c3316f0cc17b04e1db93a757746235cd2a208585
+  data.tar.gz: 3cfeb286303fbd876f7e45986d857c022315efeace92f2140bb2d90daa05293025df96601359f765c213d4311aa5d3794e001baa14265ba939828be5dfe9c0b3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sapos-print (1.0.6)
+    sapos-print (1.0.7)
       activesupport
       awesome_print
       json
@@ -12,29 +12,29 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     awesome_print (1.9.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     concurrent-ruby-edge (0.5.0)
       concurrent-ruby (~> 1.1.5)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dry-configurable (0.14.0)
-      concurrent-ruby (~> 1.0)
+    dry-configurable (0.16.1)
       dry-core (~> 0.6)
-    dry-container (0.9.0)
+      zeitwerk (~> 2.6)
+    dry-container (0.11.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-    dry-core (0.7.1)
+    dry-core (0.9.1)
       concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
     dry-inflector (0.2.1)
-    dry-initializer (3.1.1)
+    dry-initializer (3.0.4)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
@@ -58,18 +58,18 @@ GEM
       dry-initializer (~> 3.0)
       dry-schema (~> 1.8, >= 1.8.0)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.9.1)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.1)
+    json (2.6.2)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    minitest (5.15.0)
+    minitest (5.17.0)
     netrc (0.11.0)
-    public_suffix (4.0.6)
+    public_suffix (5.0.1)
     pubnub (4.8.0)
       addressable (>= 2.0.0)
       concurrent-ruby (~> 1.1.5)
@@ -85,11 +85,12 @@ GEM
       netrc (~> 0.8)
     thor (1.2.1)
     timers (4.3.3)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.2)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   arm64-darwin-21

data/lib/sapos/print/cli.rb

@@ -10,8 +10,14 @@ module Sapos
         config = {}
         
         url = ask("Configuration URL")
-        response = RestClient.get(url)
-        data = JSON.parse(response)
+        if url.eql?('manual')
+          data = {}
+          data["channel"] = ask("Channel:")
+          data["key"] = ask("Queue Key")
+        else
+          response = RestClient.get(url)
+          data = JSON.parse(response)
+        end
         
         config_file = "#{Sapos::Print.app_directory}/config.yml"
         user_id = nil
@@ -38,16 +44,19 @@ module Sapos
       end
       
       desc "start", "run service"
+      option :verbose, type: :boolean
       def start
         info
         config = Sapos::Print.config
-        puts ["Q=#{config.q.to_s}", "Printer=#{config.printer.to_s}", "Adapter=#{config.adapter.to_s}", "Interface=#{config.interface}"].join("\n")
+        puts ["Q=#{config.q.to_s}", "Printer=#{config.printer.to_s}", "Adapter=#{config.adapter.to_s}", "Interface=#{config.interface}"].join(";")
         
         print_dir = File.join(Sapos::Print.app_directory, 'print')
         if File.exists?(print_dir)
-          FileUtils.rm_rf Dir.glob("#{print_dir}/*")
+          Dir.glob("#{print_dir}/*.print").each do |x|
+            FileUtils.rm_rf(x) if File.ctime(x) < Time.now - 3600
+          end
         end
-        
+        config.verbose = options[:verbose]
         Sapos::Print::QReader.printer_config = config
         Sapos::Print::QReader.verbose = options[:verbose]
         Sapos::Print::QReader.run!
@@ -61,6 +70,7 @@ module Sapos
         printer.print(document: "This is a test\nprint page\nwithno special commands", document_number: "test", print_control: true)
       end
       
+      desc "windows_test_print", "test printer"
       def windows_test_print
         info
         

data/lib/sapos/print/configuration.rb

@@ -6,7 +6,7 @@ module Sapos
   module Print
     class Configuration
     
-      attr_accessor :printer, :adapter, :interface, :q, :key, :emv_path, :emv_terminal, :user_id
+      attr_accessor :printer, :adapter, :interface, :q, :key, :emv_path, :emv_terminal, :user_id, :verbose
     
       def self.write(args = {})
         config_file = "#{Sapos::Print.app_directory}/config.yml"
@@ -18,7 +18,6 @@ module Sapos
         if File.exist?(config_file)
           template = ERB.new(File.read(config_file))
           result = YAML.load(template.result(binding))
-          ap result
           @printer = result[:printer]
           @adapter = result[:adapter]
           @interface = result[:interface]

data/lib/sapos/print/printer.rb

@@ -10,7 +10,7 @@ module Sapos
       def print(args = {})
         raw_message = args[:document]
       
-        log_text = "Print #{args[:document_number]},#{args[:print_control]}"
+        log_text = "id=#{args[:id]},doc=#{args[:document_number]},control=#{args[:print_control] ? "SI" : "NO"}\t"
         filename = "#{args[:document_number]}.print" if args[:document_number]
         filename = SecureRandom.hex if filename.nil?
         result = false
@@ -27,6 +27,9 @@ module Sapos
               result  = send_to_printer({file: filename})
               #puts "Result: #{result}"
               log_text += " => OK"
+            else
+              result = true
+              log_text += " => DUPLICADO"
             end
           else
             printable = data(raw_message)
@@ -49,7 +52,6 @@ module Sapos
       end
       
       def data(raw_message)
-        puts "data: #{@config.interface}"
         case @config.interface
         when 'text'
           return raw_message
@@ -71,9 +73,9 @@ module Sapos
       def send_to_printer(opts = {})
         case @config.adapter
         when 'console'
-          puts "=> CONSOLE: file: #{opts[:file]}<="
+          puts "=> CONSOLE: file: #{opts[:file]}<=\n\n"
           puts File.read(opts[:file])
-          puts "=> END CONSOLE =<"
+          puts "\n=> END CONSOLE =<"
           return true
         when 'cups'
           file = opts.delete(:file)
@@ -81,7 +83,7 @@ module Sapos
           command_options << "-d #{@printer_name}"
           command_options << "-o raw" if opts[:raw].present?
           command = "lp #{command_options.join(" ")} #{file}"
-          puts "CMD => #{command}"
+          puts "CMD => #{command}" if @config.verbose
           if !system(command)
             puts "Not executed"
             return false

data/lib/sapos/print/q_reader.rb

@@ -13,29 +13,35 @@ module Sapos
         reader = QReader.new
         callback = Pubnub::SubscribeCallback.new(
           message: -> (envelope){
-            msg = envelope.result[:data][:message]
-            print_control = nil
-            document_number = nil
+            begin
+              
+              msg = envelope.result[:data][:message]
+              msgid = envelope.result.dig(:data, :publish_time_object, :timetoken)
+              print_control = nil
+              document_number = nil
+              
+              puts msg.inspect if reader.config.verbose
+              
+              if msg.is_a?(Hash)
+                print_control = msg['print_control']
+                document_number = msg['document_number']
+                msg = msg['document']
+              end
             
-            if msg.is_a?(Hash)
-              msg = msg['document']
-              print_control = msg['print_control']
-              document_number = msg['document_number']
-            end
-            
-            document = Base64.decode64(msg)
+              document = Base64.decode64(msg)
             
-            if reader.printer.print(document: document, print_control: print_control, document_number: document_number)
-              puts "OK"
-            else
-              puts "Printer Error".red
+              if !reader.printer.print(document: document, print_control: print_control, document_number: document_number, id: msgid)
+                puts "Printer Error"
+              end
+            rescue => e
+              puts "Error: #{e.message}"
             end
           },
           presence: ->(envelope){},
           status: ->(envelope){}
         )
         reader.pubnub.add_listener(callback: callback)
-        reader.pubnub.subscribe(channels: reader.config.q)
+        reader.pubnub.subscribe(channels: [reader.config.q])
         ARGV.clear
         while line = gets do
            #Wait forever ;-)
@@ -45,7 +51,7 @@ module Sapos
       def initialize
         @config = QReader.printer_config
         @printer = Printer.new(@config)
-        @pubnub = Pubnub.new(subscribe_key: @config.key, user_id: @config.user_id)
+        @pubnub = Pubnub.new(subscribe_key: @config.key, user_id: @config.user_id, ssl: true)
       end        
     end
   end

data/lib/sapos/print/version.rb

@@ -2,6 +2,6 @@
 
 module Sapos
   module Print
-    VERSION = "1.0.7"
+    VERSION = "1.0.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sapos-print
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.9
 platform: ruby
 authors:
 - Josef Sauter
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-08 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: SAPOSCLOUD PRINT