winevt_c 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b390dc340de45facd91c7de698c1d72f7f706e961f6beb776a748499886fa4c2
-  data.tar.gz: cb6bb22241cb81551cbb84363e7c9bddb205f38fb6aa138da2c6c4489667044c
+  metadata.gz: a1e26f9f7aef69fdf599f08c4c309fd1a60e00178d0a4db7a24b76cde7376254
+  data.tar.gz: 20e705a60f389912acd1594eecd0ea1a79230de00e887b0033016ccf72d8383f
 SHA512:
-  metadata.gz: b8e2666c0d51dcf9bfc114c1bd73b1f075a1702999d44e8dd318878d837b762a568aceffffadfc89f0ce33010629fb677f0edd040a312d32a5f35a20c6f3f0cc
-  data.tar.gz: 6adec333c1e0998a712b149f470091ed24f441806b5454a05e80d937bca63de7346b806ddd1904835428344158e81108b12a1cc2aa628a595299ed243ce83abc
+  metadata.gz: ec1d0dfbf4c1ec66619a709e012c76ab5487944f1c2970520b09ed46d9f3689d8ab5dcfc4499e34aeb2cde111f571e652cbf6bf337c20c5b7d5d836ef602d4ab
+  data.tar.gz: '01842dfd20afb70a08a928baf7d38c1c3c3df79a7ffd9303275d25623520b1f3e81adfcfcd43a730e8e36cb6931933c48871bd72bb3a21b9bbc33bde91bda366'

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - 2.4
+
+services:
+  - docker
+
+gemfile:
+  - Gemfile
+
+before_install:
+  - gem update --system=2.7.8
+
+script:
+  - bundle exec rake gem:native

data/Rakefile

@@ -27,8 +27,8 @@ desc 'Build gems for Windows per rake-compiler-dock'
 task 'gem:native' do
   # See RUBY_CC_VERSION in https://github.com/rake-compiler/rake-compiler-dock/blob/master/Dockerfile.mri
   RakeCompilerDock.sh <<-EOS
-    gem install bundler --no-doc && bundle --local
-    bundle exec rake cross native gem RUBY_CC_VERSION=2.4.0:2.5.0:2.6.0
+    gem install bundler yard --no-doc && bundle
+    rake cross native gem RUBY_CC_VERSION=2.4.0:2.5.0:2.6.0
 EOS
 end
 

data/ext/winevt/winevt_c.h

@@ -78,7 +78,7 @@ struct WinevtSubscribe
   EVT_HANDLE hEvents[SUBSCRIBE_ARRAY_SIZE];
   DWORD count;
   DWORD flags;
-  BOOL tailing;
+  BOOL readExistingEvents;
   DWORD rateLimit;
   time_t lastTime;
   DWORD currentRate;

data/ext/winevt/winevt_subscribe.c

@@ -88,42 +88,43 @@ rb_winevt_subscribe_initialize(VALUE self)
   winevtSubscribe->lastTime = 0;
   winevtSubscribe->currentRate = 0;
   winevtSubscribe->renderAsXML = TRUE;
+  winevtSubscribe->readExistingEvents = TRUE;
 
   return Qnil;
 }
 
 /*
- * This method specifies whether tailing or not.
+ * This method specifies whether read existing events or not.
  *
- * @param rb_tailing_p [Boolean]
+ * @param rb_read_existing_events_p [Boolean]
  */
 static VALUE
-rb_winevt_subscribe_set_tail(VALUE self, VALUE rb_tailing_p)
+rb_winevt_subscribe_set_read_existing_events(VALUE self, VALUE rb_read_existing_events_p)
 {
   struct WinevtSubscribe* winevtSubscribe;
 
   TypedData_Get_Struct(
     self, struct WinevtSubscribe, &rb_winevt_subscribe_type, winevtSubscribe);
 
-  winevtSubscribe->tailing = RTEST(rb_tailing_p);
+  winevtSubscribe->readExistingEvents = RTEST(rb_read_existing_events_p);
 
   return Qnil;
 }
 
 /*
- * This method returns whether tailing or not.
+ * This method returns whether read existing events or not.
  *
  * @return [Boolean]
  */
 static VALUE
-rb_winevt_subscribe_tail_p(VALUE self)
+rb_winevt_subscribe_read_existing_events_p(VALUE self)
 {
   struct WinevtSubscribe* winevtSubscribe;
 
   TypedData_Get_Struct(
     self, struct WinevtSubscribe, &rb_winevt_subscribe_type, winevtSubscribe);
 
-  return winevtSubscribe->tailing ? Qtrue : Qfalse;
+  return winevtSubscribe->readExistingEvents ? Qtrue : Qfalse;
 }
 
 /*
@@ -194,19 +195,30 @@ rb_winevt_subscribe_subscribe(int argc, VALUE* argv, VALUE self)
 
   if (hBookmark) {
     flags |= EvtSubscribeStartAfterBookmark;
-  } else if (winevtSubscribe->tailing) {
-    flags |= EvtSubscribeToFutureEvents;
-  } else {
+  } else if (winevtSubscribe->readExistingEvents) {
     flags |= EvtSubscribeStartAtOldestRecord;
+  } else {
+    flags |= EvtSubscribeToFutureEvents;
   }
 
   hSubscription =
     EvtSubscribe(NULL, hSignalEvent, path, query, hBookmark, NULL, NULL, flags);
   if (!hSubscription) {
+    if (hBookmark != NULL) {
+      EvtClose(hBookmark);
+    }
+    if (hSignalEvent != NULL) {
+      CloseHandle(hSignalEvent);
+    }
     status = GetLastError();
     raise_system_error(rb_eWinevtQueryError, status);
   }
 
+  if (winevtSubscribe->subscription != NULL) {
+    // should be disgarded the old event subscription handle.
+    EvtClose(winevtSubscribe->subscription);
+  }
+
   ALLOCV_END(wpathBuf);
   ALLOCV_END(wqueryBuf);
 
@@ -217,6 +229,12 @@ rb_winevt_subscribe_subscribe(int argc, VALUE* argv, VALUE self)
   } else {
     winevtSubscribe->bookmark = EvtCreateBookmark(NULL);
     if (winevtSubscribe->bookmark == NULL) {
+      if (hSubscription != NULL) {
+        EvtClose(hSubscription);
+      }
+      if (hSignalEvent != NULL) {
+        CloseHandle(hSignalEvent);
+      }
       status = GetLastError();
       raise_system_error(rb_eWinevtQueryError, status);
     }
@@ -517,8 +535,14 @@ Init_winevt_subscribe(VALUE rb_cEventLog)
   rb_define_method(rb_cSubscribe, "next", rb_winevt_subscribe_next, 0);
   rb_define_method(rb_cSubscribe, "each", rb_winevt_subscribe_each, 0);
   rb_define_method(rb_cSubscribe, "bookmark", rb_winevt_subscribe_get_bookmark, 0);
-  rb_define_method(rb_cSubscribe, "tail?", rb_winevt_subscribe_tail_p, 0);
-  rb_define_method(rb_cSubscribe, "tail=", rb_winevt_subscribe_set_tail, 1);
+  /*
+   * @since 0.7.0
+   */
+  rb_define_method(rb_cSubscribe, "read_existing_events?", rb_winevt_subscribe_read_existing_events_p, 0);
+  /*
+   * @since 0.7.0
+   */
+  rb_define_method(rb_cSubscribe, "read_existing_events=", rb_winevt_subscribe_set_read_existing_events, 1);
   rb_define_method(rb_cSubscribe, "rate_limit", rb_winevt_subscribe_get_rate_limit, 0);
   rb_define_method(rb_cSubscribe, "rate_limit=", rb_winevt_subscribe_set_rate_limit, 1);
   rb_define_method(

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winevt_c
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,6 +110,7 @@ extra_rdoc_files: []
 files:
 - ".clang-format"
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -155,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Windows Event Log API bindings from winevt.h.