labrat 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb50449198c30b9c302af3b7ce2aa2da97039b725ef62c1e73f07cd7213649e
-  data.tar.gz: cc62b9c24f61e88a6dcd8e27efbc6c7f99fb47d70fee2bf2e4a467d22857a35e
+  metadata.gz: 020c36cc0c3e427e9e728076b7fad0fbb43f20c02a7c3141ed9826e9495e0aeb
+  data.tar.gz: b83174cd528a01d9b9276d456aee772e678b6aaf4185f11c8a69587ca7e638c6
 SHA512:
-  metadata.gz: ca700ff4b6fe931729e70a6aa79cabb24524e05529031e6b0ecde8d34555265230493f32079ec21097787c6f1907ba1eb104d73f44cad9cb78bcdf9c44d926c3
-  data.tar.gz: 7e09bcccf191f043efbeeba44df8ff94d4536912852ddb1e8a6ceafb6e6e35202395893994d3a992c1114a7d03b49fcc7c78eee894c902f4f46a153cf3791f5f
+  metadata.gz: a2b993dd909a916bc108dbd9d2408eb3cb37a1db0cf99fe518cb415eb36894d97f79b06da93fae6bf79517089c5454ab6ae53c3e7e2af88db4e789cbf65ce9da
+  data.tar.gz: 6538096acbb8366e2c22703247d30354f09cf2be1d60fecb41333a1036d6080f779dad81e01cd954e0c061fecf424548c04a5f3c274fbf05b46e9cadb2d0066e

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    labrat (1.2.1)
+    labrat (1.2.2)
       activesupport
+      fat_config (>= 0.3.0)
       fat_core
       matrix
       prawn (~> 2.0)
@@ -10,103 +11,129 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3)
+    activesupport (8.0.0)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
+    benchmark (0.4.0)
+    bigdecimal (3.1.8)
     coderay (1.1.3)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     damerau-levenshtein (1.3.3)
-    debug (1.7.1)
-      irb (>= 1.5.0)
-      reline (>= 0.3.1)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    drb (2.2.0)
-      ruby2_keywords
-    fat_core (4.14.0)
+    debug (1.9.2)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    drb (2.2.1)
+    fat_config (0.3.0)
+      activesupport
+      inifile
+      tomlib
+    fat_core (5.5.0)
       activesupport
       damerau-levenshtein
-    i18n (1.14.1)
+      ostruct
+      stringio (>= 3.1.2)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    io-console (0.6.0)
-    irb (1.6.2)
-      reline (>= 0.3.0)
-    json (2.6.3)
+    inifile (3.0.0)
+    io-console (0.7.2)
+    irb (1.14.1)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.8.2)
+    language_server-protocol (3.17.0.3)
+    logger (1.6.1)
     matrix (0.4.2)
-    method_source (1.0.0)
-    minitest (5.22.2)
-    mutex_m (0.2.0)
-    parallel (1.22.1)
-    parser (3.2.0.0)
+    method_source (1.1.0)
+    minitest (5.25.2)
+    ostruct (0.6.1)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
-    pdf-core (0.9.0)
-    prawn (2.4.0)
-      pdf-core (~> 0.9.0)
-      ttfunk (~> 1.7)
-    pry (0.14.1)
+      racc
+    pdf-core (0.10.0)
+    prawn (2.5.0)
+      matrix (~> 0.4)
+      pdf-core (~> 0.10.0)
+      ttfunk (~> 1.8)
+    pry (0.15.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    psych (5.2.0)
+      stringio
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.1)
-    reline (0.3.2)
+    rake (13.2.1)
+    rdoc (6.8.1)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    reline (0.5.12)
       io-console (~> 0.5)
-    rexml (3.2.5)
-    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)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.42.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.69.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.36.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    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.16.0)
-      rubocop (~> 1.33)
-    rubocop-shopify (2.11.1)
-      rubocop (~> 1.42)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.36.2)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.23.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (3.2.0)
+      rubocop (~> 1.61)
+    rubocop-shopify (2.15.1)
+      rubocop (~> 1.51)
+    ruby-progressbar (1.13.0)
+    securerandom (0.3.2)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    ttfunk (1.7.0)
+    stringio (3.1.2)
+    tomlib (0.7.2)
+      bigdecimal
+    ttfunk (1.8.0)
+      bigdecimal (~> 3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (3.1.2)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.2)
 
 PLATFORMS
   x86_64-linux

data/README.org

@@ -38,7 +38,7 @@ The following is for org.
       - [[#standard-input][Standard input]]
       - [[#template-exception][Template exception]]
     - [[#printing-or-viewing][Printing or viewing]]
-    - [[#shell-commands][Shell commands]]
+    - [[#printing-and-viewing-shell-commands][Printing and viewing shell commands]]
     - [[#aids-to-testing-label-layouts][Aids to testing label layouts]]
       - [[#page-grid-1][Page Grid]]
       - [[#page-template][Page Template]]
@@ -139,28 +139,30 @@ install =labrat= with:
   $ gem install labrat
 #+end_SRC
 
-After installation, you should install the user and system configuration files
+After installation, you should install the user and system (if you have sudo
+privileges) configuration files
 with:
 
 #+begin_SRC sh
   $ labrat-install
 #+end_SRC
 
-This will install an annotated system-wide config file in
-=/etc/xdg/labrat/config.yml= and a system-wide label database in
-=/etc/xdg/labrat/labeldb.yml=.
+This will, assuming you have sudo privileges, install an annotated system-wide
+config file in =/etc/xdg/labrat/config.yml= and a system-wide label database
+in =/etc/xdg/labrat/labeldb.yml=.
 
 It will also install an annotated sample user config file in
 =~/.config/labrat/labrat.el= and a sample user-level label database in
 =~/.config/labrat/labeldb.yml=.
 
 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.
+in =~/.config/labrat= as well.  You may want to add this directory to your
+~load-path~ or copy, move, or link it to a directory already in your
+~load-path~.
 
 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.
+want to re-install them you have to remove or move the existing files out of the way.
 
 ** Setting options
 You can control how =labrat= composes a label completely from the
@@ -272,12 +274,17 @@ taking the page orientation into account
 - ~--column-gap=DIM~ :: The distance between columns of labels on a page
 
 ** 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 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
-of identically-sized labels, which determines the size of each label.
+These options determine the layout of individual labels within the page grid
+rather than the page grid 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 of identically-sized
+labels, which determines the size of each label.
 
 *** Padding
 Within each label, the following options allow you to set the margins on each
@@ -461,7 +468,7 @@ command from ~--view-command~ to view the generated PDF file instead.
 
 - ~-V~, ~--[no-]view~ :: View rather than print
 
-*** Shell commands
+*** Printing and viewing shell commands
 By default, =labrat= uses the shell command:
 #+begin_example
 lpr -P %p %o
@@ -511,7 +518,7 @@ provide.
 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 gives you: it just prints an outline of where labels would be
-printed but ignores any label text.
+printed and numbers the labels, but it ignores any label text.
 
 - ~-T~, ~--[no-]template~ :: Print a template of a page of labels and ignore
   any content
@@ -519,7 +526,8 @@ printed but ignores any label text.
 **** 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.
+error output stream.  This is particularly helpful in determining how the
+final configuration was constructed from the various config files.
 
 - ~-v~, ~--[no-]verbose~ :: Run verbosely, that is, print out lots of
   information about what =labrat= is doing as it processes the job.
@@ -527,7 +535,7 @@ error output stream.
 ** The Label Database and the label option
 One of the nice things about =labrat= is that it comes with a database of
 pre-defined label configurations for many standard labels, especially Avery
-labels since they are kind enough to publish PDF templates for all their
+labels since they were good enough to publish PDF templates for all their
 products at [[https://www.avery.com/templates]].
 
 *** Listing labels
@@ -583,7 +591,7 @@ avery8986:
   label: avery8987
 #+end_example
 In other words, it defines the ~avery8986~ label with a nested ~--label~
-option that simply refers to the ~avery8987~ entry.
+option that simply incorporates the ~avery8987~ entry settings.
 
 *** Label database entries as configuration sets
 This ability to use a label database definition as an alias for a whole set of

data/labrat.gemspec

@@ -46,6 +46,7 @@ DESC
   spec.add_dependency "prawn", "~> 2.0"
   spec.add_dependency "activesupport"
   spec.add_dependency "fat_core"
+  spec.add_dependency "fat_config", '>=0.3.0'
 
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

data/lib/labrat/label_db.rb

@@ -10,8 +10,8 @@ module Labrat
     # Read in the Labrat database of label settings, merging system and user
     # databases.
     def self.read(dir_prefix: '')
-      self.db = Config.read('labrat', base: 'labeldb', dir_prefix: dir_prefix)
-        .transform_keys(&:to_sym)
+      reader = FatConfig::Reader.new('labrat', root_prefix: dir_prefix)
+      self.db = reader.read('labeldb')
     end
 
     # Return a hash of config settings for the label named by labname.

data/lib/labrat/options.rb

@@ -73,8 +73,8 @@ module Labrat
       default_config.report("Default settings") if verbose
 
       # Config files
-      file_config = Labrat::Config.read('labrat', verbose: verbose)
-      file_config.report("Settings from merged config files") if verbose
+      config_reader = FatConfig::Reader.new('labrat', xdg: true)
+      file_config = config_reader.read('labrat', verbose: verbose)
       file_options = Labrat::ArgParser.new.parse(file_config, prior: default_config, verbose: verbose)
 
       # Command-line

data/lib/labrat/version.rb

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

data/lib/labrat.rb

@@ -3,6 +3,7 @@
 require 'active_support'
 require 'active_support/core_ext'
 require 'fat_core/enumerable'
+require 'fat_config'
 require 'prawn'
 require 'prawn/measurement_extensions'
 require 'optparse'

data/texlabels/sample.tex

@@ -1,17 +1,21 @@
 \documentclass{article}
 
 \usepackage{geometry}
-\geometry{paperwidth=25mm,paperheight=87mm,landscape}
+\geometry{paperwidth=25mm,paperheight=87mm,landscape,left=1mm,right=1mm,top=1mm,bottom=1mm}
 \renewcommand*\familydefault{\sfdefault}
 \usepackage{tgheros}
+\usepackage{beton}
 
 \begin{document}
-\vfill
+\vfill\hbox{}
 \begin{center}
+  % \footnotesize
+  \large
   \textbf{ABCDEFGHIJKLMNOPQRSTUVWXYZ}\\
   $\int_0^x e^{-t\pi} dx$\\
-  0123456789abcdefghijklmnopqrstuvwxyz\\
-  \textbf{0123456789abcdefghijklmnopqrstuvwxyz}
+  % 0123456789abcdefghijklmnopqrstuvwxyz\\
+  % \textbf{0123456789abcdefghijklmnopqrstuvwxyz}\\
+  % $c^2 - a^2 + b^2$\\
 \end{center}
-\vfill
+\vfill\hbox{}
 \end{document}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: labrat
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-20 00:00:00.000000000 Z
+date: 2024-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fat_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +252,6 @@ files:
 - lib/lisp/labrat.el
 - texlabels/sample.dvi
 - texlabels/sample.pdf
-- texlabels/sample.synctex.gz
 - texlabels/sample.tex
 homepage: http://github.com/ddoherty03/labrat
 licenses: []
@@ -261,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Command-line and Emacs label print software.