systemd-journal 1.3.3 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a2558fb9916c7c32730f0a9e5d546b554527f65fd6f594c58f5abfb25a15ae20
-  data.tar.gz: 28d2597709dbb8008d893035b5f01ae9c270d6cc291f453a87a08436b42b03c5
+SHA1:
+  metadata.gz: 7954a07279ccaf744edb91b9d0ddf2dacd24cb66
+  data.tar.gz: c8ef65bcdd2d50edc7a48c45370120b34eb2025b
 SHA512:
-  metadata.gz: 1759e62cc2b655b54e51d74f09744bf56e79f7d001601440db008bbf26de4055783429858332128398e1198151b9f9fb19dfaa0c5c7b3f4d152637a66af45a0d
-  data.tar.gz: 200d4f6034ad779f2d64437d3cf06b2a7e91fb196461bf89a7d61cec8d380351acc3b10149a8540ee9c782e7f601216ffbe0cce034431bb6252bd980714f0406
+  metadata.gz: 39ad407354a6850dca2ce66b4e6a5073468fbd7d4124e99dcc4e1777629783c50a190855714aeed313920ffdd84dc65fc164a11a869e2fe56009809671b467bc
+  data.tar.gz: f1b2f96ba311b770772e88f8692f35746d0f7d615e723bd2f484237696abd2946162e40ef07841bae731492780b645161cb4e6d9042454984d185ff5b8528abe

data/README.md

@@ -49,13 +49,14 @@ require 'systemd/journal'
 Print all messages as they occur:
 
 ```ruby
-j = Systemd::Journal.new
-j.seek(:tail)
-j.move_previous
-
-# watch() does not return
-j.watch do |entry|
-  puts entry.message
+Systemd::Journal.open do |j|
+  j.seek(:tail)
+  j.move_previous
+  
+  # watch() does not return
+  j.watch do |entry|
+    puts entry.message
+  end
 end
 ```
 
@@ -69,6 +70,7 @@ j.filter(priority: 6, _exe: '/usr/bin/sshd')
 j.each do |entry|
   puts entry.message
 end
+j.close # close open files
 ```
 
 Moving around the journal:
@@ -99,11 +101,10 @@ j = Systemd::Journal.new
 j.seek(:tail)
 j.move_previous
 # wait up to one second for something to happen
-if j.wait(1_000_000)
-  puts 'something changed!'
+puts 'something changed!' if j.wait(1_000_000)
+  
 # same as above, but can be interrupted with Control+C.
-if j.wait(1_000_000, select: true)
-  puts 'something changed!'
+puts 'something changed!' if j.wait(1_000_000, select: true)
 ```
 
 Accessing the catalog:

data/certs/john@throttle.io.pem

@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
 MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARqb2hu
 MRgwFgYKCZImiZPyLGQBGRYIdGhyb3R0bGUxEjAQBgoJkiaJk/IsZAEZFgJpbzAe
-Fw0xNzA4MDgxNDMyMjdaFw0xODA4MDgxNDMyMjdaMD0xDTALBgNVBAMMBGpvaG4x
+Fw0xOTAzMDUyMDM1MjZaFw0yMDAzMDQyMDM1MjZaMD0xDTALBgNVBAMMBGpvaG4x
 GDAWBgoJkiaJk/IsZAEZFgh0aHJvdHRsZTESMBAGCgmSJomT8ixkARkWAmlvMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoNysk6eAiijtXvE+Yp+i5n/g
-n6mzDAuV5cA2E37v5LUCnNJXRnVOt0pO+CfWw0AV8dxbBKddwVvwkT+u/pBMce6B
-cATETUMYjzryb+5Sbf1k0MFiIsAc9ASlP5OWF3cQTefJhpGlklqCZwpdBeh5p4XM
-WYJ85StSH/OzMg0PcX07d1Ps5MmLV7qyMQEvaOCKnme5OmxCQzVBv3ySgyBLh7hj
-gUUzMFYeYZU0tPBJHHKxW19wmdis59/ktMo5JOGCBRKYNwcOYEaMUP3Mrmc+ZDk3
-YikJg7xL8eQa3qJjZ5xEeXSI34u2VUqBmqs2CMH4ZvdXZl4rZrFZs8uePdxCxQID
-AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU3jyZnlOE
-slGWjYuqMAfdqBCyoaUwGwYDVR0RBBQwEoEQam9obkB0aHJvdHRsZS5pbzAbBgNV
-HRIEFDASgRBqb2huQHRocm90dGxlLmlvMA0GCSqGSIb3DQEBBQUAA4IBAQCdXeiJ
-7LDI9AdMXqJsDAHps+2sN/77BLxuNXB3BZRgrJ0+VaSfNKdMvf69h195bFjP/VD5
-PePsf+ZoQTOVpPaunWP2u4Np9NgXi3EWywLAlmEqt1/1P2Cw4QOePTV/BVs4XRal
-hnjXkfWlHd6ngozGr4ICBR0x0WqLRR09pSKuwEUspzUWuunU5Z0vJPHDZAoTGdrR
-fqWHVr6WwoNUEZH3D+kMyJNwDpuq5m0n/iKhHypAE1LI0l4EapKzSXlBImywCTIh
-LnHNrDPklxqI1pnkXyKU9OrcCVuFnKY6te48kWZ8ZN/WhegL1fbNtLuvgoS2WuUJ
-5MDu0m5ogQUz8Ijw
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtt7tfjZWDXScvPrmsfgFTAk4
+q8hSkI5B4R+IsIquG6M9cNhbbQJyofRQxfzY0lGWC8Xtd+bRt04WVznerSNqbPFP
+Gou2NHQvI77T/UDvjYvbf+7ZVYHgWHzIjoFAHeUDV0hAMPIizoX04nDsPSqiKHxp
+6fypG8eLdiMn+Ab8/M+94FeXL/EhSQcvOFE0P98SgYu57jhPfbdH4IeN+eIoO8e7
+yjbi6jbtVa2k9ZDi4mlg0f8cH8nYXfO9wKDW3lcPa4Le4MwIAy70iEozoxdDQd+X
+5X2ZYk2Mcss+FxhzZro/ChJgdGWk0gM632koFaIuCRgmtp2a915WXhMrsYyrsQID
+AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUnFpnqd56
+KP6ORCFp9LEvackdywQwGwYDVR0RBBQwEoEQam9obkB0aHJvdHRsZS5pbzAbBgNV
+HRIEFDASgRBqb2huQHRocm90dGxlLmlvMA0GCSqGSIb3DQEBBQUAA4IBAQCNvyn1
+8hDTha8YvQtrJd5OTNoMztU3k+1zsv4KzAkvqcp1TpJfTF54GLq4QXcUYaepxCTW
+PUBdWX8cgjZePmJ005KT3MPtA//o1nATLyYWc86Xk02FI9f7h4K6lSHMUr/L2fVL
+9DahKJje3A0xvOupPKojNqHRB8NPwOV7lbD9Na8vqymCxqahh6VYGreAHAmoFJLw
+Hw1jejkkg22p795C8ajT+BVGkALv64eUKBcg43XRiEdURHk6N0a9hPeV+F0pXJSi
+qFmZlFSs2UEGpMrcVelMgdQ5dBFzZ/SIvfYO70bQhRRae39Z/QmV0jEgYx5f2Q1d
+bc0+je0pm4TYY6oC
 -----END CERTIFICATE-----

data/lib/systemd/journal.rb

@@ -48,12 +48,20 @@ module Systemd
       open_type, flags = validate_options!(opts)
       ptr = FFI::MemoryPointer.new(:pointer, 1)
 
+      @finalize = (opts.key?(:finalize) ? opts.delete(:finalize) : true)
       rc = open_journal(open_type, ptr, opts, flags)
       raise JournalError, rc if rc < 0
 
       @ptr = ptr.read_pointer
       file_descriptor
-      ObjectSpace.define_finalizer(self, self.class.finalize(@ptr))
+      ObjectSpace.define_finalizer(self, self.class.finalize(@ptr)) if @finalize
+    end
+
+    def self.open(opts = {})
+      j = new(opts.merge(finalize: false))
+      yield j
+    ensure
+      j.close if j
     end
 
     # Iterate over each entry in the journal, respecting the applied
@@ -198,7 +206,7 @@ module Systemd
     def close
       return if @ptr.nil?
 
-      ObjectSpace.undefine_finalizer(self)
+      ObjectSpace.undefine_finalizer(self) if @finalize
       Native.sd_journal_close(@ptr)
 
       @ptr = nil

data/lib/systemd/journal/version.rb

@@ -1,6 +1,6 @@
 module Systemd
   class Journal
     # The version of the systemd-journal gem.
-    VERSION = '1.3.3'
+    VERSION = '1.4.1'
   end
 end

data/spec/systemd/journal_spec.rb

@@ -8,6 +8,24 @@ RSpec.describe Systemd::Journal do
     end
   end
 
+  describe 'open' do
+    it 'creates and closes' do
+      expect(Systemd::Journal::Native).to receive(:sd_journal_close)
+        .and_call_original
+
+      result = j.open { 1 }
+      expect(result).to eq 1
+    end
+
+    it 'raises original exception when creating journal fails' do
+      expect(Systemd::Journal::Native).to_not receive(:sd_journal_close)
+
+      expect do
+        j.open(file: 1, path: 2, files: 3) { 1 }
+      end.to raise_error(ArgumentError)
+    end
+  end
+
   describe 'initialize' do
     subject(:j) { Systemd::Journal }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: systemd-journal
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.1
 platform: ruby
 authors:
 - John Ledbetter
@@ -13,25 +13,25 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARqb2hu
   MRgwFgYKCZImiZPyLGQBGRYIdGhyb3R0bGUxEjAQBgoJkiaJk/IsZAEZFgJpbzAe
-  Fw0xNzA4MDgxNDMyMjdaFw0xODA4MDgxNDMyMjdaMD0xDTALBgNVBAMMBGpvaG4x
+  Fw0xOTAzMDUyMDM1MjZaFw0yMDAzMDQyMDM1MjZaMD0xDTALBgNVBAMMBGpvaG4x
   GDAWBgoJkiaJk/IsZAEZFgh0aHJvdHRsZTESMBAGCgmSJomT8ixkARkWAmlvMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoNysk6eAiijtXvE+Yp+i5n/g
-  n6mzDAuV5cA2E37v5LUCnNJXRnVOt0pO+CfWw0AV8dxbBKddwVvwkT+u/pBMce6B
-  cATETUMYjzryb+5Sbf1k0MFiIsAc9ASlP5OWF3cQTefJhpGlklqCZwpdBeh5p4XM
-  WYJ85StSH/OzMg0PcX07d1Ps5MmLV7qyMQEvaOCKnme5OmxCQzVBv3ySgyBLh7hj
-  gUUzMFYeYZU0tPBJHHKxW19wmdis59/ktMo5JOGCBRKYNwcOYEaMUP3Mrmc+ZDk3
-  YikJg7xL8eQa3qJjZ5xEeXSI34u2VUqBmqs2CMH4ZvdXZl4rZrFZs8uePdxCxQID
-  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU3jyZnlOE
-  slGWjYuqMAfdqBCyoaUwGwYDVR0RBBQwEoEQam9obkB0aHJvdHRsZS5pbzAbBgNV
-  HRIEFDASgRBqb2huQHRocm90dGxlLmlvMA0GCSqGSIb3DQEBBQUAA4IBAQCdXeiJ
-  7LDI9AdMXqJsDAHps+2sN/77BLxuNXB3BZRgrJ0+VaSfNKdMvf69h195bFjP/VD5
-  PePsf+ZoQTOVpPaunWP2u4Np9NgXi3EWywLAlmEqt1/1P2Cw4QOePTV/BVs4XRal
-  hnjXkfWlHd6ngozGr4ICBR0x0WqLRR09pSKuwEUspzUWuunU5Z0vJPHDZAoTGdrR
-  fqWHVr6WwoNUEZH3D+kMyJNwDpuq5m0n/iKhHypAE1LI0l4EapKzSXlBImywCTIh
-  LnHNrDPklxqI1pnkXyKU9OrcCVuFnKY6te48kWZ8ZN/WhegL1fbNtLuvgoS2WuUJ
-  5MDu0m5ogQUz8Ijw
+  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtt7tfjZWDXScvPrmsfgFTAk4
+  q8hSkI5B4R+IsIquG6M9cNhbbQJyofRQxfzY0lGWC8Xtd+bRt04WVznerSNqbPFP
+  Gou2NHQvI77T/UDvjYvbf+7ZVYHgWHzIjoFAHeUDV0hAMPIizoX04nDsPSqiKHxp
+  6fypG8eLdiMn+Ab8/M+94FeXL/EhSQcvOFE0P98SgYu57jhPfbdH4IeN+eIoO8e7
+  yjbi6jbtVa2k9ZDi4mlg0f8cH8nYXfO9wKDW3lcPa4Le4MwIAy70iEozoxdDQd+X
+  5X2ZYk2Mcss+FxhzZro/ChJgdGWk0gM632koFaIuCRgmtp2a915WXhMrsYyrsQID
+  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUnFpnqd56
+  KP6ORCFp9LEvackdywQwGwYDVR0RBBQwEoEQam9obkB0aHJvdHRsZS5pbzAbBgNV
+  HRIEFDASgRBqb2huQHRocm90dGxlLmlvMA0GCSqGSIb3DQEBBQUAA4IBAQCNvyn1
+  8hDTha8YvQtrJd5OTNoMztU3k+1zsv4KzAkvqcp1TpJfTF54GLq4QXcUYaepxCTW
+  PUBdWX8cgjZePmJ005KT3MPtA//o1nATLyYWc86Xk02FI9f7h4K6lSHMUr/L2fVL
+  9DahKJje3A0xvOupPKojNqHRB8NPwOV7lbD9Na8vqymCxqahh6VYGreAHAmoFJLw
+  Hw1jejkkg22p795C8ajT+BVGkALv64eUKBcg43XRiEdURHk6N0a9hPeV+F0pXJSi
+  qFmZlFSs2UEGpMrcVelMgdQ5dBFzZ/SIvfYO70bQhRRae39Z/QmV0jEgYx5f2Q1d
+  bc0+je0pm4TYY6oC
   -----END CERTIFICATE-----
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to libsystemd-journal