labrat 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9638d07db35a3698225529915d79d2075fb2ec912d6fb5a476d4863508c64cb
-  data.tar.gz: fab7d0b7feaa529f3b76bef4bade636635985c9c5ac1a7f9bd045ec347f73565
+  metadata.gz: 8ce9676af6fe2c1155bd75cdae1dc61e6b0a8875408340a53ab0b8cbef18b6b3
+  data.tar.gz: 313c7fc8caaac101a427e2e8f8f707e12dd2355fef59445c8f133eeba3caa834
 SHA512:
-  metadata.gz: 17ee2b23c97e134bc5eb74926684fa8025b902a09cc1fbb33e8943b9ede3a8b037b39bea7c5d3d7527c40a833ea259a4c66a9cf74eea90efdf211ff266cf2767
-  data.tar.gz: 0d81a841a46408a1448fcb34ca6ad8f899493ecbcc1581cbf4cfb74d4990e4234c4c43b9c7c55346ae82e253bddc24051848f3aea057607476d921acc95727d3
+  metadata.gz: 36b1daaa10a3bd14688ad0eaecdcee97afdc9e5bc2511a33a43346b63f3335e0d4c2111ec96144055fca72a84d5ce83e51fc6c9ae2347c360e13f74966f6e0ce
+  data.tar.gz: f24a79df4d77e682be68c1fecf709214250b050665eddd85353026b4358cdaa6aa8e771bed16f4ee6eb901ac7ff54e815bdf1f9fa52c6310ea913993b816d4e8

data/CHANGELOG.md

@@ -1,22 +1,33 @@
-- [Version 1.4.1 <span class="timestamp-wrapper"><span class="timestamp">[2025-12-28 Sun]</span></span>](#orgd8249d2)
-- [Version 1.3.0 <span class="timestamp-wrapper"><span class="timestamp">[2025-12-26 Fri]</span></span>](#org107aabd)
-- [Version 1.2.3 <span class="timestamp-wrapper"><span class="timestamp">[2025-03-20 Thu]</span></span>](#org99dae2d)
-- [Version 1.2.2 <span class="timestamp-wrapper"><span class="timestamp">[2024-11-29 Fri]</span></span>](#org9958d5d)
-- [Version 1.2.1 <span class="timestamp-wrapper"><span class="timestamp">[2024-09-20 Fri]</span></span>](#org69020a9)
-- [Version 1.2.0 <span class="timestamp-wrapper"><span class="timestamp">[2023-01-19 Thu]</span></span>](#org8b0bc88)
-- [Version 1.1.0 <span class="timestamp-wrapper"><span class="timestamp">[2023-01-06 Fri]</span></span>](#orgccb7d5f)
-- [Version 0.1.14 <span class="timestamp-wrapper"><span class="timestamp">[2022-02-03 Thu]</span></span>](#org1ddf800)
-- [Version 0.1.13 <span class="timestamp-wrapper"><span class="timestamp">[2021-11-04 Thu]</span></span>](#org3b34d02)
+- [Version 1.6.0 <span class="timestamp-wrapper"><span class="timestamp">[2026-03-06 Fri]</span></span>](#org0072ea7)
+- [Version 1.4.1 <span class="timestamp-wrapper"><span class="timestamp">[2025-12-28 Sun]</span></span>](#org309b509)
+- [Version 1.3.0 <span class="timestamp-wrapper"><span class="timestamp">[2025-12-26 Fri]</span></span>](#orgcd48f5d)
+- [Version 1.2.3 <span class="timestamp-wrapper"><span class="timestamp">[2025-03-20 Thu]</span></span>](#orgd671ebe)
+- [Version 1.2.2 <span class="timestamp-wrapper"><span class="timestamp">[2024-11-29 Fri]</span></span>](#org55a1d4d)
+- [Version 1.2.1 <span class="timestamp-wrapper"><span class="timestamp">[2024-09-20 Fri]</span></span>](#org89e5245)
+- [Version 1.2.0 <span class="timestamp-wrapper"><span class="timestamp">[2023-01-19 Thu]</span></span>](#orgeed739d)
+- [Version 1.1.0 <span class="timestamp-wrapper"><span class="timestamp">[2023-01-06 Fri]</span></span>](#orgadd5092)
+- [Version 0.1.14 <span class="timestamp-wrapper"><span class="timestamp">[2022-02-03 Thu]</span></span>](#org25c7986)
+- [Version 0.1.13 <span class="timestamp-wrapper"><span class="timestamp">[2021-11-04 Thu]</span></span>](#org2d49d11)
 
 
-<a id="orgd8249d2"></a>
+<a id="org0072ea7"></a>
+
+# Version 1.6.0 <span class="timestamp-wrapper"><span class="timestamp">[2026-03-06 Fri]</span></span>
+
+-   Improved labrat.el to ensure that the **labrat** buffer gets created and logs the command used along with a timestamp and any errors.
+-   Echo the output file name after creation.
+-   Add the process number to file name to prevent name collisions.
+-   Fix use of XDG\_DATA\_HOME environment variable.
+
+
+<a id="org309b509"></a>
 
 # Version 1.4.1 <span class="timestamp-wrapper"><span class="timestamp">[2025-12-28 Sun]</span></span>
 
 -   Added a `vim` plugin to allow printing or viewing labels from within a vim buffer as was possible in Emacs with `labrat.el`.
 
 
-<a id="org107aabd"></a>
+<a id="orgcd48f5d"></a>
 
 # Version 1.3.0 <span class="timestamp-wrapper"><span class="timestamp">[2025-12-26 Fri]</span></span>
 
@@ -24,28 +35,28 @@
 -   Output file can still be overridden with the `-o` or `--out-file` option
 
 
-<a id="org99dae2d"></a>
+<a id="orgd671ebe"></a>
 
 # Version 1.2.3 <span class="timestamp-wrapper"><span class="timestamp">[2025-03-20 Thu]</span></span>
 
 -   No user-visible changes
 
 
-<a id="org9958d5d"></a>
+<a id="org55a1d4d"></a>
 
 # Version 1.2.2 <span class="timestamp-wrapper"><span class="timestamp">[2024-11-29 Fri]</span></span>
 
 -   Used `fat_config` gem to read config files
 
 
-<a id="org69020a9"></a>
+<a id="org89e5245"></a>
 
 # Version 1.2.1 <span class="timestamp-wrapper"><span class="timestamp">[2024-09-20 Fri]</span></span>
 
 -   Fixed `labrat.el` view command
 
 
-<a id="org8b0bc88"></a>
+<a id="orgeed739d"></a>
 
 # Version 1.2.0 <span class="timestamp-wrapper"><span class="timestamp">[2023-01-19 Thu]</span></span>
 
@@ -54,7 +65,7 @@
 -   Minor bug fixes
 
 
-<a id="orgccb7d5f"></a>
+<a id="orgadd5092"></a>
 
 # Version 1.1.0 <span class="timestamp-wrapper"><span class="timestamp">[2023-01-06 Fri]</span></span>
 
@@ -63,14 +74,14 @@
 -   Added label name to template output
 
 
-<a id="org1ddf800"></a>
+<a id="org25c7986"></a>
 
 # Version 0.1.14 <span class="timestamp-wrapper"><span class="timestamp">[2022-02-03 Thu]</span></span>
 
 -   Nothing important
 
 
-<a id="org3b34d02"></a>
+<a id="org2d49d11"></a>
 
 # Version 0.1.13 <span class="timestamp-wrapper"><span class="timestamp">[2021-11-04 Thu]</span></span>
 

data/CHANGELOG.org

@@ -1,4 +1,11 @@
 
+* Version 1.6.0 [2026-03-06 Fri]
+- Improved labrat.el to ensure that the *labrat* buffer gets created and logs
+  the command used along with a timestamp and any errors.
+- Echo the output file name after creation.
+- Add the process number to file name to prevent name collisions.
+- Fix use of XDG_DATA_HOME environment variable.
+
 * Version 1.4.1 [2025-12-28 Sun]
 - Added a ~vim~ plugin to allow printing or viewing labels from within a vim
   buffer as was possible in Emacs with ~labrat.el~.

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    labrat (1.5.1)
+    labrat (1.6.0)
       activesupport
       fat_config (>= 0.4.2)
       matrix
@@ -220,7 +220,7 @@ CHECKSUMS
   irb (1.17.0) sha256=168c4ddb93d8a361a045c41d92b2952c7a118fa73f23fe14e55609eb7a863aae
   json (2.18.1) sha256=fe112755501b8d0466b5ada6cf50c8c3f41e897fa128ac5d263ec09eedc9f986
   json-schema (6.1.0) sha256=6bf70a2cfb6dfd5a06da28093fa8190f324c88eabd36a7f47097f227321dc702
-  labrat (1.5.1)
+  labrat (1.6.0)
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203

data/lib/labrat/label.rb

@@ -119,6 +119,7 @@ module Labrat
           end
         end
       end
+      puts ops.out_file
       self
     end
 

data/lib/labrat/options.rb

@@ -117,11 +117,11 @@ module Labrat
     end
 
     def self.default_out_file
-      dir = ENV['XDG_DATA_HOME'] || "~/.local/share/labrat"
-      dir = File.expand_path(dir)
+      base = ENV["XDG_DATA_HOME"] || "~/.local/share"
+      dir = File.expand_path(File.join(base, "labrat"))
       FileUtils.mkdir_p(dir)
       stamp = Time.now.strftime("%Y-%m-%dT%H:%M:%S.%3N")
-      File.join(dir, stamp + '.pdf')
+      File.join(dir, "#{stamp}-#{$$}.pdf")
     end
 
     # Return any string in msg, e.g., the usage help or error.

data/lib/labrat/version.rb

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

data/lib/lisp/labrat.el

@@ -38,6 +38,9 @@ labrat configuration at ~/.config/labrat/config.yml."
   :type 'string
   :group 'labrat)
 
+(defconst labrat-buffer-name "*labrat*"
+  "Name of the labrat process output buffer.")
+
 (defun labrat/pars-in-region ()
   "Return a string of paragraphs in region, separated by `labrat-label-sep'.
 
@@ -82,6 +85,57 @@ that start with '#' are removed, and the remaining lines
 returned"
   (s-join "\n" (--remove (string-match "^#" it) (s-split "\n" str))))
 
+(defun labrat/run (&rest args)
+  "Run labrat with ARGS, always reusing and displaying `*labrat*'.
+
+Stdout and stderr are both written to the `*labrat*' buffer.
+Return the labrat exit status."
+  (let* ((buf (get-buffer-create labrat-buffer-name))
+         (stderr-file (make-temp-file "labrat-stderr-"))
+         (status nil))
+    (unwind-protect
+        (progn
+          (with-current-buffer buf
+            (let ((inhibit-read-only t)
+                  (ts (format-time-string "%Y-%m-%d %H:%M:%S")))
+              (goto-char (point-max))
+              (unless (bolp)
+                (insert "\n"))
+              (insert (format "\n===== %s =====\n" ts))
+              (insert (format "$ %s %s\n\n"
+                              labrat-executable
+                              (mapconcat #'identity args " ")))))
+          (setq status
+                (apply #'call-process
+                       labrat-executable
+                       nil
+                       (list buf stderr-file)
+                       nil
+                       args))
+          (with-current-buffer buf
+            (let ((inhibit-read-only t))
+              (when (file-exists-p stderr-file)
+                (let ((stderr-text
+                       (with-temp-buffer
+                         (insert-file-contents stderr-file)
+                         (buffer-string))))
+                  (unless (string-empty-p stderr-text)
+                    (goto-char (point-max))
+                    (unless (bolp)
+                      (insert "\n"))
+                    (insert "===== stderr =====\n")
+                    (insert stderr-text)
+                    (unless (bolp)
+                      (insert "\n")))))
+              (goto-char (point-max))
+              (insert (format "\n[labrat exited with status %s]\n" status))))
+          (unless (equal status 0)
+            (display-buffer buf)
+            (message "labrat failed with status %s; see %s" status labrat-buffer-name))
+          status)
+      (when (file-exists-p stderr-file)
+        (delete-file stderr-file)))))
+
 (defun labrat-view ()
   "View the paragraph at or before point as a label with labrat.
 
@@ -90,19 +144,17 @@ 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."
   (interactive)
-  (call-process labrat-executable nil (get-buffer-create "*labrat*") nil
-                "-V" "-o ~/labrat.pdf" (labrat/pars-in-region)))
+  (labrat/run "-V" (labrat/pars-in-region)))
 
 (defun labrat-print ()
   "Print the paragraph at or before point as a label with labrat.
 
-This invokes the \"labrat -P <label>\" command with the paragraph
+This invokes the \"labrat <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."
   (interactive)
-  (call-process labrat-executable nil (buffer-name (get-buffer-create "*labrat*")) nil
-                "-o ~/labrat.pdf" (labrat/pars-in-region)))
+  (labrat/run (labrat/pars-in-region)))
 
 (provide 'labrat)
 ;;; labrat.el ends here

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labrat
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Daniel E. Doherty