win32-service 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c61135d653d2cd836f4b191664aade237c35ceb
-  data.tar.gz: 1d5c27933e9a68469dcc40ca580307e521eebfe0
+  metadata.gz: d9da3b7cac48ec6cfe0304595e3b6c6cdf8a7480
+  data.tar.gz: e71218d14b39f03d49582806ae139306c4570883
 SHA512:
-  metadata.gz: c23f2a150c83ab807c44d15b7fd52efdfcfef3018472470838ebf3895685f10475a427e78375ca75f9b01367816a7668b920ca1dd257d4515df90b3fe67e22cb
-  data.tar.gz: 705f5de01cdf3e709350385763afe7b7aa3bdf63c81b0b914da6a1c84181435b116e38617cf6a96974b2c836bf40632b25bf4ebd7463aadc1528606e674671ec
+  metadata.gz: 7952a1dcd227fbcf118cbfdc1c3d9efcd681b82a4f3f10e331506e4cecae2456c3d181fe2c853d056c7c197f83b3d72d3506d0313234c6297127e5c0910fdda8
+  data.tar.gz: 293fc5528459592f6cb781b48959db7184a88da758197271fa3f2bc2ed74c717b79e558d87381820b66c2d5cf2e1cc418b88e1efb915421f0d3674e40446a3de

data/CHANGES

@@ -1,3 +1,13 @@
+== 0.8.5 - 2-Jul-2014
+* The service type for Service.new no longer defaults to being an interactive
+  process. This could cause process credential issues and wasn't very
+  useful in practice anyway. Thanks go to Pierre Ynard for the report.
+* More tests skipped unless run with admin privileges.
+* Use relative_require instead of doing things manually.
+* Minor memory efficieny improvements.
+* Skip errors on ERROR_RESOURCE_TYPE_NOT_FOUND when getting service config info.
+  Thanks go to Rob Reynolds for the patch.
+
 == 0.8.4 - 23-Jan-2014
 * Added support for the delayed start startup type. Thanks go to Jim Arnold
   for the patch.

data/Rakefile

@@ -24,7 +24,7 @@ namespace 'gem' do
   desc "Install the win32-service gem"
   task :install => [:create] do
     file = Dir['*.gem'].first
-    sh "gem install #{file}"
+    sh "gem install -l #{file}"
   end
 end
 

data/lib/win32/service.rb

@@ -1,7 +1,7 @@
-require File.join(File.dirname(__FILE__), 'windows', 'helper')
-require File.join(File.dirname(__FILE__), 'windows', 'constants')
-require File.join(File.dirname(__FILE__), 'windows', 'structs')
-require File.join(File.dirname(__FILE__), 'windows', 'functions')
+require_relative 'windows/helper'
+require_relative 'windows/constants'
+require_relative 'windows/structs'
+require_relative 'windows/functions'
 
 # The Win32 module serves as a namespace only.
 module Win32
@@ -17,7 +17,7 @@ module Win32
     extend Windows::Functions
 
     # The version of the win32-service library
-    VERSION = '0.8.4'
+    VERSION = '0.8.5'
 
     # SCM security and access rights
 
@@ -81,7 +81,7 @@ module Win32
     FILE_SYSTEM_DRIVER  = SERVICE_FILE_SYSTEM_DRIVER
 
     # Service that runs in its own process
-    WIN32_OWN_PROCESS   = SERVICE_WIN32_OWN_PROCESS
+    WIN32_OWN_PROCESS = SERVICE_WIN32_OWN_PROCESS
 
     # Service that shares a process with one or more other services.
     WIN32_SHARE_PROCESS = SERVICE_WIN32_SHARE_PROCESS
@@ -260,8 +260,7 @@ module Win32
     # * host                   => nil (optional)
     # * display_name           => service_name
     # * desired_access         => Service::ALL_ACCESS
-    # * service_type           => Service::WIN32_OWN_PROCESS |
-    #                             Service::INTERACTIVE_PROCESS
+    # * service_type           => Service::WIN32_OWN_PROCESS
     # * start_type             => Service::DEMAND_START
     # * error_control          => Service::ERROR_NORMAL
     # * binary_path_name       => nil
@@ -306,8 +305,7 @@ module Win32
       opts = {
         'display_name'           => nil,
         'desired_access'         => SERVICE_ALL_ACCESS,
-        'service_type'           => SERVICE_WIN32_OWN_PROCESS |
-                                    SERVICE_INTERACTIVE_PROCESS,
+        'service_type'           => SERVICE_WIN32_OWN_PROCESS,
         'start_type'             => SERVICE_DEMAND_START,
         'error_control'          => SERVICE_ERROR_NORMAL,
         'binary_path_name'       => nil,
@@ -1334,7 +1332,7 @@ module Win32
         FFI.raise_windows_error('QueryServiceConfig', error)
       end
 
-      bytes_needed = FFI::MemoryPointer.new(:ulong)
+      bytes_needed.clear
 
       # Second attempt at QueryServiceConfig gets the actual info
       begin
@@ -1369,14 +1367,14 @@ module Win32
       #
       if !bool && err_num == ERROR_INSUFFICIENT_BUFFER
         config2_buf = FFI::MemoryPointer.new(:char, bytes_needed.read_ulong)
-      elsif err_num == ERROR_FILE_NOT_FOUND
+      elsif [ERROR_FILE_NOT_FOUND, ERROR_RESOURCE_TYPE_NOT_FOUND].include?(err_num)
         return err_num
       else
         CloseServiceHandle(handle)
         FFI.raise_windows_error('QueryServiceConfig2', err_num)
       end
 
-      bytes_needed = FFI::MemoryPointer.new(:ulong)
+      bytes_needed.clear
 
       # Second attempt at QueryServiceConfig2 gets the actual info
       begin

data/lib/win32/windows/constants.rb

@@ -136,6 +136,7 @@ module Windows
     ERROR_INSUFFICIENT_BUFFER = 122
     ERROR_MORE_DATA = 234
     ERROR_FILE_NOT_FOUND = 2
+    ERROR_RESOURCE_TYPE_NOT_FOUND = 1813
     WAIT_FAILED = 0xFFFFFFFF
   end
 end

data/test/test_win32_service.rb

@@ -12,6 +12,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   def self.startup
     @@host = Socket.gethostname
     @@service_name = 'stisvc'
+    @@elevated = Win32::Security.elevated_security?
   end
 
   def setup
@@ -19,7 +20,6 @@ class TC_Win32_Service < Test::Unit::TestCase
     @service_name = 'stisvc'
     @service_stat = nil
     @services     = []
-    @elevated     = Win32::Security.elevated_security?
 
     @singleton_methods = Win32::Service.methods.map{ |m| m.to_s }
     @instance_methods  = Win32::Service.instance_methods.map{ |m| m.to_s }
@@ -52,7 +52,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "version number is expected value" do
-    assert_equal('0.8.4', Win32::Service::VERSION)
+    assert_equal('0.8.5', Win32::Service::VERSION)
   end
 
   test "services basic functionality" do
@@ -99,6 +99,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "delete method raises an error if a bogus service name is provided" do
+    omit_unless(@@elevated, "Skipped unless run with admin privileges")
     assert_raise(SystemCallError){ Win32::Service.delete('bogus') }
   end
 
@@ -119,7 +120,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "pause and resume work as expected" do
-    omit_unless(@elevated, "Skipped unless run with admin privileges")
+    omit_unless(@@elevated, "Skipped unless run with admin privileges")
     start_service(@service_name)
 
     assert_nothing_raised{ Win32::Service.pause(@service_name) }
@@ -130,6 +131,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "pausing an already paused service is harmless" do
+    omit_unless(@@elevated, "Skipped unless run with admin privileges")
     start_service(@service_name)
 
     assert_nothing_raised{ Win32::Service.pause(@service_name) }
@@ -178,6 +180,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "stop and start methods work as expected" do
+    omit_unless(@@elevated, "Skipped unless run with admin privileges")
     start_service(@service_name)
 
     assert_nothing_raised{ Win32::Service.stop(@service_name) }
@@ -188,6 +191,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "attempting to stop a stopped service raises an error" do
+    omit_unless(@@elevated, "Skipped unless run with admin privileges")
     start_service(@service_name)
 
     assert_nothing_raised{ Win32::Service.stop(@service_name) }
@@ -218,7 +222,8 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "attempting to start a running service raises an error" do
-	  start_service(@service_name)
+    omit_unless(@@elevated, "Skipped unless run with admin privileges")
+    start_service(@service_name)
     assert_raise(SystemCallError){ Win32::Service.start(@service_name) }
   end
 
@@ -413,7 +418,6 @@ class TC_Win32_Service < Test::Unit::TestCase
     @service_name = nil
     @service_stat = nil
     @services     = nil
-    @elevated     = nil
   end
 
   def self.shutdown
@@ -427,5 +431,7 @@ class TC_Win32_Service < Test::Unit::TestCase
     unless ['running', 'start pending'].include?(status)
       Win32::Service.start(@@service_name)
     end
+
+    @@elevated = nil
   end
 end

data/test/test_win32_service_configure.rb

@@ -47,7 +47,7 @@ class TC_Win32_Service_Configure < Test::Unit::TestCase
   end
 
   test "configuring the service type works as expected" do
-    assert_equal('own process, interactive', config_info.service_type)
+    assert_equal('own process', config_info.service_type)
     service_configure(:service_type => Win32::Service::WIN32_SHARE_PROCESS)
     assert_equal('share process', config_info.service_type)
   end
@@ -65,7 +65,7 @@ class TC_Win32_Service_Configure < Test::Unit::TestCase
   end
 
   test "service start can be delayed" do
-	  service_configure(:start_type => Win32::Service::AUTO_START, :delayed_start => true)
+    service_configure(:start_type => Win32::Service::AUTO_START, :delayed_start => true)
     assert_true(full_info.delayed_start)
   end
 

data/test/test_win32_service_create.rb

@@ -54,7 +54,7 @@ class TC_Win32_Service_Create < Test::Unit::TestCase
   end
 
   test "expected service type configuration information" do
-    assert_equal('own process, interactive', @info1.service_type)
+    assert_equal('own process', @info1.service_type)
   end
 
   test "expected start type configuration information" do

data/win32-service.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-service'
-  spec.version    = '0.8.4'
+  spec.version    = '0.8.5'
   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.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -71,6 +71,9 @@ extra_rdoc_files:
 - doc/daemon.txt
 files:
 - CHANGES
+- MANIFEST
+- README
+- Rakefile
 - doc/daemon.txt
 - doc/service.txt
 - examples/demo_daemon.rb
@@ -82,9 +85,6 @@ files:
 - lib/win32/windows/functions.rb
 - lib/win32/windows/helper.rb
 - lib/win32/windows/structs.rb
-- MANIFEST
-- Rakefile
-- README
 - test/test_win32_daemon.rb
 - test/test_win32_service.rb
 - test/test_win32_service_configure.rb
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An interface for MS Windows services