systemd-journal 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62fda8140f386ef899a2e599ebd0b28dcc4d371e
-  data.tar.gz: 20856e68190c5cb1b62c79baeeeb90a1db5ac009
+  metadata.gz: 41bf055a81da81e7351fbfafdd5a16177cbea081
+  data.tar.gz: 235ba1a4be3f02c1b8ba7b23d68bfed2b549f933
 SHA512:
-  metadata.gz: 1501c0de4be3f35d44ed101e2c9f068beb66b14b9554eb61c382430bc1c946d5039ff55a71388ba7acca5a16eed898a25ed1d1164fcd95be1a3dbb24b6971c84
-  data.tar.gz: 8fbb64089d686aeabc530dbd207da49d47ac170fcac504d31291e277cec527f9a2ca957d78c4a68cbe72c253fc645ea8162b19b756e3934d34b9e92d24dfd2e3
+  metadata.gz: 6e45b203f15cf57d61e9a0392bc299dda4c64dc7cf383b41561a95f4e8b14f5add2b55af0ec98a16ddcb5b6c0d034d718f8697f55975649c74d7ce59f8237447
+  data.tar.gz: 18c6726c5c693748bc37e6b09972c47efff27c5fbea3fe55b8f07219c58c9ca2fce1404a00abf2fce1cde26f25fb49726deb6507091e86677fe63bd1fce97922

data/README.md

@@ -2,7 +2,7 @@
 
 Ruby bindings for reading from the systemd journal.
 
-* [documentation](http://rubydoc.info/github/ledbettj/systemd-journal)
+* [documentation](http://rubydoc.info/github/ledbettj/systemd-journal/Systemd/Journal)
 
 ## Installation
 
@@ -45,5 +45,5 @@ Or to print all data in each entry:
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-6. Wipe hands on pants
+5. Create new Pull Request, targeting the __develop__ branch.
+6. Wipe hands on pants, you're done.

data/Rakefile

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require "yard"
+require "rspec/core/rake_task"
 
+desc "open a console with systemd/journal required"
 task :console do
   exec 'pry -I./lib -r systemd/journal'
 end
@@ -9,3 +11,7 @@ YARD::Rake::YardocTask.new do |t|
   t.files = ['lib/**/*.rb']
   t.options = ['--no-private', '--markup=markdown']
 end
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = "--color"
+end

data/lib/systemd/journal.rb

@@ -51,9 +51,10 @@ module Systemd
     #   that the pointer has reached the end of the journal.
     def move_next
       case (rc = Native::sd_journal_next(@ptr))
-      when 0 then false # EOF
+      when 0 then false
       when 1 then true
-      when rc < 0 then raise JournalError.new(rc)
+      else
+        raise JournalError.new(rc) if rc < 0
       end
     end
 
@@ -75,7 +76,8 @@ module Systemd
       case (rc = Native::sd_journal_previous(@ptr))
       when 0 then false # EOF
       when 1 then true
-      when rc < 0 then raise JournalError.new(rc)
+      else
+        raise JournalError.new(rc) if rc < 0
       end
     end
 
@@ -104,11 +106,13 @@ module Systemd
              Native::sd_journal_seek_head(@ptr)
            when :tail, :end
              Native::sd_journal_seek_tail(@ptr)
-           when whence.is_a?(Time)
-             # TODO: is this right? who knows.
-             Native::sd_journal_seek_realtime_usec(@ptr, whence.to_i * 1_000_000)
            else
-             raise ArgumentError.new("Unknown seek type: #{whence}")
+             if whence.is_a?(Time)
+               # TODO: is this right? who knows.
+               Native::sd_journal_seek_realtime_usec(@ptr, whence.to_i * 1_000_000)
+             else
+               raise ArgumentError.new("Unknown seek type: #{whence.class}")
+             end
            end
 
       raise JournalErrornew(rc) if rc < 0

data/lib/systemd/journal/version.rb

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

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'rspec'
+require 'simplecov'
+
+SimpleCov.start
+require 'systemd/journal'

data/spec/systemd/id128_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Systemd::Id128 do
+
+  describe 'boot_id' do
+    it 'returns a properly formatted string representing the boot id' do
+      Systemd::Id128::Native.should_receive(:sd_id128_get_boot) do |out|
+        dummy = [0xa1, 0x0c] * 8
+        out.write_array_of_uint8(dummy)
+        0
+      end
+      Systemd::Id128.boot_id.should eq("a10c" * 8)
+    end
+  end
+
+  describe 'machine_id' do
+    it 'returns a properly formatted string representing the machine id' do
+      Systemd::Id128::Native.should_receive(:sd_id128_get_machine) do |out|
+        dummy = [0xa1, 0x0c] * 8
+        out.write_array_of_uint8(dummy)
+        0
+      end
+      Systemd::Id128.machine_id.should eq("a10c" * 8)
+    end
+  end
+
+  describe 'random' do
+    it 'returns a random hex string' do
+      Systemd::Id128::Native.should_receive(:sd_id128_randomize) do |out|
+        dummy = [0xa1, 0x0c] * 8
+        out.write_array_of_uint8(dummy)
+        0
+      end
+      Systemd::Id128.random.should eq("a10c" * 8)
+    end    
+
+  end
+  
+end

data/spec/systemd/journal_spec.rb

@@ -0,0 +1,149 @@
+require 'spec_helper'
+
+describe Systemd::Journal do
+  
+  before(:each) do
+    # don't actually make native API calls.
+    dummy_open = ->(ptr, flags, path=nil) do
+      dummy = FFI::MemoryPointer.new(:int, 1)
+      ptr.write_pointer(dummy)
+      0
+    end
+
+    Systemd::Journal::Native.stub(:sd_journal_open, &dummy_open)
+    Systemd::Journal::Native.stub(:sd_journal_open_directory, &dummy_open)
+    Systemd::Journal::Native.stub(:sd_journal_close).and_return(0)
+  end
+
+  describe '#initialize' do
+    it 'opens a directory if a path is passed' do
+      Systemd::Journal::Native.should_receive(:sd_journal_open_directory)
+      Systemd::Journal::Native.should_not_receive(:sd_journal_open)
+      Systemd::Journal.new(path: '/path/to/journal')
+    end
+
+    it 'accepts flags as an argument' do
+      Systemd::Journal::Native.should_receive(:sd_journal_open).with(anything, 1234)
+      Systemd::Journal.new(flags: 1234)
+    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
+  end
+
+  ['next', 'previous'].each do |direction|
+    describe "#move_#{direction}" do
+      it 'returns true on a successful move' do
+        j = Systemd::Journal.new
+        Systemd::Journal::Native.should_receive(:"sd_journal_#{direction}").and_return(1)
+        j.send(:"move_#{direction}").should eq(true)
+      end
+
+      it 'returns false on EOF' do
+        j = Systemd::Journal.new
+        Systemd::Journal::Native.should_receive(:"sd_journal_#{direction}").and_return(0)
+        j.send(:"move_#{direction}").should eq(false)
+      end
+
+      it 'raises an exception on failure' do
+        j = Systemd::Journal.new
+        Systemd::Journal::Native.should_receive(:"sd_journal_#{direction}").and_return(-1)
+        expect {
+          j.send(:"move_#{direction}")
+        }.to raise_error(Systemd::JournalError)
+      end
+    end
+
+    describe "#move_#{direction}_skip" do
+      it 'returns the number of records moved by' do
+        Systemd::Journal::Native.should_receive(:"sd_journal_#{direction}_skip").
+          with(anything, 10).and_return(10)
+
+        Systemd::Journal.new.send(:"move_#{direction}_skip", 10).should eq(10)
+      end
+
+      it 'raises an exception on failure' do
+        Systemd::Journal::Native.should_receive(:"sd_journal_#{direction}_skip").
+          with(anything, 10).and_return(-1)
+
+        j = Systemd::Journal.new
+
+        expect { j.send(:"move_#{direction}_skip", 10) }.to raise_error(Systemd::JournalError)
+      end
+    end
+  end
+
+  describe '#seek' do
+    it 'moves to the first entry of the file' do
+      j = Systemd::Journal.new
+      Systemd::Journal::Native.should_receive(:sd_journal_seek_head).and_return(0)
+      j.seek(:head).should eq(true)
+    end
+
+    it 'moves to the last entry of the file' do
+      j = Systemd::Journal.new
+      Systemd::Journal::Native.should_receive(:sd_journal_seek_tail).and_return(0)
+      j.seek(:tail).should eq(true)
+    end
+
+    it 'seeks based on time when a time is provided' do
+      j = Systemd::Journal.new
+      Systemd::Journal::Native.should_receive(:sd_journal_seek_realtime_usec).and_return(0)
+      j.seek(Time.now).should eq(true)
+    end
+  end
+
+  describe '#read_field' do
+    pending
+  end
+
+  describe '#current_entry' do
+    pending
+  end
+
+  describe '#query_unique' do
+    pending
+  end
+
+  describe '#wait' do
+    pending
+  end
+
+  describe '#add_match' do
+    pending
+  end
+
+  describe '#add_conjunction' do
+    pending
+  end
+
+  describe '#add_disjunction' do
+    pending
+  end
+
+  describe '#clear_matches' do
+    pending
+  end
+
+  describe '#disk_usage' do
+    it 'returns the size used on disk' do
+      Systemd::Journal::Native.should_receive(:sd_journal_get_usage) do |ptr, size_ptr|
+        size_ptr.size == 8 ? size_ptr.write_uint64(12) : size_ptr.write_uint32(12)
+        0
+      end
+      j = Systemd::Journal.new
+      j.disk_usage.should eq(12)
+    end
+
+    it 'raises an error if the call fails' do
+      Systemd::Journal::Native.should_receive(:sd_journal_get_usage).and_return(-1)
+      j = Systemd::Journal.new
+      expect { j.disk_usage }.to raise_error(Systemd::JournalError)
+    end
+  end
+
+end

data/systemd-journal.gemspec

@@ -6,6 +6,7 @@ require 'systemd/journal/version'
 Gem::Specification.new do |gem|
   gem.name          = "systemd-journal"
   gem.version       = Systemd::Journal::VERSION
+  gem.license       = 'MIT'
   gem.authors       = ["John Ledbetter", "Daniel Mack"]
   gem.email         = ["john@throttle.io"]
   gem.description   = %q{Provides the ability to navigate and read entries from the systemd journal in ruby, as well as write events to the journal.}
@@ -18,4 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'ffi', '~>1.9.0'
+
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'simplecov'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: systemd-journal
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - John Ledbetter
@@ -25,6 +25,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.9.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides the ability to navigate and read entries from the systemd journal
   in ruby, as well as write events to the journal.
 email:
@@ -49,9 +77,13 @@ files:
 - lib/systemd/journal/native.rb
 - lib/systemd/journal/version.rb
 - lib/systemd/journal_error.rb
+- spec/spec_helper.rb
+- spec/systemd/id128_spec.rb
+- spec/systemd/journal_spec.rb
 - systemd-journal.gemspec
 homepage: https://github.com/ledbettj/systemd-journal
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -69,9 +101,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to libsystemd-journal
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/systemd/id128_spec.rb
+- spec/systemd/journal_spec.rb
 has_rdoc: