trinidad 1.4.0 → 1.4.1

data/History.txt

@@ -1,3 +1,18 @@
+== Trinidad 1.4.1 (2012-08-17)
+
+* make sure file logging rotates correctly when file handler attempts rolling 
+  after midnight (#81)
+* refined (backwards-compatible) extension API 
+  - options attr reader 
+  - override_tomcat? no longer needed simply return a tomcat duck 
+  - expose camelize + symbolize helpers
+  - WebAppExtension should only get a single context argument on configure
+* better rails (2.3/3.x) detection with environment.rb
+* minor server updates 
+  - expose configured web_apps 
+  - add a trap? helper (for easier overrides) 
+  - introduce a stop! for stopping and destroying a the server
+
 == Trinidad 1.4.0 (2012-07-24)
 
 * fix incorrect context-param parsing and only configure logging when 

data/lib/trinidad/extensions.rb

@@ -1,77 +1,119 @@
 module Trinidad
   module Extensions
-    def self.configure_webapp_extensions(extensions, tomcat, app_context)
-      if extensions
-        extensions.each do |name, options|
-          if extension = extension(name, 'WebAppExtension', options)
-            extension.configure(tomcat, app_context)
-          end
+
+    def self.configure_options_extensions(extensions, parser, default_options)
+      extensions.each do |name, options|
+        if extension = extension(name, 'OptionsExtension', options)
+          extension.configure(parser, default_options)
         end
-      end
+      end if extensions
     end
-
+    
     def self.configure_server_extensions(extensions, tomcat)
-      if extensions
-        extensions.each do |name, options|
-          if extension = extension(name, 'ServerExtension', options)
-            configured_tomcat = extension.configure(tomcat)
-            tomcat = configured_tomcat if extension.override_tomcat?
+      extensions.each do |name, options|
+        if extension = extension(name, 'ServerExtension', options)
+          outcome = extension.configure(tomcat)
+          if tomcat_like?(outcome) || extension.override_tomcat?
+            tomcat = outcome
           end
         end
-      end
+      end if extensions
       tomcat
     end
 
-    def self.configure_options_extensions(extensions, parser, default_options)
-      if extensions
-        extensions.each do |name, options|
-          if extension = extension(name, 'OptionsExtension', options)
-            extension.configure(parser, default_options)
+    def self.configure_webapp_extensions(extensions, tomcat, context)
+      extensions.each do |name, options|
+        if extension = extension(name, 'WebAppExtension', options)
+          extension.tomcat = tomcat
+          if extension.method(:configure).arity == 2
+            extension.configure(tomcat, context) # #deprecated old way
+          else
+            extension.configure(context)
           end
         end
-      end
+      end if extensions
     end
-
+    
+    protected
+    
     def self.extension(name, type, options)
       class_name = (camelize(name.to_s) << type).to_sym
       load_extension(name) unless const_defined?(class_name)
       clazz = const_get(class_name) rescue nil
-      clazz.new(options) if clazz
+      clazz.new(options) if clazz # MyExtension.new(options)
     end
 
     def self.load_extension(name)
       require "trinidad_#{name}_extension"
     end
 
+    private
+    
+    def self.tomcat_like?(tomcat)
+      tomcat.respond_to?(:server) && tomcat.respond_to?(:start) && tomcat.respond_to?(:stop)
+    end
+    
+    def self.camelize(string)
+      string.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+    end
+    
+    def self.camelize(string)
+      string = string.sub(/^[a-z\d]*/) { $&.capitalize }
+      string.gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }
+      string.gsub!('/', '::')
+      string
+    end
+    
     class Extension
+      
+      attr_reader :options
+      
       def initialize(options = {})
         @options = options ? options.dup : {}
       end
+      
+      private
+      
+      # Hash#symbolize
+      def symbolize(options, deep = false)
+        Trinidad::Configuration.symbolize_options(options, deep)
+      end
+
+      # String#camelize
+      def camelize(string)
+        Trinidad::Extensions.send :camelize, string
+      end
+      
     end
 
     class WebAppExtension < Extension
-      def configure(tomcat, app_context)
-        raise NotImplementedError, "#{self.class}#configure not implemented"
+      
+      attr_accessor :tomcat
+      
+      def configure(context)
+        raise NotImplementedError, "#{self.class.name}#configure(context) not implemented"
       end
+      
     end
 
     class ServerExtension < Extension
+      
       def configure(tomcat)
-        raise NotImplementedError, "#{self.class}#configure not implemented"
+        raise NotImplementedError, "#{self.class.name}#configure(tomcat) not implemented"
       end
-
-      def override_tomcat?; false; end # hack to allow override the tomcat's instance, it should be a better way
+      
+      # #deprecated override tomcat by returning it from #configure
+      def override_tomcat?; false; end
+      
     end
 
     class OptionsExtension < Extension
+      
       def configure(parser, default_options)
-        raise NotImplementedError, "#{self.class}#configure not implemented"
+        raise NotImplementedError, "#{self.class.name}#configure(parser, default_options) not implemented"
       end
+      
     end
-
-    private
-    def self.camelize(string)
-      string.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-    end
+    
   end
 end

data/lib/trinidad/lifecycle/host.rb

@@ -4,7 +4,7 @@ module Trinidad
     class Host < Base
       
       attr_reader :server, :app_holders
-       # @deprecated (<= 1.3.5)
+      # @deprecated (<= 1.3.5)
       alias_method :contexts, :app_holders
 
       # #server current server instance

data/lib/trinidad/logging.rb

@@ -160,7 +160,8 @@ module Trinidad
       end
       
       def closeWriter
-        super
+        date = _date
+        super # sets `date = null`
         # the additional trick here is to rotate the closed file
         synchronized do
           # we're normally in the lock here (from #publish) 
@@ -168,11 +169,10 @@ module Trinidad
           dir = java.io.File.new(directory).getAbsoluteFile
           log = java.io.File.new(dir, prefix + "" + suffix)
           if log.exists
-            date = _date
-            if date.empty?
+            if ! date || date.empty?
               date = log.lastModified
-              # we're abuse Timestamp to get a date formatted !
-              # just like the super does internally (just in case)
+              # we abuse Timestamp to get a date formatted !
+              # just like super does internally (just in case)
               date = java.sql.Timestamp.new(date).toString[0, 10]
             end
             today = java.lang.System.currentTimeMillis

data/lib/trinidad/server.rb

@@ -1,13 +1,13 @@
 module Trinidad
   class Server
-    attr_reader :tomcat, :config
+    attr_reader :config, :tomcat, :web_apps
 
     def initialize(config = Trinidad.configuration)
       load_config(config)
       configure_logging(@config[:log])
       load_tomcat_server
-      apps = create_web_apps
-      load_host_monitor(apps)
+      @web_apps = create_web_apps
+      load_host_monitor(@web_apps)
     end
 
     def load_config(config)
@@ -114,7 +114,7 @@ module Trinidad
     end
     
     def start
-      trap_signals if @config[:trap]
+      trap_signals if trap?
 
       @tomcat.start
       @tomcat.server.await
@@ -122,16 +122,24 @@ module Trinidad
 
     def stop
       @tomcat.stop
-      @tomcat.destroy
     end
 
+    def stop!
+      stop
+      @tomcat.destroy
+    end
+    
     protected
     
+    def trap?
+      !!@config[:trap]
+    end
+    
     def create_web_apps
-      apps = []
-      apps << create_from_web_apps
+      apps = [ create_from_web_apps ]
       apps << create_from_apps_base
-      apps.flatten.compact
+      apps.flatten!; apps.compact!
+      apps
     end
     
     def create_from_web_apps
@@ -232,9 +240,8 @@ module Trinidad
     def generate_default_keystore(config)
       keystore_file = java.io.File.new(config[:keystoreFile])
 
-      if (!keystore_file.parent_file.exists &&
-              !keystore_file.parent_file.mkdir)
-          raise "Unable to create keystore folder: " + keystore_file.parent_file.canonical_path
+      if ! keystore_file.parent_file.exists && ! keystore_file.parent_file.mkdir
+          raise "Unable to create keystore folder: #{keystore_file.parent_file.canonical_path}"
       end
 
       key_tool_args = ["-genkey",
@@ -252,8 +259,9 @@ module Trinidad
     end
     
     def trap_signals
-      trap('INT') { stop }
-      trap('TERM') { stop }
+      trap('INT') { stop! }
+      trap('TERM') { stop! }
     end
+    
   end
 end

data/lib/trinidad/version.rb

@@ -1,3 +1,3 @@
 module Trinidad
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/lib/trinidad/web_app.rb

@@ -179,7 +179,7 @@ module Trinidad
     private
     
     def web_xml_doc
-      return @web_xml_doc || nil if ! @web_xml_doc.nil?
+      return @web_xml_doc || nil unless @web_xml_doc.nil?
       if deployment_descriptor
         begin
           require 'rexml/document'
@@ -200,14 +200,32 @@ module Trinidad
       web_app_dir = config[:web_app_dir] || 
         (default_config && default_config[:web_app_dir]) || Dir.pwd
       config_ru = (default_config && default_config[:rackup]) || 'config.ru'
-      # Check for rackup (but still use config/environment.rb for Rails 3)
+      # check for rackup (but still use config/environment.rb for rails 3)
       if File.exists?(File.join(web_app_dir, config_ru)) && 
-          ! File.exists?(File.join(web_app_dir, 'config/environment.rb'))
+          ! rails?(config, default_config) # do not :rackup a rails app
         config[:rackup] = config_ru
       end
       config[:rackup] || ! Dir[File.join(web_app_dir, 'WEB-INF/**/config.ru')].empty?
     end
-
+    
+    def self.rails?(config, default_config = nil)
+      web_app_dir = config[:web_app_dir] || 
+        (default_config && default_config[:web_app_dir]) || Dir.pwd
+      # standart Rails 3.x `class Application < Rails::Application`
+      if File.exists?(application = File.join(web_app_dir, 'config/application.rb'))
+        application_rb = File.read(application)
+        return true if application_rb =~ /^[^#]*Rails::Application/
+      end
+      if File.exists?(environment = File.join(web_app_dir, 'config/environment.rb'))
+        environment_rb = File.read(environment)
+        # customized Rails 3.x, expect a `Rails::Application` subclass
+        return true if environment_rb =~ /^[^#]*Rails::Application/
+        # plain-old Rails 2.3 `RAILS_GEM_VERSION = '2.3.14'` ...
+        return true if environment_rb =~ /^[^#]*RAILS_GEM_VERSION/
+      end
+      false
+    end
+    
     def self.war?(config, default_config = nil)
       config[:context_path] && config[:context_path][-4..-1] == '.war'
     end

metadata

@@ -2,7 +2,7 @@
 name: trinidad
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors: 
   - David Calavera
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-24 00:00:00 Z
+date: 2012-08-17 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: trinidad_jars