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

Cleanup ruby code via rubocop

Browse Source 
This commit will add code cleanup as corrected
and alerted by rubocop. It also adds rules to
execute rubocop on Travis.
This commit is contained in:
Will Meek
2017-11-17 16:40:06 +00:00
parent 692b490438
commit dec5136e11
18 changed files with 714 additions and 1087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/facter/java_default_home.rb
View File

@@ -11,18 +11,20 @@
# Notes:
# None
Facter.add(:java_default_home) do
confine :kernel => [ 'Linux', 'OpenBSD' ]
confine kernel: %w[Linux OpenBSD]
java_default_home = nil
setcode do
java_bin = Facter::Util::Resolution.which('java').to_s.strip
if java_bin.empty?
nil
else
java_path = File.realpath(java_bin)
if java_path =~ %r(/jre/)
java_default_home = File.dirname(File.dirname(File.dirname(java_path)))
else
java_default_home = File.dirname(File.dirname(java_path))
end
java_default_home = if java_path =~ %r{/jre/}
File.dirname(File.dirname(File.dirname(java_path)))
else
File.dirname(File.dirname(java_path))
end
end
end
java_default_home
end

3
lib/facter/java_libjvm_path.rb
View File

@@ -11,7 +11,7 @@
# Notes:
# None
Facter.add(:java_libjvm_path) do
confine :kernel => [ "Linux", "OpenBSD" ]
confine kernel: %w[Linux OpenBSD]
setcode do
java_default_home = Facter.value(:java_default_home)
java_libjvm_file = Dir.glob("#{java_default_home}/jre/lib/**/libjvm.so")
@@ -22,4 +22,3 @@ Facter.add(:java_libjvm_path) do
end
end
end

6
lib/facter/java_major_version.rb
View File

@@ -13,8 +13,10 @@
# Notes:
# None
Facter.add(:java_major_version) do
java_major_version = nil
setcode do
java_version = Facter.value(:java_version)
java_patch_level = java_version.strip.split('_')[0].split('.')[1] unless java_version.nil?
java_major_version = java_version.strip.split('_')[0].split('.')[1] unless java_version.nil?
end
end
java_major_version
end

4
lib/facter/java_patch_level.rb
View File

@@ -11,8 +11,10 @@
# Notes:
# None
Facter.add(:java_patch_level) do
java_patch_level = nil
setcode do
java_version = Facter.value(:java_version)
java_patch_level = java_version.strip.split('_')[1] unless java_version.nil?
end
end
java_patch_level
end

10
lib/facter/java_version.rb
View File

@@ -21,10 +21,10 @@ Facter.add(:java_version) do
# Additionally, facter versions prior to 2.0.1 only support
# positive matches, so this needs to be done manually in setcode.
setcode do
unless [ 'darwin' ].include? Facter.value(:operatingsystem).downcase
unless ['darwin'].include? Facter.value(:operatingsystem).downcase
version = nil
if Facter::Util::Resolution.which('java')
Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $~[1] if /^.+ version \"(.+)\"$/ =~ line }
Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $LAST_MATCH_INFO[1] if %r{^.+ version \"(.+)\"$} =~ line }
end
version
end
@@ -32,12 +32,12 @@ Facter.add(:java_version) do
end
Facter.add(:java_version) do
confine :operatingsystem => 'Darwin'
confine operatingsystem: 'Darwin'
has_weight 100
setcode do
unless /Unable to find any JVMs matching version/ =~ Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1')
unless %r{Unable to find any JVMs matching version} =~ Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1')
version = nil
Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $~[1] if /^.+ version \"(.+)\"$/ =~ line }
Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $LAST_MATCH_INFO[1] if %r{^.+ version \"(.+)\"$} =~ line }
version
end
end