trinidad 0.9.3 → 0.9.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/History.txt CHANGED
@@ -1,3 +1,7 @@
1
+ == 0.9.4 (2010-08-04)
2
+
3
+ * fix error configuring ssl
4
+
1
5
  == 0.9.3 (2010-07-27)
2
6
 
3
7
  * Tomcat updated to version 7.0.0
data/README.rdoc CHANGED
@@ -47,7 +47,7 @@ Trinidad allows you to configure some parameters when the server is started from
47
47
  * -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.
48
48
  * -l, --load EXTENSION_NAME => loads an extension to use its command line options.
49
49
 
50
- 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).
50
+ 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).
51
51
 
52
52
  jruby -S trinidad -f
53
53
  jruby -S trinidad --config my_custom_configuration.yml
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.9.3
1
+ 0.9.4
@@ -6,6 +6,7 @@ module Trinidad
6
6
  if rackup_path = rackup
7
7
  rackup_path = File.join(rackup_path, 'config.ru') if File.directory?(rackup_path)
8
8
  add_parameter_unless_exist('rackup.path', rackup_path)
9
+ add_parameter_unless_exist('rack.env', environment.to_s)
9
10
  end
10
11
  @params
11
12
  end
@@ -93,10 +93,10 @@ module Trinidad
93
93
  if !options[:keystoreFile] && !options[:SSLCertificateFile]
94
94
  options[:keystoreFile] = 'ssl/keystore'
95
95
  options[:keystorePass] = 'waduswadus'
96
+ create_default_keystore(options)
96
97
  end
97
98
 
98
99
  add_service_connector(options)
99
- create_default_keystore(options)
100
100
  end
101
101
 
102
102
  def add_http_connector
@@ -121,10 +121,7 @@ module Trinidad
121
121
  end
122
122
 
123
123
  def create_default_keystore(config)
124
- keystore_file_path = config[:keystoreFile]
125
- return unless keystore_file_path && File.exist?(keystore_file_path)
126
-
127
- keystore_file = java.io.File.new(keystore_file)
124
+ keystore_file = java.io.File.new(config[:keystoreFile])
128
125
 
129
126
  if (!keystore_file.parent_file.exists &&
130
127
  !keystore_file.parent_file.mkdir)
@@ -137,7 +134,7 @@ module Trinidad
137
134
  "-keyalg", "RSA",
138
135
  "-validity", "365",
139
136
  "-storepass", "key",
140
- "-keystore", keystore_file_path,
137
+ "-keystore", config[:keystoreFile],
141
138
  "-storepass", config[:keystorePass],
142
139
  "-keypass", config[:keystorePass]]
143
140
 
@@ -28,11 +28,16 @@ describe Trinidad::Server do
28
28
  end
29
29
 
30
30
  it "enables ssl when config param is a number" do
31
- server = Trinidad::Server.new({:ssl => {:port => 8443},
32
- :web_app_dir => MOCK_WEB_APP_DIR})
33
-
34
- server.ssl_enabled?.should be_true
35
- File.exist?('ssl').should be_true
31
+ begin
32
+ server = Trinidad::Server.new({:ssl => {:port => 8443},
33
+ :web_app_dir => MOCK_WEB_APP_DIR})
34
+
35
+ server.ssl_enabled?.should be_true
36
+ File.exist?('ssl').should be_true
37
+ ensure
38
+ require 'fileutils'
39
+ FileUtils.rm_rf(File.expand_path('../../ssl', File.dirname(__FILE__)))
40
+ end
36
41
  end
37
42
 
38
43
  it "enables ajp when config param is a number" do
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trinidad
3
3
  version: !ruby/object:Gem::Version
4
- hash: 61
4
+ hash: 51
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 9
9
- - 3
10
- version: 0.9.3
9
+ - 4
10
+ version: 0.9.4
11
11
  platform: ruby
12
12
  authors:
13
13
  - David Calavera
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-07-27 00:00:00 +02:00
18
+ date: 2010-08-04 00:00:00 +02:00
19
19
  default_executable: trinidad
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency