labrat 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d5dccd86fad67c08b3e39f77bc6fe062142f869343ab3e4947d611e06a7943e
-  data.tar.gz: f3937d493d2f9ec504874e96c1f0fb6a882b3ffb1f9a57f095005657936821c3
+  metadata.gz: 595b6352e6630e3efbffd4fc438a818b43df1c596de48074fc490562b56f8e8b
+  data.tar.gz: 564456cd01a4bb534a41f4046ae34efb7069c0570ce8dd0ae2df2c3c22229553
 SHA512:
-  metadata.gz: 630dcc80e27810cf4865673f520506548bf75dbbc60b7ddbf3193860ab51d1fd4fff0396e1d948cce318f80bfa70c40df12012eff0f773f5a5856fded1fc8f5d
-  data.tar.gz: 4ab61f63efb8875ff8ca5591bc5ebf695f865bc0ef38abe0018a1b9cec051877d2d7f10d8f7e23eb47102aa0c31dbc5ce9214ee5337c16ed06ad7655340ca2c1
+  metadata.gz: e29546a60511b70555b8eb200352ef908ea9c41dacfc86a6d490354ac00e8fe4ff04777cbf2778c58583dc76296da83be21ebdd45fa7ea6fc53b630467bde6bb
+  data.tar.gz: 529df6f6936b969f7c23f064954dc2c86d5638a6556dce443177053a2c28961e389ee550eae1a4b1181af7dffd9bad26c3d9709a5a135f5b3030bf6ae5de874d

data/Gemfile

@@ -5,6 +5,9 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in labrat.gemspec
 gemspec
 
+# Force the pre-bigdecimal-dep ttfunk so prawn can load even if bigdecimal 4.x is around
+gem "ttfunk", "1.7.0"
+
 group :development do
   gem 'debug', '>= 1.0.0'
   gem 'gem_docs', '>=0.3.1'

data/Gemfile.lock

@@ -12,15 +12,16 @@ GIT
 PATH
   remote: .
   specs:
-    labrat (1.4.1)
+    labrat (1.5.0)
       activesupport
       fat_config (>= 0.4.2)
-      prawn (~> 2.0)
+      matrix
+      prawn (<= 2.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.1.1)
+    activesupport (8.1.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -33,6 +34,8 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
+    addressable (2.8.9)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     base64 (0.3.0)
     bigdecimal (3.3.1)
@@ -47,8 +50,8 @@ GEM
     diff-lcs (1.6.2)
     docile (1.4.1)
     drb (2.2.3)
-    erb (6.0.1)
-    fat_config (0.4.2)
+    erb (6.0.2)
+    fat_config (0.8.0)
       activesupport
       fat_core (>= 5.6.1)
       inifile
@@ -65,32 +68,38 @@ GEM
       concurrent-ruby (~> 1.0)
     inifile (3.0.0)
     io-console (0.8.2)
-    irb (1.16.0)
+    irb (1.17.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.18.0)
+    json (2.18.1)
+    json-schema (6.1.0)
+      addressable (~> 2.8)
+      bigdecimal (>= 3.1, < 5)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
     matrix (0.4.3)
+    mcp (0.8.0)
+      json-schema (>= 4.1)
     method_source (1.1.0)
-    minitest (6.0.1)
+    minitest (6.0.2)
+      drb (~> 2.0)
       prism (~> 1.5)
     ostruct (0.6.3)
     parallel (1.27.0)
-    parser (3.3.10.0)
+    parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
-    pdf-core (0.10.0)
+    pdf-core (0.9.0)
     pp (0.6.3)
       prettyprint
-    prawn (2.5.0)
-      matrix (~> 0.4)
-      pdf-core (~> 0.10.0)
-      ttfunk (~> 1.8)
+    prawn (2.4.0)
+      pdf-core (~> 0.9.0)
+      ttfunk (~> 1.7)
     prettyprint (0.2.0)
-    prism (1.7.0)
+    prism (1.9.0)
     pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -98,10 +107,11 @@ GEM
     psych (5.3.1)
       date
       stringio
+    public_suffix (7.0.5)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.1)
-    rdoc (7.0.3)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
@@ -117,19 +127,20 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.6)
-    rubocop (1.82.1)
+    rspec-support (3.13.7)
+    rubocop (1.85.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
+      mcp (~> 0.6)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.49.0)
@@ -142,7 +153,7 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.8.0)
+    rubocop-rspec (3.9.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.81)
     rubocop-shopify (2.18.0)
@@ -159,8 +170,7 @@ GEM
     tomlib (0.7.3)
       bigdecimal
     tsort (0.2.0)
-    ttfunk (1.8.0)
-      bigdecimal (~> 3.1)
+    ttfunk (1.7.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.2.0)
@@ -183,9 +193,11 @@ DEPENDENCIES
   rubocop
   rubocop-ddoherty!
   simplecov
+  ttfunk (= 1.7.0)
 
 CHECKSUMS
-  activesupport (8.1.1) sha256=5e92534e8d0c8b8b5e6b16789c69dbea65c1d7b752269f71a39422e9546cea67
+  activesupport (8.1.2) sha256=88842578ccd0d40f658289b0e8c842acfe9af751afee2e0744a7873f50b6fdae
+  addressable (2.8.9) sha256=cc154fcbe689711808a43601dee7b980238ce54368d23e127421753e46895485
   ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (3.3.1) sha256=eaa01e228be54c4f9f53bf3cc34fe3d5e845c31963e7fcc5bedb05a4e7d52218
@@ -198,49 +210,52 @@ CHECKSUMS
   diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
   docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e
   drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
-  erb (6.0.1) sha256=28ecdd99c5472aebd5674d6061e3c6b0a45c049578b071e5a52c2a7f13c197e5
-  fat_config (0.4.2) sha256=5136d00289d0fa12a60897e7e70e931b2465007e0a11ffc7b8e350c470119676
+  erb (6.0.2) sha256=9fe6264d44f79422c87490a1558479bd0e7dad4dd0e317656e67ea3077b5242b
+  fat_config (0.8.0) sha256=5648b33d5eba414276ea064d9dec99fb853dfac4b5e003636b45b47bf2858dde
   fat_core (7.1.3) sha256=54aae0da4edcfb77cd2370c46c8a36f792cb0a890069191a47c776c5fce5d367
   gem_docs (0.3.1) sha256=cdd4ec7f65e15e12947f8b8db0d9dea7cc0603c3415c06526263cdab8e32ea65
   i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
   inifile (3.0.0) sha256=b103eb3655ec93cc626cf2de00950e91f7e69b8398842968e17e1815cfacbfb0
   io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
-  irb (1.16.0) sha256=2abe56c9ac947cdcb2f150572904ba798c1e93c890c256f8429981a7675b0806
-  json (2.18.0) sha256=b10506aee4183f5cf49e0efc48073d7b75843ce3782c68dbeb763351c08fd505
-  labrat (1.4.1)
+  irb (1.17.0) sha256=168c4ddb93d8a361a045c41d92b2952c7a118fa73f23fe14e55609eb7a863aae
+  json (2.18.1) sha256=fe112755501b8d0466b5ada6cf50c8c3f41e897fa128ac5d263ec09eedc9f986
+  json-schema (6.1.0) sha256=6bf70a2cfb6dfd5a06da28093fa8190f324c88eabd36a7f47097f227321dc702
+  labrat (1.5.0)
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
   matrix (0.4.3) sha256=a0d5ab7ddcc1973ff690ab361b67f359acbb16958d1dc072b8b956a286564c5b
+  mcp (0.8.0) sha256=ae8bd146bb8e168852866fd26f805f52744f6326afb3211e073f78a95e0c34fb
   method_source (1.1.0) sha256=181301c9c45b731b4769bc81e8860e72f9161ad7d66dd99103c9ab84f560f5c5
-  minitest (6.0.1) sha256=7854c74f48e2e975969062833adc4013f249a4b212f5e7b9d5c040bf838d54bb
+  minitest (6.0.2) sha256=db6e57956f6ecc6134683b4c87467d6dd792323c7f0eea7b93f66bd284adbc3d
   ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912
   parallel (1.27.0) sha256=4ac151e1806b755fb4e2dc2332cbf0e54f2e24ba821ff2d3dcf86bf6dc4ae130
-  parser (3.3.10.0) sha256=ce3587fa5cc55a88c4ba5b2b37621b3329aadf5728f9eafa36bbd121462aabd6
-  pdf-core (0.10.0) sha256=0a5d101e2063c01e3f941e1ee47cbb97f1adfc1395b58372f4f65f1300f3ce91
+  parser (3.3.10.2) sha256=6f60c84aa4bdcedb6d1a2434b738fe8a8136807b6adc8f7f53b97da9bc4e9357
+  pdf-core (0.9.0) sha256=4f368b2f12b57ec979872d4bf4bd1a67e8648e0c81ab89801431d2fc89f4e0bb
   pp (0.6.3) sha256=2951d514450b93ccfeb1df7d021cae0da16e0a7f95ee1e2273719669d0ab9df6
-  prawn (2.5.0) sha256=f4e20e3b4f30bf5b9ae37dad15eb421831594553aa930b2391b0fa0a99c43cb6
+  prawn (2.4.0) sha256=82062744f7126c2d77501da253a154271790254dfa8c309b8e52e79bc5de2abd
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
-  prism (1.7.0) sha256=10062f734bf7985c8424c44fac382ac04a58124ea3d220ec3ba9fe4f2da65103
+  prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
   pry (0.16.0) sha256=d76c69065698ed1f85e717bd33d7942c38a50868f6b0673c636192b3d1b6054e
   psych (5.3.1) sha256=eb7a57cef10c9d70173ff74e739d843ac3b2c019a003de48447b2963d81b1974
+  public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
-  rdoc (7.0.3) sha256=dfe3d0981d19b7bba71d9dbaeb57c9f4e3a7a4103162148a559c4fc687ea81f9
+  rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
   regexp_parser (2.11.3) sha256=ca13f381a173b7a93450e53459075c9b76a10433caadcb2f1180f2c741fc55a4
   reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835
   rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
   rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
   rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
-  rspec-mocks (3.13.7) sha256=0979034e64b1d7a838aaaddf12bf065ea4dc40ef3d4c39f01f93ae2c66c62b1c
-  rspec-support (3.13.6) sha256=2e8de3702427eab064c9352fe74488cc12a1bfae887ad8b91cba480ec9f8afb2
-  rubocop (1.82.1) sha256=09f1a6a654a960eda767aebea33e47603080f8e9c9a3f019bf9b94c9cab5e273
+  rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
+  rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
+  rubocop (1.85.1) sha256=3dbcf9e961baa4c376eeeb2a03913dca5e3987033b04d38fa538aa1e7406cc77
   rubocop-ast (1.49.0) sha256=49c3676d3123a0923d333e20c6c2dbaaae2d2287b475273fddee0c61da9f71fd
   rubocop-ddoherty (0.1.2)
   rubocop-performance (1.26.1) sha256=cd19b936ff196df85829d264b522fd4f98b6c89ad271fa52744a8c11b8f71834
   rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
-  rubocop-rspec (3.8.0) sha256=28440dccb3f223a9938ca1f946bd3438275b8c6c156dab909e2cb8bc424cab33
+  rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
   rubocop-shopify (2.18.0) sha256=dafa25e5617ce4600ff86b1de3d5b78e43ab3d58cc5729df38e492b8e10294eb
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
   securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
@@ -250,7 +265,7 @@ CHECKSUMS
   stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1
   tomlib (0.7.3) sha256=85e562eeaa40b2aca552a13515f41fc6ae9dc522154bc1089c8d3ef94dcebd9b
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
-  ttfunk (1.8.0) sha256=a7cbc7e489cc46e979dde04d34b5b9e4f5c8f1ee5fc6b1a7be39b829919d20ca
+  ttfunk (1.7.0) sha256=2370ba484b1891c70bdcafd3448cfd82a32dd794802d81d720a64c15d3ef2a96
   tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b
   unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42
   unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f

data/labrat.gemspec

@@ -46,5 +46,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport"
   spec.add_dependency "fat_config", '>=0.4.2'
-  spec.add_dependency "prawn", "~> 2.0"
+  spec.add_dependency "matrix"
+  spec.add_dependency "prawn", "<=2.5"
 end

data/lib/config_files/labeldb.yml

@@ -19,7 +19,7 @@ dymo30327:
   right-pad: 1mm
   landscape: true
 
-duraready1034D:
+duraready1034d:
   label: dymo30327
   page-width: 23mm
   page-height: 88mm

data/lib/labrat/config.rb

@@ -1,215 +1,11 @@
 # frozen_string_literal: true
 
+# A thin wrapper around FatConfig.
 module Labrat
-  # This class is responsible for finding a config files, reading them, and
-  # returning a Hash to reflect the configuration.  We use YAML as the
-  # configuration format and look for the config file in the standard places.
-  class Config
-    # Return a Hash of the YAML-ized config files for app_name directories.
-    # Config file may be located in either the xdg locations (containing any
-    # variant of base: base, base.yml, or base.yaml) or in the classic
-    # locations (/etc/app_namerc, /etc/app_name, ~/.app_namerc~, or
-    # ~/.app_name/base[.ya?ml]). Return a hash that reflects the merging of
-    # those files according to the following priorities, from highest to
-    # lowest:
-    #
-    # 1. A config file pointed to by the environment variable APPNAME_CONFIG
-    # 2. User classic config files
-    # 3. User xdg config files for app_name,
-    # 4. A config file pointed to by the environment variable APPNAME_SYS_CONFIG
-    # 5. System classic config files,
-    # 6. System xdg config files for for app_name,
-    #
-    # If an environment variable is found, the search for xdg and classic
-    # config files is skipped. Any dir_prefix is pre-pended to search
-    # locations environment, xdg and classic config paths so you can run this
-    # on a temporary directory set up for testing.
+  module Config
     def self.read(app_name, base: 'config', dir_prefix: '', xdg: true, verbose: false)
-      paths = config_paths(app_name, base: base, dir_prefix: dir_prefix, xdg: xdg)
-      sys_configs = paths[:system]
-      usr_configs = paths[:user]
-      merge_configs_from((sys_configs + usr_configs).compact, verbose: verbose)
-    end
-
-    def self.config_paths(app_name, base: 'config', dir_prefix: '', xdg: true)
-      sys_configs = []
-      sys_env_name = "#{app_name.upcase}_SYS_CONFIG"
-      if ENV[sys_env_name]
-        sys_fname = File.join(dir_prefix, File.expand_path(ENV[sys_env_name]))
-        sys_configs << sys_fname if File.readable?(sys_fname)
-      else
-        sys_configs +=
-          if xdg
-            find_xdg_sys_config_files(app_name, base, dir_prefix)
-          else
-            find_classic_sys_config_files(app_name, base, dir_prefix)
-          end
-      end
-
-      usr_configs = []
-      usr_env_name = "#{app_name.upcase}_CONFIG"
-      if ENV[usr_env_name]
-        usr_fname = File.join(dir_prefix, File.expand_path(ENV[usr_env_name]))
-        usr_configs << usr_fname if File.readable?(usr_fname)
-      else
-        usr_configs <<
-          if xdg
-            find_xdg_user_config_file(app_name, base, dir_prefix)
-          else
-            find_classic_user_config_file(app_name, dir_prefix)
-          end
-      end
-      { system: sys_configs.compact, user: usr_configs.compact }
-    end
-
-    # Merge the settings from the given Array of config files in order from
-    # lowest priority to highest priority, starting with an empty hash.  Any
-    # values of the top-level hash that are themselves Hashes are merged
-    # recursively.
-    def self.merge_configs_from(files = [], verbose: false)
-      hash = {}
-      files.each do |f|
-        next unless File.readable?(f)
-
-        yml_hash = YAML.load_file(f)
-        next unless yml_hash
-
-        if yml_hash.is_a?(Hash)
-          yml_hash = yml_hash
-        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
-    end
-
-    ########################################################################
-    # XDG config files
-    ########################################################################
-
-    # From the XDG standard:
-    # Your application should store and load data and configuration files to/from
-    # the directories pointed by the following environment variables:
-    #
-    # $XDG_CONFIG_HOME (default: "$HOME/.config"): user-specific configuration files.
-    # $XDG_CONFIG_DIRS (default: "/etc/xdg"): precedence-ordered set of system configuration directories.
-
-    # Return the absolute path names of all XDG system config files for
-    # app_name with the basename variants of base. Return the lowest priority
-    # files first, highest last. Prefix the search locations with dir_prefix
-    # if given.
-    def self.find_xdg_sys_config_files(app_name, base, dir_prefix)
-      configs = []
-      xdg_search_dirs = ENV['XDG_CONFIG_DIRS']&.split(':')&.reverse || ['/etc/xdg']
-      xdg_search_dirs.each do |dir|
-        dir = File.expand_path(File.join(dir, app_name))
-        dir = File.join(dir_prefix, dir) unless dir_prefix.nil? || dir_prefix.strip.empty?
-        base = app_name if base.nil? || base.strip.empty?
-        base_candidates = [
-          base.to_s,
-          "#{base}.yml",
-          "#{base}.yaml",
-          "#{base}.cfg",
-          "#{base}.config"
-        ]
-        config_fname = base_candidates.find { |b| File.readable?(File.join(dir, b)) }
-        configs << File.join(dir, config_fname) if config_fname
-      end
-      configs
-    end
-
-    # Return the absolute path name of any XDG user config files for app_name
-    # with the basename variants of base. The XDG_CONFIG_HOME environment
-    # variable for the user configs is intended to be the name of a single xdg
-    # config directory, not a list of colon-separated directories as for the
-    # system config. Return the name of a config file for this app in
-    # XDG_CONFIG_HOME (or ~/.config by default).  Prefix the search location
-    # with dir_prefix if given.
-    def self.find_xdg_user_config_file(app_name, base, dir_prefix)
-      dir_prefix ||= ''
-      base ||= base&.strip || app_name
-      xdg_search_dir = ENV['XDG_CONFIG_HOME'] || ['~/.config']
-      dir = File.expand_path(File.join(xdg_search_dir, app_name))
-      dir = File.join(dir_prefix, dir) unless dir_prefix.strip.empty?
-      return unless Dir.exist?(dir)
-
-      base_candidates = [
-        base.to_s,
-        "#{base}.yml",
-        "#{base}.yaml",
-        "#{base}.cfg",
-        "#{base}.config"
-      ]
-      config_fname = base_candidates.find { |b| File.readable?(File.join(dir, b)) }
-      if config_fname
-        File.join(dir, config_fname)
-      end
-    end
-
-    ########################################################################
-    # Classic config files
-    ########################################################################
-
-    # Return the absolute path names of all "classic" system config files for
-    # app_name with the basename variants of base. Return the lowest priority
-    # files first, highest last.  Prefix the search locations with dir_prefix
-    # if given.
-    def self.find_classic_sys_config_files(app_name, base, dir_prefix)
-      dir_prefix ||= ''
-      configs = []
-      env_config = ENV["#{app_name.upcase}_SYS_CONFIG"]
-      if env_config && File.readable?(config = File.join(dir_prefix, File.expand_path(env_config)))
-        configs = [config]
-      elsif File.readable?(config = File.join(dir_prefix, "/etc/#{app_name}"))
-        configs = [config]
-      elsif File.readable?(config = File.join(dir_prefix, "/etc/#{app_name}rc"))
-        configs = [config]
-      else
-        dir = File.join(dir_prefix, "/etc/#{app_name}")
-        if Dir.exist?(dir)
-          base = app_name if base.nil? || base.strip.empty?
-          base_candidates = [
-            base.to_s + "#{base}.yml",
-            "#{base}.yaml",
-            "#{base}.cfg",
-            "#{base}.config"
-          ]
-          config = base_candidates.find { |b| File.readable?(File.join(dir, b)) }
-          configs = [File.join(dir, config)] if config
-        end
-      end
-      configs
-    end
-
-    # Return the absolute path names of all "classic" system config files for
-    # app_name with the basename variants of base. Return the lowest priority
-    # files first, highest last.  Prefix the search locations with dir_prefix if
-    # given.
-    def self.find_classic_user_config_file(app_name, dir_prefix)
-      dir_prefix ||= ''
-      config_fname = nil
-      env_config = ENV["#{app_name.upcase}_CONFIG"]
-      if env_config && File.readable?(config = File.join(dir_prefix, File.expand_path(env_config)))
-        config_fname = config
-      elsif Dir.exist?(config_dir = File.join(dir_prefix, File.expand_path("~/.#{app_name}")))
-        base_candidates = ["config.yml", "config.yaml", "config"]
-        base_fname = base_candidates.find { |b| File.readable?(File.join(config_dir, b)) }
-        config_fname = File.join(config_dir, base_fname)
-      elsif Dir.exist?(config_dir = File.join(dir_prefix, File.expand_path('~/')))
-        base_candidates = [
-          ".#{app_name}",
-          ".#{app_name}rc",
-          ".#{app_name}.yml",
-          ".#{app_name}.yaml",
-          ".#{app_name}.cfg",
-          ".#{app_name}.config"
-        ]
-        base_fname = base_candidates.find { |b| File.readable?(File.join(config_dir, b)) }
-        config_fname = File.join(config_dir, base_fname)
-      end
-      config_fname
+      reader = FatConfig::Reader.new(app_name, xdg:, root_prefix: dir_prefix)
+      reader.read(verbose:)
     end
   end
 end

data/lib/labrat/label_db.rb

@@ -4,26 +4,26 @@ module Labrat
   module LabelDb
     class << self
       # Module-level variable to hold the merged database.
-      attr_accessor :db
+      attr_accessor :db, :reader
     end
 
     # Read in the Labrat database of label settings, merging system and user
     # databases.
     def self.read(dir_prefix: '')
-      reader = FatConfig::Reader.new('labrat', root_prefix: dir_prefix)
-      self.db = reader.read('labeldb')
+      self.reader = FatConfig::Reader.new('labrat', root_prefix: dir_prefix)
+      self.db = reader.read('labeldb').transform_keys(&:downcase)
     end
 
     # Return a hash of config settings for the label named by labname.
     def self.[](labname)
       read unless db
-      db[labname.to_sym] || {}
+      db[labname.to_sym] || db[labname.downcase.to_sym] || {}
     end
 
     # Set a runtime configuration for a single labelname.
     def self.[]=(labname, config = {})
       read unless db
-      db[labname.to_sym] = config
+      db[labname.to_sym.downcase] = config
     end
 
     # Return an Array of label names.
@@ -37,13 +37,11 @@ module Labrat
     end
 
     def self.system_db_paths(dir_prefix = '')
-      paths = Config.config_paths('labrat', base: 'labeldb', dir_prefix: dir_prefix)
-      paths[:system]
+      reader.config_paths[:system]
     end
 
     def self.user_db_paths(dir_prefix = '')
-      paths = Config.config_paths('labrat', base: 'labeldb', dir_prefix: dir_prefix)
-      paths[:user]
+      reader.config_paths[:user]
     end
   end
 end

data/lib/labrat/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labrat
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Daniel E. Doherty
@@ -37,20 +37,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: matrix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.5'
 description: |2+
 
   Labrat is a linux command-line program for quickly printing labels.  Labrat uses
@@ -146,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.0
 specification_version: 4
 summary: Command-line and Emacs label print software.
 test_files: []