torquebox-capistrano-support 2.1.1 → 2.1.2

data/lib/torquebox/capistrano/recipes.rb

@@ -61,11 +61,12 @@ module Capistrano
       configuration.load do 
         # --
 
-        set( :app_ruby_version,    1.8 ) unless exists?( :app_ruby_version )
         set( :torquebox_home,      '/opt/torquebox' ) unless exists?( :torquebox_home )
 
         set( :jruby_home,          lambda{ "#{torquebox_home}/jruby" } ) unless exists?( :jruby_home )
-        set( :jruby_opts,          lambda{ "--#{app_ruby_version}" } ) unless exists?( :jruby_opts )
+        if exists?( :app_ruby_version ) && !exists?( :jruby_opts )
+          set( :jruby_opts,          lambda{ "--#{app_ruby_version}" } )
+        end
         set( :jruby_bin,           lambda{ "#{jruby_home}/bin/jruby #{jruby_opts}" } ) unless exists?( :jruby_bin )
 
         set( :jboss_home,          lambda{ "#{torquebox_home}/jboss" } ) unless exists?( :jboss_home )

data/spec/recipes_spec.rb

@@ -25,17 +25,33 @@ describe Capistrano::TorqueBox, "loaded into a configuration" do
     Capistrano::TorqueBox.load_into(@configuration)
   end
 
-  it "should define app_ruby_version" do
-    @configuration.exists?( :app_ruby_version ).should be_true
+  it "should not define app_ruby_version by default" do
+    @configuration.exists?( :app_ruby_version ).should be_false
   end
 
-  it "should default app_ruby_version to 1.8" do
+  it "should allow default 1.9 override for app_ruby_version" do
+    @configuration.set( :app_ruby_version, 1.9 )
+    Capistrano::TorqueBox.load_into(@configuration)
+    @configuration.fetch( :app_ruby_version ).should == 1.9
+  end
+
+  it "should allow default 1.8 override for app_ruby_version" do
+    @configuration.set( :app_ruby_version, 1.8 )
+    Capistrano::TorqueBox.load_into(@configuration)
     @configuration.fetch( :app_ruby_version ).should == 1.8
   end
 
-  it "should allow default override for app_ruby_version" do
+  it "should add app_ruby_version if set to jruby opts if unset" do
     @configuration.set( :app_ruby_version, 1.9 )
-    @configuration.fetch( :app_ruby_version ).should == 1.9
+    Capistrano::TorqueBox.load_into(@configuration)
+    @configuration.fetch( :jruby_opts ).should == "--1.9"
+  end
+
+  it "should not modify jruby_opts if already set" do
+    @configuration.set( :app_ruby_version, 1.9 )
+    @configuration.set( :jruby_opts, "-X+C" )
+    Capistrano::TorqueBox.load_into(@configuration)
+    @configuration.fetch( :jruby_opts ).should == "-X+C"
   end
 
   it "should create a deployment descriptor" do

metadata

@@ -2,7 +2,7 @@
 name: torquebox-capistrano-support
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-27 00:00:00 Z
+date: 2012-09-24 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: jruby-openssl