Merge pull request #43 from ledbettj/develop

release support for opening containers / files.

.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3

README.md

@@ -22,16 +22,7 @@ thing.
 
 Obviously you will need to have
 [systemd](http://www.freedesktop.org/wiki/Software/systemd/) installed on your
-system in order to use the gem.
-
-__systemd 208__:
-
-* `libsystemd-journal`
-* `libsystemd-id128`
-
-__systemd 209+__:
-
-* `libsystemd`
+system in order to use the gem.  Currently we support systemd 208 or higher.
 
 ## Usage
 
@@ -114,5 +105,3 @@ If you run into problems or have questions, please open an
 4. Push to the branch
 5. Create new Pull Request, targeting the __develop__ branch.
 6. Wipe hands on pants, you're done!
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ledbettj/systemd-journal/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

lib/systemd/journal.rb

@@ -1,3 +1,4 @@
+require 'systemd/journal/version'
 require 'systemd/journal/native'
 require 'systemd/journal/flags'
 require 'systemd/journal/writable'
@@ -29,22 +30,33 @@ class Journal
     # @option opts [Integer] :flags a set of bitwise OR-ed
     #   {Systemd::Journal::Flags} which control what journal files are opened.
     #   Defaults to `0`, meaning all journals avaiable to the current user.
-    # @option opts [String]  :path if provided, open the journal files living
-    #   in the provided directory only.  Any provided flags will be ignored per
+    # @option opts [String] :path if provided, open the journal files living
+    #   in the provided directory only.  Any provided flags will be ignored
     #   since sd_journal_open_directory does not currently accept any flags.
+    # @option opts [Array] :files if provided, open the provided journal files
+    #   only.  Any provided flags will be ignored since sd_journal_open_files
+    #   does not currently accept any flags.
+    # @option opts [String] :container if provided, open the journal files from
+    #   the container with the provided machine name only.
     # @example Read only system journal entries
     #   j = Systemd::Journal.new(flags: Systemd::Journal::Flags::SYSTEM_ONLY)
     # @example Directly open a journal directory
     #   j = Systemd::Journal.new(
     #     path: '/var/log/journal/5f5777e46c5f4131bd9b71cbed6b9abf'
     #   )
     def initialize(opts = {})
+      validate_options!(opts)
+
       flags = opts[:flags] || 0
-      path  = opts[:path]
       ptr   = FFI::MemoryPointer.new(:pointer, 1)
 
-      rc = if path
-             Native.sd_journal_open_directory(ptr, path, 0)
+      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
@@ -194,6 +206,23 @@ def data_threshold=(threshold)
 
     private
 
+    def array_to_ptrs(strings)
+      ptr = FFI::MemoryPointer.new(:pointer, strings.length + 1)
+      strings.each_with_index do |s, i|
+        ptr[i].put_pointer(0, FFI::MemoryPointer.from_string(s))
+      end
+      ptr[strings.length].put_pointer(0, nil)
+      ptr
+    end
+
+    def validate_options!(opts)
+      exclusive = [:path, :files, :container]
+      provided  = (opts.keys & exclusive)
+      if provided.length > 1
+        raise ArgumentError.new("#{provided} are conflicting options")
+      end
+    end
+
     def self.finalize(ptr)
       proc { Native.sd_journal_close(ptr) unless ptr.nil? }
     end

lib/systemd/journal/native.rb

@@ -16,6 +16,9 @@ module Native
       attach_function :sd_journal_open_directory, [:pointer, :string, :int], :int
       attach_function :sd_journal_close,          [:pointer], :void
 
+      attach_function :sd_journal_open_files,     [:pointer, :pointer, :int], :int
+      attach_function :sd_journal_open_container, [:pointer, :string, :int], :int
+
       # navigation
       attach_function :sd_journal_next,          [:pointer], :int
       attach_function :sd_journal_next_skip,     [:pointer, :uint64], :int

spec/spec_helper.rb

@@ -15,8 +15,9 @@
       0
     end
 
-    Systemd::Journal::Native.stub(:sd_journal_open, &dummy_open)
-    Systemd::Journal::Native.stub(:sd_journal_open_directory, &dummy_open)
+    ['', '_directory', '_files', '_container'].each do |suffix|
+      Systemd::Journal::Native.stub(:"sd_journal_open#{suffix}", &dummy_open)
+    end
     Systemd::Journal::Native.stub(:sd_journal_close).and_return(0)
 
     # Raise an exception if any native calls are actually called
@@ -25,7 +26,8 @@
     end
 
     native_calls -= [
-      :sd_journal_open, :sd_journal_open_directory, :sd_journal_close
+      :sd_journal_open, :sd_journal_open_directory, :sd_journal_close,
+      :sd_journal_open_files, :sd_journal_open_container
     ]
 
     build_err_proc = ->(method_name) do

spec/systemd/journal_spec.rb

@@ -16,10 +16,29 @@
       Systemd::Journal.new(flags: 1234)
     end
 
+    it 'accepts a files argument to open specific files' do
+      Systemd::Journal::Native.should_receive(:sd_journal_open_files)
+      Systemd::Journal.new(files: ['/path/to/journal/1', '/path/to/journal/2'])
+    end
+
+    it 'accepts a machine name to open a container' do
+      Systemd::Journal::Native.should_receive(:sd_journal_open_container)
+      Systemd::Journal.new(container: 'bobs-machine')
+    end
+
     it 'raises a Journal Error if a native call fails' do
       Systemd::Journal::Native.should_receive(:sd_journal_open).and_return(-1)
       expect { Systemd::Journal.new }.to raise_error(Systemd::JournalError)
     end
+
+    it 'raises an argument error if conflicting options are passed' do
+      expect do
+        Systemd::Journal.new(path: 'p', files: %w{a b})
+      end.to raise_error(ArgumentError)
+      expect do
+        Systemd::Journal.new(container: 'c', files: %w{a b})
+      end.to raise_error(ArgumentError)
+    end
   end
 
   describe '#move' do