win32-service 0.6.1 → 0.7.0

data/CHANGES

@@ -1,3 +1,24 @@
+== 0.7.0 - 30-Jun-2009
+* INTERFACE CHANGE: The Service.new and Service.configure methods now accept
+  a single hash argument only. The :service_name key is mandatory, while the
+  :host key is optional.
+* Fixed a bug in the Service.services method where a segfault would occur if
+  the binary_path_name was greater than 260 characters. The buffer size has
+  been increased to 1024 characters. Thanks go to Dan Daniels for the spot.
+* Altered the Daemon class so that the Ruby interpreter was not invoked within
+  the Service_Main function. The functions that close stdin, stdout and stderr
+  are now called within the mainloop method. Thanks go to Tim Hanson for the
+  spot and the patch.
+* Eliminated a minor build warning in daemon.c
+* License changed to Artistic 2.0, with corresponding gemspec update.
+* Added an uninstall rake task.
+* Updated the service_stop method in the demo_daemon.rb file, and added some
+  additional comments.
+* The test files were renamed.
+* Several tests were updated and refactored to use Test::Unit 2.x. That
+  library is now a dependency.
+* The 'uninstall' Rakefile task is now more verbose.
+
 == 0.6.1 - 1-Jan-2008
 * The Service.services method now handles the scenario where a particular
   service may still exist, but its underlying registry entry has been deleted.

data/MANIFEST

@@ -11,8 +11,9 @@
 * examples/demo_daemon_ctl.rb
 * examples/demo_services.rb
 * lib/win32/service.rb
-* test/tc_daemon.rb
-* test/tc_service_create.rb
-* test/tc_service_info.rb
-* test/tc_service_status.rb
-* test/tc_service.rb
+* test/test_win32_daemon.rb
+* test/test_win32_service_configure.rb
+* test/test_win32_service_create.rb
+* test/test_win32_service_info.rb
+* test/test_win32_service_status.rb
+* test/test_win32_service.rb

data/README

@@ -41,4 +41,5 @@ will happen if your W32Time service isn't running.
 
 = Future Plans
 * Pure Ruby Daemon class
-* Add service_session_change hook
+* Add service_session_change hook
+* Add a WMI variant of the Service class.

data/Rakefile

@@ -0,0 +1,128 @@
+require 'rake'
+require 'rake/clean'
+require 'rake/testtask'
+require 'rbconfig'
+include Config
+
+desc "Cleans up the C related files created during the build"
+task :clean do
+   Dir.chdir('ext') do
+      if File.exists?('daemon.o') || File.exists?('daemon.so')
+         sh 'nmake distclean'
+      end
+      File.delete('win32/daemon.so') if File.exists?('win32/daemon.so')
+   end
+end
+
+desc "Builds, but does not install, the win32-service library"
+task :build => [:clean] do
+   Dir.chdir('ext') do
+      ruby 'extconf.rb'
+      sh 'nmake'
+      FileUtils.cp('daemon.so', 'win32/daemon.so')      
+   end  
+end
+
+desc "Install the win32-service library (non-gem)"
+task :install => [:build] do
+   Dir.chdir('ext') do
+      sh 'nmake install'
+   end
+   install_dir = File.join(CONFIG['sitelibdir'], 'win32')
+   Dir.mkdir(install_dir) unless File.exists?(install_dir)
+   FileUtils.cp('lib/win32/service.rb', install_dir, :verbose => true)
+end
+
+desc 'Install the win32-service library as a gem'
+task :install_gem => [:clean] do
+   ruby 'win32-service.gemspec'
+   file = Dir['win32-service*.gem'].first
+   sh "gem install #{file}"
+end
+
+desc 'Uninstall the (non-gem) win32-service library.'
+task :uninstall do
+   service = File.join(CONFIG['sitelibdir'], 'win32', 'service.rb')
+   FileUtils.rm(service, :verbose => true) if File.exists?(service)
+
+   daemon = File.join(CONFIG['sitearchdir'], 'win32', 'daemon.so')
+   FileUtils.rm(daemon, :verbose => true) if File.exists?(daemon)
+end
+
+desc "Build a binary gem"
+task :build_binary_gem => [:build] do
+   if File.exists?('lib/win32/daemon.rb')
+      mv 'lib/win32/daemon.rb', 'lib/win32/daemon.orig'
+   end
+
+   cp 'ext/win32/daemon.so', 'lib/win32/daemon.so'
+
+   task :build_binary_gem => [:clean]
+
+   spec = Gem::Specification.new do |gem|
+      gem.name         = 'win32-service'
+      gem.version      = '0.7.0'
+      gem.authors      = ['Daniel J. Berger', 'Park Heesob']
+      gem.email        = 'djberg96@gmail.com'
+      gem.license      = 'Artistic 2.0'
+      gem.homepage     = 'http://www.rubyforge.org/projects/win32utils'
+      gem.platform     = Gem::Platform::CURRENT
+      gem.summary      = 'An interface for MS Windows services'
+      gem.test_files   = Dir['test/test*.rb']
+      gem.has_rdoc     = true
+      gem.files        = Dir['**/*'].delete_if{ |f|
+         f.include?('CVS') || f.include?('ext') || f.include?('daemon.orig')
+      }
+
+      gem.extra_rdoc_files = [
+         'CHANGES',
+         'README',
+         'MANIFEST',
+         'doc/service.txt',
+         'doc/daemon.txt',
+         'ext/win32/daemon.c'
+      ]
+
+      gem.rubyforge_project     = 'win32utils'
+      gem.required_ruby_version = '>= 1.8.2'
+
+      gem.add_dependency('windows-pr', '>= 1.0.5')
+      gem.add_dependency('test-unit', '>= 2.0.2')
+
+      gem.description = <<-EOF
+         The win32-service library provides a Ruby interface to services on
+         MS Windows. You can create new services, or control, configure and
+         inspect existing services.
+
+         In addition, you can create a pure Ruby service by using the Daemon
+         class that is included as part of the library.
+      EOF
+   end
+
+   Gem::Builder.new(spec).build
+end
+
+desc "Run the test suite for the win32-service library"
+Rake::TestTask.new do |t|
+   task :test => :build
+   t.libs << 'ext'
+   t.verbose = true
+   t.warning = true
+end
+
+desc "Run the test suite for the Win32::Daemon class (only)"
+Rake::TestTask.new('test_daemon') do |t|
+   task :test_daemon => :build
+   t.libs << 'ext'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/test_win32_daemon.rb']
+end
+
+task :test do
+   Rake.application[:clean].execute
+end
+
+task :test_daemon do
+   Rake.application[:clean].execute
+end

data/doc/daemon.txt

@@ -7,7 +7,7 @@
       def service_main
          while running?
             sleep 3
-            File.open("c:\\test.log","a+"){ |f| f.puts "service is running" }
+            File.open("c:\\test.log", "a"){ |f| f.puts "service is running" }
          end
       end
    end
@@ -131,6 +131,8 @@ Daemon::IDLE
    http://rubyforge.org/projects/win32utils.
 
 = Future Plans
+   Rewrite the Daemon class in pure Ruby.
+
    Suggestions welcome. Please log them on the Feature Request tracker at
    http://rubyforge.org/projects/win32utils
    
@@ -140,10 +142,10 @@ Daemon::IDLE
    service responsiveness issues.
     
 = Copyright
-   (C) 2003-2008 Daniel J. Berger, All Rights Reserved
+   (C) 2003-2009 Daniel J. Berger, All Rights Reserved
 
 = License
-   Ruby's
+   Artistic 2.0
 
 = Warranty
    This package is provided "as is" and without any express or

data/doc/service.txt

@@ -17,7 +17,8 @@
    include Win32
     
    # Create a new service
-   Service.create('some_service', nil, 
+   Service.create(
+      :service_name       => 'some_service', 
       :service_type       => Service::WIN32_OWN_PROCESS,
       :description        => 'A custom service I wrote just for fun'
       :start_type         => Service::AUTO_START,
@@ -52,11 +53,12 @@
    }
     
 = Class Methods
-Service.new(service_name, host=nil, options={})
-   Creates a new service with +service_name+ on +host+, or the local host
-   if no host is specified. The +options+ parameter is a hash that can
+Service.new(options={})
+   Creates a new service. The +options+ parameter is a hash that can
    contain any of the following parameters, and their default values:
    
+   * service_name       => nil (mandatory)
+   * host               => nil
    * display_name       => service_name
    * desired_access     => Service::ALL_ACCESS
    * service_type       => Service::WIN32_OWN_PROCESS | Service::INTERACTIVE_PROCESS
@@ -69,11 +71,12 @@ Service.new(service_name, host=nil, options={})
    * password           => nil
    * description        => nil
 
-Service.configure(service_name, host=nil, options={})   
-   Configures the named +service_name+ on +host+, or the local host if no
-   host is specified. The +options+ parameter is a hash that can contain any
-   of the following parameters:
+Service.configure(options={})   
+   Configures an existing service. The +options+ parameter is a hash that can
+   contain any of the following parameters:
    
+   * service_name (mandatory)
+   * host
    * service_type
    * start_type
    * error_control
@@ -350,10 +353,10 @@ Service::ERROR_CRITICAL
    Use RegisterServiceCtrlHandlerEx().
     
 = Copyright
-   (C) 2003-2008, Daniel J. Berger, All Rights Reserved
+   (C) 2003-2009, Daniel J. Berger, All Rights Reserved
     
 = License
-   Ruby's
+   Artistic 2.0
     
 = Warranty
    This package is provided "as is" and without any express or

data/examples/demo_daemon_ctl.rb

@@ -0,0 +1,122 @@
+############################################################################
+# 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
+# of text to a file every 20 seconds. It will also write some text to the
+# file during the initialization (service_init) step.
+#
+# It should take about 10 seconds to start, which is intentional - it's a test
+# 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.
+#
+# To run the service, you must install it first.
+#
+# Usage: ruby demo_daemon_ctl.rb <option>
+#
+# Note that you *must* pass this program an option
+#
+# Options:
+#    install    - Installs the service.  The service name is "DemoSvc"
+#                 and the display name is "Demo".
+#    start      - Starts the service.  Make sure you stop it at some point or
+#                 you will eventually fill up your filesystem!.
+#    stop       - Stops the service.
+#    pause      - Pauses the service.
+#    resume     - Resumes the service.
+#    uninstall  - Uninstalls the service.
+#    delete     - Same as uninstall.
+#
+# You can also used the Windows Services GUI to start and stop the service.
+#
+# To get to the Windows Services GUI just follow:
+#    Start -> Control Panel -> Administrative Tools -> Services
+############################################################################
+require 'win32/service'
+require 'rbconfig'
+include Win32
+include Config
+
+# Make sure you're using the version you think you're using.
+puts 'VERSION: ' + Service::VERSION
+
+SERVICE_NAME = 'DemoSvc'
+SERVICE_DISPLAYNAME = 'Demo'
+
+# Quote the full path to deal with possible spaces in the path name.
+ruby = File.join(CONFIG['bindir'], 'ruby').tr('/', '\\')
+path = ' "' + File.dirname(File.expand_path($0)).tr('/', '\\')
+path += '\demo_daemon.rb"'
+cmd = ruby + path
+
+# You must provide at least one argument.
+raise ArgumentError, 'No argument provided' unless ARGV[0]
+
+case ARGV[0].downcase
+   when 'install'
+      Service.new(
+         :service_name     => SERVICE_NAME,
+         :display_name     => SERVICE_DISPLAYNAME,
+         :description      => 'Sample Ruby service',
+         :binary_path_name => cmd
+      )
+      puts 'Service ' + SERVICE_NAME + ' installed'      
+   when 'start'
+      if Service.status(SERVICE_NAME).current_state != 'running'
+         Service.start(SERVICE_NAME, nil, 'hello', 'world')
+         while Service.status(SERVICE_NAME).current_state != 'running'
+            puts 'One moment...' + Service.status(SERVICE_NAME).current_state
+            sleep 1
+         end
+         puts 'Service ' + SERVICE_NAME + ' started'
+      else
+         puts 'Already running'
+      end
+   when 'stop'
+      if Service.status(SERVICE_NAME).current_state != 'stopped'
+         Service.stop(SERVICE_NAME)
+         while Service.status(SERVICE_NAME).current_state != 'stopped'
+            puts 'One moment...' + Service.status(SERVICE_NAME).current_state
+            sleep 1
+         end
+         puts 'Service ' + SERVICE_NAME + ' stopped'
+      else
+         puts 'Already stopped'
+      end
+   when 'uninstall', 'delete'
+      if Service.status(SERVICE_NAME).current_state != 'stopped'
+         Service.stop(SERVICE_NAME)
+      end
+      while Service.status(SERVICE_NAME).current_state != 'stopped'
+         puts 'One moment...' + Service.status(SERVICE_NAME).current_state
+         sleep 1
+      end
+      Service.delete(SERVICE_NAME)
+      puts 'Service ' + SERVICE_NAME + ' deleted'
+   when 'pause'
+      if Service.status(SERVICE_NAME).current_state != 'paused'
+         Service.pause(SERVICE_NAME)
+         while Service.status(SERVICE_NAME).current_state != 'paused'
+            puts 'One moment...' + Service.status(SERVICE_NAME).current_state
+            sleep 1
+         end
+         puts 'Service ' + SERVICE_NAME + ' paused'
+      else
+         puts 'Already paused'
+      end
+   when 'resume'
+      if Service.status(SERVICE_NAME).current_state != 'running'
+         Service.resume(SERVICE_NAME)
+         while Service.status(SERVICE_NAME).current_state != 'running'
+            puts 'One moment...' + Service.status(SERVICE_NAME).current_state
+            sleep 1
+         end
+         puts 'Service ' + SERVICE_NAME + ' resumed'
+      else
+         puts 'Already running'
+      end
+   else
+      raise ArgumentError, 'unknown option: ' + ARGV[0]
+end

data/examples/demo_services.rb

@@ -0,0 +1,23 @@
+#######################################################################
+# demo_services.rb
+#
+# Test script for general futzing that shows off the basic
+# capabilities of this library. Modify as you see fit.
+#######################################################################
+require 'win32/service'
+include Win32
+
+puts "VERSION: " + Service::VERSION
+
+p Service.exists?("ClipSrv")
+p Service.exists?("foo")
+
+status = Service.status("ClipSrv")
+p status
+
+info = Service.config_info("ClipSrv")
+p info
+
+Service.services{ |struct|
+   p struct
+}

data/ext/extconf.rb

@@ -1,5 +1,5 @@
-require 'mkmf'
-
-dir_config('win32-daemon')
-have_func('RegisterServiceCtrlHandlerEx')
-create_makefile('win32/daemon', 'win32')
+require 'mkmf'
+
+dir_config('win32-daemon')
+have_func('RegisterServiceCtrlHandlerEx')
+create_makefile('win32/daemon', 'win32')

data/ext/win32/daemon.c

@@ -5,7 +5,7 @@
 #include <malloc.h>
 #include <tchar.h>
 
-#define WIN32_SERVICE_VERSION "0.6.1"
+#define WIN32_SERVICE_VERSION "0.7.0"
 
 static VALUE cDaemonError;
 
@@ -66,34 +66,23 @@ void WINAPI Service_Main(DWORD dwArgc, LPTSTR *lpszArgv)
 {
    // Obtain the name of the service.
    LPTSTR lpszServiceName = lpszArgv[0];
-   
+
    // Args passed to Service.start
    if(dwArgc > 1){
-      int i;
+      unsigned int i;
       Argc = dwArgc - 1;
       Argv = malloc(sizeof(VALUE)*Argc);
-      
-      for(i=1;i<dwArgc;i++)
+
+      for(i=1; i < dwArgc; i++)
          Argv[i-1] = rb_str_new2(lpszArgv[i]);
    }
 
    // Register the service ctrl handler.
    ssh = RegisterServiceCtrlHandler(lpszServiceName,
            (LPHANDLER_FUNCTION)Service_Ctrl);
-   
-   // Redirect STDIN, STDOUT and STDERR to the NUL device if they're still
-   // associated with a tty. This helps newbs avoid Errno::EBADF errors.
-   if(rb_funcall(rb_stdin, rb_intern("isatty"), 0) == Qtrue)
-      rb_funcall(rb_stdin, rb_intern("reopen"), 1, rb_str_new2("NUL"));
-      
-   if(rb_funcall(rb_stdout, rb_intern("isatty"), 0) == Qtrue)
-      rb_funcall(rb_stdout, rb_intern("reopen"), 1, rb_str_new2("NUL"));
-      
-   if(rb_funcall(rb_stderr, rb_intern("isatty"), 0) == Qtrue)
-      rb_funcall(rb_stderr, rb_intern("reopen"), 1, rb_str_new2("NUL"));
 
    // no service to stop, no service handle to notify, nothing to do but exit
-   if(ssh == (SERVICE_STATUS_HANDLE)0)   
+   if(ssh == (SERVICE_STATUS_HANDLE)0)
       return;
 
    // The service has started.
@@ -274,7 +263,7 @@ DWORD WINAPI ThreadProc(LPVOID lpParameter){
    SERVICE_TABLE_ENTRY ste[] =
       {{TEXT(""),(LPSERVICE_MAIN_FUNCTION)Service_Main}, {NULL, NULL}};
 
-   // No service to step, no service handle, no ruby exceptions, just 
+   // No service to step, no service handle, no ruby exceptions, just
    // terminate the thread.
    if(!StartServiceCtrlDispatcher(ste))
       return 1;
@@ -291,12 +280,12 @@ static VALUE daemon_allocate(VALUE klass){
 static VALUE daemon_mainloop_protect(VALUE self)
 {
    if(rb_respond_to(self,rb_intern("service_main"))){
-      if(Argc == 0)      
+      if(Argc == 0)
          rb_funcall(self, rb_intern("service_main"), 0);
       else
          rb_funcall2(self, rb_intern("service_main"), Argc, Argv);
-   } 
-   
+   }
+
    return self;
 }
 
@@ -341,115 +330,126 @@ static VALUE daemon_mainloop_ensure(VALUE self)
  */
 static VALUE daemon_mainloop(VALUE self)
 {
-    DWORD ThreadId;
-    HANDLE events[2];
-    DWORD index;
-    VALUE result, EventHookHash;
-    int status = 0;
+   DWORD ThreadId;
+   HANDLE events[2];
+   DWORD index;
+   VALUE result, EventHookHash;
+   int status = 0;
+
+   dwServiceState = 0;
+
+   // Redirect STDIN, STDOUT and STDERR to the NUL device if they're still
+   // associated with a tty. This helps newbs avoid Errno::EBADF errors.
+   if(rb_funcall(rb_stdin, rb_intern("isatty"), 0) == Qtrue)
+      rb_funcall(rb_stdin, rb_intern("reopen"), 1, rb_str_new2("NUL"));
 
-    dwServiceState = 0;
+   if(rb_funcall(rb_stdout, rb_intern("isatty"), 0) == Qtrue)
+      rb_funcall(rb_stdout, rb_intern("reopen"), 1, rb_str_new2("NUL"));
 
-   // use a markable instance variable to prevent the garbage collector
+   if(rb_funcall(rb_stderr, rb_intern("isatty"), 0) == Qtrue)
+      rb_funcall(rb_stderr, rb_intern("reopen"), 1, rb_str_new2("NUL"));
+
+   // Use a markable instance variable to prevent the garbage collector
    // from freeing the hash before Ruby_Service_Ctrl exits, or just
    // at any ole time while running the service
    EventHookHash = rb_hash_new();
    rb_ivar_set(self, rb_intern("@event_hooks"), EventHookHash);
 
-    // Event hooks
-    if(rb_respond_to(self, rb_intern("service_stop"))){
-       rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_STOP),
-          rb_ary_new3(2, self, INT2NUM(rb_intern("service_stop"))));
-    }
+   // Event hooks
+   if(rb_respond_to(self, rb_intern("service_stop"))){
+      rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_STOP),
+         rb_ary_new3(2, self, INT2NUM(rb_intern("service_stop"))));
+   }
 
-    if(rb_respond_to(self, rb_intern("service_pause"))){
-       rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_PAUSE),
-          rb_ary_new3(2, self, INT2NUM(rb_intern("service_pause"))));
-    }
+   if(rb_respond_to(self, rb_intern("service_pause"))){
+      rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_PAUSE),
+         rb_ary_new3(2, self, INT2NUM(rb_intern("service_pause"))));
+   }
 
-    if(rb_respond_to(self, rb_intern("service_resume"))){
-       rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_CONTINUE),
-          rb_ary_new3(2, self, INT2NUM(rb_intern("service_resume"))));
-    }
+   if(rb_respond_to(self, rb_intern("service_resume"))){
+      rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_CONTINUE),
+         rb_ary_new3(2, self, INT2NUM(rb_intern("service_resume"))));
+   }
 
-    if(rb_respond_to(self, rb_intern("service_interrogate"))){
-       rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_INTERROGATE),
-          rb_ary_new3(2, self, INT2NUM(rb_intern("service_interrogate"))));
-    }
+   if(rb_respond_to(self, rb_intern("service_interrogate"))){
+      rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_INTERROGATE),
+         rb_ary_new3(2, self, INT2NUM(rb_intern("service_interrogate"))));
+   }
 
-    if(rb_respond_to(self, rb_intern("service_shutdown"))){
-       rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_SHUTDOWN),
-          rb_ary_new3(2, self, INT2NUM(rb_intern("service_shutdown"))));
-    }
+   if(rb_respond_to(self, rb_intern("service_shutdown"))){
+      rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_SHUTDOWN),
+         rb_ary_new3(2, self, INT2NUM(rb_intern("service_shutdown"))));
+   }
 
 #ifdef SERVICE_CONTROL_PARAMCHANGE
-    if(rb_respond_to(self, rb_intern("service_paramchange"))){
-       rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_PARAMCHANGE),
-          rb_ary_new3(2, self, INT2NUM(rb_intern("service_paramchange"))));
-    }
+   if(rb_respond_to(self, rb_intern("service_paramchange"))){
+      rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_PARAMCHANGE),
+         rb_ary_new3(2, self, INT2NUM(rb_intern("service_paramchange"))));
+   }
 #endif
 
 #ifdef SERVICE_CONTROL_NETBINDADD
-    if(rb_respond_to(self, rb_intern("service_netbindadd"))){
-       rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_NETBINDADD),
-          rb_ary_new3(2, self, INT2NUM(rb_intern("service_netbindadd"))));
-    }
+   if(rb_respond_to(self, rb_intern("service_netbindadd"))){
+      rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_NETBINDADD),
+         rb_ary_new3(2, self, INT2NUM(rb_intern("service_netbindadd"))));
+   }
 #endif
 
 #ifdef SERVICE_CONTROL_NETBINDREMOVE
-    if(rb_respond_to(self, rb_intern("service_netbindremove"))){
-       rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_NETBINDREMOVE),
-          rb_ary_new3(2, self, INT2NUM(rb_intern("service_netbindremove"))));
-    }
+   if(rb_respond_to(self, rb_intern("service_netbindremove"))){
+      rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_NETBINDREMOVE),
+         rb_ary_new3(2, self, INT2NUM(rb_intern("service_netbindremove"))));
+   }
 #endif
 
 #ifdef SERVICE_CONTROL_NETBINDENABLE
-    if(rb_respond_to(self, rb_intern("service_netbindenable"))){
-       rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_NETBINDENABLE),
-          rb_ary_new3(2, self, INT2NUM(rb_intern("service_netbindenable"))));
-    }
+   if(rb_respond_to(self, rb_intern("service_netbindenable"))){
+      rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_NETBINDENABLE),
+         rb_ary_new3(2, self, INT2NUM(rb_intern("service_netbindenable"))));
+   }
 #endif
 
 #ifdef SERVICE_CONTROL_NETBINDDISABLE
-    if(rb_respond_to(self, rb_intern("service_netbinddisable"))){
-       rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_NETBINDDISABLE),
-          rb_ary_new3(2, self, INT2NUM(rb_intern("service_netbinddisable"))));
-    }
+   if(rb_respond_to(self, rb_intern("service_netbinddisable"))){
+      rb_hash_aset(EventHookHash, INT2NUM(SERVICE_CONTROL_NETBINDDISABLE),
+         rb_ary_new3(2, self, INT2NUM(rb_intern("service_netbinddisable"))));
+   }
 #endif
 
-    // calling init here so that init failures never even tries to
-    // start the service... of course that means that init methods
-    // must be very quick, because the SCM will be receiving no
-    // START_PENDING messages while init's running - I may fix this
-    // later
-    if(rb_respond_to(self, rb_intern("service_init")))
-       rb_funcall(self, rb_intern("service_init"),0);
+   // Calling init here so that init failures never even tries to
+   // start the service... of course that means that init methods
+   // must be very quick, because the SCM will be receiving no
+   // START_PENDING messages while init's running - I may fix this
+   // later
+   if(rb_respond_to(self, rb_intern("service_init")))
+      rb_funcall(self, rb_intern("service_init"),0);
 
-    // Create the event to signal the service to start.
-    hStartEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+   // Create the event to signal the service to start.
+   hStartEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
 
-    if(hStartEvent == NULL)
-       rb_raise(cDaemonError, ErrorDescription(GetLastError()));
+   if(hStartEvent == NULL)
+      rb_raise(cDaemonError, ErrorDescription(GetLastError()));
 
-    // Create the event to signal the service to stop.
-    hStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+   // Create the event to signal the service to stop.
+   hStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
 
-    if(hStopEvent == NULL)
-       rb_raise(cDaemonError, ErrorDescription(GetLastError()));
+   if(hStopEvent == NULL)
+      rb_raise(cDaemonError, ErrorDescription(GetLastError()));
 
-    // Create the event to signal the service that stop has completed
-    hStopCompletedEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+   // Create the event to signal the service that stop has completed
+   hStopCompletedEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
 
-    if(hStopCompletedEvent == NULL)
-       rb_raise(cDaemonError, ErrorDescription(GetLastError()));
+   if(hStopCompletedEvent == NULL)
+      rb_raise(cDaemonError, ErrorDescription(GetLastError()));
 
-    // Create Thread for service main
-    hThread = CreateThread(NULL, 0, ThreadProc, 0, 0, &ThreadId);
+   // Create Thread for service main
+   hThread = CreateThread(NULL, 0, ThreadProc, 0, 0, &ThreadId);
 
-    if(hThread == INVALID_HANDLE_VALUE)
-       rb_raise(cDaemonError, ErrorDescription(GetLastError()));
+   if(hThread == INVALID_HANDLE_VALUE)
+      rb_raise(cDaemonError, ErrorDescription(GetLastError()));
 
-    events[0] = hThread;
-    events[1] = hStartEvent;
+   events[0] = hThread;
+   events[1] = hStartEvent;
 
    // wait for Service_Main function to either start the service OR terminate
    while((index = WaitForMultipleObjects(2,events,FALSE,1000)) == WAIT_TIMEOUT)
@@ -480,10 +480,10 @@ static VALUE daemon_mainloop(VALUE self)
 /*
  * Returns the state of the service (as an constant integer) which can be any
  * of the service status constants, e.g. RUNNING, PAUSED, etc.
- * 
+ *
  * This method is typically used within your service_main method to setup the
  * loop. For example:
- * 
+ *
  *    class MyDaemon < Daemon
  *       def service_main
  *          while state == RUNNING || state == PAUSED || state == IDLE
@@ -491,7 +491,7 @@ static VALUE daemon_mainloop(VALUE self)
  *          end
  *       end
  *    end
- * 
+ *
  * See the Daemon#running? method for an abstraction of the above code.
  */
 static VALUE daemon_state(VALUE self){
@@ -501,10 +501,10 @@ static VALUE daemon_state(VALUE self){
 /*
  * Returns whether or not the service is in a running state, i.e. the service
  * status is either RUNNING, PAUSED or IDLE.
- * 
+ *
  * This is typically used within your service_main method to setup the main
  * loop. For example:
- * 
+ *
  *    class MyDaemon < Daemon
  *       def service_main
  *          while running?
@@ -522,11 +522,11 @@ static VALUE daemon_is_running(VALUE self){
    ){
       v_bool = Qtrue;
    }
-	
-   return v_bool;	
+
+   return v_bool;
 }
 
-/* 
+/*
  * This is a shortcut for Daemon.new + Daemon#mainloop.
  */
 static VALUE daemon_c_mainloop(VALUE klass){
@@ -552,17 +552,17 @@ void Init_daemon()
    rb_define_method(cDaemon, "mainloop", daemon_mainloop, 0);
    rb_define_method(cDaemon, "state", daemon_state, 0);
    rb_define_method(cDaemon, "running?", daemon_is_running, 0);
-   
+
    rb_define_singleton_method(cDaemon, "mainloop", daemon_c_mainloop, 0);
 
    // Intialize critical section used by green polling thread
    InitializeCriticalSection(&csControlCode);
 
    // Constants
-   
-   /* 0.6.1: The version of this library */
+
+   /* 0.7.0: The version of this library */
    rb_define_const(cDaemon, "VERSION", rb_str_new2(WIN32_SERVICE_VERSION));
-   
+
    /* Service has received a signal to resume but is not yet running */
    rb_define_const(cDaemon, "CONTINUE_PENDING",
       INT2NUM(SERVICE_CONTINUE_PENDING));
@@ -590,7 +590,7 @@ void Init_daemon()
    /* Service is stopped. */
    rb_define_const(cDaemon, "STOPPED",
       INT2NUM(SERVICE_STOPPED));
-   
+
    /* Service is in an idle state */
    rb_define_const(cDaemon, "IDLE", INT2NUM(0));
 }