Release trinidad 1.3.1

rkh · Jan 6, 2012 · b6ba233 · b6ba233
1 parent c9f97fe
commit b6ba233
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trinidad (1.3.0)
+    trinidad (1.3.1)
       jruby-rack (>= 1.1.2)
       rack
       trinidad_jars (>= 1.0.1)
@@ -25,7 +25,7 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    trinidad_jars (1.0.1)
+    trinidad_jars (1.0.2)
 
 PLATFORMS
   java

diff --git a/History.txt b/History.txt
@@ -1,3 +1,7 @@
+== Trinidad 1.3.1 (2012-01-06)
+
+* Fix Rack handler configuration issues
+
 == Trinidad_jars 1.0.2 (2011-12-31)
 
 * Bump Tomcat's version to 7.0.23

diff --git a/README.md b/README.md
@@ -12,13 +12,62 @@ Trinidad allows you to run a rails or rackup applications within an embedded Apa
 $ jruby -S gem install trinidad
 ```
 
-## Usage
+## Quick Start
 
 ```
 $ cd myapp
 $ jruby -S trinidad
 ```
 
+### Advanced Rackup setup
+
+**Sinatra**
+
+You can run your Sinatra application with Trinidad from the command line like this:
+
+```
+$ ruby app.rb -s Trinidad
+```
+
+Or tou can configure your application to always use it:
+
+```ruby
+require 'sinatra'
+require 'trinidad'
+
+configure do
+  set :server, :trinidad
+end
+```
+
+If you use Bundler, make sure you add Trinidad to your Gemfile:
+
+```
+gem 'trinidad'
+```
+
+**Rails**
+
+If you already have Trinidad in your Gemfile you can start the server with the rails command:
+
+```
+$ rails s trinidad
+```
+
+**Rackup**
+
+You can pass the server name as an option to `rackup`:
+
+```
+$ rackup -s trinidad
+```
+
+Or you can set Trinidad by default in your `config.ru` file:
+
+```
+#\ -s trinidad
+```
+
 ## Configuration
 
 Trinidad allows you to configure some parameters when the server is started from the command line, the following is a list of the currently supported options:

diff --git a/lib/trinidad.rb b/lib/trinidad.rb
@@ -24,5 +24,5 @@
 require 'rack/handler/trinidad'
 
 module Trinidad
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end
diff --git a/trinidad.gemspec b/trinidad.gemspec
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'trinidad'
-  s.version           = '1.3.0'
-  s.date              = '2011-12-30'
+  s.version           = '1.3.1'
+  s.date              = '2012-01-06'
   s.rubyforge_project = 'trinidad'
 
   ## Make sure your summary is short. The description may be as long