trinidad_jars 0.1.1 → 0.2.0

data/README.rdoc

@@ -25,6 +25,8 @@ Trinidad allows you to configure some parameters when the server is started from
   * --classes CLASSES_DIR   =>    directory containing classes.
   * --rackup [RACKUP_FILE]  =>    run a provided rackup file instead of a rails application, by default it's config.ru.
   * --public PUBLIC_DIR     =>    specify the public directory for your application, by default it's 'public'.
+  * -t, --threadsafe        =>    shortcut to work in threadsafe mode. Setting jruby_min_runtimes and jruby_max_runtimes to 1 in the configuration file the server behaves as the same way.
+  * -l, --load EXTENSION_NAME => loads an extension to use its command line options.
 
 The server can also be configured from a yaml file. If a file is not especified, the server tries to load the file <em>config/tomcat.yml</em>. Within this file you can add other options like jruby.min.runtimes(:jruby_min_runtimes) or jruby.max.runtimes(:jruby_max_runtimes).
 
@@ -40,8 +42,10 @@ Other advanced options can be found in the wiki: http://wiki.github.com/calavera
 From the version 0.8.0 Trinidad allows to extend the server with more Tomcat features, here there is a list with the current available extensions:
 
 * Database connection pooling: http://github.com/calavera/trinidad-dbpool
+* Daemon, run Trinidad as a daemon: http://github.com/calavera/trinidad_daemon_extension
+* Hot deploy, do hot deploys monitorizing a temporal file, ala Passenger: http://github.com/calavera/trinidad_hotdeploy_extension
 
-You can find further information on how to write your onw extension in the wiki: http://wiki.github.com/calavera/trinidad/extensions
+You can find further information on how to write your own extension in the wiki: http://wiki.github.com/calavera/trinidad/extensions
 
 == Copyright
 

data/bin/trinidad

@@ -5,5 +5,5 @@ $:.unshift(File.dirname(__FILE__) + '/../trinidad-libs')
 
 require "trinidad"
 
-opts = Trinidad::CommandLineParser.parse
-Trinidad::Server.new(opts).start
+opts = Trinidad::CommandLineParser.parse(ARGV)
+Trinidad::Server.new(opts).start

data/lib/trinidad/jars.rb

@@ -3,16 +3,12 @@ $:.unshift(TRINIDAD_LIBS) unless
   $:.include?(TRINIDAD_LIBS) || $:.include?(File.expand_path(TRINIDAD_LIBS))
 
 module Trinidad
-  require 'servlet-api-2.5-6.1.14'
-  require 'jsp-api-2.1'
-  require 'jsp-2.1'
   require 'tomcat-core'
-  require 'jetty-util-6.1.14'
 
   require 'jruby-rack'
   require JRubyJars.jruby_rack_jar_path
-  
-module Tomcat
+
+  module Tomcat
     include_package 'org.apache.catalina'
     include_package 'org.apache.catalina.startup'
     include_package 'org.apache.catalina.core'

data/spec/fixtures/trinidad_foo_extension.rb

@@ -1 +1,23 @@
-require File.dirname(__FILE__) + '/foo'
+module Trinidad
+  module Extensions
+    class FooWebAppExtension < WebAppExtension
+      def configure(tomcat, app_context)
+        @options
+      end
+    end
+
+    class FooServerExtension < ServerExtension
+      def configure(tomcat)
+        @options
+      end
+    end
+
+    class FooOptionsExtension < OptionsExtension
+      def configure(parser, default_options)
+        parser.on('--foo') do
+          default_options[:bar] = true
+        end
+      end
+    end
+  end
+end

data/spec/fixtures/trinidad_override_tomcat_extension.rb

@@ -0,0 +1,11 @@
+module Trinidad
+  module Extensions
+    class OverrideTomcatServerExtension < ServerExtension
+      def configure(tomcat)
+        Trinidad::Tomcat::Tomcat.new
+      end
+
+      def override_tomcat?; true; end
+    end
+  end
+end

data/spec/trinidad/command_line_parser_spec.rb

@@ -1,85 +1,119 @@
 require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/fakeapp'
+
+include FakeApp
 
 describe Trinidad::CommandLineParser do
-  it "should override classes option" do
-    ARGV = "--classes my_classes".split
-    
-    options = Trinidad::CommandLineParser.parse
+  subject { Trinidad::CommandLineParser }
+
+  it "overrides classes option" do
+    args = "--classes my_classes".split
+
+    options = subject.parse(args)
     options[:classes_dir].should == 'my_classes'
   end
-  
-  it "should override libs option with lib option" do
-    ARGV = "--lib my_libs".split
-    
-    options = Trinidad::CommandLineParser.parse
+
+  it "overrides libs option with lib option" do
+    args = "--lib my_libs".split
+
+    options = subject.parse(args)
     options[:libs_dir].should == 'my_libs'
   end
-  
-  it "should override libs option with jar option" do
-    ARGV = "--jars my_jars".split
-    
-    options = Trinidad::CommandLineParser.parse
+
+  it "overrides libs option with jar option" do
+    args = "--jars my_jars".split
+
+    options = subject.parse(args)
     options[:libs_dir].should == 'my_jars'
   end
-  
-  it "should override the config file when it's especified" do
-    ARGV = "-f #{File.join(MOCK_WEB_APP_DIR, 'tomcat.yml')}".split
-    
-    options = Trinidad::CommandLineParser.parse
-    options[:environment].should == 'production'
+
+  it "uses config/trinidad.yml as the default configuration file name" do
+    FakeFS do
+      create_default_config_file
+      options = subject.parse(['-f'])
+
+      options[:config].should == 'config/trinidad.yml'
+      options[:port].should == 8080
+    end
   end
-  
-  it "should add default ssl port to options" do
-    ARGV = '--ssl'.split
-    
-    options = Trinidad::CommandLineParser.parse
+
+  it "overrides the config file when it's especified" do
+    FakeFS do
+      create_custom_config_file
+      args = "-f config/tomcat.yml".split
+
+      options = subject.parse(args)
+      options[:environment].should == 'production'
+    end
+  end
+
+  it "adds default ssl port to options" do
+    args = '--ssl'.split
+
+    options = subject.parse(args)
     options[:ssl].should == {:port => 8443}
   end
-  
-  it "should add custom ssl port to options" do
-    ARGV = '--ssl 8843'.split
-    
-    options = Trinidad::CommandLineParser.parse
+
+  it "adds custom ssl port to options" do
+    args = '--ssl 8843'.split
+
+    options = subject.parse(args)
     options[:ssl].should == {:port => 8843}
   end
-  
-  it "should add ajp connection with default port to options" do
-    ARGV = '--ajp'.split
-    
-    options = Trinidad::CommandLineParser.parse
+
+  it "adds ajp connection with default port to options" do
+    args = '--ajp'.split
+
+    options = subject.parse(args)
     options[:ajp].should == {:port => 8009}
   end
-  
-  it "should add ajp connection with coustom port to options" do
-    ARGV = '--ajp 8099'.split
-    
-    options = Trinidad::CommandLineParser.parse
+
+  it "adds ajp connection with coustom port to options" do
+    args = '--ajp 8099'.split
+
+    options = subject.parse(args)
     options[:ajp].should == {:port => 8099}
   end
-  
-  it "should merge ajp options from the config file" do
-    ARGV = "--ajp 8099 -f #{File.join(MOCK_WEB_APP_DIR, 'tomcat.yml')}".split
-    
-    options = Trinidad::CommandLineParser.parse
-    options[:ajp][:port].should == 8099
-    options[:ajp][:secure].should == true
+
+  it "merges ajp options from the config file" do
+    FakeFS do
+      create_custom_config_file
+      args = "--ajp 8099 -f config/tomcat.yml".split
+
+      options = subject.parse(args)
+      options[:ajp][:port].should == 8099
+      options[:ajp][:secure].should == true
+    end
   end
-  
+
   it "uses default rackup file to configure the server" do
-    ARGV = "--rackup".split
-    options = Trinidad::CommandLineParser.parse
+    args = "--rackup".split
+    options = subject.parse(args)
     options[:rackup].should == 'config.ru'
   end
 
   it "uses a custom rackup file if it's provided" do
-    ARGV = "--rackup custom_config.ru".split
-    options = Trinidad::CommandLineParser.parse
+    args = "--rackup custom_config.ru".split
+    options = subject.parse(args)
     options[:rackup].should == 'custom_config.ru'
   end
 
   it "uses a custom public directory" do
-    ARGV = "--public web".split
-    options = Trinidad::CommandLineParser.parse
+    args = "--public web".split
+    options = subject.parse(args)
     options[:public].should == 'web'
   end
+
+  it "works on threadsafe mode using the shortcut" do
+    args = '--threadsafe'.split
+    options = subject.parse(args)
+    options[:jruby_min_runtimes].should == 1
+    options[:jruby_max_runtimes].should == 1
+  end
+
+  it "loads a given extension to add its options to the parser" do
+    args = "--load foo --foo".split
+    options = subject.parse(args)
+    options.has_key?(:bar).should be_true
+  end
 end

data/spec/trinidad/extensions_spec.rb

@@ -16,4 +16,25 @@ describe Trinidad::Extensions do
     lambda {Trinidad::Extensions.configure_webapp_extensions(@extensions, nil, nil)}.should_not raise_error
     lambda {Trinidad::Extensions.const_get(:FooWebAppExtension)}.should_not raise_error
   end
+
+  it "adds options to the command line parser" do
+    options = {}
+    parser = OptionParser.new
+    lambda {
+      Trinidad::Extensions.configure_options_extensions({:foo => {}}, parser, options)
+    }.should_not raise_error
+
+    lambda {
+      parser.parse! ['--foo']
+      options.has_key?(:bar).should be_true
+    }.should_not raise_error
+  end
+
+  it "allows to override the tomcat's instance" do
+    extensions = {:override_tomcat => {}}
+    tomcat = Trinidad::Tomcat::Tomcat.new
+
+    extended = Trinidad::Extensions.configure_server_extensions(extensions, tomcat)
+    extended.should_not equal(tomcat)
+  end
 end

data/spec/trinidad/fakeapp.rb

@@ -0,0 +1,24 @@
+require 'fakefs/safe'
+module FakeApp
+  def create_default_config_file
+    @default ||= config_file 'config/trinidad.yml', <<-EOF
+---
+  port: 8080
+EOF
+  end
+
+  def create_custom_config_file
+    @custom ||= config_file 'config/tomcat.yml', <<-EOF
+---
+  environment: production
+  ajp:
+    port: 8099
+    secure: true
+EOF
+  end
+
+  private 
+  def config_file(path, options)
+    File.open(path, 'w') {|io| io.write(options) }
+  end
+end

data/spec/trinidad/server_spec.rb

@@ -19,25 +19,25 @@ describe Trinidad::Server do
 
   it "should have ssl disabled when config param is nil" do
     server = Trinidad::Server.new
-    server.ssl_enabled?.should == false
+    server.ssl_enabled?.should be_false
   end
 
   it "should have ajp disabled when config param is nil" do
     server = Trinidad::Server.new
-    server.ajp_enabled?.should == false
+    server.ajp_enabled?.should be_false
   end
 
   it "should have ssl enabled when config param is a number" do
     server = Trinidad::Server.new({:ssl => {:port => 8443},
       :web_app_dir => MOCK_WEB_APP_DIR})
 
-    server.ssl_enabled?.should == true
+    server.ssl_enabled?.should be_true
   end
 
   it "should have ajp enabled when config param is a number" do
     server = Trinidad::Server.new({:ajp => {:port => 8009}})
 
-    server.ajp_enabled?.should == true
+    server.ajp_enabled?.should be_true
   end
 
   it "should have a connector with https scheme" do
@@ -96,6 +96,14 @@ describe Trinidad::Server do
     context.findParameter('rackup').gsub(/\s+/, ' ').should == "require 'rubygems' require 'sinatra'"
   end
 
+  it "removes default servlets from the application" do
+    server = Trinidad::Server.new({:web_app_dir => MOCK_WEB_APP_DIR})
+    app = server.tomcat.host.find_child('/')
+
+    app.find_child('default').should be_nil
+    app.find_child('jsp').should be_nil
+  end
+
   def default_context_should_be_loaded(children)
     children.should have(1).web_apps
     children[0].getDocBase().should == MOCK_WEB_APP_DIR

data/spec/trinidad/web_app_spec.rb

@@ -3,7 +3,9 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Trinidad::WebApp do
   before do
     @tomcat = Trinidad::Tomcat::Tomcat.new
+    @tomcat.host.app_base = Dir.pwd
     @tomcat_web_app = @tomcat.addWebapp('/', File.dirname(__FILE__) + '/../../')
+
     @app = {
       :web_app_dir => MOCK_WEB_APP_DIR,
       :context_path => '/'
@@ -20,15 +22,17 @@ describe Trinidad::WebApp do
     }
     @web_app = Trinidad::RailsWebApp.new(@tomcat_web_app, @config, @app)
   end
-  
+
   it "creates a RailsWebApp if rackup option is not present" do
-    Trinidad::WebApp.create(@tomcat_web_app, @config, @app).is_a?(Trinidad::RailsWebApp).should be_true
+    app = Trinidad::WebApp.create(@tomcat_web_app, @config, @app)
+    app.should be_an_instance_of(Trinidad::RailsWebApp)
   end
 
   it "creates a RackupWebApp if rackup option is present" do
     rackup_app = {:rackup => 'config.ru'}
     @config.deep_merge({:web_apps => {:default => rackup_app}})
-    Trinidad::WebApp.create(@tomcat_web_app, @config, rackup_app).is_a?(Trinidad::RackupWebApp).should be_true
+    app = Trinidad::WebApp.create(@tomcat_web_app, @config, rackup_app)
+    app.should be_an_instance_of(Trinidad::RackupWebApp)
   end
 
   it "should load custom jars" do 
@@ -36,15 +40,15 @@ describe Trinidad::WebApp do
     @web_app.add_application_libs(class_loader)
 
     resource = class_loader.find_class('org.ho.yaml.Yaml')
-    resource.should_not == nil
+    resource.should_not be_nil
   end
 
   it "should load custom classes" do
     class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
     @web_app.add_application_classes(class_loader)
-    
+
     resource = class_loader.find_class('HelloTomcat')
-    resource.should_not == nil    
+    resource.should_not be_nil
   end
 
   it "should start application context without errors" do
@@ -61,39 +65,68 @@ describe Trinidad::WebApp do
     lambda { @web_app.add_init_params }.should_not raise_error
   end
 
-  it "should load init params" do
+  it "loads init params from configuration root" do
     @web_app.add_init_params
 
     @web_app.context.findParameter('jruby.min.runtimes').should == '2'
     @web_app.context.findParameter('jruby.max.runtimes').should == '6'
   end
 
-  it "should configure rack filter" do
-    @web_app.add_rack_filter
-    @web_app.context.findFilterDefs().should have(1).filters
+  it 'loads init params from application node' do
+    @app[:jruby_min_runtimes] = 4
+    @app[:jruby_max_runtimes] = 8
+    @config[:web_apps][:default] = @app
+
+    web_app = Trinidad::WebApp.create(@tomcat_web_app, @config, @app)
+    web_app.add_init_params
+
+    web_app.context.findParameter('jruby.min.runtimes').should == '4'
+    web_app.context.findParameter('jruby.max.runtimes').should == '8'
+  end
+
+  it "configures rack handler" do
+    @web_app.configure_rack
+    @web_app.context.findChild('RackServlet').should_not be_nil
   end
 
-  it "should configure rack listener" do
+  it "configures rack listener" do
     @web_app.add_rack_context_listener
     @web_app.context.findApplicationListeners().should have(1).listeners
   end
 
-  it "should have rack filter already configured" do
+  it "has rack handler already configured when web.xml includes it" do
     @web_app.load_default_web_xml
-    @web_app.rack_filter_configured?().should == true
+    @web_app.rack_configured?().should  be_true
 
-    @web_app.add_rack_filter
-    @web_app.context.findFilterDefs().should have(0).filters
+    @web_app.configure_rack
+    @web_app.context.findChild('RackServlet').should be_nil
   end
 
-  it "should have rack listener already configured" do
+  it "has rack listener already configured when web.xml includes it" do
     @web_app.load_default_web_xml
-    @web_app.rack_listener_configured?().should == true
+    @web_app.rack_listener_configured?().should be_true
 
     @web_app.add_rack_context_listener
     @web_app.context.findApplicationListeners().should have(0).listeners
   end
 
+  it "loads the provided web.xml for rails applications" do
+    @config[:default_web_xml] = 'config/foo.xml'
+    app = Trinidad::WebApp.create(@tomcat_web_app, @config, @app)
+
+    app.load_default_web_xml
+    app.context.default_web_xml.should =~ /rails_web.xml$/
+  end
+
+  it "loads the provided web.xml for rack applications" do
+    @config[:default_web_xml] = 'config/foo.xml'
+    @app[:rackup] = 'config.ru'
+
+    app = Trinidad::WebApp.create(@tomcat_web_app, @config, @app)
+    app.load_default_web_xml
+    app.context.default_web_xml.should =~ /rackup_web.xml$/
+  end
+
   def start_context_with_web_xml
     @web_app.load_default_web_xml
     start_context
@@ -108,5 +141,4 @@ describe Trinidad::WebApp do
     @web_app.config[:libs_dir] = File.join(File.dirname(__FILE__), '..', '..', 'tomcat-libs')
     @web_app.add_context_loader
   end
-  
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - David Calavera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 +02:00
+date: 2010-04-28 00:00:00 +02:00
 default_executable: trinidad
 dependencies: []
 
@@ -29,10 +29,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/trinidad/jars.rb
-- trinidad-libs/jetty-util-6.1.14.jar
-- trinidad-libs/jsp-2.1.jar
-- trinidad-libs/jsp-api-2.1.jar
-- trinidad-libs/servlet-api-2.5-6.1.14.jar
 - trinidad-libs/tomcat-core.jar
 - LICENSE
 - README.rdoc
@@ -67,10 +63,11 @@ signing_key:
 specification_version: 3
 summary: Common jars for Trinidad
 test_files: 
-- spec/fixtures/foo.rb
 - spec/fixtures/trinidad_foo_extension.rb
+- spec/fixtures/trinidad_override_tomcat_extension.rb
 - spec/spec_helper.rb
 - spec/trinidad/command_line_parser_spec.rb
 - spec/trinidad/extensions_spec.rb
+- spec/trinidad/fakeapp.rb
 - spec/trinidad/server_spec.rb
 - spec/trinidad/web_app_spec.rb

data/spec/fixtures/foo.rb

@@ -1,15 +0,0 @@
-module Trinidad
-  module Extensions
-  class FooWebAppExtension < WebAppExtension
-    def configure(tomcat, app_context)
-      @options
-    end
-  end
-
-  class FooServerExtension < ServerExtension
-    def configure(tomcat)
-      @options
-    end
-  end
-  end
-end