trinidad 1.3.3 → 1.3.4

data/History.txt

@@ -1,3 +1,7 @@
+== Trinidad 1.3.4 (2012-02-20)
+
+* Do not explicitely load rack/handler/trinidad.rb, it solves load issues with trinidad_init_services.
+
 == Trinidad 1.3.3 (2012-02-16)
 
 * Fix issues loading the default configuration file from the rack handler

data/bin/trinidad

@@ -2,5 +2,5 @@
 
 require "trinidad"
 
-opts = Trinidad::CommandLineParser.parse(ARGV)
+Trinidad::CommandLineParser.parse(ARGV)
 Trinidad::Server.new(Trinidad.configuration).start

data/lib/rack/handler/trinidad.rb

@@ -1,3 +1,8 @@
+# NOTE: require 'rack/handler/trinidad' might get invoked 2 ways :
+# 1. Rack::Handler.try_require('rack/handler', 'trinidad') during rackup
+#    in this case trinidad.rb might not yet been loaded
+# 2. a user require (after trinidad.rb booted) - need to load rack first
+require 'trinidad'
 require 'rack/handler'
 require 'rack/handler/servlet'
 

data/lib/trinidad.rb

@@ -18,8 +18,7 @@ require 'trinidad/web_app'
 require 'trinidad/rails_web_app'
 require 'trinidad/rackup_web_app'
 require 'trinidad/war_web_app'
-require 'rack/handler/trinidad'
 
 module Trinidad
-  VERSION = '1.3.3'
+  VERSION = '1.3.4'
 end

data/lib/trinidad/web_app.rb

@@ -81,8 +81,8 @@ module Trinidad
       end
     end
 
-    def war?; WebApp.war?(app_config); end
-    def work_dir; web_app_dir; end
+    def war?; WebApp.war?(app_config); end    
+    def work_dir; @app_config[:work_dir] || @config[:work_dir] || web_app_dir; end
     def environment; @app_config[:environment] || @config[:environment] || 'development'; end
 
     def solo?

metadata

@@ -2,7 +2,7 @@
 name: trinidad
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors: 
   - David Calavera
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-16 00:00:00 Z
+date: 2012-02-20 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: trinidad_jars