From 197213e51734ac949f2af61fb7ebc9703265f1b3 Mon Sep 17 00:00:00 2001 From: Jeroen Hooyberghs Date: Tue, 10 Sep 2019 14:15:56 +0200 Subject: [PATCH] Put test result in variable to satisfy RuboCop --- lib/facter/java_major_version.rb | 12 ++++++------ lib/facter/java_patch_level.rb | 13 ++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/lib/facter/java_major_version.rb b/lib/facter/java_major_version.rb index c82e20c..3c3c99f 100644 --- a/lib/facter/java_major_version.rb +++ b/lib/facter/java_major_version.rb @@ -18,12 +18,12 @@ Facter.add(:java_major_version) do java_version = Facter.value(:java_version) unless java_version.nil? # First part > 1, use the first part as major version - java_version_test = java_version.strip.split('.')[0] - if java_version_test.to_i > 1 - java_major_version = java_version_test - else - java_major_version = java_version.strip.split('_')[0].split('.')[1] - end + java_version_first_number = java_version.strip.split('.')[0] + java_major_version = if java_version_first_number.to_i > 1 + java_version_first_number + else + java_version.strip.split('_')[0].split('.')[1] + end end end java_major_version diff --git a/lib/facter/java_patch_level.rb b/lib/facter/java_patch_level.rb index 5e4e897..d3acded 100644 --- a/lib/facter/java_patch_level.rb +++ b/lib/facter/java_patch_level.rb @@ -16,14 +16,13 @@ Facter.add(:java_patch_level) do java_version = Facter.value(:java_version) unless java_version.nil? # First part > 1, use . as seperator to get patch level - java_version_test = java_version.strip.split('.')[0] - if java_version_test.to_i > 1 - java_patch_level = java_version.strip.split('.')[2] - else - java_patch_level = java_version.strip.split('_')[1] - end + java_version_first_number = java_version.strip.split('.')[0] + java_patch_level = if java_version_first_number.to_i > 1 + java_version.strip.split('.')[2] + else + java_version.strip.split('_')[1] + end end - end java_patch_level end