trinidad_init_services 1.0.0 → 1.1.0.pre

data/History.txt

@@ -1,3 +1,7 @@
+== 1.1.0.pre (2011-09-30)
+
+* Load prunsrv on Windows according with the architecture
+
 == 1.0.0 (2011-06-11)
 
 * Rebranded gem

data/init.d/trinidad.erb

@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
 # Generic script for running ruby scripts as daemons using
 # jsvc and a java class to control the daemon.
 #

data/lib/trinidad_init_services/configuration.rb

@@ -76,10 +76,8 @@ module Trinidad
       end
 
       def configure_windows_service
-        prunsrv = File.join(@jars_path, 'prunsrv.exe')
-
         command = %Q{//IS//Trinidad --DisplayName="#{@trinidad_name}" \
---Install="#{prunsrv}" --Jvm=auto --StartMode=jvm --StopMode=jvm \
+--Install="#{prunsrv_path}" --Jvm=auto --StartMode=jvm --StopMode=jvm \
 --StartClass=com.msp.procrun.JRubyService --StartMethod=start \
 --StartParams="#{@trinidad_daemon_path};#{@trinidad_options.join(";")}" \
 --StopClass=com.msp.procrun.JRubyService --StopMethod=stop --Classpath="#{@classpath.join(";")}" \
@@ -112,11 +110,20 @@ module Trinidad
         RbConfig::CONFIG['host_os'] =~ /darwin/i
       end
 
+      def ia64?
+        RbConfig::CONFIG['arch'] =~ /i686|ia64/i
+      end
+
       def jsvc_path
         jsvc = 'jsvc_' + (macosx? ? 'darwin' : 'linux')
         File.join(@jars_path, jsvc)
       end
 
+      def prunsrv_path
+        prunsrv = 'prunsrv_' + (ia64? 'ia64' : 'amd64') + '.exe'
+        File.join(@jars_path, prunsrv)
+      end
+
       def ask_path(question, default = nil)
         File.expand_path(ask(question, default))
       end

data/lib/trinidad_init_services.rb

@@ -3,7 +3,7 @@ require 'trinidad'
 
 module Trinidad
   module Daemon
-    VERSION = '1.0.0'
+    VERSION = '1.1.0.pre'
 
     def init
     end

data/trinidad_init_services.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'trinidad_init_services'
-  s.version           = '1.0.0'
-  s.date              = '2011-07-12'
+  s.version           = '1.1.0.pre'
+  s.date              = '2011-09-30'
   s.rubyforge_project = 'trinidad_init_services'
 
   ## Make sure your summary is short. The description may be as long
@@ -63,7 +63,8 @@ Gem::Specification.new do |s|
     trinidad-libs/jruby-jsvc.jar
     trinidad-libs/jsvc_darwin
     trinidad-libs/jsvc_linux
-    trinidad-libs/prunsrv.exe
+    trinidad-libs/prunsrv_amd64.exe
+    trinidad-libs/prunsrv_ia64.exe
     trinidad_init_services.gemspec
   ]
   # = MANIFEST =

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad_init_services
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.0
+  prerelease: 6
+  version: 1.1.0.pre
 platform: ruby
 authors: 
   - David Calavera
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 +02:00
+date: 2011-09-30 00:00:00 +02:00
 default_executable: trinidad_daemon_install
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -46,7 +46,8 @@ files:
   - trinidad-libs/jruby-jsvc.jar
   - trinidad-libs/jsvc_darwin
   - trinidad-libs/jsvc_linux
-  - trinidad-libs/prunsrv.exe
+  - trinidad-libs/prunsrv_amd64.exe
+  - trinidad-libs/prunsrv_ia64.exe
   - trinidad_init_services.gemspec
 has_rdoc: true
 homepage: http://github.com/calavera/trinidad_daemon
@@ -77,9 +78,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: trinidad_init_services