win32-service 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00420c9a08f4efbc505916adfdf394aaa827d88d
-  data.tar.gz: 7cc804d073520c13b7a0d3cb376eef7594131d7b
+  metadata.gz: 5c61135d653d2cd836f4b191664aade237c35ceb
+  data.tar.gz: 1d5c27933e9a68469dcc40ca580307e521eebfe0
 SHA512:
-  metadata.gz: 2468f2cddb5f34466323c9e000d5655fe533c67b120e836bb79cdc08359afc44087b35031a3815d6d2b809650c7c060dfe8f51779f2e0c201f29c6462b16550d
-  data.tar.gz: d37585b5947428e224cd0840ddc806c6a5359971a1eedd3bd3b325eff0a1914e1c5fb07177a10a5ed81a01cb9b644a49e3e6b351fb302e5d5e43e5ca5da1621d
+  metadata.gz: c23f2a150c83ab807c44d15b7fd52efdfcfef3018472470838ebf3895685f10475a427e78375ca75f9b01367816a7668b920ca1dd257d4515df90b3fe67e22cb
+  data.tar.gz: 705f5de01cdf3e709350385763afe7b7aa3bdf63c81b0b914da6a1c84181435b116e38617cf6a96974b2c836bf40632b25bf4ebd7463aadc1528606e674671ec

data/CHANGES

@@ -1,3 +1,9 @@
+== 0.8.4 - 23-Jan-2014
+* Added support for the delayed start startup type. Thanks go to Jim Arnold
+  for the patch.
+* Fixed the service test that ensures that trying to start an already running
+  service will raise an error. Thanks again to Jim Arnold for the patch.
+
 == 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

data/README

@@ -56,7 +56,7 @@
   Add service_session_change hook
 
 == Copyright
-  (C) 2003-2013, Daniel J. Berger, All Rights Reserved
+  (C) 2003-2014, Daniel J. Berger, All Rights Reserved
     
 == License
   Artistic 2.0

data/lib/win32/daemon.rb

@@ -18,7 +18,7 @@ module Win32
     extend Windows::Functions
 
     # The version of this library
-    VERSION = '0.8.3'
+    VERSION = '0.8.4'
 
     private
 

data/lib/win32/service.rb

@@ -17,7 +17,7 @@ module Win32
     extend Windows::Functions
 
     # The version of the win32-service library
-    VERSION = '0.8.3'
+    VERSION = '0.8.4'
 
     # SCM security and access rights
 
@@ -244,7 +244,8 @@ module Win32
       :reboot_message,
       :command,
       :num_actions,
-      :actions
+      :actions,
+      :delayed_start
     )
 
     # :startdoc: #
@@ -479,7 +480,8 @@ module Win32
         'failure_actions'        => nil,
         'failure_delay'          => 0,
         'service_name'           => nil,
-        'host'                   => nil
+        'host'                   => nil,
+        'delayed_start'          => false
       }
 
       # Validate the hash options
@@ -563,6 +565,19 @@ module Win32
           FFI.raise_windows_error('ChangeServiceConfig2') unless bool
         end
 
+        if opts['delayed_start']
+          delayed_start = SERVICE_DELAYED_AUTO_START_INFO.new
+          delayed_start[:fDelayedAutostart] = opts['delayed_start']
+
+          bool = ChangeServiceConfig2(
+            handle_scs,
+            SERVICE_CONFIG_DELAYED_AUTO_START_INFO,
+            delayed_start
+          )
+
+          FFI.raise_windows_error('ChangeServiceConfig2') unless bool
+        end
+
         if opts['failure_reset_period'] || opts['failure_reboot_message'] ||
            opts['failure_command'] || opts['failure_actions']
         then
@@ -1069,6 +1084,15 @@ module Win32
               else
                 description = buf.read_pointer.read_string
               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
+              end
             else
               msg = "WARNING: The registry entry for the #{service_name} "
               msg += "service could not be found."
@@ -1153,7 +1177,8 @@ module Win32
             reboot_msg,
             command,
             num_actions,
-            actions
+            actions,
+            delayed_start
           )
 
           if block_given?

data/lib/win32/windows/structs.rb

@@ -36,6 +36,10 @@ module Windows
       layout(:lpDescription, :pointer)
     end
 
+    class SERVICE_DELAYED_AUTO_START_INFO < FFI::Struct
+      layout(:fDelayedAutostart, :bool)
+    end
+
     class QUERY_SERVICE_CONFIG < FFI::Struct
       layout(
         :dwServiceType, :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.3', Daemon::VERSION)
+    assert_equal('0.8.4', 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.3', Win32::Service::VERSION)
+    assert_equal('0.8.4', Win32::Service::VERSION)
   end
 
   test "services basic functionality" do
@@ -218,6 +218,7 @@ class TC_Win32_Service < Test::Unit::TestCase
   end
 
   test "attempting to start a running service raises an error" do
+	  start_service(@service_name)
     assert_raise(SystemCallError){ Win32::Service.start(@service_name) }
   end
 

data/test/test_win32_service_configure.rb

@@ -64,6 +64,11 @@ class TC_Win32_Service_Configure < Test::Unit::TestCase
     assert_equal('disabled', config_info.start_type)
   end
 
+  test "service start can be delayed" do
+	  service_configure(:start_type => Win32::Service::AUTO_START, :delayed_start => true)
+    assert_true(full_info.delayed_start)
+  end
+
   test "the configure method requires one argument" do
     assert_raise(ArgumentError){ Win32::Service.configure }
   end

data/test/test_win32_service_info.rb

@@ -162,7 +162,7 @@ class TC_Win32_ServiceInfo_Struct < Test::Unit::TestCase
 
   def test_service_info_interactive
     assert_respond_to(@service_info, :interactive)
-    assert([true, false].include?(@service_info.interactive))
+    assert_boolean(@service_info.interactive)
   end
 
   def test_service_info_service_flags
@@ -170,6 +170,11 @@ class TC_Win32_ServiceInfo_Struct < Test::Unit::TestCase
     assert([0,1].include?(@service_info.service_flags))
   end
 
+  def test_service_info_delayed_start
+    assert_respond_to(@service_info, :delayed_start)
+    assert_boolean(@service_info.delayed_start)
+  end
+
   def teardown
     @types    = nil
     @states   = nil

data/win32-service.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-service'
-  spec.version    = '0.8.3'
+  spec.version    = '0.8.4'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   ]
 
   spec.add_dependency('ffi')
-  spec.add_development_dependency('test-unit', '>= 2.4.0')
+  spec.add_development_dependency('test-unit')
   spec.add_development_dependency('rake')
 
   spec.description = <<-EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-service
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-02 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: An interface for MS Windows services