torquebox 2.2.0 → 2.3.0

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.
Files changed (3) hide show
  1. data/bin/torquebox +9 -1
  2. data/lib/torquebox.rb +1 -1
  3. metadata +26 -26
data/bin/torquebox CHANGED
@@ -33,6 +33,7 @@ class TorqueBoxCommand < Thor
33
33
  method_option 'extra', :aliases => '-e', :type => :string, :desc => 'Extra options to pass through to JBoss AS, you will need to escape dashes with \ (e.g. \--help)'
34
34
  method_option 'max-threads', :type => :numeric, :desc => "Maximum number of HTTP threads"
35
35
  method_option 'bind-address', :aliases => '-b', :type => :string, :desc => "IP address to bind to - don't set this to 0.0.0.0 if used with --clustered"
36
+ method_option 'port', :aliases => '-p', :type => :numeric, :desc => 'HTTP port to listen on'
36
37
  method_option 'node-name', :type => :string, :desc => 'Override the name of the node (which by default is the hostname)'
37
38
  method_option 'port-offset', :type => :numeric, :desc => 'Offset all port numbers listened on by TorqueBox by this number'
38
39
  method_option 'jvm-options', :aliases => '-J', :type => :string, :desc => 'Pass options on to the JVM'
@@ -41,6 +42,7 @@ class TorqueBoxCommand < Thor
41
42
  TorqueBox::DeployUtils.run_server(:clustered => options.clustered,
42
43
  :max_threads => options['max-threads'],
43
44
  :bind_address => options['bind-address'],
45
+ :port => options['port'],
44
46
  :port_offset => options['port-offset'],
45
47
  :pass_through => options['extra'],
46
48
  :node_name => options['node-name'],
@@ -49,8 +51,14 @@ class TorqueBoxCommand < Thor
49
51
  end
50
52
 
51
53
  desc "rails ROOT", "Create a Rails application at ROOT using the TorqueBox Rails template, or apply the TorqueBox template to an existing application at ROOT."
52
- def rails(root = ".")
54
+ def rails(root = ".", *args)
53
55
  ARGV.shift
56
+ # Ensure the root defaults to the current directory if the user
57
+ # doesn't specify one but passes in additional args
58
+ if root.start_with?('-')
59
+ args.unshift( root )
60
+ root = '.'
61
+ end
54
62
  TorqueBox::Server.setup_environment
55
63
  if File.exist?( File.join(root, 'config', 'environment.rb') )
56
64
  TorqueBox::Rails.apply_template( root )
data/lib/torquebox.rb CHANGED
@@ -1,4 +1,4 @@
1
- # Copyright 2008-2012 Red Hat, Inc, and individual contributors.
1
+ # Copyright 2008-2013 Red Hat, Inc, and individual contributors.
2
2
  #
3
3
  # This is free software; you can redistribute it and/or modify it
4
4
  # under the terms of the GNU Lesser General Public License as
metadata CHANGED
@@ -2,14 +2,14 @@
2
2
  name: torquebox
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 2.2.0
5
+ version: 2.3.0
6
6
  platform: ruby
7
7
  authors:
8
8
  - The TorqueBox Team
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-12-06 00:00:00.000000000 Z
12
+ date: 2013-01-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: torquebox-core
@@ -17,13 +17,13 @@ dependencies:
17
17
  requirements:
18
18
  - - '='
19
19
  - !ruby/object:Gem::Version
20
- version: 2.2.0
20
+ version: 2.3.0
21
21
  none: false
22
22
  requirement: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 2.2.0
26
+ version: 2.3.0
27
27
  none: false
28
28
  prerelease: false
29
29
  type: :runtime
@@ -33,13 +33,13 @@ dependencies:
33
33
  requirements:
34
34
  - - '='
35
35
  - !ruby/object:Gem::Version
36
- version: 2.2.0
36
+ version: 2.3.0
37
37
  none: false
38
38
  requirement: !ruby/object:Gem::Requirement
39
39
  requirements:
40
40
  - - '='
41
41
  - !ruby/object:Gem::Version
42
- version: 2.2.0
42
+ version: 2.3.0
43
43
  none: false
44
44
  prerelease: false
45
45
  type: :runtime
@@ -49,13 +49,13 @@ dependencies:
49
49
  requirements:
50
50
  - - '='
51
51
  - !ruby/object:Gem::Version
52
- version: 2.2.0
52
+ version: 2.3.0
53
53
  none: false
54
54
  requirement: !ruby/object:Gem::Requirement
55
55
  requirements:
56
56
  - - '='
57
57
  - !ruby/object:Gem::Version
58
- version: 2.2.0
58
+ version: 2.3.0
59
59
  none: false
60
60
  prerelease: false
61
61
  type: :runtime
@@ -65,13 +65,13 @@ dependencies:
65
65
  requirements:
66
66
  - - '='
67
67
  - !ruby/object:Gem::Version
68
- version: 2.2.0
68
+ version: 2.3.0
69
69
  none: false
70
70
  requirement: !ruby/object:Gem::Requirement
71
71
  requirements:
72
72
  - - '='
73
73
  - !ruby/object:Gem::Version
74
- version: 2.2.0
74
+ version: 2.3.0
75
75
  none: false
76
76
  prerelease: false
77
77
  type: :runtime
@@ -81,13 +81,13 @@ dependencies:
81
81
  requirements:
82
82
  - - '='
83
83
  - !ruby/object:Gem::Version
84
- version: 2.2.0
84
+ version: 2.3.0
85
85
  none: false
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
88
  - - '='
89
89
  - !ruby/object:Gem::Version
90
- version: 2.2.0
90
+ version: 2.3.0
91
91
  none: false
92
92
  prerelease: false
93
93
  type: :runtime
@@ -97,13 +97,13 @@ dependencies:
97
97
  requirements:
98
98
  - - '='
99
99
  - !ruby/object:Gem::Version
100
- version: 2.2.0
100
+ version: 2.3.0
101
101
  none: false
102
102
  requirement: !ruby/object:Gem::Requirement
103
103
  requirements:
104
104
  - - '='
105
105
  - !ruby/object:Gem::Version
106
- version: 2.2.0
106
+ version: 2.3.0
107
107
  none: false
108
108
  prerelease: false
109
109
  type: :runtime
@@ -113,13 +113,13 @@ dependencies:
113
113
  requirements:
114
114
  - - '='
115
115
  - !ruby/object:Gem::Version
116
- version: 2.2.0
116
+ version: 2.3.0
117
117
  none: false
118
118
  requirement: !ruby/object:Gem::Requirement
119
119
  requirements:
120
120
  - - '='
121
121
  - !ruby/object:Gem::Version
122
- version: 2.2.0
122
+ version: 2.3.0
123
123
  none: false
124
124
  prerelease: false
125
125
  type: :runtime
@@ -129,13 +129,13 @@ dependencies:
129
129
  requirements:
130
130
  - - '='
131
131
  - !ruby/object:Gem::Version
132
- version: 2.2.0
132
+ version: 2.3.0
133
133
  none: false
134
134
  requirement: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - '='
137
137
  - !ruby/object:Gem::Version
138
- version: 2.2.0
138
+ version: 2.3.0
139
139
  none: false
140
140
  prerelease: false
141
141
  type: :runtime
@@ -145,13 +145,13 @@ dependencies:
145
145
  requirements:
146
146
  - - '='
147
147
  - !ruby/object:Gem::Version
148
- version: 2.2.0
148
+ version: 2.3.0
149
149
  none: false
150
150
  requirement: !ruby/object:Gem::Requirement
151
151
  requirements:
152
152
  - - '='
153
153
  - !ruby/object:Gem::Version
154
- version: 2.2.0
154
+ version: 2.3.0
155
155
  none: false
156
156
  prerelease: false
157
157
  type: :runtime
@@ -161,13 +161,13 @@ dependencies:
161
161
  requirements:
162
162
  - - '='
163
163
  - !ruby/object:Gem::Version
164
- version: 2.2.0
164
+ version: 2.3.0
165
165
  none: false
166
166
  requirement: !ruby/object:Gem::Requirement
167
167
  requirements:
168
168
  - - '='
169
169
  - !ruby/object:Gem::Version
170
- version: 2.2.0
170
+ version: 2.3.0
171
171
  none: false
172
172
  prerelease: false
173
173
  type: :runtime
@@ -175,13 +175,13 @@ dependencies:
175
175
  name: thor
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ! '>='
178
+ - - ">="
179
179
  - !ruby/object:Gem::Version
180
180
  version: 0.14.6
181
181
  none: false
182
182
  requirement: !ruby/object:Gem::Requirement
183
183
  requirements:
184
- - - ! '>='
184
+ - - ">="
185
185
  - !ruby/object:Gem::Version
186
186
  version: 0.14.6
187
187
  none: false
@@ -223,14 +223,14 @@ require_paths:
223
223
  - lib
224
224
  required_ruby_version: !ruby/object:Gem::Requirement
225
225
  requirements:
226
- - - ! '>='
226
+ - - ">="
227
227
  - !ruby/object:Gem::Version
228
228
  version: !binary |-
229
229
  MA==
230
230
  none: false
231
231
  required_rubygems_version: !ruby/object:Gem::Requirement
232
232
  requirements:
233
- - - ! '>='
233
+ - - ">="
234
234
  - !ruby/object:Gem::Version
235
235
  version: !binary |-
236
236
  MA==