win32-service 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c2d9406b19292d6d66131600aa2e18a15d193da
-  data.tar.gz: cf2ba8abfcfe003ad3f00e44887ab195b0439115
+  metadata.gz: 8c9e7a6cfd6aa6f113daf315e64979fb66c9c83b
+  data.tar.gz: bc7920b71189a326bfd7b2b6e9affd2bd1fb1ded
 SHA512:
-  metadata.gz: 13bb69b43beacc04a54bdc387b4fa78604bd48c147be9ead2c50958216d26ebac91161f64a62fc19262e01d409c2523969437439f4c676ccd5b68acc27f46f10
-  data.tar.gz: f08fc1b91207ae51e1399580b54b275ad36baf048b66ccf93009568e4f18072593c7acb3b008d76a528a77e79959cd2523b9122438cc4bbb32dfbd2b7f076cd1
+  metadata.gz: c3bca8887a30ced151972c81d62d0d724ba3954b62b7ce435b02053ce91d674602a2d274955992c6b4a28d751ce574da8f2ffb6aa5045e27b0b6d0cb345fa5fe
+  data.tar.gz: 8ad98044dd9fdee7917a2267715d0ecbd1b37d946525fba1a340391e877a6f340464fef6c31b4ad93f70e020e126ab5f986bc4830050d1bc66c366a2d9f59bda

data.tar.gz.sig

@@ -0,0 +1,2 @@
+��~�ՒG/n�"J�+�r�״]�θ

+�#i"rty�\��TL#:��v

data/CHANGES

@@ -1,3 +1,24 @@
+== 0.8.8 - 24-Jun-2016
+* Fixed the function prototypes for CreateEvent and AdjustTokenPrivileges
+  where I was using :bool instead of :int.
+* Updated the various FFI module wrapper names so that they're more distinctly
+  namespaced. Avoids a clash with the win32-eventlog gem, and possibly others.
+* Discovered more places where QueryServiceConfig2 could fail while attempting
+  to get failure actions and delayed auto start info. Instead of failing,
+  these now set their respective data to nil.
+* A timeout value in our main observer thread was increased to potentially
+  improve performance. Feedback welcome.
+* This gem is now signed.
+* Added the win32-service.rb and win32-daemon.rb files for convenience.
+* Use require_relative internally.
+* Added win32-security as a development dependency. It was already being used
+  for tests but now it's actually part of the gemspec.
+* Many tests are now skipped unless run with administrative privileges, either
+  because they require it, or because they otherwise take too long.
+* Gem related tasks in the Rakefile now assume Rubygems 2.x.
+* Added an appveyor.yml file.
+* The DemoDaemon example will create C:/Tmp if it doesn't already exist.
+
 == 0.8.7 - 14-Jul-2014
 * Fixed a bug in the SERVICE_DELAYED_AUTO_START_INFO struct. It now returns 0
   or 1, though it still accepts true or false as arguments. Thanks go to

data/MANIFEST

@@ -3,11 +3,14 @@
 * README
 * Rakefile
 * win32-service.gemspec
+* certs/djberg96_pub.pem
 * doc/daemon.txt
 * doc/service.txt
 * examples/demo_daemon.rb
 * examples/demo_daemon_ctl.rb
 * examples/demo_services.rb
+* lib/win32-daemon.rb
+* lib/win32-service.rb
 * lib/win32/service.rb
 * lib/win32/daemon.rb
 * test/test_win32_daemon.rb

data/README

@@ -56,17 +56,11 @@
   Add service_session_change hook
 
 == Copyright
-  (C) 2003-2014, Daniel J. Berger, All Rights Reserved
+  (C) 2003-2016, Daniel J. Berger, All Rights Reserved
     
 == License
   Artistic 2.0
 
-== Contributions
-  Although this library is free, please consider having your company
-  setup a gittip if used by your company professionally.
-
-  http://www.gittip.com/djberg96/
-    
 == Warranty
   This package is provided "as is" and without any express or
   implied warranties, including, without limitation, the implied

data/Rakefile

@@ -12,13 +12,10 @@ CLEAN.include(
 namespace 'gem' do
   desc "Create the win32-service gem"
   task :create => [:clean] do
+    require 'rubygems/package'
     spec = eval(IO.read('win32-service.gemspec'))
-    if Gem::VERSION.to_f < 2.0
-      Gem::Builder.new(spec).build
-    else
-      require 'rubygems/package'
-      Gem::Package.build(spec)
-    end
+    spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
+    Gem::Package.build(spec, true)
   end
 
   desc "Install the win32-service gem"

data/appveyor.yml

@@ -0,0 +1,48 @@
+version: '{build}'
+branches:
+  only:
+  - ffi
+skip_tags: true
+clone_depth: 10
+environment:
+  matrix:
+  - ruby_version: 193
+    ruby_dir: 1.9.1
+  - ruby_version: 200
+    ruby_dir: 2.0.0
+  - ruby_version: 200-x64
+    ruby_dir: 2.0.0
+  - ruby_version: 21
+    ruby_dir: 2.1.0
+  - ruby_version: 21-x64
+    ruby_dir: 2.1.0
+  - ruby_version: 22
+    ruby_dir: 2.2.0
+  - ruby_version: 22-x64
+    ruby_dir: 2.2.0
+install:
+- ps: >-
+    $env:path = "C:\Ruby" + $env:ruby_version + "\bin;" + $env:path
+
+    $tpath = "C:\Ruby" + $env:ruby_version + "\lib\ruby\" + $env:ruby_dir + "\test"
+
+    if ((test-path $tpath) -eq $True){ rm -recurse -force $tpath }
+
+    gem update --system > $null
+
+    if ((gem query -i ffi) -eq $False){ gem install ffi --no-document }
+
+    if ((gem query -i win32-security) -eq $False){ gem install win32-security --no-document }
+
+    if ((gem query -i test-unit -v ">= 3.0") -eq $False){ gem install test-unit --no-document }
+cache:
+- C:\Ruby193\lib\ruby\gems\1.9.1
+- C:\Ruby200\lib\ruby\gems\2.0.0
+- C:\Ruby200-x64\lib\ruby\gems\2.0.0
+- C:\Ruby21\lib\ruby\gems\2.1.0
+- C:\Ruby21-x64\lib\ruby\gems\2.1.0
+- C:\Ruby22\lib\ruby\gems\2.2.0
+- C:\Ruby22-x64\lib\ruby\gems\2.2.0
+build: off
+test_script:
+- cmd: rake

data/certs/djberg96_pub.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
+cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
+MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
+Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
+S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
+gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
+FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
+zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
+DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
+nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
+bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
+ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
+tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
+/sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
+wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
+EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
+tGSHgAmcLlkdGgan182qsE/4kKM=
+-----END CERTIFICATE-----

data/doc/daemon.txt

@@ -127,7 +127,7 @@ Daemon::IDLE
   setup your own Daemon.
 
 = Known Bugs
-  None known.  Please report any bugs you find on the Bug tracker at
+  None known. Please report any bugs you find on the issue tracker at
   https//github.com/djberg96/win32-service
 
 = Future Plans
@@ -142,7 +142,7 @@ Daemon::IDLE
   his patch that solved service responsiveness issues.
     
 = Copyright
-  (C) 2003-2013 Daniel J. Berger, All Rights Reserved
+  (C) 2003-2016 Daniel J. Berger, All Rights Reserved
 
 = License
   Artistic 2.0

data/doc/service.txt

@@ -2,7 +2,7 @@
   An interface for MS Windows Services.
     
 = Prerequisites
-  FFI 1.0 or later
+  ffi 1.0 or later
 	
   This library is only supported for the Windows NT family of operating
   systems, e.g. 2000, XP, 2003, etc. It is NOT supported (and won't
@@ -351,7 +351,7 @@ Service::ERROR_CRITICAL
   Add ability to create or modify service failure actions.
     
 = Copyright
-  (C) 2003-2013, Daniel J. Berger, All Rights Reserved
+  (C) 2003-2016, Daniel J. Berger, All Rights Reserved
     
 = Warranty
   This package is provided "as is" and without any express or

data/examples/demo_daemon.rb

@@ -12,6 +12,7 @@ begin
     # timeout error when you try to start it.
     #
     def service_init
+      Dir.mkdir("C:/Tmp") unless File.exist?("C:/Tmp")
       10.times{ |i|
         File.open(LOG_FILE , 'a'){ |f| f.puts("#{i}") }
         sleep 1

data/examples/demo_daemon_ctl.rb

@@ -2,7 +2,7 @@
 # demo_daemon_ctl.rb
 #
 # This is a command line script for installing and/or running a small
-# Ruby program as a service.  The service will simply write a small bit
+# Ruby program as a service. The service will simply write a small bit
 # of text to a file every 20 seconds. It will also write some text to the
 # file during the initialization (service_init) step.
 #
@@ -10,7 +10,8 @@
 # of the service_init hook, so don't be surprised if you see "one moment,
 # start pending" about 10 times on the command line.
 #
-# The file in question is C:\test.log.  Feel free to delete it when finished.
+# The file in question is C:\Tmp\win32_daemon_test.log. Feel free to delete
+# it when you're finished.
 #
 # To run the service, you must install it first.
 #

data/lib/win32-daemon.rb

@@ -0,0 +1 @@
+require_relative 'win32/daemon'

data/lib/win32-service.rb

@@ -0,0 +1 @@
+require_relative 'win32/service'

data/lib/win32/daemon.rb

@@ -1,9 +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 'ffi'
+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
@@ -11,14 +9,14 @@ module Win32
   # The Daemon class
   class Daemon
     include Windows::ServiceConstants
-    include Windows::Structs
-    include Windows::Functions
+    include Windows::ServiceStructs
+    include Windows::ServiceFunctions
 
-    extend Windows::Structs
-    extend Windows::Functions
+    extend Windows::ServiceStructs
+    extend Windows::ServiceFunctions
 
     # The version of this library
-    VERSION = '0.8.6'
+    VERSION = '0.8.8'
 
     private
 
@@ -240,21 +238,21 @@ module Win32
       service_init() if respond_to?('service_init')
 
       # Create the event to signal the service to start.
-      @@hStartEvent = CreateEvent(nil, true, false, nil)
+      @@hStartEvent = CreateEvent(nil, 1, 0, nil)
 
       if @@hStartEvent == 0
         raise SystemCallError.new('CreateEvent', FFI.errno)
       end
 
       # Create the event to signal the service to stop.
-      @@hStopEvent = CreateEvent(nil, true, false, nil)
+      @@hStopEvent = CreateEvent(nil, 1, 0, nil)
 
       if @@hStopEvent == 0
         raise SystemCallError.new('CreateEvent', FFI.errno)
       end
 
       # Create the event to signal the service that stop has completed
-      @@hStopCompletedEvent = CreateEvent(nil, true, false, nil)
+      @@hStopCompletedEvent = CreateEvent(nil, 1, 0, nil)
 
       if @@hStopCompletedEvent == 0
         raise SystemCallError.new('CreateEvent', FFI.errno)
@@ -270,7 +268,7 @@ module Win32
       events.put_pointer(0, FFI::Pointer.new(hThread))
       events.put_pointer(FFI::Pointer.size, FFI::Pointer.new(@@hStartEvent))
 
-      while ((index = WaitForMultipleObjects(2, events, false, 1000)) == WAIT_TIMEOUT) do
+      while ((index = WaitForMultipleObjects(2, events, 0, 1000)) == WAIT_TIMEOUT) do
       end
 
       if index == WAIT_FAILED
@@ -284,7 +282,7 @@ module Win32
 
       thr = Thread.new do
         begin
-          while(WaitForSingleObject(@@hStopEvent, 10) == WAIT_TIMEOUT)
+          while(WaitForSingleObject(@@hStopEvent, 1000) == WAIT_TIMEOUT)
             # Check to see if anything interesting has been signaled
             case @@waiting_control_code
               when SERVICE_CONTROL_PAUSE

data/lib/win32/service.rb

@@ -10,14 +10,14 @@ module Win32
   # creating, starting, configuring or deleting services.
   class Service
     include Windows::ServiceConstants
-    include Windows::Structs
-    include Windows::Functions
+    include Windows::ServiceStructs
+    include Windows::ServiceFunctions
 
-    extend Windows::Structs
-    extend Windows::Functions
+    extend Windows::ServiceStructs
+    extend Windows::ServiceFunctions
 
     # The version of the win32-service library
-    VERSION = '0.8.7'
+    VERSION = '0.8.8'
 
     # SCM security and access rights
 
@@ -1085,22 +1085,24 @@ module Win32
                 end
               rescue
                 # While being annoying, not being able to get a description is not exceptional
-                warn "WARNING: Failed to retreive description for the #{service_name} service."
+                warn "WARNING: Failed to retrieve description for the #{service_name} service."
                 description = ''
               end
 
-              delayed_start_buf = get_config2_info(handle_scs, SERVICE_CONFIG_DELAYED_AUTO_START_INFO)
-
-              if delayed_start_buf.is_a?(FFI::MemoryPointer)
-                delayed_start_info = SERVICE_DELAYED_AUTO_START_INFO.new(delayed_start_buf)
-                delayed_start = delayed_start_info[:fDelayedAutostart]
-              else
-                delayed_start = false
+              begin
+                delayed_start_buf = get_config2_info(handle_scs, SERVICE_CONFIG_DELAYED_AUTO_START_INFO)
+                if delayed_start_buf.is_a?(FFI::MemoryPointer)
+                  delayed_start_info = SERVICE_DELAYED_AUTO_START_INFO.new(delayed_start_buf)
+                  delayed_start = delayed_start_info[:fDelayedAutostart]
+                else
+                  delayed_start = false
+                end
+              rescue
+                warn "WARNING: Unable to get delayed auto start information for the #{service_name} service"
+                delayed_start = nil
               end
             else
-              msg = "WARNING: The registry entry for the #{service_name} "
-              msg += "service could not be found."
-              warn msg
+              warn "WARNING: The registry entry for the #{service_name} service could not be found"
 
               binary_path = nil
               load_order  = nil
@@ -1112,41 +1114,49 @@ module Win32
               description = nil
             end
 
-            buf2 = get_config2_info(handle_scs, SERVICE_CONFIG_FAILURE_ACTIONS)
+            begin
+              buf2 = get_config2_info(handle_scs, SERVICE_CONFIG_FAILURE_ACTIONS)
 
-            if buf2.is_a?(FFI::MemoryPointer)
-              fail_struct = SERVICE_FAILURE_ACTIONS.new(buf2)
+              if buf2.is_a?(FFI::MemoryPointer)
+                fail_struct = SERVICE_FAILURE_ACTIONS.new(buf2)
 
-              reset_period = fail_struct[:dwResetPeriod]
-              num_actions  = fail_struct[:cActions]
+                reset_period = fail_struct[:dwResetPeriod]
+                num_actions  = fail_struct[:cActions]
 
-              if fail_struct[:lpRebootMsg].null?
-                reboot_msg = nil
-              else
-                reboot_msg = fail_struct[:lpRebootMsg].read_string
-              end
+                if fail_struct[:lpRebootMsg].null?
+                  reboot_msg = nil
+                else
+                  reboot_msg = fail_struct[:lpRebootMsg].read_string
+                end
 
-              if fail_struct[:lpCommand].null?
-                command = nil
-              else
-                command = fail_struct[:lpCommand].read_string
-              end
+                if fail_struct[:lpCommand].null?
+                  command = nil
+                else
+                  command = fail_struct[:lpCommand].read_string
+                end
 
-              actions = nil
+                actions = nil
 
-              if num_actions > 0
-                action_ptr = fail_struct[:lpsaActions]
+                if num_actions > 0
+                  action_ptr = fail_struct[:lpsaActions]
 
-                actions = {}
+                  actions = {}
 
-                num_actions.times{ |n|
-                  sc_action = SC_ACTION.new(action_ptr[n])
-                  delay = sc_action[:Delay]
-                  action_type = get_action_type(sc_action[:Type])
-                  actions[n+1] = {:action_type => action_type, :delay => delay}
-                }
+                  num_actions.times{ |n|
+                    sc_action = SC_ACTION.new(action_ptr[n])
+                    delay = sc_action[:Delay]
+                    action_type = get_action_type(sc_action[:Type])
+                    actions[n+1] = {:action_type => action_type, :delay => delay}
+                  }
+                end
+              else
+                reset_period = nil
+                reboot_msg   = nil
+                command      = nil
+                actions      = nil
               end
-            else
+            rescue
+              warn "WARNING: Unable to retrieve failure actions for the #{service_name} service"
               reset_period = nil
               reboot_msg   = nil
               command      = nil
@@ -1242,7 +1252,7 @@ module Win32
         # Enable shutdown privilege in access token of this process
         bool = AdjustTokenPrivileges(
           token_handle,
-          false,
+          0,
           tkp,
           tkp.size,
           nil,

data/lib/win32/windows/functions.rb

@@ -1,7 +1,7 @@
 require 'ffi'
 
 module Windows
-  module Functions
+  module ServiceFunctions
     extend FFI::Library
 
     # Make FFI functions private
@@ -22,7 +22,7 @@ module Windows
     ffi_lib :kernel32
 
     attach_pfunc :CloseHandle, [:handle], :bool
-    attach_pfunc :CreateEvent, :CreateEventA, [:ptr, :bool, :bool, :str], :handle
+    attach_pfunc :CreateEvent, :CreateEventA, [:ptr, :int, :int, :str], :handle
     attach_pfunc :CreateThread, [:ptr, :size_t, :ptr, :ptr, :dword, :ptr], :handle, :blocking => true
     attach_pfunc :EnterCriticalSection, [:ptr], :void
     attach_pfunc :FormatMessage, :FormatMessageA, [:ulong, :ptr, :ulong, :ulong, :str, :ulong, :ptr], :ulong
@@ -31,13 +31,13 @@ module Windows
     attach_pfunc :LeaveCriticalSection, [:ptr], :void
     attach_pfunc :SetEvent, [:handle], :bool
     attach_pfunc :WaitForSingleObject, [:handle, :dword], :dword, :blocking => true
-    attach_pfunc :WaitForMultipleObjects, [:dword, :ptr, :bool, :dword], :dword
+    attach_pfunc :WaitForMultipleObjects, [:dword, :ptr, :int, :dword], :dword
 
     ffi_lib :advapi32
 
     callback :handler_ex, [:ulong, :ulong, :ptr, :ptr], :void
 
-    attach_pfunc :AdjustTokenPrivileges, [:handle, :bool, :ptr, :dword, :ptr, :ptr], :bool
+    attach_pfunc :AdjustTokenPrivileges, [:handle, :int, :ptr, :dword, :ptr, :ptr], :bool
     attach_pfunc :CloseServiceHandle, [:handle], :bool
 
     attach_pfunc :ChangeServiceConfig, :ChangeServiceConfigA,

data/lib/win32/windows/structs.rb

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

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.6', Daemon::VERSION)
+    assert_equal('0.8.8', Daemon::VERSION)
   end
 
   test "constructor basic functionality" do

data/test/test_win32_service.rb

@@ -1,7 +1,9 @@
 ##########################################################################
 # test_win32_service.rb
 #
-# Tests for the Win32::Service class.
+# Tests for the Win32::Service class. Some tests are skipped unless
+# run with admin privileges either because they are somewhat invasive,
+# or because they take too long.
 ##########################################################################
 require 'test-unit'
 require 'win32/security'
@@ -20,29 +22,39 @@ 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 }
   end
 
+  def omit_unless_elevated
+    omit_unless(@elevated, "Skipped unless run with admin privileges")
+  end
+
   def start_service(service)
     status = Win32::Service.status(@service_name).current_state
-    if status == 'paused'
-      Win32::Service.resume(service)
-    else
-      unless ['running', 'start pending'].include?(status)
-        Win32::Service.start(service)
+
+    if @elevated
+      if status == 'paused'
+        Win32::Service.resume(service)
+      else
+        unless ['running', 'start pending'].include?(status)
+          Win32::Service.start(service)
+        end
       end
+      wait_for_status('running')
     end
-    wait_for_status('running')
   end
 
   def stop_service(service)
     status = Win32::Service.status(@service_name).current_state
-    unless ['stopped', 'stop pending'].include?(status)
-      Win32::Service.stop(service)
+    if @elevated
+      unless ['stopped', 'stop pending'].include?(status)
+        Win32::Service.stop(service)
+      end
+      wait_for_status('stopped')
     end
-    wait_for_status('stopped')
   end
 
   # Helper method that waits for a status to change its state since state
@@ -52,14 +64,23 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "version number is expected value" do
-    assert_equal('0.8.7', Win32::Service::VERSION)
+    assert_equal('0.8.8', Win32::Service::VERSION)
   end
 
   test "services basic functionality" do
     assert_respond_to(Win32::Service, :services)
+  end
+
+  test "services with no arguments works as expected" do
     assert_nothing_raised{ Win32::Service.services }
-    assert_nothing_raised{ Win32::Service.services(nil) }
-    assert_nothing_raised{ Win32::Service.services(nil, 'network') }
+  end
+
+  test "services with explicit host works as expected" do
+    assert_nothing_raised{ Win32::Service.services(@@host) }
+  end
+
+  test "services with explicit host and group works as expected" do
+    assert_nothing_raised{ Win32::Service.services(@@host, 'network') }
   end
 
   test "services method returns an array without a block" do
@@ -87,6 +108,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "a valid hostname must be provided or an error is raised" do
+    omit_unless_elevated
     assert_raise(SystemCallError){ Win32::Service.services('bogus') }
   end
 
@@ -99,11 +121,12 @@ 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")
+    omit_unless_elevated
     assert_raise(SystemCallError){ Win32::Service.delete('bogus') }
   end
 
   test "delete method raises an error if a bogus host name is provided" do
+    omit_unless_elevated
     assert_raise(SystemCallError){ Win32::Service.delete('bogus', 'bogus') }
   end
 
@@ -120,7 +143,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
     start_service(@service_name)
 
     assert_nothing_raised{ Win32::Service.pause(@service_name) }
@@ -131,7 +154,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")
+    omit_unless_elevated
     start_service(@service_name)
 
     assert_nothing_raised{ Win32::Service.pause(@service_name) }
@@ -148,6 +171,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "pausing a service on an unrecognized host raises an error" do
+    omit_unless_elevated
     assert_raise(SystemCallError){ Win32::Service.pause('W32Time', 'bogus') }
   end
 
@@ -164,6 +188,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "resume method with an unrecognized host name raises an error" do
+    omit_unless_elevated
     assert_raise(SystemCallError){ Win32::Service.resume('W32Time', 'bogus') }
   end
 
@@ -180,7 +205,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")
+    omit_unless_elevated
     start_service(@service_name)
 
     assert_nothing_raised{ Win32::Service.stop(@service_name) }
@@ -191,7 +216,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")
+    omit_unless_elevated
     start_service(@service_name)
 
     assert_nothing_raised{ Win32::Service.stop(@service_name) }
@@ -210,6 +235,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "stop method raises an error if the host is unrecognized" do
+    omit_unless_elevated
     assert_raise(SystemCallError){ Win32::Service.stop('W32Time', 'bogus') }
   end
 
@@ -222,7 +248,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "attempting to start a running service raises an error" do
-    omit_unless(@@elevated, "Skipped unless run with admin privileges")
+    omit_unless_elevated
     start_service(@service_name)
     assert_raise(SystemCallError){ Win32::Service.start(@service_name) }
   end
@@ -232,6 +258,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "attempting to start a service on an unknown host raises an error" do
+    omit_unless_elevated
     assert_raise(SystemCallError){ Win32::Service.start('bogus', 'bogus') }
   end
 
@@ -244,6 +271,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "stop raises an error with an unrecognized host" do
+    omit_unless_elevated
     assert_raise(SystemCallError){ Win32::Service.stop('W32Time', 'bogus') }
   end
 
@@ -281,6 +309,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "get_service_name raises an error if a bogus host is provided" do
+    omit_unless_elevated
     assert_raise(SystemCallError){ Win32::Service.get_service_name('foo', 'bogus') }
   end
 
@@ -312,6 +341,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "get_display_name raises an error if a bad host name is provided" do
+    omit_unless_elevated
     assert_raise(SystemCallError){ Win32::Service.get_display_name('W32Time', 'bogus') }
   end
 
@@ -335,9 +365,8 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "exists method raises an error if a bogus host is passed" do
-    assert_raises(SystemCallError){
-      Win32::Service.exists?('foo', 'bogushost')
-    }
+    omit_unless_elevated
+    assert_raises(SystemCallError){ Win32::Service.exists?('foo', 'bogus') }
   end
 
   test "exists method only accepts up to two arguments" do
@@ -424,12 +453,14 @@ class TC_Win32_Service < Test::Unit::TestCase
     @@host = nil
     status = Win32::Service.status(@@service_name).current_state
 
-    if status == 'paused'
-      Win32::Service.resume(@@service_name)
-    end
+    if @elevated
+      if status == 'paused'
+        Win32::Service.resume(@@service_name)
+      end
 
-    unless ['running', 'start pending'].include?(status)
-      Win32::Service.start(@@service_name)
+      unless ['running', 'start pending'].include?(status)
+        Win32::Service.start(@@service_name)
+      end
     end
 
     @@elevated = nil

data/test/test_win32_service_configure.rb

@@ -4,6 +4,7 @@
 # Test suite that validates the Service.configure method.
 #######################################################################
 require 'test-unit'
+require 'win32/security'
 require 'win32/service'
 
 class TC_Win32_Service_Configure < Test::Unit::TestCase
@@ -11,10 +12,12 @@ class TC_Win32_Service_Configure < Test::Unit::TestCase
     @@service = "notepad_service"
     @@command = "C:\\windows\\system32\\notepad.exe"
 
-    Win32::Service.new(
-      :service_name     => @@service,
-      :binary_path_name => @@command
-    )
+    if Win32::Security.elevated_security?
+      Win32::Service.new(
+        :service_name     => @@service,
+        :binary_path_name => @@command
+      )
+    end
   end
 
   def config_info
@@ -39,7 +42,8 @@ class TC_Win32_Service_Configure < Test::Unit::TestCase
   end
 
   def setup
-    @info = Win32::Service.config_info(@@service)
+    @elevated = Win32::Security.elevated_security?
+    @info = Win32::Service.config_info(@@service) if @elevated
   end
 
   test "configure method is defined" do
@@ -47,24 +51,28 @@ class TC_Win32_Service_Configure < Test::Unit::TestCase
   end
 
   test "configuring the service type works as expected" do
+    omit_unless(@elevated)
     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
 
   test "configuring the description works as expected" do
+    omit_unless(@elevated)
     assert_equal('', full_info.description)
     service_configure(:description => 'test service')
     assert_equal('test service', full_info.description)
   end
 
   test "configuring the start type works as expected" do
+    omit_unless(@elevated)
     assert_equal('demand start', config_info.start_type)
     service_configure(:start_type => Win32::Service::DISABLED)
     assert_equal('disabled', config_info.start_type)
   end
 
   test "service start can be delayed" do
+    omit_unless(@elevated)
     service_configure(:start_type => Win32::Service::AUTO_START, :delayed_start => true)
     assert_equal(1, full_info.delayed_start)
   end
@@ -89,10 +97,13 @@ class TC_Win32_Service_Configure < Test::Unit::TestCase
 
   def teardown
     @info = nil
+    @elevated = nil
   end
 
   def self.shutdown
-    Win32::Service.delete(@@service) if Win32::Service.exists?(@@service)
+    if Win32::Service.exists?(@@service) && Win32::Security.elevated_security?
+      Win32::Service.delete(@@service)
+    end
     @@service = nil
     @@command = nil
   end

data/test/test_win32_service_create.rb

@@ -5,6 +5,7 @@
 # a dummy (notepad) service. It won't actually run of course.
 ########################################################################
 require 'test-unit'
+require 'win32/security'
 require 'win32/service'
 
 class TC_Win32_Service_Create < Test::Unit::TestCase
@@ -13,28 +14,34 @@ class TC_Win32_Service_Create < Test::Unit::TestCase
     @@service2 = "notepad_service2"
     @@command  = "C:\\windows\\system32\\notepad.exe"
 
-    Win32::Service.new(
-      :service_name     => @@service1,
-      :binary_path_name => @@command
-    )
-
-    Win32::Service.new(
-      :service_name     => @@service2,
-      :display_name     => 'Notepad Test',
-      :desired_access   => Win32::Service::ALL_ACCESS,
-      :service_type     => Win32::Service::WIN32_OWN_PROCESS,
-      :start_type       => Win32::Service::DISABLED,
-      :error_control    => Win32::Service::ERROR_IGNORE,
-      :binary_path_name => @@command,
-      :load_order_group => 'Network',
-      :dependencies     => 'W32Time',
-      :description      => 'Test service. Please delete me'
-    )
+    if Win32::Security.elevated_security?
+      Win32::Service.new(
+        :service_name     => @@service1,
+        :binary_path_name => @@command
+      )
+
+      Win32::Service.new(
+        :service_name     => @@service2,
+        :display_name     => 'Notepad Test',
+        :desired_access   => Win32::Service::ALL_ACCESS,
+        :service_type     => Win32::Service::WIN32_OWN_PROCESS,
+        :start_type       => Win32::Service::DISABLED,
+        :error_control    => Win32::Service::ERROR_IGNORE,
+        :binary_path_name => @@command,
+        :load_order_group => 'Network',
+        :dependencies     => 'W32Time',
+        :description      => 'Test service. Please delete me'
+      )
+    end
   end
 
   def setup
-    @info1 = Win32::Service.config_info(@@service1)
-    @info2 = Win32::Service.config_info(@@service2)
+    @elevated = Win32::Security.elevated_security?
+
+    if @elevated
+      @info1 = Win32::Service.config_info(@@service1)
+      @info2 = Win32::Service.config_info(@@service2)
+    end
   end
 
   test "constructor basic functionality" do
@@ -48,48 +55,59 @@ class TC_Win32_Service_Create < Test::Unit::TestCase
   end
 
   test "ensure services were created in startup method" do
+    omit_unless(@elevated)
     notify "If this test fails then remaining results are meaningless."
     assert_true(Win32::Service.exists?(@@service1))
     assert_true(Win32::Service.exists?(@@service2))
   end
 
   test "expected service type configuration information" do
+    omit_unless(@elevated)
     assert_equal('own process', @info1.service_type)
   end
 
   test "expected start type configuration information" do
+    omit_unless(@elevated)
     assert_equal('demand start', @info1.start_type)
   end
 
   test "expected error control configuration information" do
+    omit_unless(@elevated)
     assert_equal('normal', @info1.error_control)
   end
 
   test "expected binary path name configuration information" do
+    omit_unless(@elevated)
     assert_equal(@@command, @info1.binary_path_name)
   end
 
   test "expected load order group configuration information" do
+    omit_unless(@elevated)
     assert_equal('', @info1.load_order_group)
   end
 
   test "expected tag id configuration information" do
+    omit_unless(@elevated)
     assert_equal(0, @info1.tag_id)
   end
 
   test "expected dependency configuration information" do
+    omit_unless(@elevated)
     assert_equal([], @info1.dependencies)
   end
 
   test "expected service start time configuration information" do
+    omit_unless(@elevated)
     assert_equal('LocalSystem', @info1.service_start_name)
   end
 
   test "expected display name configuration information" do
+    omit_unless(@elevated)
     assert_equal('notepad_service1', @info1.display_name)
   end
 
   test "configuration information options are set properly for service 2" do
+    omit_unless(@elevated)
     assert_equal('own process', @info2.service_type)
     assert_equal('disabled', @info2.start_type)
     assert_equal('ignore', @info2.error_control)
@@ -114,13 +132,19 @@ class TC_Win32_Service_Create < Test::Unit::TestCase
   end
 
   def teardown
-    @info1 = nil
-    @info2 = nil
+    if @elevated
+      @info1 = nil
+      @info2 = nil
+    end
+
+    @elevated = nil
   end
 
   def self.shutdown
-    Win32::Service.delete(@@service1) if Win32::Service.exists?(@@service1)
-    Win32::Service.delete(@@service2) if Win32::Service.exists?(@@service2)
+    if Win32::Security.elevated_security?
+      Win32::Service.delete(@@service1) if Win32::Service.exists?(@@service1)
+      Win32::Service.delete(@@service2) if Win32::Service.exists?(@@service2)
+    end
 
     @@service1 = nil
     @@service2 = nil

data/test/test_win32_service_info.rb

@@ -71,106 +71,107 @@ class TC_Win32_ServiceInfo_Struct < Test::Unit::TestCase
     ]
   end
 
-  def test_service_info_info_service_name
+  test "service_name basic functionality" do
     assert_respond_to(@service_info, :service_name)
     assert_kind_of(String, @service_info.service_name)
   end
 
-  def test_service_info_info_display_name
+  test "display_name basic functionality" do
     assert_respond_to(@service_info, :display_name)
     assert_kind_of(String, @service_info.display_name)
   end
 
-  def test_service_info_info_service_type
+  test "service_type basic functionality" do
     assert_respond_to(@service_info, :service_type)
     assert(@types.include?(@service_info.service_type))
   end
 
-  def test_service_info_current_state
+  test "current_state basic functionality" do
     assert_respond_to(@service_info, :current_state)
     assert(@states.include?(@service_info.current_state))
   end
 
-  def test_service_info_controls_accepted
+  test "controls_accepted basic functionality" do
     assert_respond_to(@service_info, :controls_accepted)
     assert_kind_of(Array, @service_info.controls_accepted)
+  end
+
+  test "controls_accepted returns expected values" do
     assert_false(@service_info.controls_accepted.empty?)
-    @service_info.controls_accepted.each{ |control|
-      assert_true(@controls.include?(control))
-    }
+    @service_info.controls_accepted.each{ |c| assert_true(@controls.include?(c)) }
   end
 
-  def test_service_info_win32_exit_code
+  test "win32_exit_code basic functionality" do
     assert_respond_to(@service_info, :win32_exit_code)
     assert_kind_of(Fixnum, @service_info.win32_exit_code)
   end
 
-  def test_service_info_service_specific_exit_code
+  test "service_specific_exit_code basic functionality" do
     assert_respond_to(@service_info, :service_specific_exit_code)
     assert_kind_of(Fixnum, @service_info.service_specific_exit_code)
   end
 
-  def test_service_info_check_point
+  test "check_point basic functionality" do
     assert_respond_to(@service_info, :check_point)
     assert_kind_of(Fixnum, @service_info.check_point)
   end
 
-  def test_service_info_wait_hint
+  test "wait_hint basic functionality" do
     assert_respond_to(@service_info, :wait_hint)
     assert_kind_of(Fixnum, @service_info.wait_hint)
   end
 
-  def test_service_info_binary_path_name
+  test "binary_path_name basic functionality" do
     assert_respond_to(@service_info, :binary_path_name)
     assert_kind_of(String, @service_info.binary_path_name)
   end
 
-  def test_service_info_start_type
+  test "start_type basic functionality" do
     assert_respond_to(@service_info, :start_type)
     assert(@start_types.include?(@service_info.start_type))
   end
 
-  def test_service_info_error_control
+  test "error_control basic functionality" do
     assert_respond_to(@service_info, :error_control)
     assert(@error_controls.include?(@service_info.error_control))
   end
 
-  def test_service_info_load_order_group
+  test "load_order_group basic functionality" do
     assert_respond_to(@service_info, :load_order_group)
     assert_kind_of(String, @service_info.load_order_group)
   end
 
-  def test_service_info_tag_id
+  test "tag_id basic functionality" do
     assert_respond_to(@service_info, :tag_id)
     assert_kind_of(Fixnum, @service_info.tag_id)
   end
 
-  def test_service_info_start_name
+  test "start_name basic functionality" do
     assert_respond_to(@service_info, :start_name)
     assert_kind_of(String, @service_info.start_name)
   end
 
-  def test_service_info_dependencies
+  test "dependencies basic functionality" do
     assert_respond_to(@service_info, :dependencies)
     assert_kind_of(Array, @service_info.dependencies)
   end
 
-  def test_service_info_description
+  test "description basic functionality" do
     assert_respond_to(@service_info, :description)
     assert_kind_of(String, @service_info.description)
   end
 
-  def test_service_info_interactive
+  test "interactive basic functionality" do
     assert_respond_to(@service_info, :interactive)
     assert_boolean(@service_info.interactive)
   end
 
-  def test_service_info_service_flags
+  test "service_flags basic functionality" do
     assert_respond_to(@service_info, :service_flags)
     assert([0,1].include?(@service_info.service_flags))
   end
 
-  def test_service_info_delayed_start
+  test "delayed_start basic functionality" do
     assert_respond_to(@service_info, :delayed_start)
     assert([0,1].include?(@service_info.delayed_start))
   end

data/win32-service.gemspec

@@ -2,13 +2,14 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-service'
-  spec.version    = '0.8.7'
+  spec.version    = '0.8.8'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'
   spec.homepage   = 'http://github.com/djberg96/win32-service'
   spec.summary    = 'An interface for MS Windows services'
   spec.test_files = Dir['test/test*.rb']
+  spec.cert_chain = Dir['certs/*']
    
   spec.files = Dir['**/*'].reject{ |f| f.include?('git') }
 
@@ -23,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency('ffi')
   spec.add_development_dependency('test-unit')
   spec.add_development_dependency('rake')
+  spec.add_development_dependency('win32-security')
 
   spec.description = <<-EOF
     The win32-service library provides a Ruby interface to services on

metadata

@@ -1,15 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: win32-service
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Daniel J. Berger
 - Park Heesob
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
+  cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
+  MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+  ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
+  Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
+  S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
+  gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
+  FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
+  zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
+  DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
+  nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
+  bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
+  ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
+  tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
+  /sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
+  wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
+  EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
+  tGSHgAmcLlkdGgan182qsE/4kKM=
+  -----END CERTIFICATE-----
+date: 2016-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -53,6 +75,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: win32-security
+  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: |2
       The win32-service library provides a Ruby interface to services on
       MS Windows. You can create new services, or control, configure and
@@ -70,21 +106,32 @@ extra_rdoc_files:
 - doc/service.txt
 - doc/daemon.txt
 files:
+- appveyor.yml
+- certs
+- certs/djberg96_pub.pem
 - CHANGES
-- MANIFEST
-- README
-- Rakefile
+- doc
 - doc/daemon.txt
 - doc/service.txt
+- examples
 - examples/demo_daemon.rb
 - examples/demo_daemon_ctl.rb
 - examples/demo_services.rb
+- lib
+- lib/win32
 - lib/win32/daemon.rb
 - lib/win32/service.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-daemon.rb
+- lib/win32-service.rb
+- MANIFEST
+- Rakefile
+- README
+- test
 - test/test_win32_daemon.rb
 - test/test_win32_service.rb
 - test/test_win32_service_configure.rb
@@ -112,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: An interface for MS Windows services