systemd-journal 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0438540edec22fbae63e8415a028a3811efe665d
-  data.tar.gz: 33fd5a5c73b159830d8e545be1ea9b5fde0b0250
+  metadata.gz: c3e6b1c29dbf1ebfb965fb46cc8b4d6a74b99c0c
+  data.tar.gz: 82a5ec063e3d282c9c87ae670ca09ed009d0a3de
 SHA512:
-  metadata.gz: a236ee7822df8302c33e32b2a2d14ee0a359bf0ea0bccfc9e46645583cad6e8f0889c3761b63351ff770bf461d4e6308cc9ca945765e2eea4a1acc72e372dfaa
-  data.tar.gz: f347074030ae403b3093dd73c4931a41aefee52c4d18b38576c5105fa4bbf5fd606f2579f273cfed68b2c712186149dd4eb20049c9957c6ebfc68ec322ed7860
+  metadata.gz: ce52fb6b99913e16cbf5d44f2f076e24d3fc36bfe95427f345faca78ba1895f14d9c46d26e4d74ee396c47250161220244be9d3f5e573b5fffdf9e1274d0ae08
+  data.tar.gz: 4a231f9e05a15535a95d713f10aa3c822989358666679d15756e5e1d30abc2391c77c5d814406b8430dbad581691baf3e10291a539d33005397f5df30b8e6770

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 rvm:
+  - 2.4.0
   - 2.3.0
-  - 1.9.3
-  - jruby-19mode
 before_install:
   - gem install bundler
 before_script:

data/README.md

@@ -51,6 +51,7 @@ 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|
@@ -81,9 +82,9 @@ c = j.cursor    # get a reference to this entry
 j.move(-5)      # move back 5 entries
 j.seek(c)       # move to the saved cursor
 j.cursor?(c)    # verify that we're at the correct entry
-j.seek(:tail)   # move to end of the journal
-j.move_previous # move back
-j.move_next     # move forward
+j.seek(:tail)   # move past the end of the journal
+j.move_previous # move to last entry in journal
+j.move_next     # move forward (fails since we're at the end)
 
 j.current_entry # get the entry we're currently positioned at
 
@@ -96,6 +97,7 @@ Waiting for things to happen:
 ```ruby
 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!'
@@ -145,7 +147,8 @@ a valid entry:
     Journal#seek(:tail)
 
 The solution is to always call one of `move`, `move_next`, `move_previous` and
-friends before reading after issuing one of the above calls.
+friends before reading after issuing one of the above calls.  For most functions,
+call `move_next`.  For `seek(:tail)`, call `move_previous`.
 
 ## Issues?
 

data/certs/john@throttle.io.pem

@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
 MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARqb2hu
 MRgwFgYKCZImiZPyLGQBGRYIdGhyb3R0bGUxEjAQBgoJkiaJk/IsZAEZFgJpbzAe
-Fw0xNjAxMTcxNjEyNDlaFw0xNzAxMTYxNjEyNDlaMD0xDTALBgNVBAMMBGpvaG4x
+Fw0xNzA4MDgxNDMyMjdaFw0xODA4MDgxNDMyMjdaMD0xDTALBgNVBAMMBGpvaG4x
 GDAWBgoJkiaJk/IsZAEZFgh0aHJvdHRsZTESMBAGCgmSJomT8ixkARkWAmlvMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsKoOAl3GjhyD0ijDTrgKRdN2
-LgFc59HUFYKLfPnCxH3LLxyFEQWMyxmqwetUAQ2SALKNM2U+rr4Dvv39sqEjvYHn
-prWK8+XuvvBYHeH2E5K0uQjwZ5yIo8wsqc0ae46cBZoRjvlWFo3ha6vo5KU1i80K
-wY1bk5NykKBUIgblDCIjsh6h6lflje1MNpBW0IaHinIBeU2ZLDVi46kssptHos2q
-HQLHR+wqTtaSy22jzLHf5yYDagPHyjCC6CGoApY2qE+DRiCHBE0mTB8sRrlu5aln
-3aoLT+z5iCfNrS20ycEKCg73WDdVs2gYK+yHh6GBWL0n1UhfPrOj6XIAtZTKtQID
-AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU5yrYSRUD
-85vV8/Gecelpz5p3qt4wGwYDVR0RBBQwEoEQam9obkB0aHJvdHRsZS5pbzAbBgNV
-HRIEFDASgRBqb2huQHRocm90dGxlLmlvMA0GCSqGSIb3DQEBBQUAA4IBAQAwUOPx
-qQlrazrqAIGKMSBs7sTnyxAiirElMQLsaJbqsNmup7fDnAPaQBViL8uv2n08F7ZV
-wAeItgtQxTVUkaQLh/x0OqjEc7z1P0XMXReL1Et6ep8vBOhLRHIXAdZ8Q2ESTtBM
-JnHwNiSbojxBFwn7OkUuisaXr9cu6CDH/VpiGT/GxJ7cRT1WgH/ZAPt+oCY6jcs9
-3jCu+Q6KtUcFxFdXr7L2+p9Z1HkKECa1CuBsLQa8ENcqblazSJ3k7jh1nRC+PjNU
-GqIHnd4cKMcoFxN3l2KjrTS2rabk/yf6nWrkVGPkN41hSRf9reteYiI08RAi3peY
-7eGf9eghUTYEt1pJ
+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
 -----END CERTIFICATE-----

data/examples/ssh_watcher.rb

@@ -10,6 +10,7 @@ class SSHWatcher
   def run
     @journal.filter(_exe: '/usr/bin/sshd')
     @journal.seek(:tail)
+    @journal.move_previous
     @journal.watch{ |entry| process_event(entry) }
   end
 

data/lib/systemd.rb

@@ -1,4 +1,4 @@
-require 'systemd/journal'
+require 'systemd/id128'
 
 module Systemd
   # See {Systemd::Id128.machine_id}.

data/lib/systemd/journal.rb

@@ -191,6 +191,22 @@ module Systemd
       end
     end
 
+    # Explicitly close the underlying Journal file.
+    # Once this is done, any operations on the instance will fail and raise an
+    # exception.
+    def close
+      return if @ptr.nil?
+
+      ObjectSpace.undefine_finalizer(self)
+      Native.sd_journal_close(@ptr)
+
+      @ptr = nil
+    end
+
+    def closed?
+      @ptr.nil?
+    end
+
     # @private
     def inspect
       format(

data/lib/systemd/journal/navigable.rb

@@ -78,6 +78,9 @@ module Systemd
       # Seek to a position in the journal.
       # Note: after seeking, you must call {#move_next} or {#move_previous}
       #   before you can call {#read_field} or {#current_entry}.
+      #   When calling `seek(:tail)` the read pointer is positioned _after_
+      #   the last entry in the journal -- thus you should use `move_previous`.
+      #   Otherwise, use `move_next`.
       #
       # @param [Symbol, Time] whence one of :head, :tail, or a Time instance.
       #   `:head` (or `:start`) will seek to the beginning of the journal.
@@ -86,6 +89,11 @@ module Systemd
       #   time. When a String is provided, assume it is a cursor from {#cursor}
       #   and seek to that entry.
       # @return [True]
+      # @example Read last journal entry
+      #   j = Systemd::Joural.new
+      #   j.seek(:tail)
+      #   j.move_previous
+      #   puts j.current_entry
       def seek(where)
         rc = case
              when [:head, :start].include?(where)

data/lib/systemd/journal/version.rb

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

data/lib/systemd/journal/waitable.rb

@@ -20,7 +20,7 @@ module Systemd
           wait_select(timeout_usec)
         else
           rc = Native.sd_journal_wait(@ptr, timeout_usec)
-          raise JournalError, rc if rc.is_a?(Fixnum) && rc < 0
+          raise JournalError, rc if rc.is_a?(Integer) && rc < 0
           rc == :nop ? nil : rc
         end
       end
@@ -67,7 +67,7 @@ module Systemd
 
       def reason_for_wakeup
         rc = Native.sd_journal_process(@ptr)
-        raise JournalError, rc if rc.is_a?(Fixnum) && rc < 0
+        raise JournalError, rc if rc.is_a?(Integer) && rc < 0
         rc == :nop ? nil : rc
       end
     end

data/spec/systemd/journal_spec.rb

@@ -25,6 +25,34 @@ RSpec.describe Systemd::Journal do
     end
   end
 
+  describe 'close' do
+    it 'closes the underlying file' do
+      expect(Systemd::Journal::Native).to receive(:sd_journal_close)
+        .and_call_original
+
+      j.close
+    end
+
+    it 'unregisters the finalizer' do
+      expect(ObjectSpace).to receive(:undefine_finalizer)
+        .with(j)
+        .and_call_original
+
+      j.close
+    end
+
+    it 'does not fail if called more than once' do
+      j.close
+      expect { j.close }.to_not raise_error
+    end
+
+    it 'marks the journal as closed' do
+      expect(j).to_not be_closed
+      j.close
+      expect(j).to be_closed
+    end
+  end
+
   describe 'query_unique' do
     it 'throws a JournalError on invalid return code' do
       expect(Systemd::Journal::Native).to receive(:sd_journal_enumerate_unique)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: systemd-journal
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - John Ledbetter
@@ -13,25 +13,25 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARqb2hu
   MRgwFgYKCZImiZPyLGQBGRYIdGhyb3R0bGUxEjAQBgoJkiaJk/IsZAEZFgJpbzAe
-  Fw0xNjAxMTcxNjEyNDlaFw0xNzAxMTYxNjEyNDlaMD0xDTALBgNVBAMMBGpvaG4x
+  Fw0xNzA4MDgxNDMyMjdaFw0xODA4MDgxNDMyMjdaMD0xDTALBgNVBAMMBGpvaG4x
   GDAWBgoJkiaJk/IsZAEZFgh0aHJvdHRsZTESMBAGCgmSJomT8ixkARkWAmlvMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsKoOAl3GjhyD0ijDTrgKRdN2
-  LgFc59HUFYKLfPnCxH3LLxyFEQWMyxmqwetUAQ2SALKNM2U+rr4Dvv39sqEjvYHn
-  prWK8+XuvvBYHeH2E5K0uQjwZ5yIo8wsqc0ae46cBZoRjvlWFo3ha6vo5KU1i80K
-  wY1bk5NykKBUIgblDCIjsh6h6lflje1MNpBW0IaHinIBeU2ZLDVi46kssptHos2q
-  HQLHR+wqTtaSy22jzLHf5yYDagPHyjCC6CGoApY2qE+DRiCHBE0mTB8sRrlu5aln
-  3aoLT+z5iCfNrS20ycEKCg73WDdVs2gYK+yHh6GBWL0n1UhfPrOj6XIAtZTKtQID
-  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU5yrYSRUD
-  85vV8/Gecelpz5p3qt4wGwYDVR0RBBQwEoEQam9obkB0aHJvdHRsZS5pbzAbBgNV
-  HRIEFDASgRBqb2huQHRocm90dGxlLmlvMA0GCSqGSIb3DQEBBQUAA4IBAQAwUOPx
-  qQlrazrqAIGKMSBs7sTnyxAiirElMQLsaJbqsNmup7fDnAPaQBViL8uv2n08F7ZV
-  wAeItgtQxTVUkaQLh/x0OqjEc7z1P0XMXReL1Et6ep8vBOhLRHIXAdZ8Q2ESTtBM
-  JnHwNiSbojxBFwn7OkUuisaXr9cu6CDH/VpiGT/GxJ7cRT1WgH/ZAPt+oCY6jcs9
-  3jCu+Q6KtUcFxFdXr7L2+p9Z1HkKECa1CuBsLQa8ENcqblazSJ3k7jh1nRC+PjNU
-  GqIHnd4cKMcoFxN3l2KjrTS2rabk/yf6nWrkVGPkN41hSRf9reteYiI08RAi3peY
-  7eGf9eghUTYEt1pJ
+  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
   -----END CERTIFICATE-----
-date: 2016-09-17 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to libsystemd-journal
@@ -204,4 +204,3 @@ test_files:
 - spec/systemd/journal_entry_spec.rb
 - spec/systemd/journal_spec.rb
 - spec/systemd_spec.rb
-has_rdoc: