Merge branch 'fix/proctable-on-macos'

Author: joeyates

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 16.4.1 - 2026-01-06
+
+### Changed
+
+* Modified lockfile creation to handle macOS.
+* Removed handling of (ancient) version 2 configuration files.
+
 ## 16.4.0 - 2026-01-01
 
 ### Changed

lib/imap/backup/account/locker.rb

@@ -28,7 +28,11 @@ def with_lock(&block)
         Account::FolderEnsurer.new(account: account).run
       end
 
-      lockfile.with_lock do
+      begin
+        lockfile.with_lock do
+          block.call
+        end
+      rescue Lockfile::ProcessStartTimeUnavailableError
         block.call
       end
     end

lib/imap/backup/lockfile.rb

@@ -7,6 +7,7 @@ module Imap::Backup
   class Lockfile
     # An error that is thrown if a lockfile already exists
     class LockfileExistsError < StandardError; end
+    class ProcessStartTimeUnavailableError < StandardError; end
 
     attr_reader :path
 
@@ -53,7 +54,9 @@ def stale?
 
       return true if proc_table_entry.nil?
 
-      proc_table_entry.starttime != starttime
+      other_starttime = starttime(proc_table_entry)
+
+      other_starttime != starttime
     end
 
     private
@@ -62,9 +65,11 @@ def create
       pid = Process.pid
       proc_table_entry = Sys::ProcTable.ps(pid: pid)
 
-      raise "Unable to get process info for PID #{pid}" if proc_table_entry.nil?
+      if proc_table_entry.nil?
+        raise ProcessStartTimeUnavailableError, "Unable to get process info for PID #{pid}"
+      end
 
-      starttime = proc_table_entry.starttime
+      starttime = starttime(proc_table_entry)
 
       data = {
         pid: pid,
@@ -74,5 +79,16 @@ def create
       json_data = JSON.generate(data)
       File.write(path, json_data)
     end
+
+    def starttime(proc_table_entry)
+      case
+      when proc_table_entry.respond_to?(:starttime)
+        proc_table_entry.starttime
+      when proc_table_entry.respond_to?(:start_tvsec)
+        proc_table_entry.start_tvsec
+      else
+        raise ProcessStartTimeUnavailableError, "Proctable entry structure unknown"
+      end
+    end
   end
 end

lib/imap/backup/version.rb

@@ -6,7 +6,7 @@ module Imap::Backup
   # @private
   MINOR    = 4
   # @private
-  REVISION = 0
+  REVISION = 1
   # @private
   PRE      = nil
   # The application version

spec/unit/account/locker_spec.rb

@@ -94,6 +94,18 @@ module Backup
             end.to raise_error("Lockfile '#{account.lockfile_path}' exists and is not stale.")
           end
         end
+
+        context "when the process start time is unavailable" do
+          it "calls the supplied block" do
+            allow(lockfile).to receive(:with_lock).
+              and_raise(Lockfile::ProcessStartTimeUnavailableError)
+
+            yielded = false
+            subject.with_lock { yielded = true }
+
+            expect(yielded).to be true
+          end
+        end
       end
     end
   end

spec/unit/lockfile_spec.rb

@@ -7,7 +7,14 @@ module Imap::Backup
     let(:lockfile_path) { "test.lock" }
     # We don't mock Process.pid because we want to use the real value in Process.kill
     let(:pid) { Process.pid }
-    let(:proc_info) { instance_double(Struct::ProcTableStruct, starttime: starttime) }
+    let(:proc_info) do
+      case RUBY_PLATFORM
+      when /darwin/
+        instance_double(Struct::ProcTableStruct, start_tvsec: starttime)
+      else
+        instance_double(Struct::ProcTableStruct, starttime: starttime)
+      end
+    end
     let(:starttime) { 456 }
 
     before do
@@ -45,6 +52,16 @@ module Imap::Backup
         end
       end
 
+      context "when starttime is not available" do
+        let(:proc_info) { "Unknown platform's proc info" }
+
+        it "raises" do
+          expect do
+            subject.with_lock {}
+          end.to raise_error(Lockfile::ProcessStartTimeUnavailableError)
+        end
+      end
+
       it "creates the lockfile" do
         subject.with_lock {}
 
@@ -140,7 +157,14 @@ module Imap::Backup
         end
 
         context "when the PID exists with a different starttime" do
-          let(:other_proc_info) { instance_double(Struct::ProcTableStruct, starttime: starttime + 1) }
+          let(:other_proc_info) do
+            case RUBY_PLATFORM
+            when /darwin/
+              instance_double(Struct::ProcTableStruct, start_tvsec: starttime + 1)
+            else
+              instance_double(Struct::ProcTableStruct, starttime: starttime + 1)
+            end
+          end
 
           before do
             allow(Sys::ProcTable).to receive(:ps).with(pid: pid) { other_proc_info }