svn commit: r655729 - in /incubator/buildr/trunk: CHANGELOG lib/buildr/java.rb spec/java_spec.rb

[as...@apache.org]

Author: assaf
Date: Mon May 12 21:21:11 2008
New Revision: 655729

URL: http://svn.apache.org/viewvc?rev=655729&view=rev
Log:
Merge branch 'BUILDR-68'

Added:
    incubator/buildr/trunk/spec/java_spec.rb
      - copied, changed from r654524, incubator/buildr/trunk/lib/buildr/java.rb
Modified:
    incubator/buildr/trunk/CHANGELOG
    incubator/buildr/trunk/lib/buildr/java.rb

Modified: incubator/buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/CHANGELOG?rev=655729&r1=655728&r2=655729&view=diff
==============================================================================
--- incubator/buildr/trunk/CHANGELOG (original)
+++ incubator/buildr/trunk/CHANGELOG Mon May 12 21:21:11 2008
@@ -2,6 +2,7 @@
 * Added:  reading files from SFTP server.
 * Changed: Upgraded to Net::SSH 2.0 and Net::SFTP 2.0.
 * Fixed: BUILDR-67 HTTP GET now works with query parameters (Tommy Knowlton).
+* Fixed: BUILDR-68 Now accepting JAVA_HOME setting on OS X (Nathan Hamblen).
 
 1.3.0 (2008-04-25)
 * Added: Testing with EasyB (Nicolas Modrzyk).

Modified: incubator/buildr/trunk/lib/buildr/java.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java.rb?rev=655729&r1=655728&r2=655729&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java.rb Mon May 12 21:21:11 2008
@@ -14,7 +14,7 @@
 # the License.
 
 
-ENV['JAVA_HOME'] = '/System/Library/Frameworks/JavaVM.framework/Home' if Config::CONFIG['host_os'] =~ /darwin/i
+ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home' if Config::CONFIG['host_os'] =~ /darwin/i
 require PLATFORM == 'java' ? 'buildr/java/jruby' : 'buildr/java/rjb'
 
 

Copied: incubator/buildr/trunk/spec/java_spec.rb (from r654524, incubator/buildr/trunk/lib/buildr/java.rb)
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/java_spec.rb?p2=incubator/buildr/trunk/spec/java_spec.rb&p1=incubator/buildr/trunk/lib/buildr/java.rb&r1=654524&r2=655729&rev=655729&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java.rb (original)
+++ incubator/buildr/trunk/spec/java_spec.rb Mon May 12 21:21:11 2008
@@ -13,14 +13,26 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+require File.join(File.dirname(__FILE__), 'spec_helpers')
 
-ENV['JAVA_HOME'] = '/System/Library/Frameworks/JavaVM.framework/Home' if Config::CONFIG['host_os'] =~ /darwin/i
-require PLATFORM == 'java' ? 'buildr/java/jruby' : 'buildr/java/rjb'
+describe ENV, 'JAVA_HOME on OS X' do
+  before do
+    @old_home, ENV['JAVA_HOME'] = ENV['JAVA_HOME'], nil
+    Config::CONFIG.should_receive(:[]).with('host_os').and_return('darwin0.9')
+  end
 
+  it 'should point to default JVM' do
+    load File.expand_path('../lib/buildr/java.rb')
+    ENV['JAVA_HOME'].should == '/System/Library/Frameworks/JavaVM.framework/Home'
+  end
 
-require 'buildr/java/compilers'
-require 'buildr/java/test_frameworks'
-require 'buildr/java/bdd_frameworks'
-require 'buildr/java/packaging'
-require 'buildr/java/commands'
-require 'buildr/java/deprecated'
+  it 'should use value of environment variable if specified' do
+    ENV['JAVA_HOME'] = '/System/Library/Frameworks/JavaVM.specified'
+    load File.expand_path('../lib/buildr/java.rb')
+    ENV['JAVA_HOME'].should == '/System/Library/Frameworks/JavaVM.specified'
+  end
+
+  after do
+    ENV['JAVA_HOME'] = @old_home
+  end
+end