vae 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de2f275762e0dc9d57e999436934d851ebde0f017d5b04fe9ce2a5fb2c7ce121
-  data.tar.gz: 49ad8260ca9356c246de744522007a0ead78e16565859365e7687da0e11eab86
+  metadata.gz: 92e2ed1ab66a2045e2a3343fa7bdf033a5da5b840affc948407376863ec1f9a5
+  data.tar.gz: 2794d9c0bcdae2cffd28f287887f435b07abd9b454aed6dd598cca64c3e657ca
 SHA512:
-  metadata.gz: 0461a07291b53db820ed2be157c7674a0e5ed853c45e9d2bc38f1f6a15bc3aeb310ecb308481287f9328a596c858e13d8262eee03112009a11b947bf23cfcd8e
-  data.tar.gz: 6c26b227a0027ead0983d53767eda9cd9ac8637814e37b27fc82755a51e5e1c882a9dc133be64c3721756571438403676f1fdbcaa65bbadac1158c8870d2a6b2
+  metadata.gz: ad2a3844af78872f37c640bdf55c827ca3064d9d01bd926010c1f0d35ae0b34a2756dc0e2ae8815bf6c7aee619cb2f4a0ac4348cc6521e51ff0adaf51c4c78cc
+  data.tar.gz: c33eb0e919353a3556a68aaf1514f45ca6e5c0c13e56493772b723fbdb3a6883303fbd4aaa019bcd2afc49d7ffb4a961486300abe09a1129b4f86d902f2654e6

data/bin/vae

@@ -16,6 +16,7 @@ require 'net/http'
 require 'net/https'
 require 'optparse'
 require 'ptools'
+require 'pty'
 require 'rest-client'
 require 'shellwords'
 require 'tempfile'

data/lib/print_node_server.rb

@@ -40,7 +40,10 @@ class PrintNodeServer < ProxyServer
           name: node_name,
           default_printer: default_printer,
           printers_list: printers_list,
-          print_queue_status: print_queue_status
+          print_queue_status: print_queue_status,
+          last_job_id: @last_job_id,
+          last_job_success: @last_job_success,
+          last_job_output: @last_job_output
         }
       }.to_json
     }
@@ -60,17 +63,24 @@ class PrintNodeServer < ProxyServer
 
   def loop_action
     res = send_post
-    if match = res.body.match(/<next-job>([^<]*)<\/next-job>/)
+    @last_job_success = false
+    @last_job_id = @last_job_output = nil
+    if match = res.body.match(/<next-job-id>([^<]*)<\/next-job-id>/)
+      @last_job_id = match[1]
+    end
+    if match = res.body.match(/<next-job-url>([^<]*)<\/next-job-url>/)
       url = match[1]
       path = "/tmp/VaePrintNode-#{rand.to_s.gsub(".", "")}.pdf"
       puts "Printing #{url} to #{path}"
-      `chromehtml2pdf --marginLeft 0.5 --marginRight 0.5 --out "#{path}" #{Shellwords.shellescape(url)}`
+      puts `chromehtml2pdf --marginLeft 1 --marginRight 1 --marginTop 1 --marginBottom 1 --out "#{path}" #{Shellwords.shellescape(url)}`
       if File.exists?(path)
-        `lp #{path}`
+        @last_job_output = `lp #{path}`
         Thread.new { sleep 15; FileUtils.rm(path) }
       else
-        puts "Error: could not generate PDF!"
+        @last_job_output = "Error: could not generate PDF!"
       end
+      @last_job_success = true if @last_job_output =~ /request id/
+      puts @last_job_output
     end
   rescue StandardError => e
     puts e.message

data/lib/vae_local.rb

@@ -58,7 +58,7 @@ class VaeLocal
       opts.banner = BANNER + "\n\nUsage: vae [options]\n         starts a local development server\n       vae [options] deploy\n         deploys the source in Git repository or provided URL to the Vae servers\n\n  If you are using the Vae Production environment features:\n       vae [options] stage\n         deploys the source in Git repository or provided URL to the staging environment\n       vae [options] stagerelease\n         deploys the source in Git repository or provided URL to the staging environment\n         and releases it to the production environment\n       vae [options] release\n         releases the current staging environment to the production environment\n       vae [options] rollback\n         rolls back the production environment to a previous release\n\nAvailable Options:"
       opts.on("-u","--username <username>","Your Vae username") { |o| options[:username] = o }
       opts.on("-P","--password <password>","Your Vae password") { |o| options[:password] = o }
-      opts.on("-p","--port <port number>","Start server on this port") { |o| options[:port] = o.to_i; raise VaeError "Port #{o.to_i} is already in use." unless VaeLocal.port_open?(o.to_i) }
+      opts.on("-p","--port <port number>","Start server on this port") { |o| options[:port] = o.to_i; raise VaeError, "Port #{o.to_i} is already in use." unless VaeLocal.port_open?(o.to_i) }
       opts.on("-r","--root <path to site root>","Path to the root of the local copy of your Vae site.") { |o| options[:site_root] = o }
       opts.on("-s","--site <subdomain>","Vae subdomain for this site") { |o| options[:site] = o }
       opts.on("-f","--full-stack [php|hhvm]","Run in Full Stack Mode.  Optionally provide 'php' or 'hhvm' to specify your preferred PHP runtime") { |o| options[:server] = FullStack; options[:php_runtime] = o }

data/lib/version.rb

@@ -1 +1 @@
-VER = "0.9.0"
+VER = "0.9.1"

data/node_wrapper/vae.js

@@ -0,0 +1,9 @@
+let spawn = require("child_process").spawn
+let args = process.argv
+args.shift()
+args.shift()
+spawn(
+  "/usr/bin/env",
+  ["ruby", "-W0", __dirname + "/../vae"].concat(process.argv),
+  { stdio: [0, 1, 2] }
+);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vae
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Action Verb, LLC
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -197,6 +197,7 @@ files:
 - lib/vae_local.rb
 - lib/vae_site_servlet.rb
 - lib/version.rb
+- node_wrapper/vae.js
 - test/vae_test.rb
 homepage: http://docs.vaeplatform.com/vae_local
 licenses: