trinidad_daemon 0.3.1 → 0.3.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.3.2
+
+* Remove profile.jar from init script since it's no more bundled with JRuby distribution.
+
 == 0.3.1
 
 * Use absolute path for configuration options

data/Rakefile

@@ -95,7 +95,7 @@ task :release => :build do
   sh "git commit --allow-empty -a -m 'Release #{version}'"
   sh "git tag v#{version}"
   sh "git push origin master"
-  sh "git push origin v#{version}"
+  sh "git push --tags"
   sh "gem push pkg/#{name}-#{version}.gem"
 end
 

data/init.d/trinidad.erb

@@ -30,7 +30,7 @@ LOG_FILE=<%= @log_file %>
 # Implements the jsvc Daemon interface.
 MAIN_CLASS=com.msp.jsvc.JRubyDaemon
 
-CLASSPATH=$JRUBY_HOME/lib/jruby.jar:$JRUBY_HOME/lib/profile.jar:$DAEMON_JAR:$JRUBY_JSVC_JAR
+CLASSPATH=$JRUBY_HOME/lib/jruby.jar:<%= @profiler_classpath %>$DAEMON_JAR:$JRUBY_JSVC_JAR
 
 # 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 \

data/lib/trinidad_daemon.rb

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

data/lib/trinidad_daemon/configuration.rb

@@ -22,6 +22,8 @@ module 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:' : ''
+
         daemon = ERB.new(
           File.read(
             File.expand_path('../../init.d/trinidad.erb', File.dirname(__FILE__))
@@ -47,6 +49,11 @@ 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
+      end
+
       def ask_path(question, default = nil)
         File.expand_path(ask(question, default))
       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.1'
-  s.date              = '2010-11-04'
+  s.version           = '0.3.2'
+  s.date              = '2010-12-03'
   s.rubyforge_project = 'trinidad_daemon'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 3
-    - 1
-  version: 0.3.1
+    - 2
+  version: 0.3.2
 platform: ruby
 authors: 
   - David Calavera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -07:00
+date: 2010-12-03 00:00:00 +01:00
 default_executable: trinidad_daemon_install
 dependencies: 
   - !ruby/object:Gem::Dependency