win32-eventlog 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d52dae3358b8e57d7d8bc400f6c9dec3730d8c2d
-  data.tar.gz: 4b31e02d349c4f16f7859490484e8a9259c8b021
+  metadata.gz: ddf12eaa4b419f111eb52ec1e88c2eeb79f37ce8
+  data.tar.gz: bc574189877a4c4d8d37c66e65e80f1a8c8ceb18
 SHA512:
-  metadata.gz: 6e3ee1e904e90de863c4bea4adc3b94de09fd36b205b9386188da842913302d441ddb680d110455a945fa58179afa32c308a20bab5cf8d49828ef25fc584b795
-  data.tar.gz: 2887d615261afb3ce6924b7e44cd99b906d839dc97307240c4f5c33040df08bdeb3abc5fc05e1bdaf5b03f03ea58e0ecba91ca816265bc1c7062612ea35039c5
+  metadata.gz: ae2df2fe096c4fd6729f3c3b38779af85d3902f635b1882d28eddf2d1aabfb6b322f111541ca6a6975f9ae24a6bc3ebfa6be12ee634ac8a2f5808991c8964a50
+  data.tar.gz: 81b27c47f295da3352559f6cc241b3b1793aed86e072a7007c41d436dbcc3f32877101172f5325115e4208ccda748e0c04ab5fe48b82e060efc552a0df86c39b

data/CHANGES

@@ -1,3 +1,10 @@
+== 0.6.6 - 25-Jun-2016
+* Renamed the various modules that contain FFI information in order to
+  avoid a namespacing conflict. Thanks go to Bryan McLellan for the spot.
+* Removed the helper.rb file which wasn't being used.
+* Updated a few tests to not assume there are actually records in the
+  Application event log. Mostly this was for Appveyor.
+
 == 0.6.5 - 29-Oct-2015
 * Fixed some old code in the read method that was never properly updated.
   Thanks go to Jo�o Duarte for the spot.

data/Rakefile

@@ -10,7 +10,7 @@ namespace :gem do
     require 'rubygems/package'
     spec = eval(IO.read('win32-eventlog.gemspec'))
     spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
-    Gem::Package.build(spec)
+    Gem::Package.build(spec, true)
   end
 
   desc 'Install the win32-eventlog gem'

data/lib/win32/eventlog.rb

@@ -8,17 +8,17 @@ module Win32
   # The EventLog class encapsulates an Event Log source and provides methods
   # for interacting with that source.
   class EventLog
-    include Windows::Constants
-    include Windows::Structs
-    include Windows::Functions
-    extend Windows::Functions
+    include Windows::EventLogConstants
+    include Windows::EventLogStructs
+    include Windows::EventLogFunctions
+    extend Windows::EventLogFunctions
 
     # The EventLog::Error is raised in cases where interaction with the
     # event log should happen to fail for any reason.
     class Error < StandardError; end
 
     # The version of the win32-eventlog library
-    VERSION = '0.6.5'
+    VERSION = '0.6.6'
 
     # The log is read in chronological order, i.e. oldest to newest.
     FORWARDS_READ = EVENTLOG_FORWARDS_READ
@@ -1051,6 +1051,7 @@ module Win32
               )
 
               if res == 0
+                buf.clear
                 event_id = 0xB0000000 | event_id
 
                 res = FormatMessage(

data/lib/win32/windows/constants.rb

@@ -1,5 +1,5 @@
 module Windows
-  module Constants
+  module EventLogConstants
     private
 
     EVENTLOG_SEQUENTIAL_READ = 0x0001

data/lib/win32/windows/functions.rb

@@ -1,7 +1,7 @@
 require 'ffi'
 
 module Windows
-  module Functions
+  module EventLogFunctions
     extend FFI::Library
     ffi_lib :advapi32
 

data/lib/win32/windows/structs.rb

@@ -1,7 +1,7 @@
 require 'ffi'
 
 module Windows
-  module Structs
+  module EventLogStructs
     extend FFI::Library
     typedef :ulong, :dword
     typedef :ushort, :word

data/test/test_eventlog.rb

@@ -25,7 +25,7 @@ class TC_Win32_EventLog < Test::Unit::TestCase
   end
 
   test "version constant is set to expected value" do
-    assert_equal('0.6.5', EventLog::VERSION)
+    assert_equal('0.6.6', EventLog::VERSION)
   end
 
   test "constructor basic functionality" do
@@ -177,20 +177,26 @@ class TC_Win32_EventLog < Test::Unit::TestCase
   end
 
   test "seek_read flag plus forwards_read flag works as expected" do
+    assert_nothing_raised{ @last = @log.read[-10] }
+
+    omit_unless(@last, "No records found, skipping")
     flags = EventLog::SEEK_READ | EventLog::FORWARDS_READ
-    assert_nothing_raised{ @last = @log.read[-10].record_number }
+
     assert_nothing_raised{
-      @records = EventLog.read(nil, nil, flags, @last)
+      @records = EventLog.read(nil, nil, flags, @last.record_number)
     }
+
     assert_equal(10, @records.length)
   end
 
-  # This test could fail, since a record number + 10 may not actually exist.
+  # Allowing for 0 records is mostly for appveyor. I really need a more
+  # robust test approach here.
+  #
   test "seek_read flag plus backwards_read flag works as expected" do
     flags = EventLog::SEEK_READ | EventLog::BACKWARDS_READ
     assert_nothing_raised{ @last = @log.oldest_record_number + 10 }
     assert_nothing_raised{ @records = EventLog.read(nil, nil, flags, @last) }
-    assert_equal(11, @records.length)
+    assert_true([0,11].include?(@records.length))
   end
 
   test "the eventlog struct returned by read is frozen" do

data/test/test_mc.rb

@@ -37,13 +37,14 @@ class TC_Win32_MC < Test::Unit::TestCase
   def test_03_create_res_file
     omit_if(@@rc_cmd.nil?, "'rc' command not found - skipping")
     assert_respond_to(@mc, :create_res_file)
-    assert_equal(true, @mc.create_res_file)
+    assert_true(@mc.create_res_file)
   end
 
   def test_04_create_dll_file
     omit_if(@@link_cmd.nil?, "'link' command not found - skipping")
+    omit_unless(File.exist?(@mc.res_file), 'no res_file found - skipping')
     assert_respond_to(@mc, :create_dll_file)
-    assert_equal(true, @mc.create_dll_file)
+    assert_true(@mc.create_dll_file)
   end
 
   def test_05_clean

data/win32-eventlog.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-eventlog'
-  spec.version    = '0.6.5'
+  spec.version    = '0.6.6'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-eventlog
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -31,7 +31,7 @@ cert_chain:
   EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
   tGSHgAmcLlkdGgan182qsE/4kKM=
   -----END CERTIFICATE-----
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2016-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -105,24 +105,31 @@ extra_rdoc_files:
 - MANIFEST
 - doc/tutorial.txt
 files:
-- CHANGES
-- MANIFEST
-- README
-- Rakefile
+- certs
 - certs/djberg96_pub.pem
+- CHANGES
+- doc
 - doc/tutorial.txt
+- examples
 - examples/example_notify.rb
 - examples/example_read.rb
 - examples/example_write.rb
-- lib/win32-eventlog.rb
+- lib
+- lib/win32
 - lib/win32/eventlog.rb
 - lib/win32/mc.rb
+- lib/win32/windows
 - lib/win32/windows/constants.rb
 - lib/win32/windows/functions.rb
-- lib/win32/windows/helper.rb
 - lib/win32/windows/structs.rb
+- lib/win32-eventlog.rb
+- MANIFEST
+- misc
 - misc/install_msg.rb
 - misc/rubymsg.mc
+- Rakefile
+- README
+- test
 - test/foo.mc
 - test/test_eventlog.rb
 - test/test_mc.rb
@@ -147,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Interface for the MS Windows Event Log.

data/lib/win32/windows/helper.rb

@@ -1,13 +0,0 @@
-class String
-  # Convenience method for converting strings to UTF-16LE for wide character
-  # functions that require it.
-  def wincode
-    (self.tr(File::SEPARATOR, File::ALT_SEPARATOR) + 0.chr).encode('UTF-16LE')
-  end
-
-  # Read a wide character string up until the first double null, and delete
-  # any remaining null characters.
-  def read_wide
-    self[/^.*?(?=\x00{2})/].delete(0.chr)
-  end
-end