systemd-journal 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17f43d104aba0ce7b017388964e8dc82a8552ad2
-  data.tar.gz: 22fa6ea7f4c044f1d1e27e81b388dc390ee02066
+  metadata.gz: 72e715f4febf59e80e5b3ee18156f408e896001c
+  data.tar.gz: 9dc1f0c4921b88568469259e56db12c5db850e78
 SHA512:
-  metadata.gz: 63fda69b863ca386c990331a565ff787b3b09ca3e14db6bfb3276bc0b291f726a2b0fb89d2d6431ea2147d86cbe548fd01f92cd91af255e5490cbcc30170969b
-  data.tar.gz: 3455916da4baede72a14514ee20702b4451b1391e746a5e0cbc7db087fefda64d8f29533e4b41585273a37e91f98a4e5638232afb1d97803876d36b6db3f69da
+  metadata.gz: 7528d93f609d6e9abcb39fd52cb1b9572760ac2d09cd8ada74ae1ec18722fd4829a6625996d10757f7d5180e951af8e3e6db5e42dbb21f1665adb32fa4972aeb
+  data.tar.gz: 1466d24d65ab955ecea3b833d054df7b97a20456d26f54d33b1e564d9496bcfc1c5dba8be9c8c624c2789db49dec5b36139aae831527c3b9f93ea73a595480f2

data/.travis.yml

@@ -2,6 +2,8 @@ language: ruby
 rvm:
   - 2.1.2
   - 1.9.3
+  - jruby-19mode
+
 before_script:
   - export PREV_DIR=$(pwd)
   - sudo apt-get update -qq

data/lib/systemd/ffi_size_t.rb

@@ -2,14 +2,23 @@ require 'ffi'
 
 # @private
 class FFI::MemoryPointer
-  # monkey patch a read_size_t and write_size_t method onto FFI::MemoryPointer
-  p = FFI::MemoryPointer.new(:size_t, 1)
-  w = case p.size
-      when 4 then :uint32
-      when 8 then :uint64
-      else raise RuntimeError.new("unsupported size_t width: #{p.size}")
-      end
-
-  alias_method :read_size_t,  :"read_#{w}"  unless p.respond_to?(:read_size_t)
-  alias_method :write_size_t, :"write_#{w}" unless p.respond_to?(:write_size_t)
+  # monkey patch a read_size_t and write_size_t method onto FFI::MemoryPointer.
+  # see https://github.com/ffi/ffi/issues/118
+  def self.monkey_patch_type_i_need!(which)
+    return if self.respond_to?("read_#{which}")
+
+    type = FFI.find_type(which)
+    type, _ = FFI::TypeDefs.find do |(name, t)|
+      method_defined?("read_#{name}") if t == type
+    end
+
+    raise RuntimeError, "Unable to patch in reader/writer for #{which}" if type.nil?
+
+    alias_method "read_#{which}", "read_#{type}"
+    alias_method "write_#{which}", "write_#{type}"
+  end
+end
+
+[:size_t, :uint64, :uint32].each do |type|
+  FFI::MemoryPointer.monkey_patch_type_i_need!(type)
 end

data/lib/systemd/journal.rb

@@ -282,7 +282,7 @@ module Systemd
     end
 
     def string_from_out_ptr(p, len)
-      p.read_pointer.read_string_length(len)
+      p.read_pointer.read_string(len)
     end
 
     # some sd_journal_* functions return strings that we're expected to free

data/lib/systemd/journal/version.rb

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

data/lib/systemd/journal/waitable.rb

@@ -1,6 +1,8 @@
 module Systemd
   class Journal
     module Waitable
+      IS_JRUBY = (RUBY_ENGINE == 'jruby')
+
       # Block until the journal is changed.
       # @param timeout_usec [Integer] maximum number of microseconds to wait
       #   or `-1` to wait indefinitely.
@@ -14,7 +16,7 @@ module Systemd
       # @return [Symbol] :append new entries were appened to the journal.
       # @return [Symbol] :invalidate journal files were added/removed/rotated.
       def wait(timeout_usec = -1, opts = {})
-        if opts[:select]
+        if opts[:select] && !IS_JRUBY
           wait_select(timeout_usec)
         else
           rc = Native.sd_journal_wait(@ptr, timeout_usec)

data/spec/systemd/journal_spec.rb

@@ -359,9 +359,16 @@ RSpec.describe Systemd::Journal do
     end
 
     it 'can use select' do
+      pending "not available on JRUBY" if Systemd::Journal::IS_JRUBY
       expect(Systemd::Journal::Native).to_not receive(:sd_journal_wait)
       j.wait(1, select: true)
     end
+
+    it 'ignores request to use select on JRuby' do
+      pending "not necessary on MRI" unless Systemd::Journal::IS_JRUBY
+      expect(Systemd::Journal::Native).to receive(:sd_journal_wait)
+      j.wait(1, select: true)
+    end
   end
 
   describe 'wait_select_reliable?' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: systemd-journal
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - John Ledbetter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi