pjl 1.2.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64da9b59d4edfc301648f7da605cc066b0240dc8472737738924e0e1e514eb75
-  data.tar.gz: 7c2e844b585114aabfb5e4145b29c8e2d3660f0eff54bbae805b4fdd44c99e09
+  metadata.gz: 72f1bb05a1399968b92593cde98e48cb1a8f6d5d5d9aa5ca6600bd0ffe7d5d5f
+  data.tar.gz: 33541860fca8f140777f0b0c9308d295927b77ae692e0af2c7e89056e43bc9e5
 SHA512:
-  metadata.gz: 489963311a279752cb12df2478123a46fda84337b0c5f123e475fac985ed47b8bd142240cb0e4e3a450aff572d1ab5decff9a6fd5e84000ce94dbcb6af73604c
-  data.tar.gz: 16a1023f936fb4bac4895e534667fae6c39e96f6503daa887d3fe31638dcfde76f15016bb17ebee9113bc93264e3bb8cc05a7d02f4094f0cfc75f4cc1ab99816
+  metadata.gz: 5fc3574f149d3cec9e8dae185e7ee302266341e2df007cf89ed14ca5540557646ff33bb3d083f552f5fe9406e55e918641a18e8ad31a1db9a66402c161a8f79a
+  data.tar.gz: '09eb6c97f5d0ad99476871c7373163151e1531cdbacbfaa5b6412ace4b4c6f1a051dd71b021959a4c296f08ade6098aa4c3c0e62212eba88fcb2d2e1e218e710'

data/example/ifbrother

@@ -22,14 +22,14 @@ class MFC7420Appl < PjlAppl
 
   def frame
     job "#@login@#@host-#$$" do
-      set :ras1200mode => :off
-      set :resolution  => RES
-      set :economode   => :off
-      set :sourcetray  => :tray1
-      set :mediatype   => :regular
-      set :orientation => :portrait
-      set :paper       => :a4
-      set :pageprotect => :auto
+      set ras1200mode: :off
+      set resolution:  RES
+      set economode:   :off
+      set sourcetray:  :tray1
+      set mediatype:   :regular
+      set orientation: :portrait
+      set paper:       :a4
+      set pageprotect: :auto
       enter :pcl do
         system *GS
       end

data/example/ifcanon

@@ -26,11 +26,10 @@ class CanonIRAppl < PjlAppl
   private
 
   def job
-    uel
-    pjl "CQue2.0-2"
-    yield
-  ensure
-    uel
+    uels do
+      pjl "CQue2.0-2"
+      yield
+    end
   end
 
   GS = %w(
@@ -42,14 +41,14 @@ class CanonIRAppl < PjlAppl
     h, = Socket.gethostname.split "."
     jn = "#{h}-#$$!#@login@#@host"
     job do
-      comment :canpjl, :set, :username   => uh
-      comment :canpjl, :set, :docname    => jn
-      comment :canpjl, :set, :sortermode => :genericon
-      comment :canpjl, :set, :staple     => :genericoff
-      comment :canpjl, :set, :punch      => :genericoff
-      comment :canpjl, :set, :booklet    => :genericoff
+      comment :canpjl, :set, username:   uh
+      comment :canpjl, :set, docname:    jn
+      comment :canpjl, :set, sortermode: :genericon
+      comment :canpjl, :set, staple:     :genericoff
+      comment :canpjl, :set, punch:      :genericoff
+      comment :canpjl, :set, booklet:    :genericoff
       if @tray then
-        set :mediasource => :"tray#@tray"
+        set mediasource: :"tray#@tray"
       end
       enter :pcl do
         system *GS

data/example/ifkyocera

@@ -19,9 +19,9 @@ class KyoceraFSAppl < PjlAppl
 !R! FRPO N7,1; CMNT Postscripts settumble cannnot do that.; EXIT,E;
     EOT
     display = "#@login@#@host"
-    job "#@login@#@host-#$$", :display => display do
-      rdymsg :display => display
-      set :economode => :off
+    job "#@login@#@host-#$$", display: display do
+      rdymsg display: display
+      set economode: :off
       enter :postscript do
         l = $stdin.readline
         case l
@@ -36,7 +36,7 @@ class KyoceraFSAppl < PjlAppl
             end
         end
       end
-      rdymsg :display => ""
+      rdymsg display: ""
     end
   end
 

data/lib/pjl.rb

@@ -33,7 +33,7 @@ end
 #     include PJL
 #     def run
 #       job "job-#$$" do
-#         rdymsg :display => "wait..."
+#         rdymsg display: "wait..."
 #         enter :postscript do
 #           puts "%!PS"
 #           ...
@@ -45,22 +45,20 @@ end
 #
 module PJL
 
-  def job name, *args
+  def job name, **kwargs
     print "\0"*32
-    uel
-    pjl
-    j = { :name => name.to_s }
-    args.push j
-    pjl :job, *args
-    yield
-  ensure
-    pjl :eoj, j
-    uel
+    uels do
+      pjl
+      pjl :job, name: name, **kwargs
+      yield
+    ensure
+      pjl :eoj, name: name
+    end
   end
 
   def lparm p
     m = @m
-    @m = { :lparm => p.to_sym }
+    @m = { lparm: p.to_sym }
     yield
   ensure
     @m = m
@@ -68,7 +66,7 @@ module PJL
 
   def iparm p
     m = @m
-    @m = { :iparm => p.to_sym }
+    @m = { iparm: p.to_sym }
     yield
   ensure
     @m = m
@@ -79,23 +77,23 @@ module PJL
   end
   alias nop noop
 
-  def method_missing name, *args, &block
+  def method_missing name, *args, **kwargs, &block
     if block then
       super
     else
       args.each { |a|
         case a
-          when String, Symbol, Hash then next
-          else                           super
+          when String, Symbol then next
+          else                     super
         end
       }
       if name.to_s =~ /\Apjl_/ then name = $'.to_sym end
-      pjl name, *args
+      pjl name, *args, **kwargs
     end
   end
 
   def enter language
-    pjl :enter, :language => language.to_sym
+    pjl :enter, language: language.to_sym
     yield
   ensure
     uel
@@ -108,23 +106,31 @@ module PJL
     print "\e%-12345X"
   end
 
-  def pjl *args
-    opt = {}
-    opt.update args.pop while args.last.is_a? Hash
-    l = []
+  def uels
+    uel
+    yield
+  ensure
+    uel
+  end
+
+  class Cmd
+    def initialize     ; @cmd = "@PJL" ; end
+    def to_s           ; @cmd          ; end
+    def push k         ;          @cmd << " " << k.to_pjlkey ; end
+    def pushkw k, s, v ; push k ; @cmd << s   << v.to_pjlkey ; end
+  end
+
+  def pjl *args, **kwargs
+    c = Cmd.new
     args.flatten!
-    args.each { |a| l.push a }
-    @m and @m.each { |k,v| l.push [ k, :":", v] }
-    opt      .each { |k,v| l.push [ k, :"=", v] }
-    cmd = "@PJL"
-    l.each { |x| cmd << " " << x.to_pjlkey }
-    puts cmd
+    args   .each { |a|   c.push   a         }
+    @m    &.each { |k,v| c.pushkw k, ":", v }
+    kwargs .each { |k,v| c.pushkw k, "=", v }
+    puts c
   end
 
   def system *args
-    unless super then
-      raise "#{args.first} terminated unsuccessful: #$?"
-    end
+    super or raise "#{args.first} terminated unsuccessful: #$?"
   end
 
 end

data/lib/pjl/version.rb

@@ -5,7 +5,7 @@
 module PJL
 
   NAME        = "pjl"
-  VERSION     = "1.2.2".freeze
+  VERSION     = "1.3".freeze
 
   SUMMARY     = "PJL generation"
 
@@ -13,7 +13,7 @@ module PJL
 Write PJL (Printer Job Language) commands from a Ruby program.
 EOT
 
-  COPYRIGHT   = "(C) 2013-2018 Bertram Scharpf"
+  COPYRIGHT   = "(C) 2013-2020 Bertram Scharpf"
   LICENSE     = "BSD-2-Clause"
   AUTHOR      = "Bertram Scharpf <software@bertram-scharpf.de>"
   TEAM        = [ "Bertram Scharpf"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pjl
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: '1.3'
 platform: ruby
 authors:
 - Bertram Scharpf
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2020-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appl
@@ -49,7 +49,7 @@ homepage: http://www.bertram-scharpf.de/software/pjl
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset"
 - utf-8
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Some other tools from the same author
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: PJL generation
 test_files: []