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

Put test result in variable to satisfy RuboCop

Browse Source
This commit is contained in:
Jeroen Hooyberghs
2019-09-10 14:15:56 +02:00
parent 21d39590b0
commit 197213e517
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/facter/java_major_version.rb
View File

@@ -18,12 +18,12 @@ Facter.add(:java_major_version) do
java_version = Facter.value(:java_version) java_version = Facter.value(:java_version)
unless java_version.nil? unless java_version.nil?
# First part > 1, use the first part as major version # First part > 1, use the first part as major version
java_version_test = java_version.strip.split('.')[0] java_version_first_number = java_version.strip.split('.')[0]
if java_version_test.to_i > 1 java_major_version = if java_version_first_number.to_i > 1
java_major_version = java_version_test java_version_first_number
else else
java_major_version = java_version.strip.split('_')[0].split('.')[1] java_version.strip.split('_')[0].split('.')[1]
end end
end end
end end
java_major_version java_major_version

13
lib/facter/java_patch_level.rb
View File

@@ -16,14 +16,13 @@ Facter.add(:java_patch_level) do
java_version = Facter.value(:java_version) java_version = Facter.value(:java_version)
unless java_version.nil? unless java_version.nil?
# First part > 1, use . as seperator to get patch level # First part > 1, use . as seperator to get patch level
java_version_test = java_version.strip.split('.')[0] java_version_first_number = java_version.strip.split('.')[0]
if java_version_test.to_i > 1 java_patch_level = if java_version_first_number.to_i > 1
java_patch_level = java_version.strip.split('.')[2] java_version.strip.split('.')[2]
else else
java_patch_level = java_version.strip.split('_')[1] java_version.strip.split('_')[1]
end end
end end
end end
java_patch_level java_patch_level
end end