From fae622c8b77feebac66a538d76e4211de8bd8eb3 Mon Sep 17 00:00:00 2001
From: Philip McGrath <philip@philipmcgrath.com>
Date: Sun, 24 Jul 2022 21:50:44 -0400
Subject: [PATCH] fix saving `AnyStyle::Dictionary` after `populate!`

Some of these fixes are more generally applicable.

A more robust solution might find data files using
e.g. `Gem.find_files()`.
---
 lib/anystyle/dictionary/gdbm.rb    |  6 ++++++
 lib/anystyle/dictionary/marshal.rb | 31 ++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/lib/anystyle/dictionary/gdbm.rb b/lib/anystyle/dictionary/gdbm.rb
index 754903c..c814df2 100644
--- a/lib/anystyle/dictionary/gdbm.rb
+++ b/lib/anystyle/dictionary/gdbm.rb
@@ -1,5 +1,6 @@
 module AnyStyle
   require 'gdbm'
+  require 'fileutils'
 
   class Dictionary
     class GDBM < Dictionary
@@ -17,8 +18,13 @@ module AnyStyle
 
       def open
         close
+        FileUtils.mkdir_p(File.dirname(options[:path]))
         @db = ::GDBM.new(*options.values_at(:path, :mode, :flags))
         self
+      rescue Errno::EACCES
+        # GDBM.new tries this if :flags is nil, but not necessarily otherwise
+        @db = ::GDBM.new(options[:path],options[:mode],::GDBM::READER)
+        self
       ensure
         populate! if empty?
       end
diff --git a/lib/anystyle/dictionary/marshal.rb b/lib/anystyle/dictionary/marshal.rb
index 761ca36..b9529d0 100644
--- a/lib/anystyle/dictionary/marshal.rb
+++ b/lib/anystyle/dictionary/marshal.rb
@@ -1,4 +1,6 @@
 module AnyStyle
+  require 'fileutils'
+  require 'tempfile'
   class Dictionary
     class Marshal < Dictionary
       @defaults = {
@@ -10,17 +12,34 @@ module AnyStyle
       end
 
       def open
-        if File.exists?(options[:path])
-          @db = ::Marshal.load(File.open(options[:path]))
-        else
-          @db = {}
+        File.open(options[:path]) do |file|
+          @db = ::Marshal.load(file)
         end
         self
+      rescue Errno::ENOENT
+        @db = {}
+        self
       ensure
         if empty?
           populate!
-          if File.writable?(options[:path])
-            ::Marshal.dump(db, File.open(options[:path], 'wb'))
+          tmp = nil
+          begin
+            FileUtils.mkdir_p(File.dirname(options[:path]))
+            tmp = Tempfile.create(File.basename(options[:path]),
+                                  File.dirname(options[:path]),
+                                  mode: File::Constants::BINARY)
+            pth = tmp.path()
+            ::Marshal.dump(db, tmp)
+            tmp.close()
+            File.rename(tmp.path, options[:path]) # will overwrite if exists
+            tmp = nil
+          rescue SystemCallError => e
+            warn(e.message)
+          ensure
+            if tmp then
+              tmp.close()
+              tmp.unlink()
+            end
           end
         end
       end
-- 
2.32.0

x/inferior.scm (inferior-package-replacement): New procedure.
* tests/inferior.scm ("inferior-package-replacement"): New test.
</span></span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2021-04-29 01:22:04 +0200'>2021-04-29</span></td><td><a href='/guix/commit/tests/inferior.scm?id=9dc1c591a4fe90e823ed69fb52c055b98d4699f6'>inferior: Make sure test refers to guile@3.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/inferior.scm ("inferior-package-inputs"): Compare with
GUILE-3.0-LATEST since that's what 'lookup-inferior-packages' returns.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-01-21 00:14:38 +0100'>2021-01-21</span></td><td><a href='/guix/commit/tests/inferior.scm?id=98d3abe7440717724263cacca8c36e9f43d53fcc'>repl: Fix exception handling for interpreted code.</a><span class='msg-avail'>...<span class='msg-tooltip'>The 'stack' variable could be #f when code is interpreted, which in
practice happens when running in "legacy" mode--i.e., when
'open-inferior' invokes "guile" instead of "guix repl".

* guix/repl.scm (send-repl-response)[handle-exception]: Check whether
STACK is true before passing it to 'stack-&gt;frames'.
* tests/inferior.scm ("&amp;inferior-exception, legacy mode"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-01-21 00:14:38 +0100'>2021-01-21</span></td><td><a href='/guix/commit/tests/inferior.scm?id=074a201c33f822a7ab59512e7ee8b301204ff732'>inferior: Add 'inferior-eval-with-store' tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/inferior.scm ("inferior-eval-with-store, exception")
("inferior-eval-with-store, not a procedure"): New tests.
</span></span></td><td>Ludovic Courtès</td></tr>