win32-service 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c52768b016ef3a9947a0ca64496067ec76ae75a
-  data.tar.gz: 79a37c086022643af8f1691b8d49682976aa6f2a
+  metadata.gz: 00420c9a08f4efbc505916adfdf394aaa827d88d
+  data.tar.gz: 7cc804d073520c13b7a0d3cb376eef7594131d7b
 SHA512:
-  metadata.gz: 7346088e3cba19b598f03a2e736dac8ef90f16e07adb52f0a16702ec700d1513877ae3ed3cf3eb7def02d26efdab0d98c4578a66a51dd33b3a4c2a53204c7c82
-  data.tar.gz: ca96bdc251b1ea198d1b5ebe045a6425e15def41f32daad345d1a4c12904d8d1775f3cbb36e14ba2e9474166d9aeecf24046473b53325cde9275e907f184a004
+  metadata.gz: 2468f2cddb5f34466323c9e000d5655fe533c67b120e836bb79cdc08359afc44087b35031a3815d6d2b809650c7c060dfe8f51779f2e0c201f29c6462b16550d
+  data.tar.gz: d37585b5947428e224cd0840ddc806c6a5359971a1eedd3bd3b325eff0a1914e1c5fb07177a10a5ed81a01cb9b644a49e3e6b351fb302e5d5e43e5ca5da1621d

data/CHANGES

@@ -1,3 +1,10 @@
+== 0.8.3 - 1-Nov-2013
+* Fixed a bug where a service's state could be changed when merely
+  interrogating the service. Thanks go to Glenn Sarti / Puppet Labs
+  for the spot.
+* Fixed a bug where attempting to get the description of a service that
+  has no description could raise an error. Now an empty string is returned.
+
 == 0.8.2 - 13-Aug-2013
 * Fixed a bug in the Service.start method where it was not handling arguments
   properly. Thanks go to Sean Karlage for the spot.

data/lib/win32/daemon.rb

@@ -18,7 +18,7 @@ module Win32
     extend Windows::Functions
 
     # The version of this library
-    VERSION = '0.8.2'
+    VERSION = '0.8.3'
 
     private
 
@@ -118,10 +118,14 @@ module Win32
           dwState = SERVICE_PAUSED
         when SERVICE_CONTROL_CONTINUE
           dwState = SERVICE_RUNNING
+        #else
+          # TODO: Handle other control codes? Retain the current state?
       end
 
-      # Set the status of the service.
-      SetTheServiceStatus.call(dwState, NO_ERROR, 0, 0)
+      # Set the status of the service except on interrogation.
+      unless dwCtrlCode == SERVICE_CONTROL_INTERROGATE
+        SetTheServiceStatus.call(dwState, NO_ERROR, 0, 0)
+      end
 
       # Tell service_main thread to stop.
       if dwCtrlCode == SERVICE_CONTROL_STOP || dwCtrlCode == SERVICE_CONTROL_SHUTDOWN

data/lib/win32/service.rb

@@ -17,7 +17,7 @@ module Win32
     extend Windows::Functions
 
     # The version of the win32-service library
-    VERSION = '0.8.2'
+    VERSION = '0.8.3'
 
     # SCM security and access rights
 
@@ -1064,7 +1064,7 @@ module Win32
 
               buf = get_config2_info(handle_scs, SERVICE_CONFIG_DESCRIPTION)
 
-              if buf.read_pointer.null?
+              if buf.is_a?(Fixnum) || buf.read_pointer.null?
                 description = ''
               else
                 description = buf.read_pointer.read_string
@@ -1338,6 +1338,10 @@ module Win32
 
       err_num = FFI.errno
 
+      # This is a bit hacky since it means we have to check the type of value
+      # we get back, but we don't always want to raise an error either,
+      # depending on what we're trying to get at.
+      #
       if !bool && err_num == ERROR_INSUFFICIENT_BUFFER
         config2_buf = FFI::MemoryPointer.new(:char, bytes_needed.read_ulong)
       elsif err_num == ERROR_FILE_NOT_FOUND

data/test/test_win32_daemon.rb

@@ -17,7 +17,7 @@ class TC_Daemon < Test::Unit::TestCase
   end
 
   test "version number is set properly" do
-    assert_equal('0.8.2', Daemon::VERSION)
+    assert_equal('0.8.3', Daemon::VERSION)
   end
 
   test "constructor basic functionality" do

data/test/test_win32_service.rb

@@ -52,7 +52,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "version number is expected value" do
-    assert_equal('0.8.2', Win32::Service::VERSION)
+    assert_equal('0.8.3', Win32::Service::VERSION)
   end
 
   test "services basic functionality" do

data/win32-service.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-service'
-  spec.version    = '0.8.2'
+  spec.version    = '0.8.3'
   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-service
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: An interface for MS Windows services