systemd-journal 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 871a098e73eadfe6cd53fc8066537c37e1a1681b
-  data.tar.gz: cb944399a1624c724b469ca41b13a3ccb4bddcb0
+  metadata.gz: cb7ad77b556c438d61a805803ce3ea525aae200f
+  data.tar.gz: 135d9669a414f246f1b75e060ba8b6d719bdea2f
 SHA512:
-  metadata.gz: a399b0ddb5e9eb60bb305b631bb531588352f0015a1ac0b64880fa289877a716c44eaa34d887461a17144af21f5c520a6d759c8030c315538c117160ead48724
-  data.tar.gz: af798df9d31d0cc9e742104de505964bf1e07f94dfb74918407cdce0996cde716a96b440482614c57050afabc56c62aa82d218edc53fb20f3685e29ec5c1d719
+  metadata.gz: 063fc619fbc6436e72381812dcb0c3905a3b17d260e8d0223df0dec95b51a8219cbf6ee1c02a3eff3f0f548e474ca8df77ed2f6a97adfe12de90c87018b0a5dd
+  data.tar.gz: 1175078fb9650d9bf12c5bbbd612b87ddb5b5bf5c44974d49fdc4a9344ee1e1f4934a92f35b1f9c8c5a4fbfe5b2d4408b9a1f17a58bff2ebf0ce0bff30c051d4

data/README.md

@@ -16,10 +16,10 @@ And then execute:
 
 ## Usage
 
+    require 'systemd/journal'
+
 Print all messages as they occur:
 
-    require 'systemd/journal'
-    
     j = Systemd::Journal.new
     j.seek(:tail)
 
@@ -27,20 +27,36 @@ Print all messages as they occur:
       puts entry.message
     end
 
-Filter messages included in the journal:
-
-    require 'systemd/journal'
+Filter events and iterate:
 
     j = Systemd::Journal.new
-
+    
     # only display entries from SSHD with priority 6.
-    j.add_match(:priority, 6)
-    j.add_match(:_exe, '/usr/bin/sshd')
-
-    while j.move_next
-      puts j.current_entry.message
+    j.filter(priority: 6, _exe: '/usr/bin/sshd')
+    j.each do |entry|
+      puts entry.message
     end
+    
+Moving around the journal:
+
+    j = Systemd::Journal.new
+    
+    j.seek(:head)   # move to the start of journal
+    j.move(10)      # move forward by 10 entries
+    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.current_entry # get the entry we're currently positioned at
+    
+    # seek the entry that occured closest to this time
+    j.seek(Time.parse("2013-10-31T12:00:00+04:00:00"))
 
+     
 See the documentation for more examples.
 
 ## Contributing

data/lib/systemd/journal.rb

@@ -406,7 +406,7 @@ module Systemd
         raise JournalError.new(rc)
       end
 
-      out_ptr.read_pointer.read_string
+      read_and_free_outstr(out_ptr.read_pointer)
     end
 
     # Check if the read position is currently at the entry represented by the
@@ -428,5 +428,14 @@ module Systemd
       proc{ Native::sd_journal_close(ptr) unless ptr.nil? }
     end
 
+    # some sd_journal_* functions return strings that we're expected to free
+    # ourselves.  This function copies the string from a char* to a ruby string,
+    # frees the char*, and returns the ruby string.
+    def read_and_free_outstr(ptr)
+      str = ptr.read_string
+      LibC.free(ptr)
+      str
+    end
+
   end
 end

data/lib/systemd/journal/native.rb

@@ -62,4 +62,13 @@ module Systemd
     end
 
   end unless $NO_FFI_SPEC
+
+  module LibC
+    require 'ffi'
+    extend FFI::Library
+    ffi_lib FFI::Library::LIBC
+
+    attach_function :free, [:pointer], :void
+  end
+
 end

data/lib/systemd/journal/version.rb

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

data/spec/systemd/journal_spec.rb

@@ -429,8 +429,14 @@ describe Systemd::Journal do
   describe '#cursor' do
     it 'returns the current cursor' do
       j = Systemd::Journal.new
+
       Systemd::Journal::Native.should_receive(:sd_journal_get_cursor) do |ptr, out_ptr|
-        out_ptr.write_pointer(FFI::MemoryPointer.from_string("5678"))
+        # this memory will be manually freed. not setting autorelease to false
+        # would cause a double free.
+        str = FFI::MemoryPointer.from_string("5678")
+        str.autorelease = false
+
+        out_ptr.write_pointer(str)
         0
       end
       j.cursor.should eq("5678")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: systemd-journal
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - John Ledbetter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to libsystemd-journal