torquebox-rake-support 2.0.0.beta3 → 2.0.0.cr1

data/lib/torquebox/deploy_utils.rb

@@ -116,16 +116,25 @@ module TorqueBox
         puts "TorqueBox install OK: #{opt_torquebox}"
       end
 
+      def set_java_opts(options)
+        ENV['APPEND_JAVA_OPTS'] = options
+      end
+
       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]
+        options = "#{options} -Djboss.socket.binding.port-offset=#{opts[:port_offset]}" if opts[:port_offset]
+        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]
         if windows?
           cmd = "#{jboss_home.gsub('/', '\\')}\\bin\\standalone.bat"
         else
           cmd = "/bin/sh bin/standalone.sh"
         end
+        puts "#{cmd} #{options}" # Make it clear to the user what is being passed through to JBoss AS
         [cmd, options]
       end
 
@@ -134,7 +143,6 @@ module TorqueBox
       end
 
       def run_server(options={})
-        
         puts "[WARNING] #{deployment_name} has not been deployed. Starting TorqueBox anyway." unless ( is_deployed? )
 
         Dir.chdir(jboss_home) do
@@ -144,6 +152,7 @@ module TorqueBox
           # is probably not what we want.
           ENV.delete('BUNDLE_GEMFILE')
 
+          set_java_opts(options[:jvm_options])
           exec_command(run_command_line(options).join(' '))
         end
       end
@@ -321,9 +330,33 @@ module TorqueBox
       def normalize_archive_name(name)
         name[-5..-1] == '.knob' ? name : name + '.knob'
       end
+
+      def deployment_descriptors
+        Dir.glob( "#{deploy_dir}/*-knob.yml" ).collect { |d| File.basename( d ) }
+      end
+
+      def deployment_status
+        applications = {}
+        deployment_descriptors.each do | descriptor |
+          descriptor_path = File.join( deploy_dir, descriptor )
+          appname = descriptor.sub( /\-knob.yml/, '' ) 
+          applications[appname] = {}
+          applications[appname][:descriptor] = descriptor_path
+          applications[appname][:status] = case 
+                                           when File.exists?("#{descriptor_path}.dodeploy")
+                                             "awaiting deployment"
+                                           when File.exists?("#{descriptor_path}.deployed")
+                                             "deployed"
+                                           when File.exists?("#{descriptor_path}.failed")
+                                             "deployment failed"
+                                           else "unknown: try running `torquebox deploy #{appname}`"
+                                           end
+        end
+        applications
+      end
       
       private 
-      
+
       def undeploy(name, opts = {})
         puts "Attempting to undeploy #{name}"
         from_dir = find_option( opts, 'deploy_dir' ) || deploy_dir

data/lib/torquebox/rails.rb

@@ -15,30 +15,69 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+
 begin
-  require 'rails/generators'
-  require 'rails/generators/rails/app/app_generator'
+  require 'rails/version'
 rescue LoadError
-  # Rails isn't installed, bail out
-  return
 end
 
 module TorqueBox
   class Rails
+
     def self.new_app
+      print_rails_not_installed_and_exit unless rails_installed?
+      require_generators
       # Assumes ARGV[0] already has the application name
       ARGV << [ "-m", TorqueBox::Rails.template ]
       ARGV.flatten!
-      ::Rails::Generators::AppGenerator.start
+      if using_rails3?
+        ::Rails::Generators::AppGenerator.start
+      else
+        ::Rails::Generator::Base.use_application_sources!
+        ::Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'app')
+      end
     end
 
     def self.apply_template( root )
-      generator = ::Rails::Generators::AppGenerator.new( [root], {}, :destination_root => root )
-      generator.apply TorqueBox::Rails.template 
+      print_rails_not_installed_and_exit unless rails_installed?
+      require_generators
+      if using_rails3?
+        generator = ::Rails::Generators::AppGenerator.new( [root], {}, :destination_root => root )
+        generator.apply TorqueBox::Rails.template
+      else
+        ::Rails::TemplateRunner.new( TorqueBox::Rails.template )
+      end
     end
 
+
     def self.template
       "#{ENV['TORQUEBOX_HOME']}/share/rails/template.rb"
     end
+
+    def self.rails_installed?
+      defined? ::Rails::VERSION
+    end
+
+    def self.print_rails_not_installed_and_exit
+      $stderr.puts "Rails not installed. Unable to load generators"
+      exit 1
+    end
+
+    def self.using_rails3?
+      ::Rails::VERSION::MAJOR == 3
+    end
+
+    def self.require_generators
+      if using_rails3?
+        require 'rails/generators'
+        require 'rails/generators/rails/app/app_generator'
+      else
+        require 'rails_generator'
+        require 'rails_generator/generators/applications/app/app_generator'
+        require 'rails_generator/generators/applications/app/template_runner'
+        require 'rails_generator/scripts/generate'
+      end
+    end
   end
 end
+

data/lib/torquebox/server.rb

@@ -23,7 +23,6 @@ module TorqueBox
 
     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' )

data/spec/deploy_utils_spec.rb

@@ -223,7 +223,7 @@ describe TorqueBox::DeployUtils do
         begin
           @util.check_server
         rescue Exception => e
-          e.message.should =~ %r{doesn't appear to be a valid TorqueBox install}
+          e.message.should =~ /doesn't appear to be a valid TorqueBox install/
         end
       end
     end
@@ -249,6 +249,11 @@ describe TorqueBox::DeployUtils do
       @util.should_receive(:is_deployed?).and_return( true )
       @util.run_server
     end
+
+    it 'should set java options' do
+      @util.should_receive(:set_java_opts).with('java options')
+      @util.run_server(:jvm_options => 'java options')
+    end
   end
 
   describe '.is_deployed?' do
@@ -305,6 +310,42 @@ describe TorqueBox::DeployUtils do
       command, options = @util.run_command_line(:bind_address => '0.0.0.0')
       options.should include('-b 0.0.0.0')
     end
+
+    it 'should not set port offset by default' do
+      command, options = @util.run_command_line
+      options.should_not include('-Djboss.socket.binding.port-offset')
+    end
+
+    it 'should set port offset when given' do
+      command, options = @util.run_command_line(:port_offset => '100')
+      options.should include('-Djboss.socket.binding.port-offset=100')
+    end
+
+    it 'should not set node name by default' do
+      command, options = @util.run_command_line
+      options.should_not include('-Djboss.node.name')
+    end
+
+    it 'should set node name when given' do
+      command, options = @util.run_command_line(:node_name => 'mynode')
+      options.should include('-Djboss.node.name=mynode')
+    end
+
+    it 'should not set data directory by default' do
+      command, options = @util.run_command_line
+      options.should_not include('-Djboss.server.data.dir')
+    end
+
+    it 'should set data directory when given' do
+      command, options = @util.run_command_line(:data_directory => '/tmp/mynode')
+      options.should include('-Djboss.server.data.dir=/tmp/mynode')
+    end
+
+    it 'should allow extra parameters to be passed through to JBoss AS' do
+      command, options = @util.run_command_line(:pass_through => '--help')
+      options.should include('--help')
+    end
+
   end
 
   describe '.create_archive' do
@@ -355,4 +396,45 @@ describe TorqueBox::DeployUtils do
       path.should == "/tmp/simpleapp.knob"
     end
   end
+
+  describe '.deployment_status' do
+    before( :each ) do
+      ENV['TORQUEBOX_HOME'] = '/torquebox'
+      ENV['JBOSS_HOME'] = ENV['TORQUEBOX_HOME'] + '/jboss'
+      @myapp = @util.deployment_name( 'my-app' )
+      @appname = @myapp.sub /\-knob.yml/, ''
+      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
+      File.stub('exists?').with(File.join(@util.deploy_dir, "#{@myapp}.dodeploy")).and_return false
+      File.stub('exists?').with(File.join(@util.deploy_dir, "#{@myapp}.deployed")).and_return false
+      File.stub('exists?').with(File.join(@util.deploy_dir, "#{@myapp}.failed")).and_return false
+      Dir.stub('glob').with( "#{@util.deploy_dir}/*-knob.yml" ).and_return [ File.join( @util.deploy_dir, @myapp ) ]
+    end
+
+    it 'should return a hash of deployment info keyed by application name' do
+      @util.deployment_status[@appname].should_not be_nil
+    end
+
+    it 'should provide the deployment descriptor path' do
+      @util.deployment_status[@appname][:descriptor].should_not be_nil
+    end
+
+    it 'should provide a deployment status if awaiting deployment' do
+      dodeploy_file = File.join(@util.deploy_dir, "#{@myapp}.dodeploy")
+      File.stub('exists?').with(dodeploy_file).and_return true
+      @util.deployment_status[@appname][:status].should == 'awaiting deployment'
+    end
+
+    it 'should provide a deployment status if deployed' do
+      deployed_file = File.join(@util.deploy_dir, "#{@myapp}.deployed")
+      File.stub('exists?').with(deployed_file).and_return true
+      @util.deployment_status[@appname][:status].should == 'deployed'
+    end
+
+    it 'should provide a deployment status if failed' do
+      failed_file   = File.join(@util.deploy_dir, "#{@myapp}.failed")
+      File.stub('exists?').with(failed_file).and_return true
+      @util.deployment_status[@appname][:status].should == 'deployment failed'
+    end
+  end
 end

data/spec/rails_spec.rb

@@ -0,0 +1,82 @@
+require 'torquebox/rails'
+
+describe TorqueBox::Rails do
+
+  context "Rails not installed" do
+    before(:each) do
+      TorqueBox::Rails.stub!(:rails_installed?).and_return(false)
+    end
+
+    describe "new_app" do
+      it "should print a warning" do
+        $stderr.should_receive(:puts)
+        lambda {
+          TorqueBox::Rails.new_app
+        }.should raise_error SystemExit
+      end
+    end
+
+    describe "apply_template" do
+      it "should print a warning" do
+        $stderr.should_receive(:puts)
+        lambda {
+          TorqueBox::Rails.apply_template("root")
+        }.should raise_error SystemExit
+      end
+    end
+
+  end
+
+  context "Rails 3" do
+    before(:each) do
+      TorqueBox::Rails.stub!(:rails_installed?).and_return(true)
+      TorqueBox::Rails.stub(:using_rails3?).and_return(true)
+      TorqueBox::Rails.stub(:require_generators)
+      module ::Rails; module Generators; class AppGenerator; end; end; end
+    end
+
+    describe "new_app" do
+      it "should generate" do
+        ::Rails::Generators::AppGenerator.should_receive(:start)
+        TorqueBox::Rails.new_app
+      end
+    end
+
+    describe "apply_template" do
+      it "should apply" do
+        generator = mock('generator')
+        ::Rails::Generators::AppGenerator.stub(:new).and_return(generator)
+        generator.should_receive(:apply).with(TorqueBox::Rails.template)
+        TorqueBox::Rails.apply_template('root')
+      end
+    end
+
+  end
+
+  context "Rails 2" do
+    before(:each) do
+      TorqueBox::Rails.stub!(:rails_installed?).and_return(true)
+      TorqueBox::Rails.stub(:using_rails3?).and_return(false)
+      TorqueBox::Rails.stub(:require_generators)
+      module ::Rails; module Generator; class Base; end; end; end
+      module ::Rails; module Generator; module Scripts; class Generate; end; end; end; end
+      module ::Rails; class TemplateRunner; end; end
+      ::Rails::Generator::Base.stub(:use_application_sources!)
+    end
+
+    describe "new_app" do
+      it "should generate" do
+        ::Rails::Generator::Scripts::Generate.any_instance.should_receive(:run)
+        TorqueBox::Rails.new_app
+      end
+    end
+
+    describe "apply_template" do
+      it "should apply" do
+        ::Rails::TemplateRunner.should_receive(:new).with(TorqueBox::Rails.template)
+        TorqueBox::Rails.apply_template('root')
+      end
+    end
+  end
+
+end

metadata

@@ -2,7 +2,7 @@
 name: torquebox-rake-support
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta3
+  version: 2.0.0.cr1
 platform: ruby
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-24 00:00:00 Z
+date: 2012-03-02 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake
@@ -48,26 +48,27 @@ extra_rdoc_files: []
 
 files: 
   - licenses/lgpl-2.1.txt
-  - lib/org.torquebox.rake-support.rb
   - lib/torquebox-rake-support.rb
-  - lib/torquebox/deploy_utils.rb
-  - lib/torquebox/launchd.rb
+  - lib/org.torquebox.rake-support.rb
   - lib/torquebox/rails.rb
-  - lib/torquebox/server.rb
+  - lib/torquebox/deploy_utils.rb
   - lib/torquebox/upstart.rb
+  - lib/torquebox/server.rb
+  - lib/torquebox/launchd.rb
   - lib/torquebox/rake/tasks.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/upstart_spec.rb
+  - spec/rails_spec.rb
   - spec/deploy_utils_spec.rb
-  - spec/server_spec.rb
   - spec/spec_helper.rb
-  - spec/upstart_spec.rb
-  - spec/fixtures/simpleapp/config.ru
+  - spec/server_spec.rb
   - spec/fixtures/simpleapp/simpleapp.box
+  - spec/fixtures/simpleapp/config.ru
 homepage: http://www.torquebox.org/torquebox-gems-parent/torquebox-rake-support/
 licenses: 
   - lgpl
@@ -91,11 +92,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: TorqueBox Rake Support
 test_files: 
+  - spec/upstart_spec.rb
+  - spec/rails_spec.rb
   - spec/deploy_utils_spec.rb
   - spec/server_spec.rb
-  - spec/upstart_spec.rb