trinidad_daemon 0.4.1 → 0.4.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.4.2 (2011-05-17)
+
+* fix several minor bugs
+
 == 0.4.1 (2011-01-18)
 
 * Ensure the unix script is executable by default.

data/init.d/trinidad.erb

@@ -30,27 +30,32 @@ MAIN_CLASS=com.msp.jsvc.JRubyDaemon
 
 CLASSPATH=<%= @classpath.join(":") %>
 
+if [ -z "$JRUBY_OPTS" ] ; then
+  JRUBY_OPTS=""
+fi
+
 # 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 \
--Djffi.boot.library.path=$JRUBY_HOME/lib/native/i386-Linux:$JRUBY_HOME/lib/native/s390x-Linux:$JRUBY_HOME/lib/native/x86_64-Linux"
+  -Djffi.boot.library.path=$JRUBY_HOME/lib/native/i386-Linux:$JRUBY_HOME/lib/native/s390x-Linux:$JRUBY_HOME/lib/native/x86_64-Linux"
 
 JAVA_PROPS="$JAVA_PROPS -Djruby.memory.max=500m \
--Djruby.stack.max=1024k \
-$JAVA_NATIVE_PROPS \
--Djruby.shell=/bin/sh \
-<%= @jruby_opts.join(' ') %>"
+  -Djruby.stack.max=1024k \
+  $JAVA_NATIVE_PROPS \
+  -Djruby.shell=/bin/sh \
+  <%= @jruby_opts.join(' ') %> \
+  $JRUBY_OPTS"
 
 JAVA_OPTS="-Xmx500m -Xss1024k -Xbootclasspath/a:$JRUBY_HOME/lib/jruby.jar"
 
 JSVC_ARGS="-home $JAVA_HOME \
-$JSVC_ARGS_EXTRA \
--wait 20 \
--pidfile $PIDFILE \
--user $USER \
--procname jsvc-$SCRIPT_NAME \
--jvm server
--outfile $LOG_FILE \
--errfile &1"
+  $JSVC_ARGS_EXTRA \
+  -wait 20 \
+  -pidfile $PIDFILE \
+  -user $USER \
+  -procname jsvc-$SCRIPT_NAME \
+  -jvm server
+  -outfile $LOG_FILE \
+  -errfile &1"
 
 #
 # Stop/Start

data/lib/trinidad_daemon.rb

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

data/lib/trinidad_daemon/configuration.rb

@@ -11,33 +11,45 @@ module Trinidad
         @stdout = stdout
       end
 
+      def initialize_paths
+        @trinidad_daemon_path = File.expand_path('../../trinidad_daemon.rb', __FILE__)
+        @jars_path = File.expand_path('../../../trinidad-libs', __FILE__)
+
+        @classpath = ['jruby-jsvc.jar', 'commons-daemon.jar'].map { |jar| File.join(@jars_path, jar) }
+        @classpath << File.join(@jruby_home, 'lib', 'jruby.jar')
+      end
+
+      def collect_windows_opts(options_ask)
+        options_ask << '(separated by `;`)'
+        name_ask = 'Service name? {Alphanumeric and spaces only}'
+        name_default = 'Trinidad'
+        @trinidad_name = ask(name_ask, name_default)
+      end
+
+      def configure_jruby_opts
+        opts = []
+        opts << "-Djruby.home=#{@jruby_home}"
+        opts << "-Djruby.lib=#{File.join(@jruby_home, 'lib')}"
+        opts << "-Djruby.script=jruby"
+        opts << "-Djruby.daemon.module.name=Trinidad"
+        opts << "-Djruby.compat.version=#{@ruby_compat_version}"
+        opts
+      end
+
       def configure
         @app_path = ask_path('Application path?')
         @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)
+        collect_windows_opts(options_ask) if windows?
 
+        @trinidad_options << ask(options_ask, options_default)
         @jruby_home = ask_path('JRuby home?', default_jruby_home)
-        @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__)
-
-        @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
+        @ruby_compat_version = ask('Ruby 1.8.x or 1.9.x compatibility?', default_ruby_compat_version)
+        @jruby_opts = configure_jruby_opts
+        initialize_paths
 
+        windows? ? configure_windows_service : configure_unix_daemon
         puts 'Done.'
       end
 
@@ -65,19 +77,20 @@ module Trinidad
 
       def configure_windows_service
         prunsrv = File.join(@jars_path, 'prunsrv.exe')
-        command = %Q{//IS//Trinidad --DisplayName="Trinidad" \
+        command = %Q{//IS//Trinidad --DisplayName="#{@trinidad_name}" \
 --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" \
+--LogPrefix="#{@trinidad_name.downcase.gsub(/\W/,'')}" \
 ++JvmOptions="#{@jruby_opts.join(";")}"
 }
         system "#{prunsrv} #{command}"
       end
 
       private
+
       def default_jruby_home
         Java::JavaLang::System.get_property("jruby.home")
       end
@@ -86,6 +99,10 @@ module Trinidad
         Java::JavaLang::System.get_property("java.home")
       end
 
+      def default_ruby_compat_version
+        "RUBY1_8"
+      end
+
       def windows?
         RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
       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.4.1'
-  s.date              = '2011-01-18'
+  s.version           = '0.4.2'
+  s.date              = '2011-05-17'
   s.rubyforge_project = 'trinidad_daemon'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad_daemon
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 4
-    - 1
-  version: 0.4.1
+  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors: 
   - David Calavera
@@ -14,20 +10,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 +01:00
+date: 2011-05-17 00:00:00 -04:00
 default_executable: trinidad_daemon_install
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: trinidad
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 0
-              - 5
             version: 1.0.5
     type: :runtime
     version_requirements: *id001
@@ -74,23 +67,21 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: trinidad_daemon
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 2
 summary: Trinidad daemon based on Apache Commons Daemon