labrat 0.1.14 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d7ea2a07a4077450d70eea18beb9472f830866841e7c62f85cf917a61a6d82
-  data.tar.gz: 666cf99f5016218342cc7a9e8eed616f8b2cec00ced9b4b76753d3fff05602f8
+  metadata.gz: 33cfd23bc08f69e0f9147329ae77a91de45458ec613431c258608fc00a175e26
+  data.tar.gz: 92a47e9f6eb8e4f807591664ac1188a59856e000c5c0018bca901fb72ac08253
 SHA512:
-  metadata.gz: 37705fd50acbadd2c6b68b6a91b6004b11b74763fc9f26cdd9baef29112e62d2075dd80ade5eb72ff7e36b32f96d415b610ef55f3faeb6084a299cb114cf566f
-  data.tar.gz: dde4ca8c27e70cffc3988fc09ecded937fc8f9c6ebdb9a783b663ae68b0ab110d0c28e017737051f2c32d1a2c01526063265661bf0df67f144a22dee2edb2bf4
+  metadata.gz: e4e6e36bbc4d26531f5358f71f2e2ad43b10b67e692c9be1f7d5cd0a07f5a8ca9f02a714cd594e91bfe8703f84f68c37aa32f15765a861452a03ab6820675a1f
+  data.tar.gz: d43a0befaf67f7365d9aa7b049a555c4dacf75d2c7d5f0755047fd4adb828cb7c2781a0822d86b439ab35c34c1a9f4d7cf163545b9a1c028687dfb3c65bec360

data/.gitignore

@@ -15,3 +15,6 @@
 label.pdf
 labrat.pdf
 /vendor-templates/
+/README.pdf
+/README.pyg
+/README.tex

data/.rubocop.yml

@@ -1,18 +1,2 @@
-inherit_gem:
-    rubocop-shopify: rubocop.yml
-
-# require:
-#   - rubocop-rspec
-#   - rubocop-performance
-
-AllCops:
-  TargetRubyVersion: 2.7
-
-Style/StringLiteralsInInterpolation:
-  Enabled: true
-
-Layout/LineLength:
-  Max: 120
-
-Style/MethodCallWithArgsParentheses:
-  Enabled: false
+inherit_from:
+  - ~/.rubocop.yml

data/.simplecov

@@ -0,0 +1,18 @@
+# -*- mode: ruby -*-
+
+SimpleCov.start do
+  # any custom configs like groups and filters can be here at a central place
+  add_filter '/spec/'
+  add_filter '/tmp/'
+  add_group "Models", "lib/labrat"
+  # add_group "Core Extension", "lib/ext"
+  # After this many seconds between runs, old coverage stats are thrown out,
+  # so 3600 => 1 hour
+  merge_timeout 3600
+  # Make this true to merge rspec and cucumber coverage together
+  use_merging false
+  command_name 'Rspec'
+  nocov_token 'no_cover'
+  # Branch coverage
+  enable_coverage :branch
+end

data/Gemfile.lock

@@ -1,17 +1,16 @@
 PATH
   remote: .
   specs:
-    labrat (0.1.13)
+    labrat (1.2.0)
       activesupport
       fat_core
       matrix
-      methodize
       prawn (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (6.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -19,78 +18,85 @@ GEM
       zeitwerk (~> 2.3)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     damerau-levenshtein (1.3.3)
-    debug (1.4.0)
-      irb (>= 1.3.6)
-      reline (>= 0.2.7)
-    diff-lcs (1.4.4)
-    fat_core (4.9.2)
-      activesupport
+    debug (1.7.1)
+      irb (>= 1.5.0)
+      reline (>= 0.3.1)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    fat_core (4.13.0)
+      activesupport (~> 6.0)
       damerau-levenshtein
-    i18n (1.8.11)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    io-console (0.5.11)
-    irb (1.4.1)
+    io-console (0.6.0)
+    irb (1.6.2)
       reline (>= 0.3.0)
+    json (2.6.3)
     matrix (0.4.2)
     method_source (1.0.0)
-    methodize (0.3.1)
-    minitest (5.14.4)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    minitest (5.17.0)
+    parallel (1.22.1)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
     pdf-core (0.9.0)
     prawn (2.4.0)
       pdf-core (~> 0.9.0)
       ttfunk (~> 1.7)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
-    reline (0.3.1)
+    regexp_parser (2.6.1)
+    reline (0.3.2)
       io-console (~> 0.5)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.18.4)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.42.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.8.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.8.0)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.11.5)
+    rubocop-ast (1.24.1)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.15.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.4.0)
-      rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
-    rubocop-shopify (2.2.0)
-      rubocop (~> 1.18)
+    rubocop-rspec (2.16.0)
+      rubocop (~> 1.33)
+    rubocop-shopify (2.11.1)
+      rubocop (~> 1.42)
     ruby-progressbar (1.11.0)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     ttfunk (1.7.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.5.1)
+    unicode-display_width (2.4.2)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   x86_64-linux
@@ -98,13 +104,14 @@ PLATFORMS
 DEPENDENCIES
   debug (>= 1.0.0)
   labrat!
-  pry (~> 0.13.0)
+  pry
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 1.7)
   rubocop-performance
   rubocop-rspec
   rubocop-shopify
+  simplecov
 
 BUNDLED WITH
    2.3.4

data/Notes.org

@@ -0,0 +1,17 @@
+* Lprint
+
+See [[https://www.msweet.org/lprint/lprint.html][the documentation here]].
+
+#+begin_src shell
+  sudo snap install lprint
+  sudo apt install gtk3-nocsd
+  set -gx LD_PRELOAD '/usr/lib/x86_64-linux-gnu/libgtk3-nocsd.so.0'
+  sudo lprint devices
+  snap list
+  snap get lprint
+  snap info --verbose lprint
+  lsusb
+  snap connections lprint
+  sudo snap connect lprint:raw-usb
+  lprint devices
+#+end_src

data/README.org

@@ -10,7 +10,7 @@ The following is for org.
 [[https://travis-ci.org/ddoherty03/labrat.svg?branch=master]]
 
 
-* Table of Contents                                                   :toc_3:
+* Table of Contents                                                   :toc_4:
 - [[#labrat][Labrat]]
   - [[#motivation][Motivation]]
   - [[#a-tip-on-buying-file-folder-labels][A Tip on Buying File Folder Labels]]
@@ -32,9 +32,17 @@ The following is for org.
     - [[#label-separator][Label separator]]
     - [[#number-of-copies][Number of copies]]
     - [[#input-and-output-files][Input and output files]]
+      - [[#output-file][Output file]]
+      - [[#command-line-arguments][Command-line arguments]]
+      - [[#specified-input-file][Specified input file]]
+      - [[#standard-input][Standard input]]
+      - [[#template-exception][Template exception]]
     - [[#printing-or-viewing][Printing or viewing]]
     - [[#shell-commands][Shell commands]]
     - [[#aids-to-testing-label-layouts][Aids to testing label layouts]]
+      - [[#page-grid-1][Page Grid]]
+      - [[#page-template][Page Template]]
+      - [[#verbose-reporting][Verbose Reporting]]
   - [[#the-label-database-and-the-label-option][The Label Database and the label option]]
     - [[#listing-labels][Listing labels]]
     - [[#system-label-database][System label database]]
@@ -51,7 +59,7 @@ wonderful [[https://github.com/prawnpdf/prawn][Prawn gem]] to generate PDF files
 =labrat= properly configured, printing a label is as simple as:
 
 #+begin_example
-$ labrat 'Income Taxes 2021++Example Maker, Inc.'
+$ labrat 'Income Taxes 2021 ~~ Example Maker, Inc.'
 #+end_example
 
 And you will get a two-line file-folder label printed that looks like this:
@@ -77,14 +85,14 @@ without success, I decided to write my own.  Hence labrat.  With it---after
 due configuration---printing a file folder label is as simple as:
 
 #+begin_src sh
-  $ labrat 'First Line of Label++And the Second Line'
+  $ labrat 'First Line of Label ~~ And the Second Line'
   #+end_src
 
 Or, you can preview the label in your previewer of choice (mine is qpdfview)
 by adding the -V flag:
 
 #+begin_src sh
-  $ labrat -V 'First Line of Label++And the Second Line'
+  $ labrat -V 'First Line of Label ~~ And the Second Line'
   #+end_src
 
 Even better, I have included with =labrat= an elisp file (=labrat.el=) that
@@ -150,9 +158,9 @@ For the benefit of Emacs users, it also installs the =labrat.el= elisp library
 in =~/.config/labrat= as well, though you may want to move it to a different
 location.
 
-If invoke =labrat-install= multiple times, it will refuse to overwrite any
-existing config or database files that you may have edited.  If you want to
-re-install them you have to move them out of the way.
+If you invoke =labrat-install= multiple times, it will refuse to overwrite any
+existing config or database files that you may have already installed.  If you
+want to re-install them you have to move the existing files out of the way.
 
 ** Setting options
 You can control how =labrat= composes a label completely from the
@@ -166,11 +174,11 @@ Labrat reads options from the following locations, with the locations listed
 from lowest to highest priority.  In other words, options set in the
 first-listed location can be overriden by settings in later-listed locations.
 
-1. It reads system-wide options from =/etc/xdg/labrat/config.yml=.  This is a
-   YAML formatted file in which the long form of the option, without the
-   leading '--', is used as a key with the setting as the value.
-2. It reads a user configuration from =~/.config/labrat/config.yml=.  It also
-   uses the YAML format based on the long form of option names.
+1. From =/etc/xdg/labrat/config.yml=.  This is a YAML formatted file in which
+   the long form of the option, without the leading '--', is used as a key
+   with the setting as the value.
+2. From =~/.config/labrat/config.yml=.  It also uses the YAML format based on
+   the long form of option names.
 3. Finally, it reads options from the command-line, where, of course, the
    leading hyphens are mandatory.
 
@@ -265,7 +273,7 @@ taking the page orientation into account
 
 ** Label Setup Options
 These options determine the layout of individual labels within the page rather
-than the page as a whole.  Note that the dimensions of individual labels is
+than the page as a whole.  Note that the dimensions of a single whole label is
 not specified, but is implicitly determined by (1) the page width and height,
 (2) the page margins, (3) the number of rows and columns per page, and (4) the
 row and column gaps.  The remaining space on the page is divided into a grid
@@ -279,10 +287,10 @@ side of the label:
 - ~--bottom-pad=DIM~ :: Distance from bottom side of label to the printed text
 - ~--left-pad=DIM~ :: Distance from left side of label to the printed text
 - ~--right-pad=DIM~ :: Distance from right side of label to the printed text
-- ~--v-pad=DIM~ :: Short for ~--top-pad=DIM~ and ~--bottom-pad~
-- ~--h-pad=DIM~ :: Short for ~--left-pad=DIM~ and ~--right-pad~
-- ~--pad=DIM~ :: Short for ~--top-pad=DIM~, ~--bottom-pad~, ~--left-pad=DIM~
-  and ~--right-pad~
+- ~--v-pad=DIM~ :: Short for ~--top-pad=DIM~ and ~--bottom-pad=DIM~
+- ~--h-pad=DIM~ :: Short for ~--left-pad=DIM~ and ~--right-pad=DIM~
+- ~--pad=DIM~ :: Short for ~--top-pad=DIM~, ~--bottom-pad=DIM~, ~--left-pad=DIM~
+  and ~--right-pad=DIM~
 
 *** Alignment
 By default the label text is centered horizontally and vertically within the
@@ -298,8 +306,9 @@ label, but the following options allow you to alter that.
 of these apply to the whole label text: there is no provision yet for doing
 in-line changes of font styles.
 
-- ~--font-name=NAME~ :: Name of font to use, Times, Courier, or Helvetica
-  (default Helvetica);
+- ~--font-name=[Times|Courier|Helvetica]~ :: Name of font to use.  Currently,
+  these are the only three fonts are available: Times, Courier, or Helvetica.
+  Without this option, Helvetica is used;
 - ~--font-size=NUM~ :: Size of font to use in points (default 12)
 - ~--font-style=[normal|bold|italic|bold-italic]~ :: Style of font to use for
   text (default normal)
@@ -337,27 +346,27 @@ later pages always start on the first label position.
 
 *** New line marker
 You can embed a special text-sequence in the label text to indicate where a
-line-break should occur.  By default it is the sequence =++=.  This means that
-=labrat= will translate all occurrences of =++= in the text into a line-break,
-even consecutive occurrences.  There is no way to escape this in the text, so
-if you want labels for various programming languages, you are going to have
-difficulty printing a label with 'C++' in it.  But you can change the marker
+line-break should occur.  By default it is the sequence = ~~ =.  This means
+that =labrat= will translate all occurrences of = ~~ = in the text into a
+line-break, even consecutive occurrences.  There is no way to escape this in
+the text, so if you want labels for that use ' ~~ ' as part of the text, you
+are going to have difficulty printing a labels.  But you can change the marker
 to something else with ~--nlsep~.  This is especially helpful when you are
 using the command-line to supply the label text since specifying line-breaks
 on a shell command can be difficult.  However note that this substitution
 takes place even when reading label texts from a file or standard input.
 
 - ~-n~, ~--nlsep=SEPARATOR~ :: Specify text to be translated into a line-break
-  (default '++')
+  (default ' ~~ ')
 
 *** Label separator
 The only way to print more than one label from the command-line is to indicate
 where one label ends and the next begins with a special marker in the
-command-line arguments, by default the string ']*['.  The text used for this
+command-line arguments, by default the string '@@'.  The text used for this
 can be customized with this option.
 
 - ~--label-sep=SEPARATOR~ :: Specify text that indicates the start of a new
-  label (default ']*[')
+  label (default '@@')
 
 *** Number of copies
 This option causes =labrat= to generate multiple copies of each label with all
@@ -379,11 +388,11 @@ on the command-line.  It combines all the non-option arguments and joins them
 with a space between each argument.  For example,
 
 #+begin_example
-$ labrat -c3 This is a 'single label' '++composed of all this' text --font-style=italic
+$ labrat -c3 This is a 'single label' ' ~~ composed of all this' text --font-style=italic
 #+end_example
 
 prints three copies of a single label in italics with two lines, breaking at
-the '++' marker, resulting in something like this:
+the ' ~~ ' marker, resulting in something like this:
 
 #+begin_example
 This is a single label
@@ -392,12 +401,12 @@ composed of all this text
 
 Note that when the label text is specified on the command-line, ~labrat~ just
 prints a single label.  The only ways to get multiple labels is by (1) marking
-a separation between labels with the ~--label-sep~ marker (']*[' by default)
+a separation between labels with the ~--label-sep~ marker ('@@' by default)
 or (2) using the ~-c~ (~--copies~) argument to get multiple copies of the
 label text.  These options can be combined as well.  For example,
 
 #+begin_example
-$ labrat -c3 This is the 'first label' ']*[' 'And the rest ++ is the second' text --font-style=italic
+$ labrat -c3 This is the 'first label' @@ 'And the rest  ~~  is the second' text --font-style=italic
 #+end_example
 
 will produce three copies of two separate labels:
@@ -439,9 +448,10 @@ as for a specified ~in-file~, treating each paragraph as a label text and
 disregarding comments.
 
 **** Template exception
-Notwithstanding all of the above, if the ~-T~ (~--template~) option is given,
-all label texts from the command-line, an ~in-file~, or standard input are
-ignored and a template is generated.
+Notwithstanding all of the above, if the ~-T~ (~--template~) option is given
+(see below at [[*Aids to testing label layouts][Aids to testing label layouts]]), all label texts from the
+command-line, an ~in-file~, or standard input are ignored and a template is
+generated.
 
 *** Printing or viewing
 By default, =labrat= prints the generated output file to the printer named
@@ -467,7 +477,8 @@ any event.
 
 - ~-p~, ~--printer=NAME~ :: Name of the label printer to print on
 - ~-%~, ~--print-command=PRINTCMD~ :: Command to use for printing with %p for
-  printer name; %o for label file name
+  printer name; %o for label file name (the `%` is meant to remind you of a
+  piece of a paper beingg fed between two rollers)
 
 Likewise, =labrat= uses the shell command
 #+begin_example
@@ -479,11 +490,16 @@ very likely that you will want to configure this with the ~--view-command~
 option to your liking.
 
 - ~-:~, ~--view-command=VIEWCMD~ :: Command to use for viewing with %o for
-  label file name
+  label file name (the `:` is meant to remind you of a pair of eyes looking at
+  the purdy label)
 
 *** Aids to testing label layouts
+
+**** Page Grid
 The following options are very useful if your are trying to configure the set
-up for a new label type or otherwise trying to figure out a problem.
+up for a new label type or otherwise trying to figure out a problem, such as
+setting the ~--delta-x~ or ~--delta-y~ values for your setup.
+
 Normally, =labrat= does not print an outline for the labels, but if you are
 testing things out on plain paper, it helps to know where =labrat= thinks the
 boundaries of the labels are.  That is what the ~--grid~ or ~-g~ options
@@ -491,14 +507,16 @@ provide.
 
 - ~-g~, ~--[no-]grid~ :: Add grid lines to output
 
+**** Page Template
 When trying to define a new label layout, it also helps to just see what a
-single sheet of labels would look like.  That is what the ~--template~ or ~-T~
-option give you: it just prints an outline of where labels would be printed
-but ignores any label text.
+single sheet of labels would look like.  That is what the ~--template~ (or
+~-T~) option gives you: it just prints an outline of where labels would be
+printed but ignores any label text.
 
 - ~-T~, ~--[no-]template~ :: Print a template of a page of labels and ignore
   any content
 
+**** Verbose Reporting
 Finally, =labrat= will print a lot of information about what it's doing with
 the ~--verbose~ or ~-v~ option.  The information is printed to the standard
 error output stream.
@@ -554,7 +572,7 @@ $ labrat -T -V --label=avery8987
 
 And if you want to see it with sample label text filled in, try the following:
 #+begin_example
-$ labrat -V -c30 --label=avery8987 'Four score and seven years ago++Our fathers brought forth'
+$ labrat -V -c30 --label=avery8987 'Four score and seven years ago ~~ Our fathers brought forth'
 #+end_example
 
 *** Nesting label definitions
@@ -590,7 +608,7 @@ badge:
 
 With this, you can print a file folder label with:
 #+begin_example
-$ labrat --label=ff 'Four score and seven years ago++Our fathers brought forth'
+$ labrat --label=ff 'Four score and seven years ago ~~ Our fathers brought forth'
 #+end_example
 
 And, if you want this to be your default label type, you can add to your user-level
@@ -602,13 +620,13 @@ label:
 
 Now you can print the label without the ~--label~ option on the command-line:
 #+begin_example
-$ labrat 'Four score and seven years ago++Our fathers brought forth'
+$ labrat 'Four score and seven years ago ~~ Our fathers brought forth'
 #+end_example
 
 If you want to print badges, you have to specify the ~--label~ option explicitly on
 the command-line:
 #+begin_example
-$ labrat -V -c14 --label=badge 'Daniel E. Doherty++(Amateur Programmer)'
+$ labrat -V -c14 --label=badge 'Daniel E. Doherty ~~ (Amateur Programmer)'
 #+end_example
 
 *** A Caution about option order
@@ -618,7 +636,7 @@ override earlier settings.  For example, given the configuration above, where
 ~ff~ is your default label type, the following will not do what you expect:
 
 #+begin_example
-$ labrat --font-style=italic --label=ff 'Four score and seven years ago++Our fathers brought forth'
+$ labrat --font-style=italic --label=ff 'Four score and seven years ago ~~ Our fathers brought forth'
 #+end_example
 
 You expect the label to be printed in italic, but the ~--label=ff~ option in
@@ -629,7 +647,7 @@ namely ~--font-style=bold~ from the user-level label database.
 To get this to work, you have to put the command-line setting after the
 ~--label=ff~ option in order for it to take effect:
 #+begin_example
-$ labrat --label=ff --font-style=italic 'Four score and seven years ago++Our fathers brought forth'
+$ labrat --label=ff --font-style=italic 'Four score and seven years ago ~~ Our fathers brought forth'
 #+end_example
 
 * Development

data/bin/labrat

@@ -27,9 +27,9 @@ begin
     if ops.template
       []
     elsif !ops.in_file.blank?
-      Labrat.read_label_texts(ops.in_file, ops.nlsep)
+      Labrat.read_label_texts(ops.in_file, ops.nl_sep)
     elsif non_ops.empty?
-      Labrat.read_label_texts(nil, ops.nlsep)
+      Labrat.read_label_texts(nil, ops.nl_sep)
     else
       []
     end

data/labrat.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
     the wonderful Prawn gem to generate PDF files with label formatting in mind. With
     labrat properly configured, printing a label is as simple as:
 
-    $ labrat 'Income Taxes 2021++Example Maker, Inc.'
+    $ labrat 'Income Taxes 2021 ~~ Example Maker, Inc.'
 
     And you will get a two-line file-folder label with the text centered. It can
     print on dymo label printer rolls or Avery sheet labels.  It knows the layout of
@@ -45,13 +45,12 @@ DESC
   spec.add_dependency "matrix"
   spec.add_dependency "prawn", "~> 2.0"
   spec.add_dependency "activesupport"
-  spec.add_dependency "methodize"
   spec.add_dependency "fat_core"
 
-  # Note: pry-byebug requires that pry be within the '0.13.0' version box.
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'pry', '~> 0.13.0'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'debug', '>= 1.0.0'
   spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'rubocop-shopify'

data/lib/config_files/config.yml

@@ -93,7 +93,12 @@
 # A string sequence that is interpreted as a line-break can be defined.  Such
 # a sequence is particularly helpful when you provide the label text on the
 # command-line, though it will be applied to file-read label texts as well.
-# nlsep: '++'
+# nlsep: '~~'
+
+# A string sequence that indicates the start of a new label.  Such a sequence
+# is particularly helpful when you provide the label text on the command-line,
+# though it will be applied to file-read label texts as well.
+# label-sep: '==>'
 
 # The name of the printer to use in substituting for the %p placeholder in the
 # print-command setting below.

data/lib/config_files/labeldb.yml

@@ -3,8 +3,9 @@
 # out-file, etc., only things such as page and label dimensions that would
 # apply to all users of a particular label type.
 
+# 19.9x87.29mm
 dymo30327:
-  page-width: 24mm
+  page-width: 25mm
   page-height: 87mm
   rows: 1
   columns: 1
@@ -12,10 +13,10 @@ dymo30327:
   bottom-page-margin: 0mm
   left-page-margin: 5mm
   right-page-margin: 5mm
-  top-pad: 0mm
-  bottom-pad: 0mm
-  left-pad: 2mm
-  right-pad: 2mm
+  top-pad: 1mm
+  bottom-pad: 1mm
+  left-pad: 1mm
+  right-pad: 1mm
   landscape: true
 
 duraready1034D:
@@ -208,7 +209,7 @@ avery5163:
   column-gap: 5mm
   landscape: false
 
-avery15513::
+avery15513:
   label: avery5163
 
   label: avery5163

data/lib/labrat/arg_parser.rb

@@ -20,7 +20,7 @@ module Labrat
     # Parse and set the options object to reflect the values of the given
     # args, after merging in any prior settings into options.  Return the
     # resulting options instance.  The args argument can be either a Hash or,
-    # as usual, an Array of Strings from the command-line.x  Throw an exception
+    # as usual, an Array of Strings from the command-line.  Throw an exception
     # for errors encountered parsing the args.
     def parse(args, prior: {}, verbose: false)
       options.msg = nil
@@ -48,7 +48,7 @@ module Labrat
       parser.separator ""
       parser.separator "Print or view (with -V) a label with the given <label-text>."
       parser.separator "All non-option arguments are used for the label text with a special"
-      parser.separator "marker ('++' by default, see --nlsep) indicating a line-break."
+      parser.separator "marker ('~~' by default, see --nlsep) indicating a line-break."
       parser.separator ""
       parser.separator "Below, NUM indicates an integer, DIM, indicates a linear dimension,"
       parser.separator "valid DIM units are: pt, mm, cm, dm, m, in, ft, yd."
@@ -198,8 +198,10 @@ module Labrat
     # of common labels with their dimensions, so that --width and --height
     # need not be specified.
     def label_name_option
+      # options.raw_label = nil
       parser.on("-lNAME", "--label=NAME",
                 "Use options for label type NAME from label database") do |name|
+        options.raw_label ||= name
         if labels_seen.include?(name)
           msg = "label option '#{name}' has circular reference"
           labels_seen.each do |nm|
@@ -236,8 +238,17 @@ module Labrat
             warn "#{p}\n"
           end
           warn "\nKnown labels:\n"
-          lab_names.groups_of(6).each do |_n, grp|
-            warn "  #{grp.join(', ')}"
+          max_width = lab_names.max_by(&:length).length
+          ngrps = (78 / (max_width + 1)).floor
+
+          lab_names.sort_by do |nm|
+            nm.match(/\A([a-zA-z]+)([0-9]+)?/)
+            [$1, $2.to_i || 0]
+          end
+            .groups_of(ngrps).each do |_n, grp|
+            fmt = "%-#{max_width+1}s"
+            grp = grp.map{|nm| sprintf(fmt, nm) }
+            warn "  #{grp.join(' ')}"
           end
         end
         exit(0)
@@ -350,11 +361,11 @@ module Labrat
 
     # On a command-line, specifying where a line-break should occur is not
     # convenient when shell interpretation and quoting rules are taken into
-    # account.  This allows the user to use some distinctive marker ('++' by
+    # account.  This allows the user to use some distinctive marker ('~~' by
     # default) to designate where a line break should occur.
     def nl_sep_option
       parser.on("-nSEP", "--nl-sep=SEPARATOR",
-                "Specify text to be translated into a line-break (default '++')") do |nl|
+                "Specify text to be translated into a line-break (default '~~')") do |nl|
         options.nl_sep = nl
         warn "  ::nl-sep <- '#{nl}'::" if options.verbose
       end
@@ -365,7 +376,7 @@ module Labrat
     # designate where a new label shoul be started.
     def label_sep_option
       parser.on("--label-sep=SEPARATOR",
-                "Specify text that indicates the start of a new label (default ']*[')") do |ls|
+                "Specify text that indicates the start of a new label (default '==>')") do |ls|
         options.label-sep = ls
         warn "  ::label-sep <- '#{ls}'::" if options.verbose
       end

data/lib/labrat/config.rb

@@ -71,8 +71,15 @@ module Labrat
       files.each do |f|
         next unless File.readable?(f)
 
-        yml_hash = YAML.load(File.read(f))&.methodize || {}
-        yml_hash.report("Merging from file '#{f}") if verbose
+        yml_hash = YAML.load(File.read(f))
+        next unless yml_hash
+
+        if yml_hash.is_a?(Hash)
+          yml_hash = yml_hash.methodize
+        else
+          raise "Error loading file #{f}:\n#{File.read(f)[0..500]}"
+        end
+        yml_hash.report("Merging config from file '#{f}") if verbose
         hash.deep_merge!(yml_hash)
       end
       hash

data/lib/labrat/label.rb

@@ -57,11 +57,15 @@ module Labrat
           warn ""
         end
         if ops.template
-          # Replace any texts with the numbers and show the grid.
-          self.texts = (1..(ops.rows * ops.columns)).map(&:to_s)
+          # Replace any texts with the numbers, the name of the label (and alias) and show the grid.
+          lab_text = ops.raw_label || ops.label
+          if ops.label != ops.raw_label
+            lab_text += "\n(#{ops.label})"
+          end
+          self.texts = (1..(ops.rows * ops.columns)).map {|n| "#{n}\n#{lab_text}"}
           ops.font_name = 'Helvetica'
           ops.font_style = 'bold'
-          ops.font_size = 16
+          ops.font_size = 11
           pdf.grid.show_all
         end
         raise EmptyLabelError, "Empty label" if waste_of_labels?

data/lib/labrat/options.rb

@@ -6,7 +6,7 @@ module Labrat
   # and perhaps environment.  An Options instance can be handed off to the
   # label-printing objects to inform its formatting, printing, etc.
   class Options
-    attr_accessor :label, :page_width, :page_height,
+    attr_accessor :label, :raw_label, :page_width, :page_height,
                   :left_page_margin, :right_page_margin,
                   :top_page_margin, :bottom_page_margin,
                   :rows, :columns, :row_gap, :column_gap, :landscape,
@@ -22,6 +22,7 @@ module Labrat
     # Initialize with an optional hash of default values for the attributes.
     def initialize(**init)
       self.label = init[:label] || nil
+      self.raw_label = nil
       # Per-page attributes
       self.page_width = init[:page_width] || 24.mm
       self.page_height = init[:page_height] || 87.mm
@@ -49,8 +50,8 @@ module Labrat
       self.font_size = init[:font_size] || 12
       # Input attributes
       self.in_file = init[:in_file] || nil
-      self.nl_sep = init[:nl_sep] || '++'
-      self.label_sep = init[:label_sep] || ']*['
+      self.nl_sep = init[:nl_sep] || '~~'
+      self.label_sep = init[:label_sep] || '@@'
       self.copies = init[:copies] || 1
       # Output attributes
       self.printer = init[:printer] || ENV['LABRAT_PRINTER'] || ENV['PRINTER'] || 'dymo'
@@ -84,6 +85,8 @@ module Labrat
         end
         warn ""
       end
+      # We want raw_label to reflect what the user typed on the command-line
+      file_options.raw_label = nil
       Labrat::ArgParser.new.parse(args, prior: file_options, verbose: verbose)
     end
 
@@ -124,6 +127,7 @@ module Labrat
     def to_hash
       {
         label: label,
+        raw_label: raw_label,
         page_width: page_width,
         page_height: page_height,
         left_page_margin: left_page_margin,

data/lib/labrat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Labrat
-  VERSION = "0.1.14"
+  VERSION = "1.2.0"
 end

data/lib/labrat.rb

@@ -7,8 +7,8 @@ require 'prawn'
 require 'prawn/measurement_extensions'
 require 'optparse'
 require 'yaml'
-require 'methodize'
 require 'pp'
+require 'debug'
 
 require_relative "labrat/version"
 require_relative "labrat/errors"

data/lib/lisp/labrat.el

@@ -22,7 +22,7 @@ e.g. ~/.rbenv/shims/labrat, for an rbenv ruby installation."
   :type 'string
   :group 'labrat)
 
-(defcustom labrat-nl-sep "++"
+(defcustom labrat-nl-sep "~~"
   "String to mark newlines in label text.
 
 If you change this, you need to make a corresponding change in your
@@ -30,7 +30,7 @@ labrat configuration at ~/.config/labrat/config.yml."
   :type 'string
   :group 'labrat)
 
-(defcustom labrat-label-sep "]*["
+(defcustom labrat-label-sep "@@"
   "String to mark the separation between labels on the labrat command-line.
 
 If you change this, you need to make a corresponding change in your
@@ -88,10 +88,10 @@ returned"
 This invokes the \"labrat -V\ <label>\" command with the
 paragraph at or before point inserted in the <label> position,
 but with each new-line replaced with the value of the variable
-labrat-nl-sep, '++' by default."
+labrat-nl-sep, '~~' by default."
   (interactive)
-  (call-process labrat-executable nil nil nil
-                "-V" (labrat/pars-in-region)))
+  (call-process labrat-executable nil (get-buffer-create "*labrat*") nil
+                "-V" "-o ~/labrat.pdf""-V --out-file=~/labrat.pdf" (labrat/pars-in-region)))
 
 (defun labrat-print ()
   "Print the paragraph at or before point as a label with labrat.
@@ -99,10 +99,10 @@ labrat-nl-sep, '++' by default."
 This invokes the \"labrat -P <label>\" command with the paragraph
 at or before point inserted in the <label> position, but with
 each new-line replaced with the value of the variable
-labrat-nl-sep, '++' by default."
+labrat-nl-sep, '~~' by default."
   (interactive)
-  (call-process labrat-executable nil nil nil
-                (labrat/pars-in-region)))
+  (call-process labrat-executable nil (buffer-name (get-buffer-create "*labrat*")) nil
+                "-o ~/labrat.pdf" (labrat/pars-in-region)))
 
 (provide 'labrat)
 ;;; labrat.el ends here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: labrat
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: methodize
+  name: fat_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fat_core
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ description: |2+
   the wonderful Prawn gem to generate PDF files with label formatting in mind. With
   labrat properly configured, printing a label is as simple as:
 
-  $ labrat 'Income Taxes 2021++Example Maker, Inc.'
+  $ labrat 'Income Taxes 2021 ~~ Example Maker, Inc.'
 
   And you will get a two-line file-folder label with the text centered. It can
   print on dymo label printer rolls or Avery sheet labels.  It knows the layout of
@@ -204,10 +204,12 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".simplecov"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- Notes.org
 - README.org
 - Rakefile
 - TODO.org
@@ -254,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.2
 signing_key: 
 specification_version: 4
 summary: Command-line and Emacs label print software.