trinidad 0.9.3 → 0.9.4

data/History.txt

@@ -1,3 +1,7 @@
+== 0.9.4 (2010-08-04)
+
+* fix error configuring ssl
+
 == 0.9.3 (2010-07-27)
 
 * Tomcat updated to version 7.0.0

data/README.rdoc

@@ -47,7 +47,7 @@ Trinidad allows you to configure some parameters when the server is started from
   * -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).
+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/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 -f
   jruby -S trinidad --config my_custom_configuration.yml

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/lib/trinidad/rackup_web_app.rb

@@ -6,6 +6,7 @@ module Trinidad
       if rackup_path = rackup
         rackup_path = File.join(rackup_path, 'config.ru') if File.directory?(rackup_path)
         add_parameter_unless_exist('rackup.path', rackup_path)
+        add_parameter_unless_exist('rack.env', environment.to_s)
       end
       @params
     end

data/lib/trinidad/server.rb

@@ -93,10 +93,10 @@ module Trinidad
       if !options[:keystoreFile] && !options[:SSLCertificateFile]
         options[:keystoreFile] = 'ssl/keystore'
         options[:keystorePass] = 'waduswadus'
+        create_default_keystore(options)
       end
 
       add_service_connector(options)
-      create_default_keystore(options)
     end
 
     def add_http_connector
@@ -121,10 +121,7 @@ module Trinidad
     end
 
     def create_default_keystore(config)
-      keystore_file_path = config[:keystoreFile]
-      return unless keystore_file_path && File.exist?(keystore_file_path)
-
-      keystore_file = java.io.File.new(keystore_file)
+      keystore_file = java.io.File.new(config[:keystoreFile])
 
       if (!keystore_file.parent_file.exists &&
               !keystore_file.parent_file.mkdir)
@@ -137,7 +134,7 @@ module Trinidad
         "-keyalg", "RSA",
         "-validity", "365", 
         "-storepass", "key", 
-        "-keystore", keystore_file_path,
+        "-keystore", config[:keystoreFile],
         "-storepass", config[:keystorePass],
         "-keypass", config[:keystorePass]]
 

data/spec/trinidad/server_spec.rb

@@ -28,11 +28,16 @@ describe Trinidad::Server do
   end
 
   it "enables ssl 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 be_true
-    File.exist?('ssl').should be_true
+    begin
+      server = Trinidad::Server.new({:ssl => {:port => 8443},
+        :web_app_dir => MOCK_WEB_APP_DIR})
+
+      server.ssl_enabled?.should be_true
+      File.exist?('ssl').should be_true
+    ensure
+      require 'fileutils'
+      FileUtils.rm_rf(File.expand_path('../../ssl', File.dirname(__FILE__)))
+    end
   end
 
   it "enables ajp when config param is a number" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - David Calavera
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +02:00
+date: 2010-08-04 00:00:00 +02:00
 default_executable: trinidad
 dependencies: 
 - !ruby/object:Gem::Dependency