trinidad 0.8.3 → 0.9.0

data/History.txt

@@ -1,3 +1,11 @@
+== 0.9.0 (2010-04-28)
+
+* Tomcat updated to version 6.0.26, added constant to get its version.
+* Jars cleaned, 300kb less to load :)
+* Default configuration file name moved from tomcat.yml to trinidad.yml
+* Fixes bug merging configuration files
+* Configuring application through web.xml to avoid weird lifecycle problems
+
 == 0.8.3 (2010-04-17)
 
 * Extensions improvements:

data/README.rdoc

@@ -26,7 +26,7 @@ Trinidad allows you to configure some parameters when the server is started from
   * --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.
+  * -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).
 
@@ -42,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/VERSION

@@ -1 +1 @@
-0.8.3
+0.9.0

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.rb

@@ -17,4 +17,5 @@ require 'trinidad/rackup_web_app'
 
 module Trinidad
   VERSION = File.read(File.expand_path('../../VERSION', __FILE__))
+  TOMCAT_VERSION = '6.0.26'
 end

data/lib/trinidad/command_line_parser.rb

@@ -1,22 +1,44 @@
 module Trinidad
   require 'optparse'
   require 'yaml'
-  
+
   class CommandLineParser
+    attr_reader :default_options
+
+    def self.parse(argv)
+      CommandLineParser.new.parse!(argv)
+    end
 
-    def self.parse
-      default_options = {
+    def initialize
+      @default_options = {
         :port => 3000,
         :environment => 'development',
         :context_path => '/',
         :libs_dir => 'lib',
         :classes_dir => 'classes',
-        :config => 'config/tomcat.yml',
         :ssl_port => 8443,
         :ajp_port => 8009
       }
- 
-      parser = OptionParser.new do |opts|
+    end
+
+    def parse!(argv)
+      begin
+        options_parser.parse!(argv)
+      rescue OptionParser::InvalidOption => e
+        p e, options_parser
+        exit(1)
+      end
+
+      if default_options.has_key?(:config)
+        config_options = YAML.load_file(default_options[:config])
+        default_options.deep_merge!(config_options.symbolize!)
+      end
+
+      default_options
+    end
+
+    def options_parser
+      @parser ||= OptionParser.new do |opts|
         opts.banner = 'Trinidad server default options:'
         opts.separator ''
 
@@ -43,7 +65,7 @@ module Trinidad
         opts.on('--classes', '--classes CLASSES_DIR', 'Directory containing classes used by the application', 
             "default: #{default_options[:classes_dir]}") do |v| 
           default_options[:classes_dir] = v
-        end        
+        end
 
         opts.on('-s', '--ssl [SSL_PORT]', 'Enable secure socket layout',
             "default port: #{default_options[:ssl_port]}") do |v|
@@ -58,14 +80,21 @@ module Trinidad
         end
 
         opts.on('-f', '--config [CONFIG_FILE]', 'Configuration file',
-            "default: #{default_options[:config]}") do |v|
-          default_options[:config] = v if v
-          default_options.deep_merge! YAML.load_file(default_options[:config])
+            "default: #{default_options[:config]}") do |file|
+          default_options[:config] = 'config/trinidad.yml'
+
+          if file
+            default_options[:config] = file
+          elsif File.exist?('config/tomcat.yml') && !File.exist?(default_options[:config])
+            puts "[WARNING] Default configuration file name has been moved to trinidad.yml, tomcat.yml will not be supported in future versions."
+            puts "\tYou still can use tomcat.yml passing it as the file name to this option: -f config/tomcat.yml"
+            default_options[:config] = 'config/tomcat.yml'
+          end
         end
 
         opts.on('-r', '--rackup [RACKUP_FILE]', 'Rackup configuration file',
             'default: config.ru') do |v|
-          default_options[:rackup] = v || 'config.ru'  
+          default_options[:rackup] = v || 'config.ru'
         end
 
         opts.on('--public', '--public DIRECTORY', 'Public directory', 'default: public') do |v|
@@ -90,11 +119,7 @@ module Trinidad
           puts opts
           exit
         end
-
-        opts.parse!(ARGV)
       end
-
-      default_options
     end
   end
 end

data/lib/trinidad/extensions.rb

@@ -39,7 +39,7 @@ module Trinidad
 
     class Extension
       def initialize(options = {})
-        @options = options.dup
+        @options = options ? options.dup : {}
       end
     end
 

data/lib/trinidad/rackup_web.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app>
+    <servlet>
+        <servlet-name>RackServlet</servlet-name>
+        <servlet-class>org.jruby.rack.RackServlet</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>RackServlet</servlet-name>
+        <url-pattern>/*</url-pattern>
+    </servlet-mapping>
+
+    <listener>
+      <listener-class>org.jruby.rack.RackServletContextListener</listener-class>
+    </listener>
+
+</web-app>

data/lib/trinidad/rackup_web_app.rb

@@ -4,7 +4,7 @@ module Trinidad
     def add_init_params
       super
       add_parameter_unless_exist('rackup', rackup_script)
-    end    
+    end
 
     def context_listener
       'org.jruby.rack.RackServletContextListener'
@@ -13,5 +13,7 @@ module Trinidad
     def rackup_script
       IO.read(File.join(@app[:web_app_dir], @app[:rackup]))
     end
+
+    def provided_web_xml; 'rackup_web.xml'; end
   end
 end

data/lib/trinidad/rails_web.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app>
+    <servlet>
+        <servlet-name>RackServlet</servlet-name>
+        <servlet-class>org.jruby.rack.RackServlet</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>RackServlet</servlet-name>
+        <url-pattern>/*</url-pattern>
+    </servlet-mapping>
+
+    <listener>
+      <listener-class>org.jruby.rack.rails.RailsServletContextListener</listener-class>
+    </listener>
+
+</web-app>

data/lib/trinidad/rails_web_app.rb

@@ -10,5 +10,7 @@ module Trinidad
     def context_listener
       'org.jruby.rack.rails.RailsServletContextListener'
     end
+
+    def provided_web_xml; 'rails_web.xml'; end
   end
 end

data/lib/trinidad/server.rb

@@ -31,8 +31,9 @@ module Trinidad
 
     def load_tomcat_server
       @tomcat = Trinidad::Tomcat::Tomcat.new
-      @tomcat.setPort(@config[:port].to_i)
-      @tomcat.setBaseDir(Dir.pwd)
+      @tomcat.port = @config[:port].to_i
+      @tomcat.base_dir = Dir.pwd
+      @tomcat.host.app_base = Dir.pwd
       enable_naming
 
       add_ssl_connector if ssl_enabled?
@@ -42,20 +43,20 @@ module Trinidad
     end
 
     def create_web_apps
-      @config[:web_apps].each do |name, app|
-        app[:context_path] ||= (name.to_s == 'default' ? '/' : "/#{name.to_s}")
-        app[:web_app_dir] ||= Dir.pwd
+      @config[:web_apps].each do |name, app_config|
+        app_config[:context_path] ||= (name.to_s == 'default' ? '/' : "/#{name.to_s}")
+        app_config[:web_app_dir] ||= Dir.pwd
 
-        tomcat_app = @tomcat.addWebapp(app[:context_path].to_s, app[:web_app_dir])
+        app_context = @tomcat.addWebapp(app_config[:context_path], app_config[:web_app_dir])
+        remove_defaults(app_context)
 
-        web_app = WebApp.create(tomcat_app, @config, app)
+        web_app = WebApp.create(app_context, @config, app_config)
 
         web_app.load_default_web_xml
-        web_app.add_rack_filter
+        web_app.configure_rack
         web_app.configure_extensions(@tomcat)
         web_app.add_context_loader
         web_app.add_init_params
-        web_app.add_web_dir_resources
 
         web_app.add_rack_context_listener
       end
@@ -158,5 +159,13 @@ module Trinidad
         JSystem.setProperty(JContext.INITIAL_CONTEXT_FACTORY, "org.apache.naming.java.javaURLContextFactory")
       end
     end
+
+    def remove_defaults(app_context)
+      default_servlet = app_context.find_child('default')
+      app_context.remove_child(default_servlet) if default_servlet
+
+      jsp_servlet = app_context.find_child('jsp')
+      app_context.remove_child(jsp_servlet) if jsp_servlet
+    end
   end
 end

data/lib/trinidad/web_app.rb

@@ -14,18 +14,14 @@ module Trinidad
       @class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
     end
 
-    def add_rack_filter
-      unless rack_filter_configured?
-        filter_def = Trinidad::Tomcat::FilterDef.new
-        filter_def.setFilterName('RackFilter')
-        filter_def.setFilterClass('org.jruby.rack.RackFilter')
-
-        filter_map = Trinidad::Tomcat::FilterMap.new
-        filter_map.setFilterName('RackFilter')
-        filter_map.addURLPattern('/*')
-
-        @context.addFilterDef(filter_def)
-        @context.addFilterMap(filter_map)
+    def configure_rack(servlet_class = 'org.jruby.rack.RackServlet', servlet_name = 'RackServlet')
+      unless rack_configured?
+        wrapper = @context.createWrapper()
+        wrapper.setServletClass(servlet_class)
+        wrapper.setName(servlet_name)
+
+        @context.addChild(wrapper)
+        @context.addServletMapping('/*', servlet_name)
       end
     end
 
@@ -46,11 +42,6 @@ module Trinidad
       add_parameter_unless_exist('public.root', File.join('/', public_root))
     end
 
-    def add_web_dir_resources
-      doc_base = File.join(@app[:web_app_dir], public_root)
-      @context.setDocBase(doc_base) if File.exist?(doc_base)
-    end
-
     def add_rack_context_listener
       unless rack_listener_configured?
         @context.addApplicationListener(context_listener)
@@ -72,19 +63,17 @@ module Trinidad
 
     def load_default_web_xml
       file = File.expand_path(File.join(@app[:web_app_dir], default_web_xml))
+      file = File.expand_path("../#{provided_web_xml}", __FILE__) unless File.exist?(file)
 
-      if File.exist?(file)
-        @context.setDefaultWebXml(file)
-        @context.setDefaultContextXml(file)
+      @context.setDefaultWebXml(file)
 
-        context_config = Trinidad::Tomcat::ContextConfig.new
-        context_config.setDefaultWebXml(file)
+      context_config = Trinidad::Tomcat::ContextConfig.new
+      context_config.setDefaultWebXml(file)
 
-        @context.addLifecycleListener(context_config)
-      end
+      @context.addLifecycleListener(context_config)
     end
 
-    def rack_filter_configured?
+    def rack_configured?
       return false if @context.getDefaultWebXml().nil?
 
       web_xml = IO.read(@context.getDefaultWebXml()).gsub(/\s+/, '')

data/spec/trinidad/command_line_parser_spec.rb

@@ -1,99 +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
+  subject { Trinidad::CommandLineParser }
+
+  it "overrides classes option" do
+    args = "--classes my_classes".split
 
-    options = Trinidad::CommandLineParser.parse
+    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
+  it "overrides libs option with lib option" do
+    args = "--lib my_libs".split
 
-    options = Trinidad::CommandLineParser.parse
+    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
+  it "overrides libs option with jar option" do
+    args = "--jars my_jars".split
 
-    options = Trinidad::CommandLineParser.parse
+    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
+  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 "overrides the config file when it's especified" do
+    FakeFS do
+      create_custom_config_file
+      args = "-f config/tomcat.yml".split
 
-    options = Trinidad::CommandLineParser.parse
-    options[:environment].should == 'production'
+      options = subject.parse(args)
+      options[:environment].should == 'production'
+    end
   end
 
-  it "should add default ssl port to options" do
-    ARGV = '--ssl'.split
+  it "adds default ssl port to options" do
+    args = '--ssl'.split
 
-    options = Trinidad::CommandLineParser.parse
+    options = subject.parse(args)
     options[:ssl].should == {:port => 8443}
   end
 
-  it "should add custom ssl port to options" do
-    ARGV = '--ssl 8843'.split
+  it "adds custom ssl port to options" do
+    args = '--ssl 8843'.split
 
-    options = Trinidad::CommandLineParser.parse
+    options = subject.parse(args)
     options[:ssl].should == {:port => 8843}
   end
 
-  it "should add ajp connection with default port to options" do
-    ARGV = '--ajp'.split
+  it "adds ajp connection with default port to options" do
+    args = '--ajp'.split
 
-    options = Trinidad::CommandLineParser.parse
+    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
+  it "adds ajp connection with coustom port to options" do
+    args = '--ajp 8099'.split
 
-    options = Trinidad::CommandLineParser.parse
+    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
+  it "merges ajp options from the config file" do
+    FakeFS do
+      create_custom_config_file
+      args = "--ajp 8099 -f config/tomcat.yml".split
 
-    options = Trinidad::CommandLineParser.parse
-    options[:ajp][:port].should == 8099
-    options[:ajp][:secure].should == true
+      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
-    ARGV = '--threadsafe'.split
-    options = Trinidad::CommandLineParser.parse
+    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
-    ARGV = "--load foo --foo".split
-    options = Trinidad::CommandLineParser.parse
+    args = "--load foo --foo".split
+    options = subject.parse(args)
     options.has_key?(:bar).should be_true
-
   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 => '/'
@@ -22,13 +24,15 @@ describe Trinidad::WebApp do
   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,7 +40,7 @@ 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
@@ -44,7 +48,7 @@ describe Trinidad::WebApp do
     @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
@@ -80,32 +84,49 @@ describe Trinidad::WebApp do
     web_app.context.findParameter('jruby.max.runtimes').should == '8'
   end
 
-  it "should configure rack filter" do
-    @web_app.add_rack_filter
-    @web_app.context.findFilterDefs().should have(1).filters
+  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
@@ -120,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
-  - 8
-  - 3
-  version: 0.8.3
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - David Calavera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 +02:00
+date: 2010-04-28 00:00:00 +02:00
 default_executable: trinidad
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,9 +51,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 1
-        version: 0.1.1
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -80,6 +80,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: fakefs
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: 
 email: calavera@apache.org
 executables: 
@@ -99,7 +111,9 @@ files:
 - lib/trinidad/command_line_parser.rb
 - lib/trinidad/core_ext.rb
 - lib/trinidad/extensions.rb
+- lib/trinidad/rackup_web.xml
 - lib/trinidad/rackup_web_app.rb
+- lib/trinidad/rails_web.xml
 - lib/trinidad/rails_web_app.rb
 - lib/trinidad/server.rb
 - lib/trinidad/web_app.rb
@@ -139,5 +153,6 @@ test_files:
 - 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