Changeset 1007

Show
Ignore:
Timestamp:
04/17/08 18:20:50 (3 months ago)
Author:
luislavena
Message:

mongrel_service: Merged changes from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/stable_1-2/projects/mongrel_service/CHANGELOG

    r627 r1007  
    11 
    2 * SVN * 
    3  
     2* 0.3.4 * 
     3     
     4    * Strict Gem dependencies for mongrel_service. This version is compatible 
     5      only with mongrel 1.0.x, 1.1.x and with win32-service 0.5.x. 
     6     
     7    * Fixed issues realted to Win32::Service and gem_plugin being registered with 
     8      different names due win32-service changes. 
     9     
    410* 0.3.3 * 
    511     
  • branches/stable_1-2/projects/mongrel_service/Rakefile

    r1001 r1007  
    1616  p.email = "luislavena@gmail.com" 
    1717  p.platform = Gem::Platform::CURRENT 
    18   p.dependencies = ['gem_plugin >=0.2.3', 'mongrel >=1.0.2', 'win32-service >=0.5.0'] 
     18  p.dependencies = [['gem_plugin', '>=0.2.3', '<0.3.0'], 
     19                    ['mongrel', '>=1.0.2', '<1.2.0'], 
     20                    ['win32-service', '>=0.5.2', '<0.6.0']] 
    1921 
    2022  p.executable_pattern = "" 
     
    2224  p.need_tar_gz = false 
    2325  p.need_zip = true 
    24   p.certificate_chain = ['~/projects/gem_certificates/mongrel-public_cert.pem', 
    25     '~/projects/gem_certificates/luislavena-mongrel-public_cert.pem'] 
     26  p.certificate_chain = [ 
     27    '~/projects/gem_certificates/mongrel-public_cert.pem', 
     28    '~/projects/gem_certificates/luislavena-mongrel-public_cert.pem' 
     29  ] 
    2630  p.require_signed = true 
    2731end 
  • branches/stable_1-2/projects/mongrel_service/lib/mongrel_service/init.rb

    r407 r1007  
    33require 'mongrel/rails' 
    44require 'rbconfig' 
    5 require 'win32/service' 
    65require 'fileutils' 
    76 
     
    3534    # show to trace this. 
    3635    def validate 
     36      # TODO: investigate why Win32::Service interfere with gem_plugin 
     37      gem 'win32-service', '>= 0.5.2', '< 0.6.0' 
     38      require 'win32/service' 
     39 
    3740      @cwd = File.expand_path(@cwd) 
    3841      valid_dir? @cwd, "Invalid path to change to: #@cwd" 
     
    7578     
    7679    def run 
     80      gem 'win32-service', '>= 0.5.2', '< 0.6.0' 
     81      require 'win32/service' 
     82 
    7783      # check if mongrel_service.exe is in ruby bindir. 
    7884      gem_root = File.join(File.dirname(__FILE__), "..", "..") 
     
    165171    def validate 
    166172      valid? @svc_name != nil, "A service name is mandatory." 
     173 
     174      gem 'win32-service', '>= 0.5.2', '< 0.6.0' 
     175      require 'win32/service' 
    167176       
    168177      # Validate that the service exists 
     
    184193     
    185194    def run 
     195      gem 'win32-service', '>= 0.5.2', '< 0.6.0' 
     196      require 'win32/service' 
     197 
    186198      display_name = Win32::Service.getdisplayname(@svc_name) 
    187199