lockf.rb 0.13.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07acab1cbd6394d179fafd3fed888bdb56f7bc52868a8557a6b2114500a409ca
-  data.tar.gz: '0178e4e393991e7b3ab099ba2491aa7888fb30e1f096d785d4797f6bbb30a048'
+  metadata.gz: 2a49042a4d79251c0a85dbe626fefaa323862ea30a45426012a1d8bab08f63fb
+  data.tar.gz: 57f2c700f963a299ce4502e3a7856cc75283ceb80d1c27864ea08438950047d5
 SHA512:
-  metadata.gz: 80e87c4f223f90db7ffb518dcf969342125c546b8d3a839af8a36086caeca67a7155b90953c883dab3f598c5f17d5d827b8fe72c2e53b841b6260a789fc6deeb
-  data.tar.gz: ad79f9b41adb8ea5fd4a891eabd0f8488bfe5a5afd80a27ccacc81f2e06eae1bd7530fd74edb985f988aad559f59176ed61392e87829fb7d9e65395d23f99e7c
+  metadata.gz: 7d5c94dbaa6ad0b2eff1fe114e902d7c49014f2bb0ce69b2c5512ae0d107274d7c3c8b6a2d688672faeb85c7b48510689952efd9c64dc4cc78616e3e566f2e8e
+  data.tar.gz: 27c55d59bbab2f8e76b5370b010b3541d65a346b88279361e7f64110b3e6a1fe3f1ddaf4677fbefcec7f2e6409d70483937298f47cda1e3d729c209122d821df

data/.clang-format

@@ -0,0 +1,11 @@
+BasedOnStyle: LLVM
+IndentWidth: 2
+SortIncludes: false
+UseTab: Never
+BreakBeforeBraces: Allman
+AllowShortFunctionsOnASingleLine: Inline
+AlwaysBreakAfterDefinitionReturnType: TopLevel
+BreakBeforeBinaryOperators: All
+BinPackArguments: false
+AlignConsecutiveAssignments: true
+AlwaysBreakAfterReturnType: None

data/.rubocop.yml

@@ -18,4 +18,8 @@ Layout/ArgumentAlignment:
 ##
 # Options for all cops.
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.2
+  Include:
+    - lib/*.rb
+    - lib/**/*.rb
+    - test/*.rb

data/Gemfile

@@ -1,3 +1,2 @@
 source "https://rubygems.org"
 gemspec
-gem "test-cmd.rb", github: "0x1eef/test-cmd.rb", tag: "v0.4.0"

data/README.md

@@ -2,48 +2,36 @@
 
 lockf.rb provides Ruby bindings for
 [lockf(3)](https://man.freebsd.org/cgi/man.cgi?query=lockf&sektion=3).
-The
-[lockf(3)](https://man.freebsd.org/cgi/man.cgi?query=lockf&sektion=3)
-function implements an advisory-mode lock that can be placed on select
-regions of a file, or on the entire contents of a file.
-
-[lockf(3)](https://man.freebsd.org/cgi/man.cgi?query=lockf&sektion=3)
-can synchronize access to a file between multiple processes, or 
-synchronize access to a shared resource being accessed by multiple 
-processes at the same time. When used with a shared resource,
-[lockf(3)](https://man.freebsd.org/cgi/man.cgi?query=lockf&sektion=3)
-can provide something similar to a mutex that works across multiple
-processes rather than multiple threads.
 
 ## Examples
 
-### LockFile
-
-The
-[`LockFile`](https://0x1eef.github.io/x/lockf.rb/LockFile.html)
-class provides an abstract, Ruby-oriented interface to
-[lockf(3)](https://man.freebsd.org/cgi/man.cgi?query=lockf&sektion=3).
+### Lock::File
 
-__Blocking lock__
+__Blocking__
 
-The `LockFile#lock` method can be used to acquire a lock. The method will
-block when another process has acquired a lock beforehand:
+[Lock::File#lock](http://0x1eef.github.io/x/lockf.rb/Lock/File.html#lock-instance_method)
+can be used to acquire a lock.
+[Lock::File.temporary_file](http://0x1eef.github.io/x/lockf.rb/Lock/File.html#temporary_file-class_method)
+returns a lock for an unlinked temporary file.
+[Lock::File#lock](http://0x1eef.github.io/x/lockf.rb/Lock/File.html#lock-instance_method)
+will block when another
+process has acquired a lock beforehand:
 
 ```ruby
-require "lockf"
+#!/usr/bin/env ruby
+require "lock/file"
 
-lockf = LockFile.temporary_file
+lockf = Lock::File.temporary_file
 lockf.lock
 print "Lock acquired by parent process (#{Time.now.utc})", "\n"
-pid = fork do
+fork do
   print "Child process waiting on lock (#{Time.now.utc})", "\n"
   lockf.lock
   print "Lock acquired by child process (#{Time.now.utc})", "\n"
 end
 sleep(3)
 lockf.release
-Process.wait(pid)
-lockf.file.close
+Process.wait
 
 ##
 # Lock acquired by parent process (2023-02-11 16:43:15 UTC)
@@ -51,31 +39,31 @@ lockf.file.close
 # Lock acquired by child process (2023-02-11 16:43:18 UTC)
 ```
 
-__Non-blocking lock__
+__Non-blocking__
 
-The `LockFile#lock_nonblock` method can be used to acquire a lock
-without blocking. When it is found that acquiring a lock would block
-the method will raise an exception (ie `Errno::EAGAIN` /`Errno::EWOULDBLOCK`)
-instead:
+[Lock::File#lock_nonblock](http://0x1eef.github.io/x/lockf.rb/Lock/File.html#lock_nonblock-instance_method)
+can be used to acquire a lock without blocking. When it is found
+that acquiring a lock would block the method will raise an
+exception (`Errno::EAGAIN` / `Errno::EWOULDBLOCK`) instead:
 
 ```ruby
-require "lockf"
+#!/usr/bin/env ruby
+require "lock/file"
 
-lockf = LockFile.temporary_file
+lockf = Lock::File.temporary_file
 lockf.lock_nonblock
 print "Lock acquired by parent process (#{Time.now.utc})", "\n"
-pid = fork do
+fork do
   lockf.lock_nonblock
   print "Lock acquired by child process (#{Time.now.utc})", "\n"
 rescue Errno::EWOULDBLOCK
-  print "Lock would block", "\n"
   sleep 1
+  print "Lock would block", "\n"
   retry
 end
 sleep 3
 lockf.release
-Process.wait(pid)
-lockf.file.close
+Process.wait
 
 ##
 # Lock acquired by parent process (2023-02-11 19:03:05 UTC)
@@ -85,25 +73,25 @@ lockf.file.close
 # Lock acquired by child process (2023-02-11 19:03:08 UTC)
 ```
 
-### LockFile.lockf
+### Lock::File::FFI
+
+__lockf__
 
-The
-[`LockFile.lockf`](https://0x1eef.github.io/x/lockf.rb/LockFile.html#lockf-class_method)
-method provides a direct interface to
+[Lock::File::FFI.lockf](http://0x1eef.freebsd.home.network/x/lockf.rb/Lock/File/FFI.html#lockf-instance_method)
+provides a direct interface to
 [lockf(3)](https://man.freebsd.org/cgi/man.cgi?query=lockf&sektion=3)
 that is more or less equivalent to how the function would be called
-from C.
-
-__Blocking lock__
+from C:
 
 ```ruby
-require "lockf"
+#!/usr/bin/env ruby
+require "lock/file"
 require "tempfile"
 
 file = Tempfile.new("lockf-ffi").tap(&:unlink)
-LockFile.lockf(file.fileno, LockFile::F_LOCK, 0)
+Lock::File::FFI.lockf(file, Lock::File::F_LOCK, 0)
 print "Lock acquired", "\n"
-LockFile.lockf(file.fileno, LockFile::F_ULOCK, 0)
+Lock::File::FFI.lockf(file, Lock::File::F_ULOCK, 0)
 print "Lock released", "\n"
 file.close
 
@@ -112,29 +100,14 @@ file.close
 # Lock released
 ```
 
-__Non-blocking lock__
+## Documentation
 
-```ruby
-require "lockf"
-require "tempfile"
-
-file = Tempfile.new("lockf-ffi").tap(&:unlink)
-LockFile.lockf(file.fileno, LockFile::F_TLOCK, 0)
-print "Lock acquired", "\n"
-LockFile.lockf(file.fileno, LockFile::F_ULOCK, 0)
-print "Lock released", "\n"
-file.close
-
-##
-# Lock acquired
-# Lock released
-```
+A complete API reference is available at
+[0x1eef.github.io/x/lockf.rb](https://0x1eef.github.io/x/lockf.rb)
 
 ## Install
 
-**Rubygems.org**
-
-lockf.rb can be installed via rubygems.org.
+lockf.rb can be installed via rubygems.org:
 
     gem install lockf.rb
 
@@ -145,7 +118,7 @@ lockf.rb can be installed via rubygems.org.
 
 ## License
 
-[BSD Zero Clause](https://choosealicense.com/licenses/0bsd/).
+[BSD Zero Clause](https://choosealicense.com/licenses/0bsd/)
 <br>
-See [LICENSE](./LICENSE).
+See [LICENSE](./LICENSE)
 

data/Rakefile.rb

@@ -1,25 +1,15 @@
 require "bundler/setup"
-require "rake/extensiontask"
-require "rake/testtask"
 
-namespace :linters do
-  desc "Run the C linter"
-  task :c do
-    sh "uncrustify -c .uncrustify.cfg --no-backup --replace ext/lockf.rb/*.c"
-  end
-
-  desc "Run the Ruby linter"
+namespace :format do
+  desc "Run rubocop"
   task :ruby do
-    sh "bundle exec rubocop -A Rakefile.rb lib/**/*.rb spec/**/*.rb"
+    sh "bundle exec rubocop -A"
   end
 end
-task lint: ["linters:c", "linters:ruby"]
-
-Rake::ExtensionTask.new("lockf.rb")
+task format: %w[format:ruby]
 
-Rake::TestTask.new do |t|
-  t.test_files = FileList["test/*_test.rb"]
-  t.verbose = true
-  t.warning = false
+desc "Run tests"
+task :test do
+  sh "bin/test-runner"
 end
-task default: %w[clobber compile test]
+task default: %w[test]

data/bin/test-runner

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+for t in test/*_test.rb; do
+    ruby -Itest "${t}"
+done

data/lib/lock/file/constants.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Lock::File
+  # The constants found in this module are defined
+  # by unistd.h. Their documentation can be found in
+  # the
+  # [lockf(3)](https://man.freebsd.org/cgi/man.cgi?query=lockf&sektion=3)
+  # man page
+  module Constants
+    F_ULOCK = 0x0
+    F_LOCK  = 0x1
+    F_TLOCK = 0x2
+    F_TEST  = 0x3
+  end
+end

data/lib/lock/file/ffi.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class Lock::File
+  module FFI
+    require "fiddle"
+    include Fiddle::Types
+    extend self
+
+    ##
+    # Provides a Ruby interface for lockf(3)
+    #
+    # @see https://man.freebsd.org/cgi/man.cgi?query=lockf&sektion=3 lockf(3)
+    # @param [Integer, #fileno] fd
+    # @param [Integer] function
+    # @param [Integer] size
+    # @raise [SystemCallError]
+    #  Might raise a subclass of SystemCallError
+    # @return [Boolean]
+    #  Returns true when successful
+    def lockf(fd, function, size = 0)
+      fileno = fd.respond_to?(:fileno) ? fd.fileno : fd
+      Fiddle::Function.new(
+        libc["lockf"],
+        [INT, INT, INT],
+        INT
+      ).call(fileno, function, size)
+       .zero? || raise(SystemCallError.new("lockf", Fiddle.last_error))
+    end
+
+    private
+
+    def libc
+      @libc ||= Fiddle.dlopen Dir["/lib/libc.*"].first
+    end
+  end
+end

data/lib/lock/file/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Lock::File
+  VERSION = "2.0.0"
+end

data/lib/lock/file.rb

@@ -0,0 +1,114 @@
+module Lock
+end unless defined?(Lock)
+
+##
+# {Lock::File Lock::File} provides an object-oriented
+# [lockf(3)](https://man.freebsd.org/cgi/man.cgi?query=lockf&sektion=3)
+# interface
+class Lock::File
+  require "tmpdir"
+  require_relative "file/version"
+  require_relative "file/ffi"
+  require_relative "file/constants"
+
+  include FFI
+  include Constants
+
+  ##
+  # @example
+  #  lockf = Lock::File.temporary_file
+  #  lockf.lock
+  #  # ...
+  #
+  # @param [String] basename
+  # @param [String] tmpdir
+  # @return [Lock::File]
+  #  Returns a {Lock::File Lock::File} for a random,
+  #  unlinked temporary file
+  def self.from_temporary_file(basename: "lockf", tmpdir: Dir.tmpdir)
+    require "tempfile" unless defined?(Tempfile)
+    file = Tempfile.new(basename, tmpdir:).tap(&:unlink)
+    Lock::File.new(file)
+  end
+  class << self
+    alias_method :temporary_file, :from_temporary_file
+  end
+
+  ##
+  # @return [<#fileno>]
+  #  Returns a file handle
+  attr_reader :file
+
+  ##
+  # @param [<#fileno>] file
+  # @param [Integer] size
+  # @return [Lock::File]
+  #  Returns an instance of {Lock::File Lock::File}
+  def initialize(file, size = 0)
+    @file = file
+    @size = size
+  end
+
+  ##
+  # Acquire lock (blocking)
+  #
+  # @see https://man.freebsd.org/cgi/man.cgi?query=lockf&sektion=3 lockf(3)
+  # @raise [SystemCallError]
+  #  Might raise a subclass of SystemCallError
+  # @return [Boolean]
+  #  Returns true when successful
+  def lock
+    tries ||= 0
+    lockf(@file, F_LOCK, @size)
+  rescue Errno::EINTR => ex
+    tries += 1
+    tries == 3 ? raise(ex) : retry
+  end
+
+  ##
+  # Acquire lock (non-blocking)
+  #
+  # @see https://man.freebsd.org/cgi/man.cgi?query=lockf&sektion=3 lockf(3)
+  # @raise [SystemCallError]
+  #  Might raise a subclass of SystemCallError
+  # @return [Boolean]
+  #  Returns true when successful
+  def lock_nonblock
+    lockf(@file, F_TLOCK, @size)
+  end
+
+  ##
+  # Release lock
+  #
+  # @see https://man.freebsd.org/cgi/man.cgi?query=lockf&sektion=3 lockf(3)
+  # @raise [SystemCallError]
+  #  Might raise a subclass of SystemCallError
+  # @return [Boolean]
+  #  Returns true when successful
+  def release
+    lockf(@file, F_ULOCK, @size)
+  end
+
+  ##
+  # @return [Boolean]
+  #  Returns true when lock is held by another process
+  def locked?
+    lockf(@file, F_TEST, @size)
+    false
+  rescue Errno::EACCES, Errno::EAGAIN
+    true
+  end
+
+  ##
+  # Closes {Lock::File#file Lock::File#file}
+  #
+  # @example
+  #  # Equivalent to:
+  #  lockf = Lock::File.temporary_file
+  #  lockf.file.close
+  # @return [void]
+  def close
+    return unless @file.respond_to?(:close)
+    @file.close
+  end
+end

data/lib/lockf.rb

@@ -1,139 +1 @@
-##
-# The
-# [`LockFile`](https://0x1eef.github.io/x/lockf.rb/LockFile.html)
-# class provides a Ruby-oriented interface to the C function
-# [lockf(3)](https://man.freebsd.org/cgi/man.cgi?query=lockf&sektion=3).
-class LockFile
-  require "tmpdir"
-  require_relative "lockf.rb.so"
-
-  ##
-  # @!method self.lockf(fd, cmd, len)
-  #   @example
-  #     LockFile.lockf(5, LockFile::F_LOCK, 0)
-  #
-  #   @param [Integer] fd
-  #     A number that represents a file descriptor.
-  #
-  #   @param [Integer] cmd
-  #     {LockFile::F_LOCK}, {LockFile::F_TLOCK}, {LockFile::F_ULOCK}, or
-  #     {LockFile::F_TEST}.
-  #
-  #   @param [Integer] len
-  #     The number of bytes to place a lock on.
-  #     A value of "0" covers the entire file.
-  #
-  #   @raise [SystemCallError]
-  #     Might raise a number of Errno exception classes.
-  #
-  #   @return [Integer]
-  #     Returns 0 on success.
-  #
-  #   @see (https://man7.org/linux/man-pages/man3/lockf.3.html) lockf man page (Linux)
-  #   @see (https://man.openbsd.org/lockf.3) lockf man page (OpenBSD)
-  #   @see (https://www.freebsd.org/cgi/man.cgi?query=lockf) lockf man page (FreeBSD)
-
-  ##
-  # @example
-  #   lockf = LockFile.temporary_file
-  #   lockf.lock
-  #   lockf.release
-  #   lockf.file.close
-  #
-  # @param [String] basename
-  #  The basename of the temporary file.
-  #
-  # @param [String] tmpdir
-  #  The path to the parent directory of the temporary file.
-  #
-  # @return [LockFile]
-  #  Returns an instance of {LockFile LockFile} backed by an
-  #  unlinked instance of Tempfile.
-  def self.from_temporary_file(basename: "lockf", tmpdir: Dir.tmpdir)
-    require "tempfile" unless defined?(Tempfile)
-    file = Tempfile.new(basename, tmpdir:).tap(&:unlink)
-    LockFile.new(file)
-  end
-  class << self
-    alias_method :temporary_file, :from_temporary_file
-  end
-
-  ##
-  # @return [<File, Tempfile, #fileno>]
-  #  Returns a file object.
-  attr_reader :file
-
-  ##
-  # @param [<File, TempFile, String, #fileno>] file
-  #  The file to place a lock on.
-  #
-  # @param [Integer] len
-  #  The number of bytes to place a lock on.
-  #  A value of "0" covers the entire file.
-  #
-  # @return [LockFile]
-  #  Returns an instance of {LockFile LockFile}.
-  def initialize(file, len = 0)
-    @file = String === file ? File.open(file, "r+") : file
-    @len = len
-  end
-
-  ##
-  # Acquire a lock (blocking)
-  # @raise [Errno::EBADF]
-  # @raise [Errno::EDEADLK]
-  # @raise [Errno::EINTR]
-  # @raise [Errno::ENOLCK]
-  # @return [Integer]
-  def lock
-    attempts ||= 0
-    LockFile.lockf(@file.fileno, F_LOCK, @len)
-  rescue Errno::EINTR => ex
-    attempts += 1
-    attempts == 3 ? raise(ex) : retry
-  end
-
-  ##
-  # Acquire a lock (non-blocking)
-  # @raise [Errno::EAGAIN]
-  # @raise [Errno::EBADF]
-  # @raise [Errno::ENOLCK]
-  # @raise [Errno::EINVAL]
-  # @return [Integer]
-  def lock_nonblock
-    LockFile.lockf(@file.fileno, F_TLOCK, @len)
-  end
-
-  ##
-  # Release a lock
-  # @raise [Errno::EBADF]
-  # @raise [Errno::ENOLCK]
-  # @return [Integer]
-  def release
-    LockFile.lockf(@file.fileno, F_ULOCK, @len)
-  end
-
-  ##
-  # @return [Boolean]
-  #  Returns true when a lock has been acquired by another process.
-  def locked?
-    LockFile.lockf(@file.fileno, F_TEST, @len)
-    false
-  rescue Errno::EACCES, Errno::EAGAIN
-    true
-  end
-
-  ##
-  # Closes {LockFile#file LockFile#file}.
-  #
-  # @example
-  #   # Equivalent to:
-  #   lockf = LockFile.temporary_file
-  #   lockf.file.close
-  #
-  # @return [void]
-  def close
-    return unless @file.respond_to?(:close)
-    @file.close
-  end
-end
+require_relative "lock/file"

data/lib/lockfile.rb

@@ -0,0 +1 @@
+require_relative "lock/file"

data/lockf.rb.gemspec

@@ -1,24 +1,21 @@
-require "./lib/lockf/version"
+require_relative "lib/lockfile"
 
 Gem::Specification.new do |gem|
   gem.name = "lockf.rb"
   gem.authors = ["0x1eef"]
   gem.email = ["0x1eef@protonmail.com"]
   gem.homepage = "https://github.com/0x1eef/lockf.rb#readme"
-  gem.version = LockFile::VERSION
+  gem.version = Lock::File::VERSION
   gem.licenses = ["0BSD"]
   gem.files = `git ls-files`.split($/)
   gem.require_paths = ["lib"]
-  gem.extensions = %w[ext/lockf.rb/extconf.rb]
   gem.summary = "Ruby bindings for lockf(3)"
   gem.description = gem.summary
+
+  gem.add_runtime_dependency "fiddle", "~> 1.1"
   gem.add_development_dependency "yard", "~> 0.9"
-  gem.add_development_dependency "redcarpet", "~> 3.5"
-  gem.add_development_dependency "standard", "= 1.12.1"
-  gem.add_development_dependency "rubocop", "= 1.29.1"
-  gem.add_development_dependency "test-unit", "~> 3.5.7"
-  gem.add_development_dependency "rake-compiler", "= 1.2.0"
-  gem.add_development_dependency "rack", "~> 3.0"
-  gem.add_development_dependency "rackup", "~> 2.1"
-  gem.add_development_dependency "test-cmd.rb", "~> 0.4"
+  gem.add_development_dependency "standard", "~> 1.12"
+  gem.add_development_dependency "rubocop", "~> 1.29"
+  gem.add_development_dependency "test-unit", "~> 3.5"
+  gem.add_development_dependency "test-cmd.rb", "~> 0.12"
 end

data/share/lockf.rb/examples/1_lockfile_blocking_variant.rb

@@ -1,17 +1,18 @@
-require "lockf"
+#!/usr/bin/env ruby
+# frozen_string_literal: true
 
-lockf = LockFile.from_temporary_file
+require "lock/file"
+lockf = Lock::File.temporary_file
 lockf.lock
 print "Lock acquired by parent process (#{Time.now.utc})", "\n"
-pid = fork do
+fork do
   print "Child process waiting on lock (#{Time.now.utc})", "\n"
   lockf.lock
   print "Lock acquired by child process (#{Time.now.utc})", "\n"
 end
 sleep(3)
 lockf.release
-Process.wait(pid)
-lockf.file.close
+Process.wait
 
 ##
 # Lock acquired by parent process (2023-02-11 16:43:15 UTC)

data/share/lockf.rb/examples/2_lockfile_nonblocking_variant.rb

@@ -1,9 +1,11 @@
-require "lockf"
+#!/usr/bin/env ruby
+# frozen_string_literal: true
 
-lockf = LockFile.from_temporary_file
+require "lock/file"
+lockf = Lock::File.temporary_file
 lockf.lock_nonblock
 print "Lock acquired by parent process (#{Time.now.utc})", "\n"
-pid = fork do
+fork do
   lockf.lock_nonblock
   print "Lock acquired by child process (#{Time.now.utc})", "\n"
 rescue Errno::EWOULDBLOCK
@@ -13,8 +15,7 @@ rescue Errno::EWOULDBLOCK
 end
 sleep 3
 lockf.release
-Process.wait(pid)
-lockf.file.close
+Process.wait
 
 ##
 # Lock acquired by parent process (2023-02-11 19:03:05 UTC)

data/share/lockf.rb/examples/3_ffilockf_blocking_variant.rb

@@ -1,10 +1,12 @@
-require "lockf"
-require "tempfile"
+#!/usr/bin/env ruby
+# frozen_string_literal: true
 
+require "lock/file"
+require "tempfile"
 file = Tempfile.new("lockf-ffi").tap(&:unlink)
-LockFile.lockf(file.fileno, LockFile::F_LOCK, 0)
+Lock::File::FFI.lockf(file, Lock::File::F_LOCK, 0)
 print "Lock acquired", "\n"
-LockFile.lockf(file.fileno, LockFile::F_ULOCK, 0)
+Lock::File::FFI.lockf(file, Lock::File::F_ULOCK, 0)
 print "Lock released", "\n"
 file.close
 

data/share/lockf.rb/examples/4_ffilockf_nonblocking_variant.rb

@@ -1,10 +1,12 @@
-require "lockf"
-require "tempfile"
+#!/usr/bin/env ruby
+# frozen_string_literal: true
 
+require "lock/file"
+require "tempfile"
 file = Tempfile.new("lockf-ffi").tap(&:unlink)
-LockFile.lockf(file.fileno, LockFile::F_TLOCK, 0)
+Lock::File::FFI.lockf(file, Lock::File::F_TLOCK, 0)
 print "Lock acquired", "\n"
-LockFile.lockf(file.fileno, LockFile::F_ULOCK, 0)
+Lock::File::FFI.lockf(file, Lock::File::F_ULOCK, 0)
 print "Lock released", "\n"
 file.close
 

data/test/lock_file_test.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
 require_relative "setup"
-class LockFile::Test < Test::Unit::TestCase
+
+class Lock::File::Test < Test::Unit::TestCase
   attr_reader :file
   attr_reader :lockf
 
   def setup
-    @file  = Tempfile.new("lockf-test").tap(&:unlink)
-    @lockf = LockFile.new(file)
+    @file = Tempfile.new("lockf-test").tap(&:unlink)
+    @lockf = Lock::File.new(file)
   end
 
   def teardown
@@ -13,9 +15,9 @@ class LockFile::Test < Test::Unit::TestCase
   end
 
   ##
-  # Lock::File#lock
+  # LockFile#lock
   def test_lock
-    assert_equal 0, lockf.lock
+    assert_equal true, lockf.lock
   ensure
     lockf.release
   end
@@ -30,9 +32,9 @@ class LockFile::Test < Test::Unit::TestCase
   end
 
   ##
-  # Lock::File#lock_nonblock
+  # LockFile#lock_nonblock
   def test_lock_nonblock
-    assert_equal 0, lockf.lock_nonblock
+    assert_equal true, lockf.lock_nonblock
   ensure
     lockf.release
   end
@@ -47,7 +49,7 @@ class LockFile::Test < Test::Unit::TestCase
   end
 
   ##
-  # Lock::File#locked?
+  # LockFile#locked?
   def test_locked?
     pid = fork_sleep { lockf.lock }
     sleep(0.1)
@@ -60,9 +62,9 @@ class LockFile::Test < Test::Unit::TestCase
   ##
   # LockFile.temporary_file
   def test_temporary_file
-    lockf = LockFile.temporary_file
-    assert_equal 0, lockf.lock
-    assert_equal 0, lockf.release
+    lockf = Lock::File.temporary_file
+    assert_equal true, lockf.lock
+    assert_equal true, lockf.release
   ensure
     lockf.file.close
   end

data/test/readme_test.rb

@@ -3,40 +3,40 @@
 require_relative "setup"
 require "test/cmd"
 
-class LockFile::ReadmeTest < Test::Unit::TestCase
-  include Test::Cmd
-
+class Lock::File::ReadmeTest < Test::Unit::TestCase
   def test_lockfile_blocking_variant
-    r = 'Lock acquired by parent process \(.+\)\s*' \
-    'Child process waiting on lock \(.+\)\s*' \
-    'Lock acquired by child process \(.+\)\s*'
-    assert_match Regexp.new(r),
-                 readme_example("1_lockfile_blocking_variant.rb").stdout
+    r = ruby(readme_example("1_lockfile_blocking_variant.rb"))
+    ["Lock acquired by parent process \(.+\)\n",
+     "Child process waiting on lock \(.+\)\n",
+     "Lock acquired by child process \(.+\)\n"
+    ].each { assert_match Regexp.new(_1), r.stdout }
   end
 
   def test_lockfile_nonblocking_variant
-    r = 'Lock acquired by parent process \(.+\)\s*' \
-    '(Lock would block\s*){3,4}' \
-    'Lock acquired by child process \(.+\)\s*'
-    assert_match Regexp.new(r),
-                 readme_example("2_lockfile_nonblocking_variant.rb").stdout
+    r = ruby(readme_example("2_lockfile_nonblocking_variant.rb"))
+    ["Lock acquired by parent process \(.+\)\n",
+     "(Lock would block\n){3,4}",
+     "Lock acquired by child process \(.+\)\n"
+    ].each { assert_match Regexp.new(_1), r.stdout }
   end
 
   def test_ffi_lockf_blocking_variant
     assert_equal "Lock acquired\nLock released\n",
-                 readme_example("3_ffilockf_blocking_variant.rb").stdout
+                 ruby(readme_example("3_ffilockf_blocking_variant.rb")).stdout
   end
 
   def test_ffi_lockf_nonblocking_variant
     assert_equal "Lock acquired\nLock released\n",
-                 readme_example("4_ffilockf_nonblocking_variant.rb").stdout
+                 ruby(readme_example("4_ffilockf_nonblocking_variant.rb")).stdout
   end
 
   private
 
-  def readme_example(path)
-    examples_dir = File.join(Dir.getwd, "share", "lockf.rb", "examples")
-    example = File.join(examples_dir, path)
-    cmd "bundle exec ruby #{example}"
+  def ruby(*argv)
+    cmd("ruby", *argv)
+  end
+
+  def readme_example(example_name)
+    File.join(__dir__, "..", "share", "lockf.rb", "examples", example_name)
   end
 end

data/test/setup.rb

@@ -1,4 +1,4 @@
 require "bundler/setup"
 require "test/unit"
-require "lockf"
+require "lock/file"
 require "tempfile"

metadata

@@ -1,150 +1,108 @@
 --- !ruby/object:Gem::Specification
 name: lockf.rb
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 2.0.0
 platform: ruby
 authors:
 - '0x1eef'
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-16 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: fiddle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
+        version: '1.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.12.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.12.1
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.29.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.29.1
-- !ruby/object:Gem::Dependency
-  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.7
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.7
+        version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: rack
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.29'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.29'
 - !ruby/object:Gem::Dependency
-  name: rackup
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: test-cmd.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.12'
 description: Ruby bindings for lockf(3)
 email:
 - 0x1eef@protonmail.com
 executables: []
-extensions:
-- ext/lockf.rb/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - ".bundle/config"
+- ".clang-format"
 - ".github/workflows/tests.yml"
 - ".gitignore"
 - ".projectile"
@@ -155,11 +113,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile.rb
-- ext/lockf.rb/extconf.rb
-- ext/lockf.rb/lockf.c
-- ext/lockf.rb/lockf.h
+- bin/test-runner
+- lib/lock/file.rb
+- lib/lock/file/constants.rb
+- lib/lock/file/ffi.rb
+- lib/lock/file/version.rb
 - lib/lockf.rb
-- lib/lockf/version.rb
+- lib/lockfile.rb
 - lockf.rb.gemspec
 - share/lockf.rb/examples/1_lockfile_blocking_variant.rb
 - share/lockf.rb/examples/2_lockfile_nonblocking_variant.rb
@@ -187,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Ruby bindings for lockf(3)

data/ext/lockf.rb/extconf.rb

@@ -1,12 +0,0 @@
-require "mkmf"
-
-[
-  "INSTALL_DATA", "INSTALL_SCRIPT",
-  "INSTALL_PROGRAM", "INSTALL_DATA",
-  "INSTALL"
-].each do
-  CONFIG[_1].sub!(/-o [a-zA-Z0-9]+/, "")
-  CONFIG[_1].sub!(/-g [a-zA-Z0-9]+/, "")
-end
-
-create_makefile "lockf.rb"

data/ext/lockf.rb/lockf.c

@@ -1,34 +0,0 @@
-#include <ruby.h>
-#include <unistd.h>
-#include <errno.h>
-#include "lockf.h"
-
-static VALUE
-lockf_lock(VALUE self, VALUE fd, VALUE cmd, VALUE len)
-{
-  int result;
-
-  Check_Type(fd, T_FIXNUM);
-  Check_Type(cmd, T_FIXNUM);
-  Check_Type(len, T_FIXNUM);
-  errno = 0;
-  result = lockf(NUM2INT(fd), NUM2INT(cmd), NUM2INT(len));
-  if (result == 0) {
-    return INT2NUM(result);
-  } else {
-    rb_syserr_fail(errno, "lockf");
-  }
-}
-
-void
-Init_lockf(void)
-{
-  VALUE cLockf;
-
-  cLockf = rb_define_class("LockFile", rb_cObject);
-  rb_define_const(cLockf, "F_LOCK", INT2NUM(F_LOCK));
-  rb_define_const(cLockf, "F_TLOCK", INT2NUM(F_TLOCK));
-  rb_define_const(cLockf, "F_ULOCK", INT2NUM(F_ULOCK));
-  rb_define_const(cLockf, "F_TEST", INT2NUM(F_TEST));
-  rb_define_singleton_method(cLockf, "lockf", lockf_lock, 3);
-}

data/ext/lockf.rb/lockf.h

@@ -1 +0,0 @@
-void Init_lockf(void);

data/lib/lockf/version.rb

@@ -1,3 +0,0 @@
-class LockFile
-  VERSION = "0.13.0"
-end