RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Improve java_version fact maintainability

Browse Source
This commit is contained in:
Eli Young
2015-02-09 15:26:53 -08:00
parent 97b48f12d1
commit 8dd715a599
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/facter/java_version.rb
View File

@@ -11,9 +11,9 @@
#
# Notes:
# None
if Facter::Util::Resolution.which('java')
Facter.add(:java_version) do
setcode do
if Facter::Util::Resolution.which('java')
Facter::Util::Resolution.exec('java -Xmx8m -version 2>&1').lines.first.split(/"/)[1].strip
end
end

4
spec/unit/facter/java_version_spec.rb
View File

@@ -15,7 +15,7 @@ Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
EOS
Facter::Util::Resolution.expects(:which).with("java").returns(true)
Facter::Util::Resolution.expects(:exec).with("java -Xmx8m -version 2>&1").returns(java_version_output)
Facter.fact(:java_version).value.should == "1.7.0_71"
Facter.value(:java_version).should == "1.7.0_71"
end
end
@@ -23,7 +23,7 @@ Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
it do
Facter::Util::Resolution.stubs(:exec)
Facter::Util::Resolution.expects(:which).with("java").returns(false)
Facter.fact(:java_version).should be_nil
Facter.value(:java_version).should be_nil
end
end
end