trinidad 1.4.6 → 1.5.0.B1

data/bin/trinidad

@@ -1,6 +1,6 @@
 #!/usr/bin/env jruby
 
-require "trinidad"
+require 'trinidad'
 
-Trinidad::CommandLineParser.parse(ARGV)
-Trinidad::Server.new(Trinidad.configuration).start
+Trinidad::CLI.parse(ARGV)
+Trinidad::Server.new.start

data/lib/trinidad.rb

@@ -3,17 +3,31 @@ require 'java'
 require 'jruby-rack'
 require 'trinidad/jars'
 
-require 'trinidad/version'
-
-require 'trinidad/helpers'
-require 'trinidad/configuration'
-require 'trinidad/command_line_parser'
-require 'trinidad/extensions'
-require 'trinidad/logging'
-require 'trinidad/server'
-require 'trinidad/web_app'
-require 'trinidad/lifecycle/base'
-require 'trinidad/lifecycle/host'
-require 'trinidad/lifecycle/web_app/shared'
-require 'trinidad/lifecycle/web_app/default'
-require 'trinidad/lifecycle/web_app/war'
+module Trinidad
+
+  require 'trinidad/version'
+  require 'trinidad/helpers'
+  require 'trinidad/configuration'
+  require 'trinidad/server'
+  require 'trinidad/web_app'
+  require 'trinidad/extensions'
+  require 'trinidad/logging'
+
+  autoload :CLI, 'trinidad/cli'
+
+  module Lifecycle
+
+    autoload :Base, 'trinidad/lifecycle/base'
+    autoload :Host, 'trinidad/lifecycle/host'
+
+    module WebApp
+
+      require 'trinidad/lifecycle/web_app/shared'
+
+      autoload :Default, 'trinidad/lifecycle/web_app/default'
+      autoload :War, 'trinidad/lifecycle/web_app/war'
+
+    end
+
+  end
+end

data/lib/trinidad/{command_line_parser.rb → cli.rb}

@@ -1,12 +1,12 @@
 module Trinidad
-  class CommandLineParser
+  class CLI
 
-    def self.parse(argv)
-      CommandLineParser.new.parse!(argv)
+    def self.parse(argv = ARGV)
+      new.parse!(argv)
     end
 
     def self.load(options = {})
-      CommandLineParser.new.load!(options)
+      new.load!(options)
     end
 
     attr_reader :default_options
@@ -94,7 +94,7 @@ module Trinidad
           default_options[:monitor] = monitor
         end
 
-        opts.on('-t', '--threadsafe', 'force thread-safe mode (use single runtime)') do
+        opts.on('-t', '--threadsafe', 'force thread-safe mode (use shared runtime)') do
           default_options[:jruby_min_runtimes] = 1
           default_options[:jruby_max_runtimes] = 1
         end
@@ -112,12 +112,12 @@ module Trinidad
         end
 
         opts.on('--address', '--address ADDRESS', 'host address',
-          "default: #{default(:address)}") do |address|
+          "default: #{default(:address) || '*'}") do |address|
           default_options[:address] = address
         end
 
         opts.on('-p', '--port PORT', 'port to bind to',
-          "default: #{default(:port)}") do |port|
+          "default: #{default(:port) || 3000}") do |port|
           default_options[:port] = port
         end
 
@@ -126,11 +126,6 @@ module Trinidad
           default_options[:ssl] = { :port => (port || 3443).to_i }
         end
 
-        opts.on('-a', '--ajp [AJP_PORT]', 'enable the AJP web protocol',
-          "default port: 8009") do |port|
-          default_options[:ajp] = { :port => (port || 8009).to_i }
-        end
-
         opts.on('--java_lib LIB_DIR', '--lib LIB_DIR (deprecated use --java_lib)',
           'contains .jar files used by the app',
           "default: #{default(:java_lib)}") do |lib|
@@ -154,19 +149,28 @@ module Trinidad
           default_options[:apps_base] = apps_base
         end
 
-        opts.on('-g', '--log LEVEL', 'set logging level') do |log|
-          default_options[:log] = log
-        end
-
         opts.on('-v', '--version', 'show server version') do
           puts "Trinidad #{Trinidad::VERSION} (Tomcat #{Trinidad::TOMCAT_VERSION})"
           exit
         end
 
-        opts.on('-h', '--help', 'display this help') do
-          puts opts
-          exit
+        opts.on('-h', '--help', 'display this help') { puts opts; exit }
+
+        opts.on_tail; opts.on_tail 'DEPRECATED options:'
+
+        opts.on_tail('-a', '--ajp [AJP_PORT]', 'enable the AJP web protocol',
+          "default port: 8009") do |port|
+          Helpers.deprecated "option ( -a / --ajp )"
+          default_options[:ajp] = { :port => (port || 8009).to_i }
+        end
+
+
+        opts.on_tail('-g', '--log LEVEL', 'set logging level') do |log|
+          Helpers.deprecated "option ( -g / --log )"
+          default_options[:log] = log
         end
+
+        opts.on_tail
       end
     end
 
@@ -182,4 +186,6 @@ module Trinidad
     end
 
   end
-end
+  # @private
+  CommandLineParser = CLI
+end

data/lib/trinidad/configuration.rb

@@ -33,18 +33,11 @@ module Trinidad
   class Configuration
 
     DEFAULTS = {
-      # :port => 3000, HTTP (depends on connector used)
-      :address => 'localhost',
       :environment => 'development',
       :context_path => '/',
       :public => 'public',
       :java_lib => 'lib/java',
       :default_web_xml => 'config/web.xml',
-      :jruby_min_runtimes =>
-        java.lang.System.getProperty('jruby.min.runtimes') || 1,
-      :jruby_max_runtimes =>
-        java.lang.System.getProperty('jruby.max.runtimes') || 5,
-      :log => 'INFO',
       :trap => true
     }
 
@@ -81,7 +74,7 @@ module Trinidad
     end
 
     %w{ port address environment context_path
-        java_lib libs_dir java_classes classes_dir default_web_xml
+        java_lib java_classes default_web_xml
         jruby_min_runtimes jruby_max_runtimes jruby_compat_version
         rackup servlet rack_servlet default_servlet public hosts
         http ajp ssl https extensions
@@ -90,46 +83,20 @@ module Trinidad
       class_eval "def #{method}; self[:'#{method}']; end"
       class_eval "def #{method}=(value); self[:'#{method}'] = value; end"
     end
-    # TODO #deprecate libs_dir classes_dir servlet
+    # TODO deprecate servlet
 
-    # a Hash like #symbolize helper
-    def self.symbolize_options(options, deep = true)
-      new_options = options.class.new
-      options.each do |key, value|
-        if deep && value.is_a?(Array) # YAML::Omap is an Array
-          array = new_options[key.to_sym] = value.class.new
-          value.each do |v|
-            array << ( options_like?(v) ? symbolize_options(v, deep)  : v )
-          end
-        elsif deep && options_like?(value)
-          new_options[key.to_sym] = symbolize_options(value, deep)
-        else
-          new_options[key.to_sym] = value
-        end
-      end
-      new_options
+    # @private
+    def self.symbolize_options(options)
+      Helpers.symbolize(options, true)
     end
 
-    # a Hash like deep_merge helper
-    def self.merge_options(target, current, deep = true)
-      return target unless current
-      target_dup = target.dup
-      current.keys.each do |key|
-        target_dup[key] =
-          if deep && options_like?(target[key]) && options_like?(current[key])
-            merge_options(target[key], current[key], deep)
-          else
-            current[key]
-          end
-      end
-      target_dup
+    # @private
+    def self.merge_options(target, current)
+      Helpers.merge(target, current, true)
     end
 
-    private
-    def self.options_like?(object)
-      object.is_a?(Hash) ||
-        ( object.respond_to?(:keys) && object.respond_to?(:'[]') )
-    end
+    # @private
+    def self.options_like?(object); Helpers.hash_like?(object) end
 
   end
 end

data/lib/trinidad/extensions.rb

@@ -8,7 +8,7 @@ module Trinidad
         end
       end if extensions
     end
-    
+
     def self.configure_server_extensions(extensions, tomcat)
       extensions.each do |name, options|
         if extension = extension(name, 'ServerExtension', options)
@@ -22,20 +22,22 @@ module Trinidad
     end
 
     def self.configure_webapp_extensions(extensions, tomcat, context)
-      extensions.each do |name, options|
+      extensions.map do |name, options|
+        next if options == false # allow to explicitly disable
         if extension = extension(name, 'WebAppExtension', options)
           extension.tomcat = tomcat
           if extension.method(:configure).arity == 2
-            extension.configure(tomcat, context) # #deprecated old way
+            extension.configure(tomcat, context) # @deprecated old way
           else
             extension.configure(context)
           end
+          extension
         end
       end if extensions
     end
-    
+
     protected
-    
+
     def self.extension(name, type, options)
       class_name = Helpers.camelize(name) << type; clazz = nil
       if ( const_defined?(class_name) rescue nil )
@@ -57,63 +59,63 @@ module Trinidad
     end
 
     private
-    
+
     def self.tomcat_like?(tomcat)
       tomcat.respond_to?(:server) && tomcat.respond_to?(:start) && tomcat.respond_to?(:stop)
     end
-    
+
     def self.camelize(string)
-      Helpers.deprecate("Trinidad::Extensions.camelize use the camelize helper " << 
+      Helpers.deprecate("Trinidad::Extensions.camelize use the camelize helper " <<
                         "available in your Extension")
       Helpers.camelize(string)
     end
-    
+
     class Extension
       include Helpers; extend Helpers
-      
+
       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
-      
+
     end
 
     class WebAppExtension < Extension
-      
+
       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.name}#configure(tomcat) not implemented"
       end
-      
+
       # #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.name}#configure(parser, default_options) not implemented"
       end
-      
+
     end
-    
+
   end
 end

data/lib/trinidad/helpers.rb

@@ -1,34 +1,89 @@
 module Trinidad
   module Helpers
 
-    @@silence = nil # :nodoc
+    # @private
+    @@silence = nil
     # Should we be silent - no warnings will be printed.
     def self.silence?; @@silence; end
     # Silence ! (... or I kill you)
     def self.silence!; @@silence = true; end
 
-    # Print a warning (Kernel.warn).
+    # Print a warning (using `Kernel.warn`).
     def self.warn(msg)
       super unless silence? # Kernel.warn
     end
-    
+
     module_function
 
-    @@deprecated = {} # :nodoc
-    
+    # @private
+    @@deprecated = {}
+
     # Print a deprecated message (once - no matter how many times it's called).
-    def deprecate(msg, prefix = '[DEPRECATED] ')
+    def deprecated(msg, prefix = '[DEPRECATED] ')
       return nil if @@deprecated[msg]
       @@deprecated[msg] = true
       Helpers.warn "#{prefix}#{msg}" # Kernel.warn
     end
-    
+    # @private
+    def deprecate(msg); deprecated(msg) end
+
+    # Camelizes the passed (string) parameter.
+    # @return a new string
     def camelize(string)
       string = string.to_s.sub(/^[a-z\d]*/) { $&.capitalize }
       string.gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }
       string.gsub!('/', '::')
       string
     end
-    
+
+    # a Hash like `symbolize` helper
+    def symbolize(hash, deep = true)
+      new_options = hash.class.new
+      hash.each do |key, value|
+        if deep && value.is_a?(Array) # YAML::Omap is an Array
+          array = new_options[key.to_sym] = value.class.new
+          value.each do |v|
+            array << ( hash_like?(v) ? symbolize(v, deep)  : v )
+          end
+        elsif deep && hash_like?(value)
+          new_options[key.to_sym] = symbolize(value, deep)
+        else
+          new_options[key.to_sym] = value
+        end
+      end
+      new_options
+    end
+
+    # a Hash like `deep_merge` helper
+    def merge(target, current, deep = true)
+      return target unless current
+      target_dup = target.dup
+      current.keys.each do |key|
+        target_dup[key] =
+          if deep && hash_like?(target[key]) && hash_like?(current[key])
+            merge(target[key], current[key], deep)
+          else
+            current[key]
+          end
+      end
+      target_dup
+    end
+
+    def hash_like?(object)
+      object.is_a?(Hash) || ( object.respond_to?(:keys) && object.respond_to?(:'[]') )
+    end
+
+    def to_url(path)
+      path = java.net.URLDecoder.decode(path)
+      if path =~ /^\w*\:/ # might be a valid url: (or C:/windows/yay ... )
+        return java.net.URL.new("file:/#{path}") if path[1, 1] == ':'
+        begin
+          return java.net.URL.new(path)
+        rescue java.net.MalformedURLException
+        end
+      end
+      java.io.File.new(path).toURL
+    end
+
   end
 end