torquebox-rake-support 2.2.0 → 2.3.0
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/org.torquebox.rake-support.rb +1 -1
- data/lib/torquebox/deploy_utils.rb +5 -4
- data/lib/torquebox/launchd.rb +1 -1
- data/lib/torquebox/rails.rb +4 -3
- data/lib/torquebox/rake/tasks/archive.rb +1 -1
- data/lib/torquebox/rake/tasks/deployment.rb +1 -1
- data/lib/torquebox/rake/tasks/server.rb +1 -1
- data/lib/torquebox/rake/tasks.rb +1 -1
- data/lib/torquebox/server.rb +1 -1
- data/lib/torquebox/upstart.rb +1 -1
- data/lib/torquebox-rake-support.rb +1 -1
- data/spec/deploy_utils_spec.rb +9 -0
- data/spec/spec_helper.rb +2 -1
- metadata +17 -17
@@ -1,15 +1,15 @@
|
|
1
|
-
# Copyright 2008-
|
2
|
-
#
|
1
|
+
# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
|
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
|
5
5
|
# published by the Free Software Foundation; either version 2.1 of
|
6
6
|
# the License, or (at your option) any later version.
|
7
|
-
#
|
7
|
+
#
|
8
8
|
# This software is distributed in the hope that it will be useful,
|
9
9
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
10
10
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
11
11
|
# Lesser General Public License for more details.
|
12
|
-
#
|
12
|
+
#
|
13
13
|
# You should have received a copy of the GNU Lesser General Public
|
14
14
|
# License along with this software; if not, write to the Free
|
15
15
|
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
@@ -132,6 +132,7 @@ module TorqueBox
|
|
132
132
|
options = "#{options} -Dorg.torquebox.web.http.maxThreads=#{opts[:max_threads]}" if opts[:max_threads]
|
133
133
|
options = "#{options} -b #{opts[:bind_address]}" if opts[:bind_address]
|
134
134
|
options = "#{options} -Djboss.socket.binding.port-offset=#{opts[:port_offset]}" if opts[:port_offset]
|
135
|
+
options = "#{options} -Dhttp.port=#{opts[:port]}" if opts[:port]
|
135
136
|
options = "#{options} -Djboss.node.name=#{opts[:node_name]}" if opts[:node_name]
|
136
137
|
options = "#{options} -Djboss.server.data.dir=#{opts[:data_directory]}" if opts[:data_directory]
|
137
138
|
options = "#{options} #{opts[:pass_through]}" if opts[:pass_through]
|
data/lib/torquebox/launchd.rb
CHANGED
data/lib/torquebox/rails.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
# Copyright 2008-
|
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
|
@@ -15,7 +15,6 @@
|
|
15
15
|
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
16
16
|
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
|
17
17
|
|
18
|
-
|
19
18
|
begin
|
20
19
|
gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
|
21
20
|
require 'rails/version'
|
@@ -30,7 +29,9 @@ module TorqueBox
|
|
30
29
|
print_rails_not_installed_and_exit unless rails_installed?
|
31
30
|
require_generators
|
32
31
|
# Ensure ARGV[0] has the application path
|
33
|
-
ARGV.
|
32
|
+
if ARGV.empty? || ARGV[0] != root
|
33
|
+
ARGV.unshift( root )
|
34
|
+
end
|
34
35
|
ARGV << [ "-m", TorqueBox::Rails.template ]
|
35
36
|
ARGV.flatten!
|
36
37
|
if using_rails3?
|
data/lib/torquebox/rake/tasks.rb
CHANGED
data/lib/torquebox/server.rb
CHANGED
data/lib/torquebox/upstart.rb
CHANGED
data/spec/deploy_utils_spec.rb
CHANGED
@@ -360,6 +360,15 @@ describe TorqueBox::DeployUtils do
|
|
360
360
|
options.should include('--help')
|
361
361
|
end
|
362
362
|
|
363
|
+
it 'should set the http port' do
|
364
|
+
command, options = @util.run_command_line(:port => 9090)
|
365
|
+
options.should include('-Dhttp.port=9090')
|
366
|
+
end
|
367
|
+
|
368
|
+
it 'should not set HTTP port by default' do
|
369
|
+
command, options = @util.run_command_line
|
370
|
+
options.should_not include('-Dhttp.port')
|
371
|
+
end
|
363
372
|
end
|
364
373
|
|
365
374
|
describe '.create_archive' do
|
data/spec/spec_helper.rb
CHANGED
@@ -22,6 +22,7 @@ $: << File.dirname(__FILE__) + '/../lib'
|
|
22
22
|
require 'torquebox-rake-support'
|
23
23
|
|
24
24
|
TESTING_ON_WINDOWS = ( java.lang::System.getProperty( "os.name" ) =~ /windows/i )
|
25
|
+
WINDOWS_ABSOLUTE_PREFIX = java.lang::System.getProperty("windows.absolute.prefix", "C:")
|
25
26
|
|
26
27
|
module PathHelper
|
27
28
|
def self.extended(cls)
|
@@ -33,7 +34,7 @@ module PathHelper
|
|
33
34
|
|
34
35
|
def self.absolute_prefix
|
35
36
|
return '' unless ( TESTING_ON_WINDOWS )
|
36
|
-
|
37
|
+
WINDOWS_ABSOLUTE_PREFIX
|
37
38
|
end
|
38
39
|
|
39
40
|
end
|
metadata
CHANGED
@@ -2,26 +2,26 @@
|
|
2
2
|
name: torquebox-rake-support
|
3
3
|
version: !ruby/object:Gem::Version
|
4
4
|
prerelease:
|
5
|
-
version: 2.
|
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:
|
12
|
+
date: 2013-01-25 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rake
|
16
16
|
version_requirements: !ruby/object:Gem::Requirement
|
17
17
|
requirements:
|
18
|
-
- -
|
18
|
+
- - ">="
|
19
19
|
- !ruby/object:Gem::Version
|
20
20
|
version: 0.8.7
|
21
21
|
none: false
|
22
22
|
requirement: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- -
|
24
|
+
- - ">="
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: 0.8.7
|
27
27
|
none: false
|
@@ -53,31 +53,31 @@ files:
|
|
53
53
|
- licenses/lgpl-2.1.txt
|
54
54
|
- lib/org.torquebox.rake-support.rb
|
55
55
|
- lib/torquebox-rake-support.rb
|
56
|
-
- lib/torquebox/rails.rb
|
57
56
|
- lib/torquebox/deploy_utils.rb
|
58
|
-
- lib/torquebox/upstart.rb
|
59
57
|
- lib/torquebox/launchd.rb
|
60
58
|
- lib/torquebox/server.rb
|
59
|
+
- lib/torquebox/rails.rb
|
60
|
+
- lib/torquebox/upstart.rb
|
61
61
|
- lib/torquebox/rake/tasks.rb
|
62
|
-
- lib/torquebox/rake/tasks/deployment.rb
|
63
62
|
- lib/torquebox/rake/tasks/archive.rb
|
63
|
+
- lib/torquebox/rake/tasks/deployment.rb
|
64
64
|
- lib/torquebox/rake/tasks/server.rb
|
65
|
-
- generators/USAGE
|
66
65
|
- generators/torquebox_queue_generator.rb
|
66
|
+
- generators/USAGE
|
67
67
|
- generators/templates/queue.rb
|
68
68
|
- spec/server_spec.rb
|
69
69
|
- spec/deploy_utils_spec.rb
|
70
|
-
- spec/rails_spec.rb
|
71
70
|
- spec/upstart_spec.rb
|
71
|
+
- spec/rails_spec.rb
|
72
72
|
- spec/spec_helper.rb
|
73
|
-
- spec/fixtures/simpleapp/simpleapp.box
|
74
73
|
- spec/fixtures/simpleapp/config.ru
|
75
|
-
- spec/fixtures/simpleapp/
|
76
|
-
- spec/fixtures/simpleapp/puppet/puppet.rb
|
77
|
-
- spec/fixtures/simpleapp/app/app.box
|
78
|
-
- spec/fixtures/simpleapp/app/a-non-cached.gem
|
74
|
+
- spec/fixtures/simpleapp/simpleapp.box
|
79
75
|
- spec/fixtures/simpleapp/app/app.rb
|
76
|
+
- spec/fixtures/simpleapp/app/app.box
|
80
77
|
- spec/fixtures/simpleapp/app/puppet-master.rb
|
78
|
+
- spec/fixtures/simpleapp/app/a-non-cached.gem
|
79
|
+
- spec/fixtures/simpleapp/vendor/vendor.rb
|
80
|
+
- spec/fixtures/simpleapp/puppet/puppet.rb
|
81
81
|
homepage: http://torquebox.org/
|
82
82
|
licenses:
|
83
83
|
- lgpl
|
@@ -87,14 +87,14 @@ require_paths:
|
|
87
87
|
- lib
|
88
88
|
required_ruby_version: !ruby/object:Gem::Requirement
|
89
89
|
requirements:
|
90
|
-
- -
|
90
|
+
- - ">="
|
91
91
|
- !ruby/object:Gem::Version
|
92
92
|
version: !binary |-
|
93
93
|
MA==
|
94
94
|
none: false
|
95
95
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
96
96
|
requirements:
|
97
|
-
- -
|
97
|
+
- - ">="
|
98
98
|
- !ruby/object:Gem::Version
|
99
99
|
version: !binary |-
|
100
100
|
MA==
|
@@ -108,5 +108,5 @@ summary: TorqueBox Rake Support
|
|
108
108
|
test_files:
|
109
109
|
- spec/server_spec.rb
|
110
110
|
- spec/deploy_utils_spec.rb
|
111
|
-
- spec/rails_spec.rb
|
112
111
|
- spec/upstart_spec.rb
|
112
|
+
- spec/rails_spec.rb
|