diff options
author | luislavena <luislavena@19e92222-5c0b-0410-8929-a290d50e31e9> | 2008-04-17 23:20:50 +0000 |
---|---|---|
committer | luislavena <luislavena@19e92222-5c0b-0410-8929-a290d50e31e9> | 2008-04-17 23:20:50 +0000 |
commit | af50f84c5533e89760820ff90a3b6acccd2c50ae (patch) | |
tree | 7562766ac98e2576e0f6911d534dc99785d79a89 | |
parent | 201f1e72325a0513c7f56d20b7d5163164d5c2cd (diff) | |
download | unicorn-af50f84c5533e89760820ff90a3b6acccd2c50ae.tar.gz |
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/branches/stable_1-2@1007 19e92222-5c0b-0410-8929-a290d50e31e9
-rw-r--r-- | projects/mongrel_service/CHANGELOG | 10 | ||||
-rw-r--r-- | projects/mongrel_service/Rakefile | 10 | ||||
-rw-r--r-- | projects/mongrel_service/lib/mongrel_service/init.rb | 14 |
3 files changed, 28 insertions, 6 deletions
diff --git a/projects/mongrel_service/CHANGELOG b/projects/mongrel_service/CHANGELOG index d8ca92e..67f5086 100644 --- a/projects/mongrel_service/CHANGELOG +++ b/projects/mongrel_service/CHANGELOG @@ -1,6 +1,12 @@ -* SVN * - +* 0.3.4 * + + * Strict Gem dependencies for mongrel_service. This version is compatible + only with mongrel 1.0.x, 1.1.x and with win32-service 0.5.x. + + * Fixed issues realted to Win32::Service and gem_plugin being registered with + different names due win32-service changes. + * 0.3.3 * * Properly display package/gem version for mongrel_service. Closes #13823. diff --git a/projects/mongrel_service/Rakefile b/projects/mongrel_service/Rakefile index 1d04826..9fb0ae9 100644 --- a/projects/mongrel_service/Rakefile +++ b/projects/mongrel_service/Rakefile @@ -15,14 +15,18 @@ echoe_spec = Echoe.new("mongrel_service") do |p| p.author = "Luis Lavena" p.email = "luislavena@gmail.com" p.platform = Gem::Platform::CURRENT - p.dependencies = ['gem_plugin >=0.2.3', 'mongrel >=1.0.2', 'win32-service >=0.5.0'] + p.dependencies = [['gem_plugin', '>=0.2.3', '<0.3.0'], + ['mongrel', '>=1.0.2', '<1.2.0'], + ['win32-service', '>=0.5.2', '<0.6.0']] p.executable_pattern = "" p.need_tar_gz = false p.need_zip = true - p.certificate_chain = ['~/projects/gem_certificates/mongrel-public_cert.pem', - '~/projects/gem_certificates/luislavena-mongrel-public_cert.pem'] + p.certificate_chain = [ + '~/projects/gem_certificates/mongrel-public_cert.pem', + '~/projects/gem_certificates/luislavena-mongrel-public_cert.pem' + ] p.require_signed = true end diff --git a/projects/mongrel_service/lib/mongrel_service/init.rb b/projects/mongrel_service/lib/mongrel_service/init.rb index c6fea0e..f1475f0 100644 --- a/projects/mongrel_service/lib/mongrel_service/init.rb +++ b/projects/mongrel_service/lib/mongrel_service/init.rb @@ -2,7 +2,6 @@ require 'gem_plugin' require 'mongrel'
require 'mongrel/rails'
require 'rbconfig'
-require 'win32/service'
require 'fileutils'
module Service
@@ -34,6 +33,10 @@ module Service # of the rails application we wanted to serve, because later "as service" no error
# show to trace this.
def validate
+ # TODO: investigate why Win32::Service interfere with gem_plugin
+ gem 'win32-service', '>= 0.5.2', '< 0.6.0'
+ require 'win32/service'
+
@cwd = File.expand_path(@cwd)
valid_dir? @cwd, "Invalid path to change to: #@cwd"
@@ -74,6 +77,9 @@ module Service end
def run
+ gem 'win32-service', '>= 0.5.2', '< 0.6.0'
+ require 'win32/service'
+
# check if mongrel_service.exe is in ruby bindir.
gem_root = File.join(File.dirname(__FILE__), "..", "..")
gem_executable = File.join(gem_root, "bin/mongrel_service.exe")
@@ -164,6 +170,9 @@ module Service def validate
valid? @svc_name != nil, "A service name is mandatory."
+
+ gem 'win32-service', '>= 0.5.2', '< 0.6.0'
+ require 'win32/service'
# Validate that the service exists
begin
@@ -183,6 +192,9 @@ module Service include ServiceValidation
def run
+ gem 'win32-service', '>= 0.5.2', '< 0.6.0'
+ require 'win32/service'
+
display_name = Win32::Service.getdisplayname(@svc_name)
begin
|