trinidad_daemon 0.3.0 → 0.3.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.3.1
+
+* Use absolute path for configuration options
+* Start Trinidad from the application path
+
 == 0.3.0
 
 * Remove init script extension

data/README

@@ -9,7 +9,7 @@ are finding with the current forking process.
 Dependencies
 ============
 
-The Jsvc binary file is required, but it's already available for all the
+The Jsvc native binary file is required, but it's already available for all the
 platforms supported as a bundled package, i.e:
 
     Debian/Ubuntu:
@@ -17,7 +17,8 @@ platforms supported as a bundled package, i.e:
     Mac OS X:
         $ brew install jsvc
 
-Those binaries are also available in the Apache distribution directory:
+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/1.0.3/
 

data/init.d/trinidad.erb

@@ -64,6 +64,8 @@ $JSVC_ARGS_EXTRA \
 STOP_COMMAND="$JSVC $JSVC_ARGS -stop $MAIN_CLASS"
 START_COMMAND="$JSVC $JSVC_ARGS -cp $CLASSPATH $JAVA_PROPS $JAVA_OPTS $MAIN_CLASS $RUBY_SCRIPT $TRINIDAD_OPTS"
 
+cd $APP_PATH || exit 1
+
 case "$1" in
     start)
       if [ -e "$PIDFILE" ]; then
@@ -117,7 +119,7 @@ case "$1" in
       fi
       ;;
     *)
-      echo "Unrecognised command. Usage trinidad-daemon [ start | stop | restart ]"
+      echo "Unrecognised command. Usage trinidad [ start | stop | restart ]"
       ;;
 esac
 

data/lib/trinidad_daemon.rb

@@ -3,7 +3,7 @@ require 'trinidad'
 
 module Trinidad
   module Daemon
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
 
     def init
     end
@@ -19,6 +19,7 @@ module Trinidad
     end
 
     def stop
+      @server.tomcat.stop
       @server.tomcat.destroy
     end
 

data/lib/trinidad_daemon/configuration.rb

@@ -10,14 +10,14 @@ module Trinidad
       end
 
       def configure
-        @app_path = File.expand_path(ask('Application path?'))
-				@trinidad_options = ask('Trinidad options?', '-e production')
-        @jsvc = ask('Jsvc path?', `which jsvc`.chomp)
-        @java_home = ask('Java home?', default_java_home)
-        @jruby_home = ask('JRuby home?', default_jruby_home)
-        @output_path = ask('init.d output path?', '/etc/init.d')
-        @pid_file = ask('pid file?', '/var/run/trinidad/trinidad.pid')
-        @log_file = ask('log file?', '/var/log/trinidad/trinidad.log')
+        @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)
+        @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')
 
         @trinidad_daemon_path = File.expand_path('../../trinidad_daemon.rb', __FILE__)
         @jars_path = File.expand_path('../../../trinidad-libs', __FILE__)
@@ -33,8 +33,8 @@ module Trinidad
           file.write(daemon)
         end
 
-        puts "Moving trinidad-daemon.sh to #{@output_path}"
-        `cp #{tmp_file} #{@output_path}`
+        puts "Moving trinidad to #{@output_path}"
+        `cp #{tmp_file} #{@output_path} && chmod u+x #{@output_path}`
         puts 'Done.'
       end
 
@@ -47,6 +47,10 @@ module Trinidad
         Java::JavaLang::System.get_property("java.home")
       end
 
+      def ask_path(question, default = nil)
+        File.expand_path(ask(question, default))
+      end
+
       def ask(question, default = nil)
         return nil if not @stdin.tty?
 

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.0'
-  s.date              = '2010-10-13'
+  s.version           = '0.3.1'
+  s.date              = '2010-11-04'
   s.rubyforge_project = 'trinidad_daemon'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -3,89 +3,93 @@ name: trinidad_daemon
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+    - 0
+    - 3
+    - 1
+  version: 0.3.1
 platform: ruby
 authors: 
-- David Calavera
+  - David Calavera
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 +02:00
+date: 2010-11-04 00:00:00 -07: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: 
-        - 0
-        - 9
-        - 6
-        version: 0.9.6
-  type: :runtime
-  version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: trinidad
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 9
+              - 6
+            version: 0.9.6
+    type: :runtime
+    version_requirements: *id001
 description: Trinidad daemon based on Apache Commons Daemon and JRuby-jsvc
 email: calavera@apache.org
 executables: 
-- trinidad_daemon_install
+  - trinidad_daemon_install
 extensions: []
 
 extra_rdoc_files: 
-- README
-- LICENSE
+  - README
+  - LICENSE
 files: 
-- History.txt
-- LICENSE
-- README
-- Rakefile
-- bin/trinidad_daemon_install
-- init.d/trinidad.erb
-- lib/trinidad_daemon.rb
-- lib/trinidad_daemon/configuration.rb
-- trinidad-libs/commons-daemon.jar
-- trinidad-libs/jruby-jsvc.jar
-- trinidad_daemon.gemspec
+  - History.txt
+  - LICENSE
+  - README
+  - Rakefile
+  - bin/trinidad_daemon_install
+  - init.d/trinidad.erb
+  - lib/trinidad_daemon.rb
+  - lib/trinidad_daemon/configuration.rb
+  - trinidad-libs/commons-daemon.jar
+  - trinidad-libs/jruby-jsvc.jar
+  - trinidad_daemon.gemspec
 has_rdoc: true
 homepage: http://github.com/calavera/trinidad_daemon
 licenses: []
 
-post_install_message: "\n\
-  ------------------------------------------------------------------------------------\n\n\
-  Please now run:\n\n  $ jruby -S trinidad_daemon_install\n\n\
-  to complete the installation.\n\n\
-  ------------------------------------------------------------------------------------\n\n"
+post_install_message: |+
+  
+  ------------------------------------------------------------------------------------
+  
+  Please now run:
+  
+    $ jruby -S trinidad_daemon_install
+  
+  to complete the installation.
+  
+  ------------------------------------------------------------------------------------
+  
 rdoc_options: 
-- --charset=UTF-8
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !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"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: trinidad_daemon
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Trinidad daemon based on Apache Commons Daemon