Take upstream java fixes and put them here

Got some advice from some Puppetlabs people on how to do facts better! :)

Author: petems

lib/facter/java_major_version.rb

@@ -0,0 +1,20 @@
+# Fact: java_major_version
+#
+# Purpose: get Java's major version
+#
+# Resolution:
+#   Tests for presence of java, returns nil if not present
+#   returns output of "java -version" and splits on \n + '"'
+#   eg.
+#
+# Caveats:
+#   none
+#
+# Notes:
+#   None
+Facter.add(:java_major_version) do
+  setcode do
+    java_version = Facter.value(:java_version)
+    java_patch_level = java_version.strip.split('_')[0].split('.')[1] unless java_version.nil?
+  end
+end

lib/facter/java_patch_level.rb

@@ -13,10 +13,6 @@
 Facter.add(:java_patch_level) do
   setcode do
     java_version = Facter.value(:java_version)
-    if java_version.nil?
-      "JAVA_NOT_INSTALLED"
-    else
-      java_patch_level = java_version.strip.split('_')[1]
-    end
+    java_patch_level = java_version.strip.split('_')[1] unless java_version.nil?
   end
 end

lib/facter/java_version.rb

@@ -1,6 +1,6 @@
 # Fact: java_version
 #
-# Purpose: store java versions in the config DB
+# Purpose: get full java version string
 #
 # Resolution:
 #   Tests for presence of java, returns nil if not present
@@ -11,11 +11,10 @@
 #
 # Notes:
 #   None
-Facter.add(:java_version) do
-  setcode do
-    # This will fail on OS X when Java hasn't been installed yet.
-    next unless system "/usr/libexec/java_home --failfast &>/dev/null"
-    t_java = Facter::Util::Resolution.exec("java -version 2>&1")
-    java_version = t_java.to_s.lines.first.strip.split(/version/)[1].gsub(/"/, "").strip
+if Facter::Util::Resolution.which('java')
+  Facter.add(:java_version) do
+    setcode do
+      Facter::Util::Resolution.exec('java -version 2>&1').lines.first.split(/"/)[1].strip
+    end
   end
 end

spec/unit/facter/java_major_version_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe Facter::Util::Fact do
+  before {
+    Facter.clear
+  }
+
+  describe "java_major_version" do
+    context 'returns java major version extracted from java_version fact' do
+      before :each do
+        allow(Facter.fact(:java_version)).to receive(:value).and_return("1.7.0_71")
+      end
+      it do
+        Facter.fact(:java_major_version).value.should == "7"
+      end
+    end
+
+    context 'returns nil when java_version fact not present' do
+      before :each do
+        allow(Facter.fact(:java_version)).to receive(:value).and_return(nil)
+      end
+      it do
+        Facter.fact(:java_major_version).value.should be_nil
+      end
+    end
+  end
+end

spec/unit/facter/java_patch_level_spec.rb

@@ -6,25 +6,21 @@
   }
 
   describe "java_patch_level" do
-    context "if java is installed" do
-      context 'returns java patch version extracted from java_version fact' do
-        before :each do
-          allow(Facter.fact(:java_version)).to receive(:value).and_return("1.7.0_71")
-        end
-        it do
-          Facter.fact(:java_patch_level).value.should == "71"
-        end
+    context 'returns java patch version extracted from java_version fact' do
+      before :each do
+        allow(Facter.fact(:java_version)).to receive(:value).and_return("1.7.0_71")
+      end
+      it do
+        Facter.fact(:java_patch_level).value.should == "71"
       end
     end
 
-    context "if java is installed" do
-      context 'returns java patch version extracted from java_version fact' do
-        before :each do
-          allow(Facter.fact(:java_version)).to receive(:value).and_return(nil)
-        end
-        it do
-          Facter.fact(:java_patch_level).value.should == "JAVA_NOT_INSTALLED"
-        end
+    context "returns nil when java_version fact not present" do
+      before :each do
+        allow(Facter.fact(:java_version)).to receive(:value).and_return(nil)
+      end
+      it do
+        Facter.fact(:java_patch_level).value.should be_nil
       end
     end
   end

spec/unit/facter/java_version_spec.rb

@@ -3,8 +3,6 @@
 describe Facter::Util::Fact do
   before {
     Facter.clear
-    allow(Facter::Util::Resolution).to receive(:exec).with(anything()).and_return(nil)
-    allow(Facter.fact(:kernel)).to receive(:value).and_return("Darwin")
   }
 
   describe "java_version" do
@@ -15,18 +13,19 @@
 Java(TM) SE Runtime Environment (build 1.7.0_71-b14)
 Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
         EOS
+        allow(Facter::Util::Resolution).to receive(:which).with("java").
+          and_return(true)
         allow(Facter::Util::Resolution).to receive(:exec).with("java -version 2>&1").
-        and_return(java_version_output)
+          and_return(java_version_output)
         Facter.fact(:java_version).value.should == "1.7.0_71"
       end
     end
 
-    context 'returns nil when java present' do
+    context 'returns nil when java not present' do
       it do
-        java_version_output = "bash: java: command not found"
-        allow(Facter::Util::Resolution).to receive(:exec).with("java -version 2>&1").
-        and_return(java_version_output)
-        Facter.fact(:java_version).value.should be_nil
+        allow(Facter::Util::Resolution).to receive(:which).with("java").
+          and_return(false)
+        Facter.fact(:java_version).should be_nil
       end
     end
   end