longleaf 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71c3c9e78a968f153c457d2a59ae17e8d45b4f6e905deeb787172844cee3733f
-  data.tar.gz: d354dba30939cdf1917b09fa7fc874654135f311dd1d5c60453cb42fe2b2a736
+  metadata.gz: eb37785f1fd9fc03721f7cdc3946f648d3c1e126385677daba89fdcfb3c32330
+  data.tar.gz: a208d7c6c79440563950c6b64647637f75fa3687690ff496395cab5e524408f3
 SHA512:
-  metadata.gz: af2433108df902de025137d67c4b3d089b8766f7856d10d5d93d6bd449b82227c7cf3e987e50199c83a0869056842cb34d55f710102fa8a654282170c215882a
-  data.tar.gz: 93deda52a5f3de34ebc29baef3f531db099ea76521389dc223f33c2922da0e1fb81d775c8178370ade67ea397761553bf9ec34c03c12eec1e0a77d12174e07de
+  metadata.gz: 2d1df2dd6abad7c04af677ca571308b322368daeaa27ddde4bc48d2804819851b19e66ce6c66a01007a8439c7c6d6c5937de8c55813ee9af3f2b99a4486affa9
+  data.tar.gz: 2d2ba20c34cdf8abeeb163558b5eb5dec681fb03c17029e97ee3fa9f58ec36de00d9c1b8e8e5effbcf0dcd8ac8abb75866a8983efbd68bff8669f9a9d7a046ef

data/lib/longleaf/services/metadata_serializer.rb

@@ -105,6 +105,7 @@ module Longleaf
         original_file.flock(File::LOCK_EX)
 
         base_name = File.basename(file_path)
+        old_renamed = nil
         Tempfile.open(base_name, parent_dir) do |temp_file|
           begin
             # Write content to temp file
@@ -117,16 +118,27 @@ module Longleaf
             old_stat = File.stat(file_path)
             set_perms(temp_path, old_stat)
 
-            begin
-              digest_paths = write_digests(temp_path, content, digest_algs)
-
-              File.rename(temp_path, file_path)
-            rescue => e
-              cleanup_digests(temp_path)
-              raise e
-            end
+            # Produce digest files for the temp file
+            digest_paths = write_digests(temp_path, content, digest_algs)
+            
+            # Move the old file to a temp path in case it needs to be restored
+            old_renamed = temp_path + ".old"
+            File.rename(file_path, old_renamed)
+            
+            # Move move the new file into place as the new main file
+            File.rename(temp_path, file_path)
           rescue => e
-            temp_file.delete
+            # Attempt to restore old file if it had already been moved
+            if !old_renamed.nil? && !File.exist?(file_path)
+              File.rename(old_renamed, file_path)
+            end
+            # Cleanup the temp file and any digest files written for it
+            temp_file.delete if File.exist?(temp_file.path)
+            unless digest_paths.nil?
+              digest_paths.each do |digest_path|
+                File.delete(digest_path)
+              end
+            end
             raise e
           end
 
@@ -136,6 +148,8 @@ module Longleaf
           digest_paths.each do |digest_path|
             File.rename(digest_path, digest_path.sub(temp_path, file_path))
           end
+          # Cleanup the old file
+          File.delete(old_renamed)
         end
       end
     end

data/lib/longleaf/version.rb

@@ -1,3 +1,3 @@
 module Longleaf
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: longleaf
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ben Pennell
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor