torquebox-rake-support 2.2.0 → 2.3.0

data/lib/org.torquebox.rake-support.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as

data/lib/torquebox/deploy_utils.rb

@@ -1,15 +1,15 @@
-# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
-#
+# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
+# 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of
 # the License, or (at your option) any later version.
-#
+# 
 # This software is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # Lesser General Public License for more details.
-#
+# 
 # You should have received a copy of the GNU Lesser General Public
 # License along with this software; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@@ -132,6 +132,7 @@ module TorqueBox
         options = "#{options} -Dorg.torquebox.web.http.maxThreads=#{opts[:max_threads]}" if opts[:max_threads]
         options = "#{options} -b #{opts[:bind_address]}" if opts[:bind_address]
         options = "#{options} -Djboss.socket.binding.port-offset=#{opts[:port_offset]}" if opts[:port_offset]
+        options = "#{options} -Dhttp.port=#{opts[:port]}" if opts[:port]
         options = "#{options} -Djboss.node.name=#{opts[:node_name]}" if opts[:node_name]
         options = "#{options} -Djboss.server.data.dir=#{opts[:data_directory]}" if opts[:data_directory]
         options = "#{options} #{opts[:pass_through]}" if opts[:pass_through]

data/lib/torquebox/launchd.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as

data/lib/torquebox/rails.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
@@ -15,7 +15,6 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-
 begin
   gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
   require 'rails/version'
@@ -30,7 +29,9 @@ module TorqueBox
       print_rails_not_installed_and_exit unless rails_installed?
       require_generators
       # Ensure ARGV[0] has the application path
-      ARGV.unshift( root ) if ARGV.empty?
+      if ARGV.empty? || ARGV[0] != root
+        ARGV.unshift( root )
+      end
       ARGV << [ "-m", TorqueBox::Rails.template ]
       ARGV.flatten!
       if using_rails3?

data/lib/torquebox/rake/tasks/archive.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as

data/lib/torquebox/rake/tasks/deployment.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as

data/lib/torquebox/rake/tasks/server.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as

data/lib/torquebox/rake/tasks.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as

data/lib/torquebox/server.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as

data/lib/torquebox/upstart.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as

data/lib/torquebox-rake-support.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as

data/spec/deploy_utils_spec.rb

@@ -360,6 +360,15 @@ describe TorqueBox::DeployUtils do
       options.should include('--help')
     end
 
+    it 'should set the http port' do
+      command, options = @util.run_command_line(:port => 9090)
+      options.should include('-Dhttp.port=9090')
+    end
+
+    it 'should not set HTTP port by default' do
+      command, options = @util.run_command_line
+      options.should_not include('-Dhttp.port')
+    end
   end
 
   describe '.create_archive' do

data/spec/spec_helper.rb

@@ -22,6 +22,7 @@ $: << File.dirname(__FILE__) + '/../lib'
 require 'torquebox-rake-support'
 
 TESTING_ON_WINDOWS = ( java.lang::System.getProperty( "os.name" ) =~ /windows/i )
+WINDOWS_ABSOLUTE_PREFIX = java.lang::System.getProperty("windows.absolute.prefix", "C:")
 
 module PathHelper
   def self.extended(cls)
@@ -33,7 +34,7 @@ module PathHelper
 
       def self.absolute_prefix
         return '' unless ( TESTING_ON_WINDOWS )
-        'C:'
+        WINDOWS_ABSOLUTE_PREFIX
       end
   
     end

metadata

@@ -2,26 +2,26 @@
 name: torquebox-rake-support
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - The TorqueBox Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
     none: false
@@ -53,31 +53,31 @@ files:
 - licenses/lgpl-2.1.txt
 - lib/org.torquebox.rake-support.rb
 - lib/torquebox-rake-support.rb
-- lib/torquebox/rails.rb
 - lib/torquebox/deploy_utils.rb
-- lib/torquebox/upstart.rb
 - lib/torquebox/launchd.rb
 - lib/torquebox/server.rb
+- lib/torquebox/rails.rb
+- lib/torquebox/upstart.rb
 - lib/torquebox/rake/tasks.rb
-- lib/torquebox/rake/tasks/deployment.rb
 - lib/torquebox/rake/tasks/archive.rb
+- lib/torquebox/rake/tasks/deployment.rb
 - lib/torquebox/rake/tasks/server.rb
-- generators/USAGE
 - generators/torquebox_queue_generator.rb
+- generators/USAGE
 - generators/templates/queue.rb
 - spec/server_spec.rb
 - spec/deploy_utils_spec.rb
-- spec/rails_spec.rb
 - spec/upstart_spec.rb
+- spec/rails_spec.rb
 - spec/spec_helper.rb
-- spec/fixtures/simpleapp/simpleapp.box
 - spec/fixtures/simpleapp/config.ru
-- spec/fixtures/simpleapp/vendor/vendor.rb
-- spec/fixtures/simpleapp/puppet/puppet.rb
-- spec/fixtures/simpleapp/app/app.box
-- spec/fixtures/simpleapp/app/a-non-cached.gem
+- spec/fixtures/simpleapp/simpleapp.box
 - spec/fixtures/simpleapp/app/app.rb
+- spec/fixtures/simpleapp/app/app.box
 - spec/fixtures/simpleapp/app/puppet-master.rb
+- spec/fixtures/simpleapp/app/a-non-cached.gem
+- spec/fixtures/simpleapp/vendor/vendor.rb
+- spec/fixtures/simpleapp/puppet/puppet.rb
 homepage: http://torquebox.org/
 licenses:
 - lgpl
@@ -87,14 +87,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: !binary |-
         MA==
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: !binary |-
         MA==
@@ -108,5 +108,5 @@ summary: TorqueBox Rake Support
 test_files:
 - spec/server_spec.rb
 - spec/deploy_utils_spec.rb
-- spec/rails_spec.rb
 - spec/upstart_spec.rb
+- spec/rails_spec.rb