trinidad 1.2.0 → 1.2.1

data/History.txt

@@ -1,3 +1,7 @@
+== Trinidad 1.2.1 (2011-06-15)
+
+* Allow to specify the monitor file from the command line
+
 == Trinidad 1.2.0 (2011-05-24)
 
 * Zero downtime hot deploy

data/README.rdoc

@@ -32,13 +32,13 @@ Trinidad allows you to configure some parameters when the server is started from
   * -g, --log LEVEL             =>  set the log level, default INFO.
   * --apps APPS_BASE_DIRECTORY  =>  set the applications base directory.
 
-The server can also be configured from a yaml file. By default, if a file is not especified, the server tries to load the file <em>config/trinidad.yml</em>. Within this file you can add other options like jruby.min.runtimes(:jruby_min_runtimes) or jruby.max.runtimes(:jruby_max_runtimes).
+The server can also be configured from a yaml file. By default, if a file is not specified, the server tries to load the file <em>config/trinidad.yml</em>. Within this file you can add other options like jruby.min.runtimes(:jruby_min_runtimes) or jruby.max.runtimes(:jruby_max_runtimes).
 
   jruby -S trinidad --config my_custom_configuration.yml
 
-You can also specify a default web.xml to config your web application. By default the server tries to load the file <em>config/web.xml</em> but you can modify this path adding the option <em>default_web_xml</em> within your configuration file. 
+You can also specify a default web.xml to configure your web application. By default the server tries to load the file <em>config/web.xml</em> but you can modify this path by adding the option <em>default_web_xml</em> within your configuration file. 
 
-Other advanced options can be found in the wiki: http://wiki.github.com/trinidad/trinidad/advanced-configuration
+Other advanced options can be found on the wiki: http://wiki.github.com/trinidad/trinidad/advanced-configuration
 
 == HOT DEPLOYMENT:
 

data/lib/trinidad.rb

@@ -22,5 +22,5 @@ require 'trinidad/rackup_web_app'
 require 'trinidad/war_web_app'
 
 module Trinidad
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/trinidad/command_line_parser.rb

@@ -131,6 +131,10 @@ module Trinidad
           default_options[:apps_base] = path
         end
 
+        opts.on('--monitor' '--monitor MONITOR_FILE', 'monitor file for hot deployments') do |monitor|
+          default_options[:monitor] = monitor
+        end
+
         opts.on('-h', '--help', 'display the help') do
           puts opts
           exit

metadata

@@ -2,7 +2,7 @@
 name: trinidad
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
   - David Calavera
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 -07:00
+date: 2011-06-15 00:00:00 +02:00
 default_executable: trinidad
 dependencies: 
   - !ruby/object:Gem::Dependency