systemd-journal 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7954a07279ccaf744edb91b9d0ddf2dacd24cb66
-  data.tar.gz: c8ef65bcdd2d50edc7a48c45370120b34eb2025b
+SHA256:
+  metadata.gz: dba31ecf5a267f987bbb2f8986c9c73039a9b6baf51803a717cc5658fdfcee96
+  data.tar.gz: bac252ca548a5d09d316f8445b0f17e5307e9ccf5a41beb0443e3dabc8495ab7
 SHA512:
-  metadata.gz: 39ad407354a6850dca2ce66b4e6a5073468fbd7d4124e99dcc4e1777629783c50a190855714aeed313920ffdd84dc65fc164a11a869e2fe56009809671b467bc
-  data.tar.gz: f1b2f96ba311b770772e88f8692f35746d0f7d615e723bd2f484237696abd2946162e40ef07841bae731492780b645161cb4e6d9042454984d185ff5b8528abe
+  metadata.gz: 05f31a764d3f64ead90e25b3956778c5c563bd4133c994e76920fb3702b889c8d0042205e99e8be8d6c9884dc70ea29cb4429299239014d406344318547bff80
+  data.tar.gz: ab946f8aaa1555591828571bb31ea2861d0dace3a32f1f97fe50af981901e993cf030667d637c4e47ed64a05dbfe57939f3673eb32e7e2ea074aeb2a6e264267

data/.github/workflows/ruby.yml

@@ -0,0 +1,17 @@
+name: RSpec Matrix
+on: [push]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu]
+        ruby: [2.5, 2.6, 2.7, jruby]
+    runs-on: ${{ matrix.os }}-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - run: bundle install
+    - run: bundle exec rake spec

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+certs/gem-private_key.pem

data/README.md

@@ -1,4 +1,4 @@
-# Systemd::Journal [![Gem Version](https://badge.fury.io/rb/systemd-journal.png)](http://badge.fury.io/rb/systemd-journal)  [![Build Status](https://travis-ci.org/ledbettj/systemd-journal.png?branch=master)](https://travis-ci.org/ledbettj/systemd-journal) [![Code Climate](https://codeclimate.com/github/ledbettj/systemd-journal.png)](https://codeclimate.com/github/ledbettj/systemd-journal)
+# Systemd::Journal [![Gem Version](https://badge.fury.io/rb/systemd-journal.png)](http://badge.fury.io/rb/systemd-journal) [![Code Climate](https://codeclimate.com/github/ledbettj/systemd-journal.png)](https://codeclimate.com/github/ledbettj/systemd-journal)
 
 Ruby bindings for reading from the systemd journal.
 
@@ -10,7 +10,7 @@ Ruby bindings for reading from the systemd journal.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'systemd-journal', '~> 1.3'
+gem 'systemd-journal', '~> 1.4'
 ```
 
 And then execute:
@@ -151,6 +151,14 @@ The solution is to always call one of `move`, `move_next`, `move_previous` and
 friends before reading after issuing one of the above calls.  For most functions,
 call `move_next`.  For `seek(:tail)`, call `move_previous`.
 
+### I get a segfault pointing at Native.sd_journal_get_fd
+
+This is caused by a bug in libsystemd v245 (and maybe earlier) which cannot be
+solved in this gem, sadly.  It's fixed upstream in [this commit](https://github.com/systemd/systemd/commit/2b6df46d21abe8a8b7481e420588a9a129699cf9), which you can ask your distribution to backport if
+necessary until v246 is released.
+
+In ArchLinux, this patch is applied in systemd-libs 245.6-2.
+
 ## Issues?
 
 This gem has been tested primarily on MRI and Arch Linux running systemd version
@@ -160,6 +168,8 @@ distributions.
 The gem will run under JRuby, although some features which rely on native file
 descriptor support will not work.
 
+The gem will not run under truffleruby due to missing support for some FFI features.
+
 If you run into problems or have questions, please open an
 [Issue](https://github.com/ledbettj/systemd-journal/issues) or Pull Request.
 

data/certs/john@throttle.io.pem

@@ -1,21 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARqb2hu
-MRgwFgYKCZImiZPyLGQBGRYIdGhyb3R0bGUxEjAQBgoJkiaJk/IsZAEZFgJpbzAe
-Fw0xOTAzMDUyMDM1MjZaFw0yMDAzMDQyMDM1MjZaMD0xDTALBgNVBAMMBGpvaG4x
-GDAWBgoJkiaJk/IsZAEZFgh0aHJvdHRsZTESMBAGCgmSJomT8ixkARkWAmlvMIIB
-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
+MIIEMDCCApigAwIBAgIBATANBgkqhkiG9w0BAQsFADAhMR8wHQYDVQQDDBZqb2hu
+L0RDPXRocm90dGxlL0RDPWlvMB4XDTIwMDczMDIyMTUxNVoXDTIxMDczMDIyMTUx
+NVowITEfMB0GA1UEAwwWam9obi9EQz10aHJvdHRsZS9EQz1pbzCCAaIwDQYJKoZI
+hvcNAQEBBQADggGPADCCAYoCggGBAMEZjnWtA5/YsYEDvWlTAPOP2NshfBVcNSXE
+FHg4refJstCaf59iqFEWbEjLmbezK6HA5vzM6ZenEom2S1Rzj0OButABHKaISjxE
+wJG/DZ8fJTx+Yn970cIA7jH0r03/kpg8fzrCWjUH+Jy3vX8dkTa0I+fWz45k9o1g
+e+ENGeIRklG7T8rNCmJP6oacGJUfdmXSHDszg0u1dCi4scth1vksDbZwyL/BPqGF
+hLvIeAXwm1TPXKvD13odTRBgHj5h7w7YOBmcqGwq+rgEC+iRJhdS00x+mquD9Gdm
+CjCvRnS7JG4UTpmUxsdY0snPCiHZjbjCKhZr+dciOOWLQE2NVuTeiyNg5di7XMq+
+blIh6acnMZThiR8+bHAprJ1P+DtZ6uY0oePnRZ2K1pebGIOjA/UKaHlvbatyB49z
+NdTvAWRWAQ2tSOpQhtR/3Pp6SYniT+/lnsW3H4bBsY14wEfPp8tkp7SdbyjoEeaz
+ljX4Qi8q0ozKO22jbtwzE6F9V/EzzwIDAQABo3MwcTAJBgNVHRMEAjAAMAsGA1Ud
+DwQEAwIEsDAdBgNVHQ4EFgQUVLZVCCB2lbddzYxAxk/g4bfBjhQwGwYDVR0RBBQw
+EoEQam9obkB0aHJvdHRsZS5pbzAbBgNVHRIEFDASgRBqb2huQHRocm90dGxlLmlv
+MA0GCSqGSIb3DQEBCwUAA4IBgQAxwbDSdDZjJQ4pKoV1Xf5kj9JKL1GvJ8jotTyx
+Oy8BXUV+iiYXCelwfvBIsBtz64pH1VVg4/xrv2Vsi3It3IUdlbxUHi5Bn0X0W9ci
+xkQYlszu4au+oz86MY/LMx83r9y+3GKy633JH5qmILotKHgzAcoFK5mASC9QyJWV
+EK5FWtQGVJUelB4K3P93pxICfN5os04TCW4lAzLEwYwc+TVGDa1q1u8Wr7haId4o
+fsQvapSzlO/jXwtepH363FhrdqYnXJ1acyCGBtaHzOcRUTmgRtTwNoMQICwNzeJ+
+VvAOtMDRJT68kz5nD1G6AyriHzLptEt2/+Oq/DmAY3E2q+qN7Rb3THDBDFV7u3Cw
+aNcGx7j1YvV5morU/wytvIA1XvjZlp27MBu0dd4kL8k7SRApTxnRjavsDrz1Oxa6
+BTJGZ4qddTGCNj/QRwzZegXpckYB3u60wiU6EECWndotUYuKbgObSDU4Nh1cdrzw
+FIew3kKXPiBpZBN3eDxal56e+R0=
 -----END CERTIFICATE-----

data/lib/systemd/journal/version.rb

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

data/lib/systemd/journal/writable.rb

@@ -66,7 +66,7 @@ module Systemd
         #   severity of the event.
         # @param [String] message the content of the message to write.
         def print(level, message)
-          rc = Native.sd_journal_print(level, message)
+          rc = Native.sd_journal_print(level, message.to_s.gsub('%', '%%'))
           raise JournalError, rc if rc < 0
         end
 

data/spec/systemd/journal_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe Systemd::Journal do
       expect(Systemd::Journal::Native).to receive(:sd_journal_close)
         .and_call_original
 
-      result = j.open { 1 }
+      result = Systemd::Journal.open { 1 }
       expect(result).to eq 1
     end
 
@@ -21,7 +21,7 @@ RSpec.describe Systemd::Journal do
       expect(Systemd::Journal::Native).to_not receive(:sd_journal_close)
 
       expect do
-        j.open(file: 1, path: 2, files: 3) { 1 }
+        Systemd::Journal.open(file: 1, path: 2, files: 3) { 1 }
       end.to raise_error(ArgumentError)
     end
   end
@@ -438,4 +438,14 @@ RSpec.describe Systemd::Journal do
       Systemd::Journal.message(message: 'hello % world %')
     end
   end
+
+  describe 'print' do
+    it 'escapes percent signs' do
+      expect(Systemd::Journal::Native).to receive(:sd_journal_print)
+        .with(Systemd::Journal::LOG_DEBUG, 'hello %% world %%')
+        .and_return(0)
+
+      Systemd::Journal.print(Systemd::Journal::LOG_DEBUG, 'hello % world %')
+    end
+  end
 end

data/systemd-journal.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.summary       = 'Ruby bindings to libsystemd-journal'
   gem.homepage      = 'https://github.com/ledbettj/systemd-journal'
 
-  gem.cert_chain    = Dir['certs/*']
+  gem.cert_chain    = Dir['certs/john@throttle.io.pem']
 
   if $PROGRAM_NAME.end_with?('gem')
     gem.signing_key = ENV['GEM_SIGNING_KEY']
@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec',     '~> 3.4'
   gem.add_development_dependency 'simplecov', '~> 0.9'
   gem.add_development_dependency 'rubocop',   '~> 0.26' unless ENV['RUBOCOP'] == 'false'
-  gem.add_development_dependency 'rake',      '~> 10.3'
+  gem.add_development_dependency 'rake',      '~> 12.3'
   gem.add_development_dependency 'yard',      '~> 0.9'
   gem.add_development_dependency 'pry',       '~> 0.10'
 end

metadata

@@ -1,37 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: systemd-journal
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - John Ledbetter
 - Daniel Mack
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARqb2hu
-  MRgwFgYKCZImiZPyLGQBGRYIdGhyb3R0bGUxEjAQBgoJkiaJk/IsZAEZFgJpbzAe
-  Fw0xOTAzMDUyMDM1MjZaFw0yMDAzMDQyMDM1MjZaMD0xDTALBgNVBAMMBGpvaG4x
-  GDAWBgoJkiaJk/IsZAEZFgh0aHJvdHRsZTESMBAGCgmSJomT8ixkARkWAmlvMIIB
-  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
+  MIIEMDCCApigAwIBAgIBATANBgkqhkiG9w0BAQsFADAhMR8wHQYDVQQDDBZqb2hu
+  L0RDPXRocm90dGxlL0RDPWlvMB4XDTIwMDczMDIyMTUxNVoXDTIxMDczMDIyMTUx
+  NVowITEfMB0GA1UEAwwWam9obi9EQz10aHJvdHRsZS9EQz1pbzCCAaIwDQYJKoZI
+  hvcNAQEBBQADggGPADCCAYoCggGBAMEZjnWtA5/YsYEDvWlTAPOP2NshfBVcNSXE
+  FHg4refJstCaf59iqFEWbEjLmbezK6HA5vzM6ZenEom2S1Rzj0OButABHKaISjxE
+  wJG/DZ8fJTx+Yn970cIA7jH0r03/kpg8fzrCWjUH+Jy3vX8dkTa0I+fWz45k9o1g
+  e+ENGeIRklG7T8rNCmJP6oacGJUfdmXSHDszg0u1dCi4scth1vksDbZwyL/BPqGF
+  hLvIeAXwm1TPXKvD13odTRBgHj5h7w7YOBmcqGwq+rgEC+iRJhdS00x+mquD9Gdm
+  CjCvRnS7JG4UTpmUxsdY0snPCiHZjbjCKhZr+dciOOWLQE2NVuTeiyNg5di7XMq+
+  blIh6acnMZThiR8+bHAprJ1P+DtZ6uY0oePnRZ2K1pebGIOjA/UKaHlvbatyB49z
+  NdTvAWRWAQ2tSOpQhtR/3Pp6SYniT+/lnsW3H4bBsY14wEfPp8tkp7SdbyjoEeaz
+  ljX4Qi8q0ozKO22jbtwzE6F9V/EzzwIDAQABo3MwcTAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUVLZVCCB2lbddzYxAxk/g4bfBjhQwGwYDVR0RBBQw
+  EoEQam9obkB0aHJvdHRsZS5pbzAbBgNVHRIEFDASgRBqb2huQHRocm90dGxlLmlv
+  MA0GCSqGSIb3DQEBCwUAA4IBgQAxwbDSdDZjJQ4pKoV1Xf5kj9JKL1GvJ8jotTyx
+  Oy8BXUV+iiYXCelwfvBIsBtz64pH1VVg4/xrv2Vsi3It3IUdlbxUHi5Bn0X0W9ci
+  xkQYlszu4au+oz86MY/LMx83r9y+3GKy633JH5qmILotKHgzAcoFK5mASC9QyJWV
+  EK5FWtQGVJUelB4K3P93pxICfN5os04TCW4lAzLEwYwc+TVGDa1q1u8Wr7haId4o
+  fsQvapSzlO/jXwtepH363FhrdqYnXJ1acyCGBtaHzOcRUTmgRtTwNoMQICwNzeJ+
+  VvAOtMDRJT68kz5nD1G6AyriHzLptEt2/+Oq/DmAY3E2q+qN7Rb3THDBDFV7u3Cw
+  aNcGx7j1YvV5morU/wytvIA1XvjZlp27MBu0dd4kL8k7SRApTxnRjavsDrz1Oxa6
+  BTJGZ4qddTGCNj/QRwzZegXpckYB3u60wiU6EECWndotUYuKbgObSDU4Nh1cdrzw
+  FIew3kKXPiBpZBN3eDxal56e+R0=
   -----END CERTIFICATE-----
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -95,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -139,12 +143,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
-- Dockerfile.bionic
-- Dockerfile.centos
-- Dockerfile.xenial
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -179,7 +181,7 @@ homepage: https://github.com/ledbettj/systemd-journal
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -194,9 +196,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Ruby bindings to libsystemd-journal
 test_files:

data/Dockerfile.bionic

@@ -1,19 +0,0 @@
-FROM ubuntu:18.04
-
-RUN apt-get update -q && apt-get install -qy --no-install-recommends \
-        build-essential \
-        ruby \
-        ruby-bundler \
-        ruby-dev \
-        libsystemd0 \
-        git \
-      && apt-get clean \
-      && rm -rf /var/lib/apt/lists/* \
-      && truncate -s 0 /var/log/*log
-
-WORKDIR /usr/src
-
-COPY . .
-RUN bundle install
-RUN cat /dev/urandom | tr -cd 'a-f0-9' | head -c 32 | awk '{ print $1 }' | tee /etc/machine-id
-RUN bundle exec rake

data/Dockerfile.centos

@@ -1,11 +0,0 @@
-FROM centos:7
-
-RUN yum install -y make gcc-c++ systemd ruby ruby-devel rubygem-bundler git
-
-WORKDIR /usr/src
-ENV RUBOCOP=false
-
-COPY . .
-RUN bundle install
-RUN cat /dev/urandom | tr -cd 'a-f0-9' | head -c 32 | awk '{ print $1 }' | tee /etc/machine-id
-RUN bundle exec rake

data/Dockerfile.xenial

@@ -1,19 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update -q && apt-get install -qy --no-install-recommends \
-        build-essential \
-        ruby \
-        ruby-bundler \
-        ruby-dev \
-        libsystemd0 \
-        git \
-      && apt-get clean \
-      && rm -rf /var/lib/apt/lists/* \
-      && truncate -s 0 /var/log/*log
-
-WORKDIR /usr/src
-
-COPY . .
-RUN bundle install
-RUN cat /dev/urandom | tr -cd 'a-f0-9' | head -c 32 | awk '{ print $1 }' | tee /etc/machine-id
-RUN bundle exec rake