labrat 1.2.1 → 1.2.3

data/lib/labrat/label.rb

@@ -40,13 +40,22 @@ module Labrat
         bpm = ops.right_page_margin
       end
       out_file = File.expand_path(ops.out_file)
-      Prawn::Document.generate(out_file, page_size: [ops.page_width, ops.page_height],
-                               left_margin: lpm, right_margin: rpm,
-                               top_margin: tpm, bottom_margin: bpm,
-                               page_layout: layout) do |pdf|
+      Prawn::Document.generate(
+        out_file,
+        page_size: [ops.page_width, ops.page_height],
+                                       left_margin: lpm,
+        right_margin: rpm,
+                                       top_margin: tpm,
+        bottom_margin: bpm,
+                                       page_layout: layout,
+      ) do |pdf|
         # Define a grid with each grid box to be used for a single label.
-        pdf.define_grid(rows: ops.rows, columns: ops.columns,
-                        row_gutter: ops.row_gap, column_gutter: ops.column_gap)
+        pdf.define_grid(
+          rows: ops.rows,
+          columns: ops.columns,
+          row_gutter: ops.row_gap,
+          column_gutter: ops.column_gap,
+        )
         if ops.verbose
           warn "Page dimensions:"
           warn "  [pg_wd, pg_ht] = [#{ops.page_width.round(2)}pt,#{ops.page_height.round(2)}pt]"
@@ -62,7 +71,7 @@ module Labrat
           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}"}
+          self.texts = (1..(ops.rows * ops.columns)).map { |n| "#{n}\n#{lab_text}" }
           ops.font_name = 'Helvetica'
           ops.font_style = 'bold'
           ops.font_size = 11
@@ -82,9 +91,15 @@ module Labrat
             box_x = ops.left_pad + ops.delta_x
             box_y = ops.bottom_pad + box_ht + ops.delta_y
             pdf.font ops.font_name, style: ops.font_style, size: ops.font_size.to_f
-            pdf.text_box(text, width: box_wd, height: box_ht,
-                         align: ops.h_align, valign: ops.v_align,
-                         overflow: :truncate, at: [box_x, box_y])
+            pdf.text_box(
+              text,
+              width: box_wd,
+              height: box_ht,
+                                       align: ops.h_align,
+              valign: ops.v_align,
+                                       overflow: :truncate,
+              at: [box_x, box_y],
+            )
             if ops.verbose && !lab_dims_reported
               warn "Label text box dimensions:"
               warn "  [box_wd, box_ht] = [#{box_wd.round(2)}pt,#{box_ht.round(2)}pt]"
@@ -94,7 +109,7 @@ module Labrat
               lab_dims_reported = true
             end
             if ops.verbose
-              warn "Label \##{(k % lpp) + 1} on page #{page_num(k)} at row #{row + 1}, column #{col + 1}:"
+              warn "Label ##{(k % lpp) + 1} on page #{page_num(k)} at row #{row + 1}, column #{col + 1}:"
               warn '-------------------'
               warn text
               warn '-------------------'
@@ -149,8 +164,9 @@ module Labrat
     # Should we emit a new page at this point?
     def needs_new_page?(k, last_k)
       return false if k == last_k
+
       r, c = row_col(k + 1)
-      (r + 1 == ops.rows && c + 1 == ops.columns)
+      r + 1 == ops.rows && c + 1 == ops.columns
     end
 
     # Would we just be printing blank labels?

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

@@ -6,18 +6,44 @@ 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, :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,
-                  :start_label, :grid,
-                  :h_align, :v_align,
-                  :left_pad, :right_pad, :top_pad, :bottom_pad,
-                  :delta_x, :delta_y,
-                  :font_name, :font_style, :font_size,
-                  :in_file, :nl_sep, :label_sep, :copies,
-                  :printer, :out_file, :print_command, :view_command, :view,
-                  :template, :verbose, :msg
+    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,
+                  :start_label,
+                  :grid,
+                  :h_align,
+                  :v_align,
+                  :left_pad,
+                  :right_pad,
+                  :top_pad,
+                  :bottom_pad,
+                  :delta_x,
+                  :delta_y,
+                  :font_name,
+                  :font_style,
+                  :font_size,
+                  :in_file,
+                  :nl_sep,
+                  :label_sep,
+                  :copies,
+                  :printer,
+                  :out_file,
+                  :print_command,
+                  :view_command,
+                  :view,
+                  :template,
+                  :verbose,
+                  :msg
 
     # Initialize with an optional hash of default values for the attributes.
     def initialize(**init)
@@ -73,15 +99,15 @@ 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
       if verbose
-        warn "Command-line:"
+        warn "\nCommand-line:"
         args.each do |arg|
-          warn arg.to_s
+          warn arg
         end
         warn ""
       end
@@ -98,27 +124,27 @@ module Labrat
     # Allow hash-like assignment to attributes.  This allows an Options object
     # to be used, for example, in the OptionParser#parse :into parameter.
     def []=(att, val)
-      att = att.to_s.gsub('-', '_')
-      send("#{att}=", val)
+      att = att.to_s.tr('-', '_')
+      send(:"#{att}=", val)
     end
 
     # Allow hash-like access to attributes.  This allows an Options object
     # to be used, for example, in the OptionParser#parse :into parameter.
     def [](att)
-      att = att.to_s.gsub('-', '_')
+      att = att.to_s.tr('-', '_')
       send(att.to_s)
     end
 
     # For testing, return an Array of the attributes as symbols.
     def self.attrs
       instance_methods(false).grep(/\A[a-z_]+=\Z/)
-        .map { |a| a.to_s.sub(/=\z/, '').to_sym }
+        .map { |a| a.to_s.delete_suffix('=').to_sym }
     end
 
     # For testing, return an Array of the flags-form of the attributes, i.e.,
     # with the underscores, _, replaced with hyphens.
     def self.flags
-      attrs.map { |a| a.gsub('_', '-') }
+      attrs.map { |a| a.tr('_', '-') }
     end
 
     # Return a hash of the values in this Options object.  This is the
@@ -174,7 +200,7 @@ module Labrat
     # an Options object.
     def merge!(hsh)
       # Convert any separator hyphens in the hash keys to underscores
-      hsh = hsh.to_hash.transform_keys { |key| key.to_s.gsub('-', '_').to_sym }
+      hsh = hsh.to_hash.transform_keys { |key| key.to_s.tr('-', '_').to_sym }
       new_hash = to_hash.merge(hsh)
       new_hash.each_pair do |k, val|
         setter = "#{k}=".to_sym

data/lib/labrat/read_files.rb

@@ -9,6 +9,7 @@ module Labrat
         unless File.readable?(fname)
           raise "Cannot open label file '#{ofname}' for reading"
         end
+
         File.open(fname)
       else
         $stdin
@@ -17,9 +18,9 @@ module Labrat
     texts = []
     label = nil
     file.each do |line|
-      next if line =~ /\A#/
+      next if /\A\s*#/.match?(line)
 
-      if line =~ /\A\s*\z/
+      if /\A\s*\z/.match?(line)
         # At blank line record any accumulated label into texts, but remove
         # the nlsep from the end.
         if label

data/lib/labrat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Labrat
-  VERSION = "1.2.1"
+  VERSION = "1.2.3"
 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,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: labrat
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Daniel E. Doherty
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-20 00:00:00.000000000 Z
+date: 2025-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: matrix
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,33 +24,19 @@ dependencies:
       - !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'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
+  name: fat_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: fat_core
   requirement: !ruby/object:Gem::Requirement
@@ -67,97 +52,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: debug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-shopify
+  name: matrix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -165,19 +66,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: |2+
 
   Labrat is a linux command-line program for quickly printing labels.  Labrat uses
@@ -202,6 +103,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".envrc"
+- ".github/workflows/main.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -238,7 +141,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,8 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Command-line and Emacs label print software.
 test_files: []