trinidad_daemon 0.3.2 → 0.4.0

data/History.txt

@@ -1,3 +1,7 @@
+== 0.4.0 (2011-01-13)
+
+* Generate Windows service.
+
 == 0.3.2
 
 * Remove profile.jar from init script since it's no more bundled with JRuby distribution.

data/README

@@ -6,41 +6,54 @@ Trinidad's daemon library based on Apache Commons Daemon and JRuby-jsvc.
 It should replace the daemon_extension in a near future due to the problem we
 are finding with the current forking process.
 
-Dependencies
+Installation
 ============
 
-The Jsvc native binary file is required, but it's already available for all the
-platforms supported as a bundled package, i.e:
+When the gem is installed the user must launch the installation process:
 
-    Debian/Ubuntu:
-        $ sudo apt-get install jsvc
-    Mac OS X:
-        $ brew install jsvc
+    $ jruby -S trinidad_daemon_install
 
-Those binaries are also available in the Apache distribution directory, if
-you install it from this directory you must ensure it's in your path:
+This installer guides you through the configuration process and generates a
+init.d script if you are on a unix system or creates the service if you are
+on a windows box.
 
-http://www.apache.org/dist/commons/daemon/binaries/1.0.3/
+Unix
+====
 
-Installation
-============
+  Dependencies
+  ============
 
-When the gem is installed the user must launch the installation process:
+  The Jsvc native binary file is required, but it's already available for all the
+  platforms supported as a bundled package, i.e:
 
-    $ jruby -S trinidad_daemon_install
+      Debian/Ubuntu:
+          $ sudo apt-get install jsvc
+      Mac OS X:
+          $ brew install jsvc
 
-This installer guides you through the configuration process and generates a
-init.d script for your platform.
+  Those binaries are also available in the Apache distribution directory, if
+  you install it from this directory you must ensure it's in your path:
+
+  http://www.apache.org/dist/commons/daemon/binaries/
+
+  Execution
+  =========
+
+  When the installation process finishes you can use the script trinidad-daemon.sh
+  generated to launch the server as a daemon with the options start|stop|restart,
+  i.e:
+
+      $ /etc/init.d/trinidad restart
 
-Execution
-=========
+Windows
+=======
 
-When the installation process finishes you can use the script trinidad-daemon.sh
-generated to launch the server as a daemon with the options start|stop|restart,
-i.e:
+  Execution
+  =========
 
-    $ /etc/init.d/trinidad restart
+  Open the `Services` panel under `Administrative Tools` and look for a
+  service called `Trinidad`.
 
 == Copyright
 
-Copyright (c) 2010 David Calavera<calavera@apache.org>. See LICENSE for details.
+Copyright (c) 2011 David Calavera<calavera@apache.org>. See LICENSE for details.

data/bin/trinidad_daemon_install

@@ -1,5 +1,3 @@
-#!/usr/bin/env jruby
-
 __LIB_DIR__ = File.expand_path('../lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift(__LIB_DIR__) unless $LOAD_PATH.include? __LIB_DIR__
 

data/init.d/trinidad.erb

@@ -17,12 +17,10 @@ JAVA_HOME=<%= @java_home %>
 JRUBY_HOME=<%= @jruby_home %>
 APP_PATH=<%= @app_path %>
 RUBY_SCRIPT=<%= @trinidad_daemon_path %>
-JRUBY_JSVC_JAR=<%= "#{@jars_path}/jruby-jsvc.jar" %>
-DAEMON_JAR=<%= "#{@jars_path}/commons-daemon.jar" %>
 
 # Add here the options that Trinidad needs to run your application,
 # but DO NOT delete the -d option, i.e -e production
-TRINIDAD_OPTS="-d $APP_PATH <%= @trinidad_options %>"
+TRINIDAD_OPTS="<%= @trinidad_options.join(" ") %>"
 
 PIDFILE=<%= @pid_file %>
 LOG_FILE=<%= @log_file %>
@@ -30,7 +28,7 @@ LOG_FILE=<%= @log_file %>
 # Implements the jsvc Daemon interface.
 MAIN_CLASS=com.msp.jsvc.JRubyDaemon
 
-CLASSPATH=$JRUBY_HOME/lib/jruby.jar:<%= @profiler_classpath %>$DAEMON_JAR:$JRUBY_JSVC_JAR
+CLASSPATH=<%= @classpath.join(":") %>
 
 # TODO: Allow configuration or detect from the OS
 JAVA_NATIVE_PROPS="-Djna.boot.library.path=$JRUBY_HOME/lib/native/linux-i386:$JRUBY_HOME/lib/native/linux-amd64 \
@@ -39,11 +37,8 @@ JAVA_NATIVE_PROPS="-Djna.boot.library.path=$JRUBY_HOME/lib/native/linux-i386:$JR
 JAVA_PROPS="$JAVA_PROPS -Djruby.memory.max=500m \
 -Djruby.stack.max=1024k \
 $JAVA_NATIVE_PROPS \
--Djruby.home=$JRUBY_HOME \
--Djruby.lib=$JRUBY_HOME/lib \
--Djruby.script=jruby \
--Djruby.shell=/bin/sh
--Djruby.daemon.module.name=Trinidad"
+-Djruby.shell=/bin/sh \
+<%= @jruby_opts.join(' ') %>"
 
 JAVA_OPTS="-Xmx500m -Xss1024k -Xbootclasspath/a:$JRUBY_HOME/lib/jruby.jar"
 

data/lib/trinidad_daemon/configuration.rb

@@ -2,6 +2,7 @@ module Trinidad
   module Daemon
     require 'erb'
     require 'java'
+    require 'rbconfig'
 
     class Configuration
       def initialize(stdin = STDIN, stdout = STDOUT)
@@ -11,18 +12,40 @@ module Trinidad
 
       def configure
         @app_path = ask_path('Application path?')
-        @trinidad_options = ask('Trinidad options?', '-e production')
-        @jsvc = ask_path('Jsvc path?', `which jsvc`.chomp)
-        @java_home = ask_path('Java home?', default_java_home)
+        @trinidad_options = ["-d #{@app_path}"]
+        options_ask = 'Trinidad options?'
+        options_default = '-e production'
+        if windows?
+          options_ask << '(separated by `;`)'
+          options_default = ''
+        end
+        @trinidad_options << ask(options_ask, options_default)
+
         @jruby_home = ask_path('JRuby home?', default_jruby_home)
-        @output_path = ask_path('init.d output path?', '/etc/init.d')
-        @pid_file = ask_path('pid file?', '/var/run/trinidad/trinidad.pid')
-        @log_file = ask_path('log file?', '/var/log/trinidad/trinidad.log')
+        @jruby_opts = ["-Djruby.home=#{@jruby_home}", "-Djruby.lib=#{File.join(@jruby_home, 'lib')}",
+          "-Djruby.script=jruby", "-Djruby.daemon.module.name=Trinidad"]
 
         @trinidad_daemon_path = File.expand_path('../../trinidad_daemon.rb', __FILE__)
         @jars_path = File.expand_path('../../../trinidad-libs', __FILE__)
 
-        @profiler_classpath = should_use_profile_jar? ? '$JRUBY_HOME/lib/profile.jar:' : ''
+        @classpath = ['jruby-jsvc.jar', 'commons-daemon.jar'].map {|jar| File.join(@jars_path, jar)}
+        @classpath << File.join(@jruby_home, 'lib', 'jruby.jar')
+
+        if windows?
+          configure_windows_service
+        else
+          configure_unix_daemon
+        end
+
+        puts 'Done.'
+      end
+
+      def configure_unix_daemon
+        @jsvc = ask_path('Jsvc path?', `which jsvc`.chomp)
+        @java_home = ask_path('Java home?', default_java_home)
+        @output_path = ask_path('init.d output path?', '/etc/init.d')
+        @pid_file = ask_path('pid file?', '/var/run/trinidad/trinidad.pid')
+        @log_file = ask_path('log file?', '/var/log/trinidad/trinidad.log')
 
         daemon = ERB.new(
           File.read(
@@ -37,7 +60,20 @@ module Trinidad
 
         puts "Moving trinidad to #{@output_path}"
         `cp #{tmp_file} #{@output_path} && chmod u+x #{@output_path}`
-        puts 'Done.'
+      end
+
+      def configure_windows_service
+        prunsrv = File.join(@jars_path, 'prunsrv.exe')
+        command = %Q{//IS//Trinidad --DisplayName="Trinidad" \
+--Install="#{prunsrv}" --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(";")}" \
+--StdOutput=auto --StdError=auto \
+--LogPrefix="trinidad" \
+++JvmOptions="#{@jruby_opts.join(";")}"
+}
+        system "#{prunsrv} #{command}"
       end
 
       private
@@ -49,9 +85,8 @@ module Trinidad
         Java::JavaLang::System.get_property("java.home")
       end
 
-      # JRuby versions prior to v1.5.5 required an external profile.jar
-      def should_use_profile_jar?
-        JRUBY_VERSION.gsub(".", '').to_i < 155
+      def windows?
+        RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
       end
 
       def ask_path(question, default = nil)

data/lib/trinidad_daemon.rb

@@ -3,7 +3,7 @@ require 'trinidad'
 
 module Trinidad
   module Daemon
-    VERSION = '0.3.2'
+    VERSION = '0.4.0'
 
     def init
     end

data/trinidad_daemon.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_daemon'
-  s.version           = '0.3.2'
-  s.date              = '2010-12-03'
+  s.version           = '0.4.0'
+  s.date              = '2011-01-14'
   s.rubyforge_project = 'trinidad_daemon'
 
   ## Make sure your summary is short. The description may be as long
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('trinidad', '>=0.9.6')
+  s.add_dependency('trinidad', '>=1.0.5')
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -61,6 +61,7 @@ Gem::Specification.new do |s|
     lib/trinidad_daemon/configuration.rb
     trinidad-libs/commons-daemon.jar
     trinidad-libs/jruby-jsvc.jar
+    trinidad-libs/prunsrv.exe
     trinidad_daemon.gemspec
   ]
   # = MANIFEST =

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
     - 0
-    - 3
-    - 2
-  version: 0.3.2
+    - 4
+    - 0
+  version: 0.4.0
 platform: ruby
 authors: 
   - David Calavera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 +01:00
+date: 2011-01-14 00:00:00 +01:00
 default_executable: trinidad_daemon_install
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -25,10 +25,10 @@ dependencies:
         - - ">="
           - !ruby/object:Gem::Version 
             segments: 
+              - 1
               - 0
-              - 9
-              - 6
-            version: 0.9.6
+              - 5
+            version: 1.0.5
     type: :runtime
     version_requirements: *id001
 description: Trinidad daemon based on Apache Commons Daemon and JRuby-jsvc
@@ -51,6 +51,7 @@ files:
   - lib/trinidad_daemon/configuration.rb
   - trinidad-libs/commons-daemon.jar
   - trinidad-libs/jruby-jsvc.jar
+  - trinidad-libs/prunsrv.exe
   - trinidad_daemon.gemspec
 has_rdoc: true
 homepage: http://github.com/calavera/trinidad_daemon