trinidad 0.9.5 → 0.9.6

data/History.txt

@@ -1,3 +1,12 @@
+== 0.9.6 (2010-09-12)
+
+* add option to specify the application directory path from the command line
+
+== Trinidad_jars 0.3.1 (2010-09-12)
+
+* update to Tomcat 7.0.2
+* fix TRINIDAD-17: NPE when web app has a context path
+
 == 0.9.5 (2010-08-08)
 
 * fix TRINIDAD-15: trinidad defines String#camelize incompatibly with ActiveSupport: Argument is missing

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/lib/trinidad.rb

@@ -22,5 +22,5 @@ require 'trinidad/rackup_web_app'
 
 
 module Trinidad
-  VERSION = File.read(File.expand_path('../../VERSION', __FILE__))
+  VERSION = File.read(File.expand_path('../../VERSION', __FILE__)).chomp
 end

data/lib/trinidad/command_line_parser.rb

@@ -42,6 +42,11 @@ module Trinidad
         opts.banner = 'Trinidad server default options:'
         opts.separator ''
 
+        opts.on('-d', '--dir WEB_APP_DIRECTORY', 'Web app directory path',
+            "default: #{Dir.pwd}") do |v|
+          default_options[:web_app_dir] = v
+        end
+
         opts.on('-e', '--env ENVIRONMENT', 'Rails environment', 
             "default: #{default_options[:environment]}") do |v| 
           default_options[:environment] = v
@@ -107,7 +112,7 @@ module Trinidad
         end
 
         opts.on('-v', '--version', 'display the current version') do
-          puts File.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).chomp
+          puts "trinidad #{Trinidad::VERSION} (tomcat #{Trinidad::TOMCAT_VERSION})"
           exit
         end
 

data/spec/trinidad/command_line_parser_spec.rb

@@ -116,4 +116,9 @@ describe Trinidad::CommandLineParser do
     options = subject.parse(args)
     options.has_key?(:bar).should be_true
   end
+
+  it "adds the application directory path with the option --dir" do
+    args = "--dir #{MOCK_WEB_APP_DIR}".split
+    subject.parse(args)[:web_app_dir].should == MOCK_WEB_APP_DIR
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - David Calavera
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 +02:00
+date: 2010-09-12 00:00:00 +02:00
 default_executable: trinidad
 dependencies: 
 - !ruby/object:Gem::Dependency