systemd-journal 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a059156599a0d4007da349975fbeabc806617b7
-  data.tar.gz: 04e3a33cd7dd024fab848183ad3f36e3c3a3ecba
+  metadata.gz: 978a030e0e1fbf45c4d7cf8f597fb746c125d9ed
+  data.tar.gz: b4ead8920befcd90d27351b7552128347e165a6a
 SHA512:
-  metadata.gz: 07b7b3dadcc849ef85dec175bec3734353ffb839e0a0ce287b0bb8954e307972684584815129017e92012f027a04518a6e839237edf52c95c9a16f4763cdbf85
-  data.tar.gz: b05f3ba3b46d561c0596b498616fab5a9fb57cbeb0462a85c8fbf613e09060caf98dd7ba9224242845ad354cd9897aa135dcd8af9500f3af2a7f2cf8d3fcb909
+  metadata.gz: 16629bfb3cf7f6d58894eeec4f2e977c6eeed09eca46c09669060b6f25c1cb10237a3f2aa03551b291e974e7ae6ee10e884b11ffc4069680a30a17c76b11f51d
+  data.tar.gz: 45339d61c9c50b4eec0fcf36ac68d9cfe9feeacd8bb07f2d47f5c235b1d2e0f1bd64ce29a6118c6f226e1918d717a8b10285abc69816e56232f5c3227f8801ca

data/.rubocop.yml

@@ -4,14 +4,28 @@ SignalException:
 RaiseArgs:
   Enabled: false
 
-SpaceAroundBlockBraces:
-  EnforcedStyle: space_inside_braces
+SpaceInsideBlockBraces:
+  Enabled: true
+SpaceBeforeBlockBraces:
+  Enabled: true
+
 Lambda:
   Enabled: false
 
-GlobalVars:
-  AllowedVariables:
-    - $NO_FFI_SPEC
-
 Documentation:
-  Enabled: false
+  Enabled: false
+
+MethodLength:
+  Max: 20
+
+ClassLength:
+  Max: 150
+
+Style/FileName:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false

data/.travis.yml

@@ -0,0 +1,23 @@
+language: ruby
+rvm:
+  - 2.1.2
+  - 1.9.3
+before_script:
+  - export PREV_DIR=$(pwd)
+  - sudo apt-get update -qq
+  - sudo apt-get install autotools-dev automake autoconf libtool libdbus-1-dev libcap-dev libblkid-dev libpam-dev libcryptsetup-dev libaudit-dev libacl1-dev libattr1-dev libselinux-dev liblzma-dev libgcrypt-dev libqrencode-dev libmicrohttpd-dev gtk-doc-tools gperf python2.7-dev
+  - git clone git://github.com/systemd/systemd.git /tmp/systemd
+  - >
+      cd /tmp/systemd/  &&
+      git checkout v209 &&
+      sh autogen.sh     &&
+      ./configure --disable-apparmor --disable-audit --disable-selinux
+      --disable-machined --disable-logind --disable-timedated
+      --disable-timesyncd --disable-localed --disable-resolved
+      --disable-networkd --disable-tests --disable-coredump --disable-hostnamed
+      --disable-manpages --disable-libcryptsetup --disable-python-devel
+      --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib
+      --with-rootprefix= --with-rootlibdir=/lib
+  - cd /tmp/systemd/ && make && sudo make install
+  - echo "done building in $(pwd), switching back to $PREV_DIR, library path is $LD_LIBRARY_PATH"
+  - cd $PREV_DIR

data/lib/systemd/id128.rb

@@ -45,8 +45,8 @@ module Systemd
     module Native
       require 'ffi'
       extend FFI::Library
-      ffi_lib %w{ libsystemd.so.0       libsystemd.so
-                  libsystemd-id128.so.0 libsystemd-id128.so }
+      ffi_lib %w( libsystemd.so.0       libsystemd.so
+                  libsystemd-id128.so.0 libsystemd-id128.so )
 
       attach_function :sd_id128_get_machine, [:pointer], :int
       attach_function :sd_id128_get_boot,    [:pointer], :int

data/lib/systemd/journal.rb

@@ -49,18 +49,9 @@ module Systemd
 
       flags = opts[:flags] || 0
       ptr   = FFI::MemoryPointer.new(:pointer, 1)
+      opts[:files] = opts[:file] if opts[:file]
 
-      rc = case
-           when opts[:path]
-             Native.sd_journal_open_directory(ptr, opts[:path], 0)
-           when opts[:files]
-             Native.sd_journal_open_files(ptr, array_to_ptrs(opts[:files]), 0)
-           when opts[:container]
-             Native.sd_journal_open_container(ptr, opts[:container], flags)
-           else
-             Native.sd_journal_open(ptr, flags)
-           end
-
+      rc = open_journal(ptr, opts, flags)
       raise JournalError.new(rc) if rc < 0
 
       @ptr = ptr.read_pointer
@@ -121,7 +112,11 @@ module Systemd
         yield(key, value) if block_given?
       end
 
-      JournalEntry.new(results)
+      JournalEntry.new(
+        results,
+        realtime_ts:  read_realtime,
+        monotonic_ts: read_monotonic
+      )
     end
 
     def current_catalog
@@ -201,6 +196,37 @@ module Systemd
 
     private
 
+    def open_journal(ptr, opts, flags)
+      case
+      when opts[:path]
+        Native.sd_journal_open_directory(ptr, opts[:path], 0)
+      when opts[:files]
+        Native.sd_journal_open_files(ptr, array_to_ptrs(Array(opts[:files])), 0)
+      when opts[:container]
+        Native.sd_journal_open_container(ptr, opts[:container], flags)
+      else
+        Native.sd_journal_open(ptr, flags)
+      end
+    end
+
+    def read_realtime
+      out = FFI::MemoryPointer.new(:uint64, 1)
+      rc = Native.sd_journal_get_realtime_usec(@ptr, out)
+      raise JournalError.new(rc) if rc < 0
+
+      out.read_uint64
+    end
+
+    def read_monotonic
+      out  = FFI::MemoryPointer.new(:uint64, 1)
+      boot = FFI::MemoryPointer.new(Systemd::Id128::Native::Id128, 1)
+
+      rc = Native.sd_journal_get_monotonic_usec(@ptr, out, boot)
+      raise JournalError.new(rc) if rc < 0
+
+      [out.read_uint64, Systemd::Id128::Native::Id128.new(boot).to_s]
+    end
+
     def array_to_ptrs(strings)
       ptr = FFI::MemoryPointer.new(:pointer, strings.length + 1)
       strings.each_with_index do |s, i|
@@ -211,7 +237,7 @@ module Systemd
     end
 
     def validate_options!(opts)
-      exclusive = [:path, :files, :container]
+      exclusive = [:path, :files, :container, :file]
       provided  = (opts.keys & exclusive)
       if provided.length > 1
         raise ArgumentError.new("#{provided} are conflicting options")

data/lib/systemd/journal/fields.rb

@@ -1,18 +1,18 @@
 module Systemd
   class Journal
     # Fields directly passed by client programs and stored in the journal.
-    USER_FIELDS = %w{ MESSAGE MESSAGE_ID PRIORITY CODE_FILE CODE_LINE CODE_FUNC
-                      ERRNO SYSLOG_FACILITY SYSLOG_IDENTIFIER SYSLOG_PID }
+    USER_FIELDS = %w( MESSAGE MESSAGE_ID PRIORITY CODE_FILE CODE_LINE CODE_FUNC
+                      ERRNO SYSLOG_FACILITY SYSLOG_IDENTIFIER SYSLOG_PID )
 
     # Fields generated by the journal and added to each event.
-    TRUSTED_FIELDS = %w{ _PID _UID _GID _COMM _EXE _CMDLINE _AUDIT_SESSION
+    TRUSTED_FIELDS = %w( _PID _UID _GID _COMM _EXE _CMDLINE _AUDIT_SESSION
                          _AUDIT_LOGINUID _SYSTEMD_CGROUP _SYSTEMD_SESSION
                          _SYSTEMD_UNIT _SYSTEMD_USER_UNIT _SYSTEMD_OWNER_UID
                          _SELINUX_CONTEXT _SOURCE_REALTIME_TIMESTAMP _BOOT_ID
-                         _MACHINE_ID _HOSTNAME _TRANSPORT }
+                         _MACHINE_ID _HOSTNAME _TRANSPORT )
 
     # Fields used in messages originating from the kernel.
-    KERNEL_FIELDS = %w{ _KERNEL_DEVICE _KERNEL_SUBSYSTEM _UDEV_SYSNAME
-                        _UDEV_DEVNODE _UDEV_DEVLINK }
+    KERNEL_FIELDS = %w( _KERNEL_DEVICE _KERNEL_SUBSYSTEM _UDEV_SYSNAME
+                        _UDEV_DEVNODE _UDEV_DEVLINK )
   end
 end

data/lib/systemd/journal/native.rb

@@ -8,8 +8,8 @@ module Systemd
       # rubocop:disable LineLength
       require 'ffi'
       extend FFI::Library
-      ffi_lib %w{ libsystemd.so.0         libsystemd.so
-                  libsystemd-journal.so.0 libsystemd-journal.so}
+      ffi_lib %w( libsystemd.so.0         libsystemd.so
+                  libsystemd-journal.so.0 libsystemd-journal.so)
 
       # setup/teardown
       attach_function :sd_journal_open,           [:pointer, :int], :int
@@ -40,6 +40,9 @@ module Systemd
       attach_function :sd_journal_get_catalog,    [:pointer, :pointer], :int
       attach_function :sd_journal_get_catalog_for_message_id, [Systemd::Id128::Native::Id128.by_value, :pointer], :int
 
+      attach_function :sd_journal_get_realtime_usec,  [:pointer, :pointer], :int
+      attach_function :sd_journal_get_monotonic_usec, [:pointer, :pointer, :pointer], :int
+
       attach_function :sd_journal_get_data_threshold, [:pointer, :pointer], :int
       attach_function :sd_journal_set_data_threshold, [:pointer, :size_t],  :int
 
@@ -49,8 +52,8 @@ module Systemd
       attach_function :sd_journal_restart_unique,   [:pointer], :void
 
       # event notification
-      enum            :wake_reason,     [:nop, :append, :invalidate]
-      attach_function :sd_journal_wait, [:pointer, :uint64], :wake_reason, blocking: true
+      enum :wake_reason, [:nop, :append, :invalidate]
+      attach_function :sd_journal_wait,        [:pointer, :uint64], :wake_reason, blocking: true
       attach_function :sd_journal_get_fd,      [:pointer], :int
       attach_function :sd_journal_process,     [:pointer], :wake_reason
       attach_function :sd_journal_reliable_fd, [:pointer], :int
@@ -65,6 +68,8 @@ module Systemd
       attach_function :sd_journal_print,  [:int, :string], :int
       attach_function :sd_journal_send,   [:varargs], :int
       attach_function :sd_journal_perror, [:string], :int
+      attach_function :sd_journal_stream_fd, [:string, :int, :bool], :int
+
       # misc
       attach_function :sd_journal_get_usage, [:pointer, :pointer], :int
     end

data/lib/systemd/journal/version.rb

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

data/lib/systemd/journal/waitable.rb

@@ -68,7 +68,6 @@ module Systemd
         raise JournalError.new(rc) if rc.is_a?(Fixnum) && rc < 0
         rc == :nop ? nil : rc
       end
-
     end
   end
 end

data/lib/systemd/journal/writable.rb

@@ -7,7 +7,7 @@ module Systemd
     # the systemd-journal.gem by Daniel Mack
     # (https://github.com/zonque/systemd-journal.gem).
     module Writable
-       # system is unusable
+      # system is unusable
       LOG_EMERG   = 0
       # action must be taken immediately
       LOG_ALERT   = 1
@@ -32,6 +32,24 @@ module Systemd
       # methods in this module will be available as class methods on
       #  {Systemd::Journal}
       module ClassMethods
+
+        # Creates a new IO stream which writes newline-seperated messages to
+        # the journal.
+        # @param identifier [String] this value will be passed as
+        #   SYSLOG_IDENTIFIER to the journal.
+        # @param priority [Integer] the log level for events writen to this
+        #   stream.
+        # @param opts [Hash]
+        # @option opts [Boolean] :prefix true to enable kernel-style log
+        #   priority prefixes
+        # @return [IO]
+        def log_stream(identifier, priority, opts = {})
+          fd = Native.sd_journal_stream_fd(identifier, priority, !!opts[:prefix])
+          raise JournalError.new(fd) if fd < 0
+
+          IO.new(fd, File::WRONLY, encoding: Encoding::UTF_8)
+        end
+
         # write the value of the c errno constant to the systemd journal in the
         # style of the perror() function.
         # @param [String] message the text to prefix the error message with.

data/lib/systemd/journal_entry.rb

@@ -10,8 +10,9 @@ module Systemd
     # {Systemd::Journal} methods such as {Systemd::Journal#current_entry}.
     # @param [Hash] entry a hash containing all the key-value pairs associated
     #   with a given journal entry.
-    def initialize(entry)
+    def initialize(entry, context = {})
       @entry  = entry
+      @ctx    = context
       @fields = entry.map do |key, value|
         name = key.downcase.to_sym
         define_singleton_method(name) { value } unless respond_to?(name)
@@ -19,9 +20,23 @@ module Systemd
       end
     end
 
-    # not all journal entries will have all fields.  don't raise an error.
-    def method_missing(m)
-      nil
+    # Returns the wall-clock time that this entry was received by the journal.
+    # @return [Time]
+    def realtime_timestamp
+      @realtime_timestamp ||= Time.at(0, @ctx[:realtime_ts])
+    end
+
+    # Returns the monotonic time (time since boot) that this entry was received
+    # by the journal.  This should be associated with a boot_id.
+    # @return [Time]
+    def monotonic_timestamp
+      @monotonic_timestamp ||= Time.at(0, @ctx[:monotonic_ts].first)
+    end
+
+    def method_missing(m, *args)
+      # not all journal entries will have all fields.  don't raise an error
+      # unless the user passed arguments.
+      super(m, *args) unless args.empty?
     end
 
     # Get the value of a given field in the entry, or nil if it doesn't exist

data/lib/systemd/journal_error.rb

@@ -14,8 +14,6 @@ module Systemd
       super(LIBC.strerror(@code))
     end
 
-    private
-
     # FFI wrapper for the C standard library to pull in `strerror`.
     # @private
     module LIBC

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'simplecov'
 
 module SpecHelper
   def fixture_dir
-    @path ||= File.join(File.expand_path(__dir__), 'fixtures')
+    @path ||= File.join(File.expand_path('..', __FILE__), 'fixtures')
   end
 
   def journal_file

data/spec/systemd/journal_entry_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+RSpec.describe Systemd::JournalEntry do
+  let(:msg)       { 'test message' }
+  let(:pid)       { '123' }
+  let(:hash)      { { '_PID' => pid, 'MESSAGE' => msg } }
+  subject(:entry) { Systemd::JournalEntry.new(hash) }
+
+  describe 'initialize' do
+    it 'takes a hash as an argument' do
+      expect { Systemd::JournalEntry.new(hash) }.to_not raise_error
+    end
+  end
+
+  describe '[]' do
+    it 'accepts symbols as a field name' do
+      expect(entry[:message]).to eq(msg)
+    end
+
+    it 'accepts strings as a field name' do
+      expect(entry['message']).to eq(msg)
+    end
+
+    it 'doesnt care about case' do
+      expect(entry['MeSSage']).to eq(msg)
+    end
+
+    it 'returns nil if not found' do
+      expect(entry['missing']).to be nil
+    end
+  end
+
+  describe 'each' do
+    it 'is chainable as an enumerator' do
+      expect(entry.each.class).to be(Enumerator)
+    end
+
+    it 'yields each key/value in turn' do
+      expect(entry.map{ |k,v| [k,v] }).to eq([['_PID', pid], ['MESSAGE', msg]])
+    end
+  end
+
+  describe 'catalog' do
+    context 'without a catalog' do
+      it 'returns nil if the entry has no catalog' do
+        expect(entry.catalog).to be nil
+      end
+    end
+
+    context 'with a catalog' do
+      let(:catalog) { 'Process @_PID@ said @MESSAGE@' }
+      subject(:entry) do
+        Systemd::JournalEntry.new(hash.merge(message_id: '123'))
+      end
+
+      before(:each) do
+        allow(Systemd::Journal).to receive(:catalog_for).and_return(catalog)
+      end
+
+      it 'does field substitution by default' do
+        expect(entry.catalog).to eq('Process 123 said test message')
+      end
+
+      it 'does field substitution when requested' do
+        expect(entry.catalog(replace: true))
+          .to eq('Process 123 said test message')
+      end
+
+      it 'skips field substition if requested' do
+        expect(entry.catalog(replace: false)).to eq(catalog)
+      end
+    end
+  end
+end

data/spec/systemd/journal_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe Systemd::Journal do
   subject(:j) do
-    Systemd::Journal.new(files: [journal_file]).tap do |j|
+    Systemd::Journal.new(file: journal_file).tap do |j|
       j.seek(:head)
       j.move_next
     end
@@ -31,7 +31,7 @@ RSpec.describe Systemd::Journal do
       transports = %w(syslog journal stdout kernel driver)
 
       expect(values.length).to eq(5)
-      expect(values).to        include(*transports)
+      expect(values).to include(*transports)
     end
   end
 
@@ -44,13 +44,15 @@ RSpec.describe Systemd::Journal do
     end
 
     it 'returns the disk usage of the example journal file' do
-      expect(j.disk_usage).to eq(4005888)
+      pending 'blocks? bytes?'
+      expect(j.disk_usage).to eq(4_005_888)
     end
   end
 
   describe 'data_threshold' do
     it 'throws a JournalError on invalid return code' do
-      expect(Systemd::Journal::Native).to receive(:sd_journal_get_data_threshold)
+      expect(Systemd::Journal::Native)
+        .to receive(:sd_journal_get_data_threshold)
         .and_return(-1)
 
       expect { j.data_threshold }.to raise_error(Systemd::JournalError)
@@ -63,7 +65,8 @@ RSpec.describe Systemd::Journal do
 
   describe 'data_threshold=' do
     it 'throws a JournalError on invalid return code' do
-      expect(Systemd::Journal::Native).to receive(:sd_journal_set_data_threshold)
+      expect(Systemd::Journal::Native)
+        .to receive(:sd_journal_set_data_threshold)
         .and_return(-1)
 
       expect { j.data_threshold = 10 }.to raise_error(Systemd::JournalError)
@@ -94,7 +97,7 @@ RSpec.describe Systemd::Journal do
     it 'returns a JournalEntry with the correct values' do
       entry = j.current_entry
       expect(entry._hostname).to eq('arch')
-      expect(entry.message).to   start_with('Allowing runtime journal')
+      expect(entry.message).to start_with('Allowing runtime journal')
     end
   end
 
@@ -114,26 +117,212 @@ RSpec.describe Systemd::Journal do
       entries = j.each.map(&:message)
 
       expect(entries.first).to start_with('Allowing runtime journal')
-      expect(entries.last).to  start_with('ROOT LOGIN ON tty1')
+      expect(entries.last).to start_with('ROOT LOGIN ON tty1')
     end
   end
 
-  describe 'catalog_for' do
-    subject(:j)        { Systemd::Journal }
-    let(:message_id)   { 'f77379a8490b408bbe5f6940505a777b' }
-    let(:message_text) { 'Subject: The Journal has been started' }
+  context 'with catalog messages' do
+    let(:msg_id)   { 'f77379a8490b408bbe5f6940505a777b' }
+    let(:msg_text) { 'Subject: The Journal has been started' }
 
-    it 'throws a JournalError on invalid return code' do
-      expect(Systemd::Journal::Native)
-        .to receive(:sd_journal_get_catalog_for_message_id)
+    describe 'catalog_for' do
+      subject(:j) { Systemd::Journal }
+
+      it 'throws a JournalError on invalid return code' do
+        expect(Systemd::Journal::Native)
+          .to receive(:sd_journal_get_catalog_for_message_id)
+          .and_return(-1)
+
+        expect { j.catalog_for(msg_id) }.to raise_error(Systemd::JournalError)
+      end
+
+      it 'returns the correct catalog entry' do
+        cat = Systemd::Journal.catalog_for(msg_id)
+        expect(cat).to start_with(msg_text)
+      end
+    end
+
+    describe 'current_catalog' do
+      it 'throws a JournalError on invalid return code' do
+        expect(Systemd::Journal::Native)
+          .to receive(:sd_journal_get_catalog)
+          .and_return(-1)
+
+        expect { j.current_catalog }.to raise_error(Systemd::JournalError)
+      end
+
+      it 'returns the correct catalog entry' do
+        # find first entry with a catalog
+        j.move_next until j.current_entry.catalog?
+
+        expect(j.current_catalog).to start_with(msg_text)
+      end
+    end
+  end
+
+  describe 'filter' do
+    it 'does basic filtering as expected' do
+      j.filter(_transport: 'kernel')
+      j.each do |entry|
+        expect(entry._transport).to eq('kernel')
+      end
+      expect(j.count).to eq(435)
+    end
+
+    it 'does filtering with AND conditions' do
+      j.filter(_transport: 'kernel', priority: 3)
+      expect(j.count).to eq(2)
+      j.each do |e|
+        expect(e._transport).to eq('kernel')
+        expect(e.priority).to eq('3')
+      end
+    end
+
+    it 'does basic filtering with multiple options for the same key' do
+      j.filter(_transport: %w(kernel driver))
+      j.each do |entry|
+        expect(%w(kernel driver)).to include(entry._transport)
+      end
+      expect(j.count).to eq(438)
+    end
+
+    it 'does basic filtering with multiple keys' do
+      j.filter(
+        { _transport: 'kernel' },
+        { _systemd_unit: 'systemd-journald.service' }
+      )
+
+      c = j.each_with_object(Hash.new(0)) do |e, h|
+        h[:transport] += 1 if e._transport == 'kernel'
+        h[:unit]      += 1 if e._systemd_unit == 'systemd-journald.service'
+      end
+
+      expect(c[:transport]).to eq(435)
+      expect(c[:unit]).to eq(3)
+    end
+
+    it 'does crazy stupid filtering' do
+      filter = [
+        { _transport: 'kernel', priority: 4   },
+        { _systemd_unit: 'getty@tty1.service' },
+        { _systemd_unit: 'systemd-logind.service', seat_id: 'seat0' },
+        { priority: [3, 5] }
+      ]
+
+      j.filter(*filter)
+
+      c = j.each_with_object(Hash.new(0)) do |e, h|
+        h[:a] += 1 if e._transport == 'kernel' && e.priority == '4'
+        h[:b] += 1 if e._systemd_unit == 'getty@tty1.service'
+        if e._systemd_unit == 'systemd-logind.service' && e[:seat_id] == 'seat0'
+          h[:c] += 1
+        end
+        h[:d] += 1 if %w(3 5).include?(e.priority)
+      end
+
+      # from journalctl --file <fixture> <filter> --output json | wc -l
+      expect(c[:a]).to eq(26)
+      expect(c[:b]).to eq(1)
+      expect(c[:c]).to eq(1)
+      expect(c[:d]).to eq(11)
+    end
+  end
+
+  describe 'cursor' do
+    it 'returns some opaque string' do
+      expect(j.cursor).to be_kind_of(String)
+    end
+
+    it 'throws an error on failure' do
+      expect(Systemd::Journal::Native).to receive(:sd_journal_get_cursor)
+        .and_return(-1)
+
+      expect { j.cursor }.to raise_error(Systemd::JournalError)
+    end
+  end
+
+  describe 'cursor?' do
+    let!(:cursor) { j.cursor }
+    it 'returns true if the cursor matches' do
+      expect(j.cursor?(cursor)).to be true
+    end
+
+    it 'throws an error on failure' do
+      expect(Systemd::Journal::Native).to receive(:sd_journal_test_cursor)
         .and_return(-1)
 
-      expect { j.catalog_for(message_id) }.to raise_error(Systemd::JournalError)
+      expect { j.cursor?(cursor) }.to raise_error(Systemd::JournalError)
+    end
+  end
+
+  describe 'move' do
+    it 'moves by the specified number of entries' do
+      j.move(1)
+      expect(j.read_field(:message)).to eq(journal_json[1]['MESSAGE'])
+    end
+
+    it 'does not move with 0' do
+      j.move(1)
+      j.move(0)
+      expect(j.read_field(:message)).to eq(journal_json[1]['MESSAGE'])
+    end
+
+    it 'moves backwards' do
+      j.move(3)
+      j.move(-1)
+      expect(j.read_field(:message)).to eq(journal_json[2]['MESSAGE'])
+    end
+
+    it 'returns the number of entries moved' do
+      expect(j.move(3)).to eq(3)
+    end
+
+    it 'returns the number of entries moved even if if less' do
+      j.move(2)
+      expect(j.read_field(:message)).to eq(journal_json[2]['MESSAGE'])
+      expect(j.move(-5)).to eq(2)
+    end
+
+    it 'returns 0 if it did not move' do
+      expect(j.move(-1)).to eq(0)
+    end
+  end
+
+  describe 'seek' do
+    it 'treats a string parameter as the cursor' do
+      cursor = j.cursor
+      j.move(3)
+      expect(j.cursor?(cursor)).to be false
+      j.seek(cursor)
+      j.move_next
+      expect(j.cursor?(cursor)).to be true
+    end
+
+    it 'can seek to the end' do
+      j.seek(:tail)
+      j.move_previous
+      expect(j.move_next).to be false
+    end
+
+    it 'can seek to the start' do
+      j.seek(:start)
+      j.move_next
+      expect(j.move_previous).to be false
+    end
+
+    it 'can seek based on timestamp' do
+      j.seek(Time.parse('2013-03-28T21:07:21-04:00'))
+      j.move_next
+
+      entry = j.current_entry
+      ts    = entry.realtime_timestamp
+
+      expect(entry.message).to start_with('input: ImExPS/2')
+      expect(ts.utc.iso8601).to eq('2013-03-29T01:07:21Z')
     end
 
-    it 'returns the correct catalog entry' do
-      cat = Systemd::Journal.catalog_for(message_id)
-      expect(cat).to start_with(message_text)
+    it 'throws an ArgumentError for other types' do
+      expect { j.seek(5) }.to raise_error(ArgumentError)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: systemd-journal
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - John Ledbetter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -119,6 +119,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -142,6 +143,7 @@ files:
 - spec/fixtures/test.journal
 - spec/fixtures/test.json
 - spec/spec_helper.rb
+- spec/systemd/journal_entry_spec.rb
 - spec/systemd/journal_spec.rb
 - systemd-journal.gemspec
 homepage: https://github.com/ledbettj/systemd-journal
@@ -172,5 +174,6 @@ test_files:
 - spec/fixtures/test.journal
 - spec/fixtures/test.json
 - spec/spec_helper.rb
+- spec/systemd/journal_entry_spec.rb
 - spec/systemd/journal_spec.rb
 has_rdoc: