torquebox-rake-support 1.1.1 → 2.0.0.beta1

data/lib/torquebox/deploy_utils.rb

@@ -1,15 +1,15 @@
 # Copyright 2008-2011 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
@@ -19,6 +19,7 @@ require 'tmpdir'
 require 'rbconfig'
 require 'yaml'
 require 'rake'
+require 'torquebox/server'
 
 
 module TorqueBox
@@ -36,12 +37,14 @@ module TorqueBox
         torquebox_home = nil
         if ( ENV['TORQUEBOX_HOME'] )
           torquebox_home = File.expand_path(ENV['TORQUEBOX_HOME'])
+        else
+          torquebox_home = TorqueBox::Server.torquebox_home
         end
         torquebox_home
       end
 
       def jboss_conf
-        ENV['TORQUEBOX_CONF'] || ENV['JBOSS_CONF'] || 'default'
+        ENV['TORQUEBOX_CONF'] || ENV['JBOSS_CONF'] || 'standalone'
       end
 
       # TODO: This is not windows friendly, is it?
@@ -59,15 +62,19 @@ module TorqueBox
       end
 
       def server_dir
-        File.join("#{jboss_home}","server", "#{jboss_conf}" )
+        File.join("#{jboss_home}","#{jboss_conf}" )
       end
 
       def config_dir
-        File.join("#{server_dir}","conf")
+        File.join("#{server_dir}","configuration")
+      end
+
+      def cluster_config_file
+        File.join(config_dir, 'torquebox', "standalone-preview-ha.xml")
       end
 
       def properties_dir
-        File.join("#{config_dir}","props")
+        config_dir
       end
 
       def deploy_dir
@@ -76,11 +83,19 @@ module TorqueBox
           return d
         end
 
-        File.join( "#{server_dir}", "deploy" )
+        File.join( "#{server_dir}", "deployments" )
       end
 
       def deployers_dir
-        File.join("#{server_dir}","deployers")
+        raise "Deployers directory no longer relevant"
+      end
+
+      def modules_dir
+        File.join( jboss_home, 'modules' )
+      end
+
+      def torquebox_modules_dir
+        File.join( modules_dir, 'org', 'torquebox' )
       end
 
       def archive_name(root=Dir.pwd)
@@ -92,8 +107,8 @@ module TorqueBox
       end
 
       def check_server
-        matching = Dir[ "#{deployers_dir}/torquebox*deployer*" ]
-        raise "No TorqueBox deployer installed in #{deployers_dir}" if ( matching.empty? )
+        raise "#{jboss_home} doesn't appear to be a valid TorqueBox install" unless File.exist?( torquebox_modules_dir )
+        puts "TorqueBox installation appears OK"
       end
 
       def check_opt_torquebox
@@ -101,29 +116,38 @@ module TorqueBox
         puts "TorqueBox install OK: #{opt_torquebox}"
       end
 
-      def run_command_line
-        cmd = Config::CONFIG['host_os'] =~ /mswin/ ? "bin\\run" : "/bin/sh bin/run.sh"
-        options = ENV['JBOSS_OPTS']
-        cmd += " -b 0.0.0.0" unless /((^|\s)-b\s|(^|\s)--host=)/ =~ options
-        "#{cmd} -c #{jboss_conf} #{options}"
+      def run_command_line(opts={})
+        options = ENV['JBOSS_OPTS'] || ''
+        options = "#{options} --server-config=#{cluster_config_file}" if opts[:clustered]
+        options = "#{options} -Dorg.torquebox.web.http.maxThreads=#{opts[:max_threads]}" if opts[:max_threads]
+        options = "#{options} -b #{opts[:bind_address]}" if opts[:bind_address]
+        if windows?
+          cmd = "#{jboss_home.gsub('/', '\\')}\\bin\\standalone.bat"
+        else
+          cmd = "/bin/sh bin/standalone.sh"
+        end
+        [cmd, options]
+      end
+
+      def is_deployed?( appname = deployment_name )
+        File.exists?( File.join(deploy_dir, appname) )
       end
 
-      def run_server
+      def run_server(options={})
+        
+        puts "[WARNING] #{deployment_name} has not been deployed. Starting TorqueBox anyway." unless ( is_deployed? )
+
         Dir.chdir(jboss_home) do
-          old_trap = trap("INT") do
-            puts "caught SIGINT, shutting down"
-          end
           # don't send the gemfile from the current app, instead let
           # bundler suss it out itself for each deployed
           # app. Otherwise, they'll end up sharing this Gemfile, which
-          # is probably not what we want.          
-          ENV.delete('BUNDLE_GEMFILE') 
-          exec_command(run_command_line)
-          trap("INT", old_trap )
+          # is probably not what we want.
+          ENV.delete('BUNDLE_GEMFILE')
+
+          exec_command(run_command_line(options).join(' '))
         end
       end
 
-
       def create_archive(archive = archive_name, app_dir = Dir.pwd, dest_dir = Dir.pwd)
         skip_files = %w{ ^log$ ^tmp$ ^test$ ^spec$ \.knob$ vendor }
 
@@ -159,17 +183,18 @@ module TorqueBox
       end
 
       def basic_deployment_descriptor(options = {})
-        env = options[:env]
+        env = options[:env] || options['env']
         env ||= defined?(RACK_ENV) ? RACK_ENV : ENV['RACK_ENV']
         env ||= defined?(::Rails) ? ::Rails.env : ENV['RAILS_ENV']
 
-        root = options[:root] || Dir.pwd
-        context_path = options[:context_path]
+        root = options[:root] || options['root'] || Dir.pwd
+        context_path = options[:context_path] || options['context_path']
         
         d = {}
         d['application'] = {}
         d['application']['root'] = root
-        d['application']['env'] = env.to_s if env
+        d['environment'] = {}
+        d['environment']['RACK_ENV'] = env.to_s if env
 
         if !context_path &&
             !(File.exists?( File.join( root, "torquebox.yml" )) ||
@@ -190,46 +215,49 @@ module TorqueBox
         File.open( deployment, 'w' ) do |file|
           YAML.dump( deployment_descriptor, file )
         end
+        FileUtils.touch( dodeploy_file( name ) )
         [name, dest_dir]
       end
 
       def deploy_archive(archive_path = nil, dest_dir = deploy_dir)
         archive_path ||= File.join( Dir.pwd, archive_name )
         FileUtils.cp( archive_path, dest_dir )
-        [File.basename( archive_path ), dest_dir]
+        archive = File.basename( archive_path )
+        FileUtils.touch( dodeploy_file( archive ) )
+        [archive, dest_dir]
+      end
+
+      def dodeploy_file( name )
+        File.join( DeployUtils.deploy_dir, "#{name}" ) + ".dodeploy"
+      end
+
+      def deployed_file( name )
+        File.join( DeployUtils.deploy_dir, "#{name}" ) + ".deployed"
       end
 
       def undeploy(name = deployment_name, from_dir = deploy_dir)
         deployment = File.join( from_dir, name )
+        undeployed = false
+        if File.exists?( dodeploy_file( name ) )
+          FileUtils.rm_rf( dodeploy_file( name ) )
+          undeployed = true
+        end
+        if File.exists?( deployed_file( name ) )
+          FileUtils.rm_rf( deployed_file( name ) )
+          undeployed = true
+        end
         if File.exists?( deployment )
           FileUtils.rm_rf( deployment )
+          undeployed = true
+        end
+
+        if undeployed
           [name, from_dir]
         else
-          nil
+          puts "Can't undeploy #{deployment}. It does not appear to be deployed."
         end
       end
 
-      def write_credentials(user_data)
-        properties_file = "#{properties_dir}/torquebox-users.properties"
-        users = File.readlines( properties_file ).inject( {} ) do |accum, line|
-          user, pass = line.split( '=' )
-          accum[user] = pass
-          accum
-        end
-
-        users = user_data.inject( users ) do |accum, user|
-          accum[user[0]] = user[1]
-          accum
-        end
-        
-        File.open( properties_file, 'w' ) do |file|
-          users.each do |user, pass|
-            file.puts( "#{user}=#{pass}" )
-          end
-        end
-        properties_file
-      end
-      
       # TODO: This is not windows friendly
       def create_symlink
         unless File.exist? opt_dir
@@ -257,6 +285,10 @@ module TorqueBox
 
       def exec_command(cmd)
         IO.popen4( cmd ) do |pid, stdin, stdout, stderr|
+          trap("INT") do
+            puts "caught SIGINT, shutting down"
+            `taskkill /F /T /PID #{pid}` if windows?
+          end
           stdin.close
           [
            Thread.new(stdout) {|stdout_io|
@@ -278,7 +310,11 @@ module TorqueBox
 
       end
 
+      def windows?
+        Config::CONFIG['host_os'] =~ /mswin/
+      end
 
     end
   end
 end
+

data/lib/torquebox/launchd.rb

@@ -1,4 +1,4 @@
-# Copyright 2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2011 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,8 +15,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-
-# Helpers for upstart rake tasks
+# Helpers for launchd rake tasks
 
 require 'torquebox/deploy_utils'
 
@@ -24,18 +23,63 @@ module TorqueBox
   module Launchd
     class << self
 
+      def log_dir
+        File.join( TorqueBox::DeployUtils.jboss_home, 'standalone', 'logs' )
+      end
+
+      def plist_template
+        File.join( plist_dir, 'TorqueBoxAgent.plist.template' )
+      end
+      
+      def plist_file
+        File.join( plist_dir, 'TorqueBoxAgent.plist' )
+      end
+
       def plist_dir
-        # TODO
+        File.join( TorqueBox::DeployUtils.torquebox_home, 'share', 'init' )
       end
 
       def check_install
-        TorqueBox::DeployUtils.check_opt_torquebox
-        # raise "#{init_torquebox} not installed in #{init_dir}" unless ( File.exist?( init_torquebox ) )
-        # puts "TorqueBox init scripts OK: #{init_torquebox}"
+        raise "#{plist_file} not installed in #{plist_dir}" unless ( File.exist?( plist_file ) )
+        puts "TorqueBox plist scripts OK: #{plist_file}."
+        
+        launchctl_found = false; IO.popen( 'launchctl list | grep torquebox' ) do |output|
+          output.each do |line|
+            if line =~ /torquebox/
+              puts "TorqueBox launchd script OK: #{line}"
+              launchctl_found = true
+              break
+            end
+          end
+        end
+        
+        raise "TorqueBox launchd script not found in launchctl." unless launchctl_found
+        
       end
-
+      
+      def install
+        unless File.writable?( plist_dir )
+          raise "Cannot write launchd configuration to #{plist_dir}. You'll need to copy #{plist_file} to #{plist_dir} yourself."
+        end
+        
+        File.delete( plist_file ) if File.exists? plist_file 
+        lines = File.open( plist_template, 'r' ) { |f| f.readlines }  
+        File.open( plist_file, 'w' ) do |file|
+          lines.each do |line|
+            if line =~ /\$\{TORQUEBOX_HOME\}/
+              file.puts( line.sub( /\$\{TORQUEBOX_HOME\}/, TorqueBox::DeployUtils.torquebox_home ) )
+            else
+              file.puts line
+            end
+          end
+        end
+        puts "Created launchd plist #{plist_file}, loading now."
+        TorqueBox::DeployUtils.exec_command "launchctl load #{plist_file}"
+        check_install
+        FileUtils.mkdir_p log_dir, :mode => 0755 unless File.exists? log_dir
+      end
+    
     end
   end
 end
 
-

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

@@ -35,31 +35,31 @@ namespace :torquebox do
   end
 
   namespace :launchd do
-#    desc "Check if TorqueBox is installed as a launchd daemon"
+    
+    desc "Check if TorqueBox is installed as a launchd daemon"
     task :check=>[ 'torquebox:check' ] do
       TorqueBox::Launchd.check_install
-      puts "Launchd tasks not done yet. Try again with a later build."
     end
 
-#    desc "Install TorqueBox as an launchd daemon"
+    desc "Install TorqueBox as an launchd daemon"
     task :install=>[ 'torquebox:check' ] do
-      TorqueBox::DeployUtils.create_symlink
-      puts "Launchd tasks not done yet. Try again with a later build."
+      TorqueBox::Launchd.install
     end
 
-#    desc "Start TorqueBox when running as a launchd daemon"
+    desc "Start TorqueBox when running as a launchd daemon"
     task :start=>[ :check ] do
-      puts "Launchd tasks not done yet. Try again with a later build."
+      TorqueBox::DeployUtils.exec_command( 'launchctl start org.torquebox.TorqueBox' )
     end
 
-#    desc "Stop TorqueBox when running as an launchd daemon"
+    desc "Stop TorqueBox when running as an launchd daemon"
     task :stop=>[ :check ] do
-      puts "Launchd tasks not done yet. Try again with a later build."
+      TorqueBox::DeployUtils.exec_command( 'launchctl stop org.torquebox.TorqueBox' )
     end
 
-#    desc "Restart TorqueBox when running as an launchd daemon"
+    desc "Restart TorqueBox when running as an launchd daemon"
     task :restart=>[ :check ] do
-      puts "Launchd tasks not done yet. Try again with a later build."
+      TorqueBox::DeployUtils.exec_command( 'launchctl stop org.torquebox.TorqueBox' )
+      TorqueBox::DeployUtils.exec_command( 'launchctl start org.torquebox.TorqueBox' )
     end
 
   end
@@ -68,7 +68,7 @@ namespace :torquebox do
     desc "Check if TorqueBox is installed as an upstart service"
     task :check=>[ 'torquebox:check' ] do
       TorqueBox::Upstart.check_install
-      puts "TorqueBox is installed as an upstart service at #{TorqueBox::Upstart.opt_torquebox}"
+      puts "TorqueBox is installed as an upstart service at #{TorqueBox::DeployUtils.opt_torquebox}"
     end
 
     desc "Install TorqueBox as an upstart service"

data/lib/torquebox/rake/tasks.rb

@@ -19,4 +19,3 @@ require 'torquebox/deploy_utils'
 require 'torquebox/rake/tasks/server'
 require 'torquebox/rake/tasks/deployment'
 require 'torquebox/rake/tasks/archive'
-require 'torquebox/rake/tasks/auth'

data/lib/torquebox/server.rb

@@ -0,0 +1,50 @@
+# Copyright 2008-2011 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
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+require 'java'
+require 'rubygems'
+
+module TorqueBox
+  class Server
+
+    def self.torquebox_home
+      if ((gem_version <=> Gem::Version.new('1.8.9')) < 0)
+        puts "[WARNING] Found rubygems version #{Gem::VERSION}. This probably means you are on JRuby 1.6.4. While JRuby 1.6.4 should work, TorqueBox is tested on and ships with JRuby 1.6.5."
+        home = Gem.searcher.find( 'torquebox-server' )
+      else
+        home = Gem::Specification.find_by_name( 'torquebox-server' )
+      end
+      home.full_gem_path if home
+    rescue Exception => e
+      puts "Cannot find torquebox-server: #{e}"
+      nil
+    end
+
+    def self.jboss_home
+      File.join(torquebox_home, 'jboss') if torquebox_home
+    end
+
+    def self.jruby_home
+      File.expand_path(java.lang.System.getProperty('jruby.home'))
+    end
+
+    def self.gem_version
+      Gem::Version.new( Gem::VERSION )
+    end
+  end
+
+end

data/lib/torquebox/upstart.rb

@@ -1,4 +1,4 @@
-# Copyright 2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2011 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.
 
-
 # Helpers for upstart rake tasks
 
 require 'torquebox/deploy_utils'

data/licenses/lgpl-2.1.txt

@@ -1,5 +1,5 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +112,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -500,5 +500,3 @@ necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-

data/spec/deploy_utils_spec.rb

@@ -0,0 +1,313 @@
+#
+# Copyright 2011 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+describe TorqueBox::DeployUtils do
+  before(:each) do
+    @util = TorqueBox::DeployUtils
+  end
+
+  describe '.jboss_home' do
+    extend PathHelper
+
+    before( :each ) do
+      ENV['TORQUEBOX_HOME'] = '/torquebox'
+      ENV['JBOSS_HOME'] = ENV['TORQUEBOX_HOME'] + '/jboss'
+    end
+
+    it 'should use JBOSS_HOME environment if it is set' do
+      @util.jboss_home.downcase.should == "#{absolute_prefix}/torquebox/jboss".downcase
+    end
+
+    it 'should use TORQUEBOX_HOME environment if JBOSS_HOME is not set' do
+      ENV['JBOSS_HOME'] = nil
+      @util.jboss_home.downcase.should == "#{absolute_prefix}/torquebox/jboss".downcase
+    end
+
+    it 'should raise an error if neither JBOSS_HOME or TORQUEBOX_HOME is set' do
+      ENV['JBOSS_HOME'] = nil
+      ENV['TORQUEBOX_HOME'] = nil
+      lambda { @util.jboss_home }.should raise_error
+    end
+
+  end
+
+  describe '.torquebox_home' do
+    extend PathHelper
+
+    it 'should return nil if TORQUEBOX_HOME is not set and torquebox-server is not installed' do
+      ENV['TORQUEBOX_HOME'] = nil
+      TorqueBox::Server.should_receive( :torquebox_home ).and_return( nil )
+      @util.torquebox_home.should == nil
+    end
+
+    it 'should use torquebox-server if TORQUEBOX_HOME is not set and torquebox-server is installed' do
+      ENV['TORQUEBOX_HOME'] = nil
+      TorqueBox::Server.should_receive( :torquebox_home ).and_return( 'torquebox-server-install-path' )
+      @util.torquebox_home.should == 'torquebox-server-install-path'
+    end
+
+    it 'should use TORQUEBOX_HOME environment variable' do
+      ENV['TORQUEBOX_HOME'] = '/torquebox'
+      @util.torquebox_home.downcase.should == "#{absolute_prefix}/torquebox".downcase
+    end
+
+  end
+
+  describe '.jboss_conf' do
+    extend PathHelper
+    it 'should defafult to "standalone"' do
+      @util.jboss_conf.should == 'standalone'
+    end
+
+    it 'should use ENV["JBOSS_CONF"] if it exists' do
+      ENV['JBOSS_CONF'] = 'domain'
+      @util.jboss_conf.should == ENV['JBOSS_CONF']
+    end
+
+    it 'should use ENV["TORQUEBOX_CONF"] if it exists' do
+      ENV['TORQUEBOX_CONF'] = 'foobar'
+      @util.jboss_conf.should == ENV['TORQUEBOX_CONF']
+    end
+
+    it 'should prefer ENV["TORQUEBOX_CONF"] if it exists over ENV["JBOSS_CONF"]' do
+      ENV['JBOSS_CONF'] = 'domain'
+      ENV['TORQUEBOX_CONF'] = 'foobar'
+      @util.jboss_conf.should == ENV['TORQUEBOX_CONF']
+    end
+  end
+
+  describe '.sys_root' do
+    extend PathHelper
+    it 'should be /' do
+      @util.sys_root.should == '/'
+    end
+  end
+
+  describe '.opt_dir' do
+    extend PathHelper
+    it 'should be /opt' do
+      @util.opt_dir.should == '/opt'
+    end
+  end
+
+  describe '.opt_torquebox' do
+    extend PathHelper
+    it 'should be /opt' do
+      @util.opt_torquebox.should == '/opt/torquebox'
+    end
+  end
+
+  describe '.server_dir' do
+    extend PathHelper
+    it 'should default to ENV["JBOSS_HOME"]/standalone' do
+      ENV['JBOSS_HOME'] = '/opt/torquebox/jboss'
+      ENV['JBOSS_CONF'] = nil
+      ENV['TORQUEBOX_CONF'] = nil
+      @util.server_dir.downcase.should == "#{absolute_prefix}/opt/torquebox/jboss/standalone".downcase
+    end
+
+    it 'should use ENV["JBOSS_HOME"]/ENV["JBOSS_CONF"] if JBOSS_CONF is available' do
+      ENV['JBOSS_HOME'] = '/opt/torquebox/jboss'
+      ENV['JBOSS_CONF'] = 'foobar'
+      ENV['TORQUEBOX_CONF'] = nil
+      @util.server_dir.downcase.should == "#{absolute_prefix}/opt/torquebox/jboss/foobar".downcase
+    end
+
+    it 'should use ENV["JBOSS_HOME"]/ENV["TORQUEBOX_CONF"] if TORQUEBOX_CONF is available' do
+      ENV['JBOSS_HOME'] = '/opt/torquebox/jboss'
+      ENV['JBOSS_CONF'] = 'foobar'
+      ENV['TORQUEBOX_CONF'] = 'boofar'
+      @util.server_dir.downcase.should == "#{absolute_prefix}/opt/torquebox/jboss/boofar".downcase
+    end
+  end
+
+  describe '.config_dir' do
+    extend PathHelper
+    before( :each ) do
+      ENV['TORQUEBOX_HOME'] = '/opt/torquebox'
+      ENV['JBOSS_HOME'] = '/opt/torquebox/jboss'
+      ENV['JBOSS_CONF'] = nil
+      ENV['TORQUEBOX_CONF'] = nil
+    end
+
+    it 'should be ENV["JBOSS_HOME"]/standalone/configuration' do
+      @util.config_dir.downcase.should == "#{absolute_prefix}#{ENV['JBOSS_HOME']}/standalone/configuration".downcase
+    end
+
+    it 'should be ENV["JBOSS_HOME"]/standalone/configuration/torquebox/standalone-preview-ha.xml' do
+      @util.cluster_config_file.downcase.should == "#{absolute_prefix}#{ENV['JBOSS_HOME']}/standalone/configuration/torquebox/standalone-preview-ha.xml".downcase
+    end
+  end
+
+
+  describe '.properties_dir' do
+    extend PathHelper
+    before( :each ) do
+      ENV['TORQUEBOX_HOME'] = '/opt/torquebox'
+      ENV['JBOSS_HOME'] = '/opt/torquebox/jboss'
+      ENV['JBOSS_CONF'] = nil
+      ENV['TORQUEBOX_CONF'] = nil
+    end
+
+    it 'should be ENV["JBOSS_HOME"]/standalone/configuration' do
+      @util.properties_dir.downcase.should == "#{absolute_prefix}#{ENV['JBOSS_HOME']}/standalone/configuration".downcase
+    end
+
+    it 'should be the same as @util.config_dir' do
+      @util.properties_dir.downcase.should == @util.config_dir.downcase
+    end
+  end
+
+  describe '.deploy_dir' do
+    extend PathHelper
+    before( :each ) do
+      ENV['JBOSS_HOME'] = '/opt/torquebox/jboss'
+      ENV['JBOSS_CONF'] = nil
+      ENV['TORQUEBOX_CONF'] = nil
+    end
+    it 'should point to JBOSS_HOME/JBOSS_CONF/deployments' do
+      @util.deploy_dir.downcase.should == "#{absolute_prefix}#{ENV['JBOSS_HOME']}/standalone/deployments".downcase
+    end
+  end
+
+  describe '.modules_dir' do
+    extend PathHelper
+
+    before( :each ) do
+      ENV['TORQUEBOX_HOME'] = '/torquebox'
+      ENV['JBOSS_HOME'] = ENV['TORQUEBOX_HOME'] + '/jboss'
+    end
+
+    it 'should be where I expect it to be' do
+      @util.modules_dir.downcase.should == "#{absolute_prefix}/torquebox/jboss/modules".downcase
+    end
+
+  end
+
+  describe '.torquebox_modules_dir' do
+    extend PathHelper
+
+    before( :each ) do
+      ENV['TORQUEBOX_HOME'] = '/torquebox'
+      ENV['JBOSS_HOME'] = ENV['TORQUEBOX_HOME'] + '/jboss'
+    end
+
+    it 'should be where I expect it to be' do
+      @util.torquebox_modules_dir.downcase.should == "#{absolute_prefix}/torquebox/jboss/modules/org/torquebox".downcase
+    end
+
+  end
+
+  describe '.check_server' do
+    context "when it can't find the modules" do 
+      before(:each) do
+        File.stub(:exist?).and_return(false)
+      end
+      
+      it "should raise if it can't find the torquebox modules" do
+        lambda { @util.check_server }.should raise_error
+      end
+
+      it "should give a helpful error message" do
+        begin
+          @util.check_server
+        rescue Exception => e
+          e.message.should =~ %r{doesn't appear to be a valid TorqueBox install}
+        end
+      end
+    end
+  end
+
+  describe '.run_server' do
+    before( :each ) do
+      ENV['TORQUEBOX_HOME'] = '/torquebox'
+      ENV['JBOSS_HOME'] = ENV['TORQUEBOX_HOME'] + '/jboss'
+      Dir.stub!(:chdir).and_yield
+      Kernel.stub!(:exec)
+      @util.stub!(:exec)
+      @util.stub!(:exec_command)
+    end
+
+    it 'should pass options to run_command_line' do
+      options = { :clustered => true, :max_threads => 25 }
+      @util.should_receive(:run_command_line).with(options).and_return([])
+      @util.run_server(options)
+    end
+
+    it 'should check if the current directory is deployed' do
+      @util.should_receive(:is_deployed?).and_return( true )
+      @util.run_server
+    end
+  end
+
+  describe '.is_deployed?' do
+    before( :each ) do
+      ENV['TORQUEBOX_HOME'] = '/torquebox'
+      ENV['JBOSS_HOME'] = ENV['TORQUEBOX_HOME'] + '/jboss'
+      @myapp = @util.deployment_name( 'my-app' )
+    end
+
+    it 'should be false if the app is not deployed' do
+      @util.is_deployed?( @myapp ).should be_false
+    end
+
+    it 'should be true if the app has been deployed' do
+      File.stub('exists?').with(File.join(@util.torquebox_home, 'apps')).and_return false
+      File.stub('exists?').with(File.join(@util.deploy_dir, @myapp)).and_return true
+      @util.is_deployed?( @myapp ).should be_true
+    end
+
+    it 'should default to the default deployment_name' do
+      @util.should_receive(:deployment_name).and_return @myapp
+      @util.is_deployed?
+    end
+
+  end
+
+  describe '.run_command_line' do
+    it 'should not add --server-config when not clustered' do
+      command, options = @util.run_command_line(:clustered => false)
+      options.should_not include('--server-config=')
+    end
+
+    it 'should add --server-config when clustered' do
+      command, options = @util.run_command_line(:clustered => true)
+      options.should include('--server-config=')
+    end
+
+    it 'should not set max threads by default' do
+      command, options = @util.run_command_line
+      options.should_not include('-Dorg.torquebox.web.http.maxThreads=')
+    end
+
+    it 'should set max threads when given' do
+      command, options = @util.run_command_line(:max_threads => 5)
+      options.should include('-Dorg.torquebox.web.http.maxThreads=5')
+    end
+
+    it 'should not set bind address by default' do
+      command, options = @util.run_command_line
+      options.should_not include('-b ')
+    end
+
+    it 'should set bind address when given' do
+      command, options = @util.run_command_line(:bind_address => '0.0.0.0')
+      options.should include('-b 0.0.0.0')
+    end
+  end
+end

data/spec/server_spec.rb

@@ -0,0 +1,39 @@
+require 'torquebox/server'
+
+describe TorqueBox::Server do
+
+  it "should expand relative paths" do
+    java.lang.System.setProperty('jruby.home', '.')
+    TorqueBox::Server.jruby_home.should == Dir.pwd
+  end
+
+  it "should return nil if torquebox-server is not installed" do
+    TorqueBox::Server.torquebox_home.should == nil
+  end
+  
+  describe "under jruby-1.6.5" do
+    it "should use torquebox-server gem's installed path" do
+      server_gem = mock('server-gem')
+      Gem::Specification.should_receive(:find_by_name).with('torquebox-server').and_return(server_gem)
+      server_gem.stub('full_gem_path').and_return('torquebox-server-install-path')
+      TorqueBox::Server.torquebox_home.should == 'torquebox-server-install-path'
+    end
+  end
+
+  describe "under jruby-1.6.4" do
+    it "should use Gem.searcher to find the torquebox-server install path" do
+      # make rubygems lie to us
+      old_gems = Gem::Version.new( '1.5.1' )
+      TorqueBox::Server.stub!( :gem_version ).and_return( old_gems )
+      
+      # mocks for rubygems
+      server_gem = mock('server-gem')
+      searcher   = mock('searcher')
+      Gem.stub!(:searcher).and_return(searcher)
+      searcher.stub!('find').and_return(server_gem)
+      server_gem.stub('full_gem_path').and_return('torquebox-server-install-path')
+
+      TorqueBox::Server.torquebox_home.should == 'torquebox-server-install-path'
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,64 @@
+#
+# Copyright 2011 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+require 'java'
+
+$: << File.dirname(__FILE__) + '/../lib' 
+
+require 'torquebox-rake-support'
+
+TESTING_ON_WINDOWS = ( java.lang::System.getProperty( "os.name" ) =~ /windows/i )
+
+module PathHelper
+  def self.extended(cls)
+    cls.class_eval do
+
+      def pwd()
+        self.class.pwd
+      end
+
+      def self.pwd()
+        ::Dir.pwd
+      end
+
+      def absolute_prefix
+        self.class.absolute_prefix
+      end
+
+      def self.absolute_prefix
+        return '' unless ( TESTING_ON_WINDOWS )
+        'C:'
+      end
+  
+      def vfs_path(path)
+        self.class.vfs_path( path )
+      end
+
+      def self.vfs_path(path)
+        return path                   if ( path[0,4] == 'vfs:' )
+        return "vfs:#{path}"          if ( path[0,1] == '/' )
+        return "vfs:#{path}"          if ( path[0,1] == '\\' )
+        return vfs_path( "/#{path}" ) if ( path =~ %r(^[a-zA-Z]:) )
+        return vfs_path( File.join( pwd, path ) )
+      end
+
+
+    end
+
+  end
+end
+

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: torquebox-rake-support
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.1
+  prerelease: 6
+  version: 2.0.0.beta1
 platform: ruby
 authors: 
   - The TorqueBox Team
@@ -10,10 +10,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 -04:00
-default_executable: 
-dependencies: []
-
+date: 2011-12-02 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.8.7
+        - - <
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 2.7.0
+    type: :development
+    version_requirements: *id002
 description: ""
 email: 
   - torquebox-dev@torquebox.org
@@ -29,17 +52,19 @@ files:
   - lib/torquebox-rake-support.rb
   - lib/torquebox/deploy_utils.rb
   - lib/torquebox/launchd.rb
+  - lib/torquebox/server.rb
   - lib/torquebox/upstart.rb
   - lib/torquebox/rake/tasks.rb
   - lib/torquebox/rake/tasks/archive.rb
-  - lib/torquebox/rake/tasks/auth.rb
   - lib/torquebox/rake/tasks/deployment.rb
   - lib/torquebox/rake/tasks/server.rb
   - generators/USAGE
   - generators/torquebox_queue_generator.rb
   - generators/templates/queue.rb
-has_rdoc: true
-homepage: http://www.torquebox.org/torquebox-rake-support/
+  - spec/deploy_utils_spec.rb
+  - spec/server_spec.rb
+  - spec/spec_helper.rb
+homepage: http://www.torquebox.org/torquebox-gems-parent/torquebox-rake-support/
 licenses: 
   - lgpl
 post_install_message: 
@@ -56,15 +81,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: TorqueBox Rake Support
-test_files: []
-
+test_files: 
+  - spec/deploy_utils_spec.rb
+  - spec/server_spec.rb

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

@@ -1,32 +0,0 @@
-# Copyright 2008-2011 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
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
-require 'rake'
-require 'torquebox/deploy_utils'
-
-namespace :torquebox do
-
-  namespace :auth do
-    desc "Add a username and password to the torquebox-auth security realm with CREDENTIALS=user:pass"
-    task :adduser do
-      abort "Provide credentials as rake torquebox:auth:adduser CREDENTIALS=user:pass" unless ENV['CREDENTIALS']
-      properties_file = TorqueBox::DeployUtils.write_credentials( [ENV['CREDENTIALS'].split( ':' )] )
-      puts "Credentials written to #{properties_file}"
-    end
-  end
-end
-