openfact 5.7.0 → 6.1.0

data/lib/facter/framework/core/options.rb

@@ -16,7 +16,7 @@ module Facter
       end
 
       def []=(key, value)
-        OptionStore.send("#{key}=".to_sym, value)
+        OptionStore.send(:"#{key}=", value)
       end
 
       def custom_dir?

data/lib/facter/framework/formatters/legacy_fact_formatter.rb

@@ -69,7 +69,7 @@ module Facter
       pretty_json.gsub!(/"(.*)"\ =>/, '\1 =>')
 
       @log.debug('Remove double backslashes from paths')
-      pretty_json.gsub(/\\\\/, '\\')
+      pretty_json.gsub('\\\\', '\\')
     end
 
     def remove_enclosing_accolades(pretty_fact_json)

data/lib/facter/framework/logging/logger.rb

@@ -52,7 +52,7 @@ module Facter
 
       def set_logger_format
         @@logger.formatter = proc do |severity, datetime, _progname, msg|
-          datetime = datetime.strftime(@datetime_format || '%Y-%m-%d %H:%M:%S.%6N ')
+          datetime = datetime.strftime('%Y-%m-%dT%H:%M:%S.%6N%:z')
           "[#{datetime}] #{severity} #{msg} \n"
         end
       end

data/lib/facter/models/fact_collection.rb

@@ -79,9 +79,7 @@ module Facter
       split_fact_name = extract_fact_name(fact)
       bury(*split_fact_name << fact.value)
     rescue NoMethodError
-      @log.error("#{fact.type.to_s.capitalize} fact `#{fact.name}` cannot be added to collection."\
-          ' The format of this fact is incompatible with other'\
-          " facts that belong to `#{fact.name.split('.').first}` group")
+      @log.error("#{fact.type.to_s.capitalize} fact `#{fact.name}` cannot be added to collection. The format of this fact is incompatible with other facts that belong to `#{fact.name.split('.').first}` group")
     end
 
     def extract_fact_name(fact)

data/lib/facter/resolvers/aix/ffi/ffi_helper.rb

@@ -33,7 +33,7 @@ module Facter
 
           return if Libc.getkerninfo(KINFO_READ | KINFO_GET_AVENRUN, averages, averages_size, 0).negative?
 
-          averages.read_array_of_long_long(3).map { |x| (x / 65_536.0) }
+          averages.read_array_of_long_long(3).map { |x| x / 65_536.0 }
         end
 
         def self.read_interfaces

data/lib/facter/resolvers/aix/mountpoints.rb

@@ -31,11 +31,11 @@ module Facter
           def add_mount_points_fact(line)
             elem = line.split("\s")
 
-            if line[0] != ' '
+            if line[0] == ' '
+              device = elem[0]
+            else
               server = elem.shift
               device = "#{server}:#{elem[0]}"
-            else
-              device = elem[0]
             end
 
             @fact_list[:mountpoints][elem[1]] = { device: device, filesystem: elem[2],

data/lib/facter/resolvers/aix/networking.rb

@@ -16,7 +16,7 @@ module Facter
           def read_netstat(fact_name)
             @fact_list[:interfaces] = {}
             output = Facter::Core::Execution.execute('netstat -rn', logger: log)
-            output = output.each_line.select { |line| (line =~ /\s\s[0-9]+.[0-9]+.[0-9]+.[0-9]+|\s\s.*:[0-9a-f]+/) }
+            output = output.each_line.select { |line| line =~ /\s\s[0-9]+.[0-9]+.[0-9]+.[0-9]+|\s\s.*:[0-9a-f]+/ }
             @fact_list[:interfaces] = load_interfaces
 
             populate_with_mtu_and_mac!(@fact_list[:interfaces])

data/lib/facter/resolvers/az.rb

@@ -30,7 +30,7 @@ module Facter
         end
 
         def determine_session_timeout
-          session_env = ENV['AZ_SESSION_TIMEOUT']
+          session_env = ENV.fetch('AZ_SESSION_TIMEOUT', nil)
           session_env ? session_env.to_i : AZ_SESSION_TIMEOUT
         end
       end

data/lib/facter/resolvers/ec2.rb

@@ -18,14 +18,19 @@ module Facter
         end
 
         def read_facts(fact_name)
-          @fact_list[:metadata] = {}
-          query_for_metadata(EC2_METADATA_ROOT_URL, @fact_list[:metadata])
-          @fact_list[:userdata] = get_data_from(EC2_USERDATA_ROOT_URL).strip.force_encoding('UTF-8')
+          if fact_name == :metadata
+            metadata = {}
+            query_for_metadata(EC2_METADATA_ROOT_URL, metadata)
+            @fact_list[:metadata] = metadata
+          else
+            @fact_list[:userdata] = get_data_from(EC2_USERDATA_ROOT_URL).strip.force_encoding('UTF-8')
+          end
+
           @fact_list[fact_name]
         end
 
         def query_for_metadata(url, container)
-          metadata = get_data_from(url)
+          metadata = get_metadata_from(url)
           metadata.each_line do |line|
             next if line.empty?
 
@@ -34,14 +39,15 @@ module Facter
 
             if http_path_component.end_with?('/')
               child = {}
-              child[http_path_component] = query_for_metadata("#{url}#{http_path_component}", child)
-              child.reject! { |key, _info| key == http_path_component }
+              query_for_metadata("#{url}#{http_path_component}", child)
               name = http_path_component.chomp('/')
               container[name] = child
             else
-              container[http_path_component] = get_data_from("#{url}#{http_path_component}").strip
+              container[http_path_component] = get_metadata_from("#{url}#{http_path_component}").strip
             end
           end
+
+          container
         end
 
         def build_path_component(line)
@@ -55,8 +61,14 @@ module Facter
           Facter::Util::Resolvers::Http.get_request(url, headers, { session: determine_session_timeout }, false)
         end
 
+        def get_metadata_from(url)
+          headers = {}
+          headers['X-aws-ec2-metadata-token'] = v2_token if v2_token
+          Facter::Util::Resolvers::Http.get_request!(url, headers, { session: determine_session_timeout }, false)
+        end
+
         def determine_session_timeout
-          session_env = ENV['EC2_SESSION_TIMEOUT']
+          session_env = ENV.fetch('EC2_SESSION_TIMEOUT', nil)
           session_env ? session_env.to_i : EC2_SESSION_TIMEOUT
         end
 

data/lib/facter/resolvers/gce.rb

@@ -6,7 +6,7 @@ module Facter
       init_resolver
 
       METADATA_URL = 'http://metadata.google.internal/computeMetadata/v1/?recursive=true&alt=json'
-      HEADERS = { "Metadata-Flavor": 'Google', "Accept": 'application/json' }.freeze
+      HEADERS = { 'Metadata-Flavor': 'Google', Accept: 'application/json' }.freeze
 
       class << self
         private

data/lib/facter/resolvers/linux/docker_uptime.rb

@@ -36,7 +36,7 @@ module Facter
           end
 
           def convert_to_seconds(days, hours, minutes, seconds)
-            days * 24 * 3600 + hours * 3600 + minutes * 60 + seconds
+            (days * 24 * 3600) + (hours * 3600) + (minutes * 60) + seconds
           end
         end
       end

data/lib/facter/resolvers/linux/hostname.rb

@@ -50,7 +50,7 @@ module Facter
             end
 
             log.debug("Tried to retrieve hostname and got: #{output}")
-            output unless output&.empty?
+            output unless output && output.empty?
           end
 
           def parse_fqdn(output)

data/lib/facter/resolvers/linux/processors.rb

@@ -70,7 +70,7 @@ module Facter
                .select { |dir| dir =~ /cpu[0-9]+$/ }
                .select { |dir| File.exist?("/sys/devices/system/cpu/#{dir}/topology/physical_package_id") }
                .map do |dir|
-                 Facter::Util::FileHelper.safe_read("/sys/devices/system/cpu/#{dir}/topology/physical_package_id").strip
+              Facter::Util::FileHelper.safe_read("/sys/devices/system/cpu/#{dir}/topology/physical_package_id").strip
             end
                .uniq.count
           end

data/lib/facter/resolvers/macosx/mountpoints.rb

@@ -5,6 +5,7 @@ module Facter
     module Macosx
       class Mountpoints < BaseResolver
         include Facter::Util::Resolvers::FilesystemHelper
+
         init_resolver
 
         class << self

data/lib/facter/resolvers/mountpoints.rb

@@ -48,7 +48,7 @@ module Facter
               mount = {}
               get_mount_data(file_system, mount)
 
-              if mount[:path] =~ %r{^/(proc|sys)} && mount[:filesystem] != 'tmpfs' || mount[:filesystem] == 'autofs'
+              if (mount[:path] =~ %r{^/(proc|sys)} && mount[:filesystem] != 'tmpfs') || mount[:filesystem] == 'autofs'
                 next
               end
 

data/lib/facter/resolvers/networking.rb

@@ -97,8 +97,7 @@ module Facter
         def extract_dhcp(interface_name, raw_data, parsed_interface_data)
           return unless /status:\s+active/.match?(raw_data)
 
-          result = Facter::Core::Execution.execute("ipconfig getoption #{interface_name} " \
-                                                     'server_identifier', logger: log)
+          result = Facter::Core::Execution.execute("ipconfig getoption #{interface_name} server_identifier", logger: log)
 
           parsed_interface_data[:dhcp] = result.match(/^[\d.a-f:\s]+$/)&.to_s&.strip unless result.empty?
         end

data/lib/facter/resolvers/path.rb

@@ -13,7 +13,7 @@ module Facter
         end
 
         def read_path_from_env
-          @fact_list[:path] = ENV['PATH']
+          @fact_list[:path] = ENV.fetch('PATH', nil)
         end
       end
     end

data/lib/facter/resolvers/selinux.rb

@@ -58,7 +58,7 @@ module Facter
             @fact_list[:config_policy] = line.split('=').last.strip if /^SELINUXTYPE=/.match?(line)
           end
 
-          !file_lines.empty? ? true : false
+          file_lines.empty? ? false : true
         end
       end
     end

data/lib/facter/resolvers/solaris/ffi/functions.rb

@@ -6,6 +6,7 @@ module Facter
       module FFI
         module Ioctl
           extend ::FFI::Library
+
           ffi_lib ::FFI::Library::LIBC, 'socket'
 
           attach_function :ioctl_base, :ioctl, %i[int int pointer], :int

data/lib/facter/resolvers/solaris/ffi/structs.rb

@@ -10,20 +10,20 @@ module Facter
         end
 
         class Sockaddr < ::FFI::Struct
-          layout  :sa_family, :sa_family_t,
-                  :sa_data, [:uchar, 14]
+          layout :sa_family, :sa_family_t,
+                 :sa_data, [:uchar, 14]
         end
 
         class Lifnum < ::FFI::Struct
-          layout  :lifn_family, :sa_family_t,
-                  :lifn_flags, :int,
-                  :lifn_count, :int
+          layout :lifn_family, :sa_family_t,
+                 :lifn_flags, :int,
+                 :lifn_count, :int
         end
 
         class Arpreq < ::FFI::Struct
-          layout  :arp_pa, Sockaddr,
-                  :arp_ha, Sockaddr,
-                  :arp_flags, :int
+          layout :arp_pa, Sockaddr,
+                 :arp_ha, Sockaddr,
+                 :arp_flags, :int
 
           def sa_data_to_mac
             self[:arp_ha][:sa_data].entries[0, 6].map do |s|
@@ -41,27 +41,27 @@ module Facter
         end
 
         class Lifru1 < ::FFI::Union
-          layout  :lifru_addrlen, :int,
-                  :lifru_ppa, :uint_t
+          layout :lifru_addrlen, :int,
+                 :lifru_ppa, :uint_t
         end
 
         class Lifru < ::FFI::Union
-          layout  :lifru_addr, SockaddrStorage,
-                  :lifru_dstaddr, SockaddrStorage,
-                  :lifru_broadaddr, SockaddrStorage,
-                  :lifru_token, SockaddrStorage,
-                  :lifru_subnet, SockaddrStorage,
-                  :lifru_flags, :uint64,
-                  :lifru_metric, :int,
-                  :pad, [:char, 80]
+          layout :lifru_addr, SockaddrStorage,
+                 :lifru_dstaddr, SockaddrStorage,
+                 :lifru_broadaddr, SockaddrStorage,
+                 :lifru_token, SockaddrStorage,
+                 :lifru_subnet, SockaddrStorage,
+                 :lifru_flags, :uint64,
+                 :lifru_metric, :int,
+                 :pad, [:char, 80]
         end
 
         class Lifreq < ::FFI::Struct
-          layout  :lifr_name, [:char, 32],
-                  :lifr_lifru1, Lifru1,
-                  :lifr_movetoindex, :int,
-                  :lifr_lifru, Lifru,
-                  :pad, [:char, 80]
+          layout :lifr_name, [:char, 32],
+                 :lifr_lifru1, Lifru1,
+                 :lifr_movetoindex, :int,
+                 :lifr_lifru, Lifru,
+                 :pad, [:char, 80]
 
           def name
             self[:lifr_name].to_s
@@ -77,10 +77,10 @@ module Facter
         end
 
         class Lifconf < ::FFI::Struct
-          layout  :lifc_family, :uint,
-                  :lifc_flags, :int,
-                  :lifc_len, :int,
-                  :lifc_buf, :pointer
+          layout :lifc_family, :uint,
+                 :lifc_flags, :int,
+                 :lifc_len, :int,
+                 :lifc_buf, :pointer
 
           def self.new_for_ioctl(interface_count)
             lifconf = new
@@ -93,8 +93,8 @@ module Facter
         end
 
         class Lifcu < ::FFI::Union
-          layout  :lifcu_buf, :caddr_t,
-                  :lifcu_req, Lifreq
+          layout :lifcu_buf, :caddr_t,
+                 :lifcu_req, Lifreq
         end
 
         class InAddr < ::FFI::Struct
@@ -102,10 +102,10 @@ module Facter
         end
 
         class SockaddrIn < ::FFI::Struct
-          layout  :sin_family, :sa_family_t,
-                  :sin_port, :in_port_t,
-                  :sin_addr, InAddr,
-                  :sin_zero, [:char, 8]
+          layout :sin_family, :sa_family_t,
+                 :sin_port, :in_port_t,
+                 :sin_addr, InAddr,
+                 :sin_zero, [:char, 8]
 
           def s_addr
             self[:sin_addr][:s_addr]
@@ -117,11 +117,11 @@ module Facter
         end
 
         class SockaddrIn6 < ::FFI::Struct
-          layout  :sin6_family, :sa_family_t,
-                  :sin6_port, :in_port_t,
-                  :sin6_flowinfo, :uint32_t,
-                  :sin6_addr, In6Addr,
-                  :sin6_scope_id, :uint32_t
+          layout :sin6_family, :sa_family_t,
+                 :sin6_port, :in_port_t,
+                 :sin6_flowinfo, :uint32_t,
+                 :sin6_addr, In6Addr,
+                 :sin6_scope_id, :uint32_t
         end
       end
     end

data/lib/facter/resolvers/solaris/mountpoints.rb

@@ -5,6 +5,7 @@ module Facter
     module Solaris
       class Mountpoints < BaseResolver
         include Facter::Util::Resolvers::FilesystemHelper
+
         init_resolver
 
         class << self

data/lib/facter/resolvers/solaris/networking.rb

@@ -55,8 +55,7 @@ module Facter
             ioctl = FFI::Ioctl.ioctl(FFI::SIOCGARP, arp, lifreq.ss_family)
 
             if ioctl == -1
-              @log.debug("Could not read MAC address for interface #{lifreq.name} "\
-                          "error code is: #{::FFI::LastError.error}")
+              @log.debug("Could not read MAC address for interface #{lifreq.name} error code is: #{::FFI::LastError.error}")
             end
 
             mac = arp.sa_data_to_mac

data/lib/facter/resolvers/solaris/os_release.rb

@@ -35,7 +35,7 @@ module Facter
           def search_for_os_version(regex_pattern, text)
             result = text.match(regex_pattern)
             major, minor = result.captures if result
-            minor = regex_pattern == /Solaris (\d+)/ ? '0' : minor
+            minor = '0' if regex_pattern == /Solaris (\d+)/
             [major, minor] if major && minor
           end
         end

data/lib/facter/resolvers/solaris/processors.rb

@@ -24,7 +24,7 @@ module Facter
           end
 
           def parse_output(output)
-            @fact_list[:logical_count] = output.scan(/module/).size
+            @fact_list[:logical_count] = output.scan('module').size
             @fact_list[:physical_count] = output.scan(/chip_id .*/).uniq.size
             # .scan(//current_clock_Hz\s+(\d+)/) returns [['123']] (or [['123'], ['456']] if there are more matches)
             @fact_list[:speed] = output.scan(/current_clock_Hz\s+(\d+)/).first&.first&.to_i

data/lib/facter/resolvers/uname.rb

@@ -28,7 +28,9 @@ module Facter
         def build_fact_list(output)
           uname_results = output.split("\n")
 
-          if !uname_results.empty?
+          if uname_results.empty?
+            log.warn('Request to uname returned no output. Uname related facts are not populated.')
+          else
             @fact_list[:machine],
             @fact_list[:nodename],
             @fact_list[:processor],
@@ -39,8 +41,6 @@ module Facter
             # Fall back to -m (machine), which is the procedure suggested by the
             # uutils/coreutils developers.
             @fact_list[:processor] = @fact_list[:machine] if @fact_list[:processor] == 'unknown'
-          else
-            log.warn('Request to uname returned no output. Uname related facts are not populated.')
           end
         end
       end

data/lib/facter/resolvers/windows/netkvm.rb

@@ -23,9 +23,8 @@ module Facter
         end
 
         def build_fact_list(reg)
-          # rubocop:disable Performance/InefficientHashSearch
+          # rubocop:disable-next Performance/InefficientHashSearch
           @fact_list[:kvm] = reg.keys.include?('netkvm')
-          # rubocop:enable Performance/InefficientHashSearch
         end
       end
     end

data/lib/facter/resolvers/windows/processors.rb

@@ -19,14 +19,14 @@ module Facter
 
         def read_fact_from_win32_processor(fact_name)
           win = Facter::Util::Windows::Win32Ole.new
-          query_string = 'SELECT Name,'\
-          'Architecture,'\
-          'NumberOfLogicalProcessors,'\
-          'NumberOfCores FROM Win32_Processor'
+          query_string = 'SELECT Name,' \
+                         'Architecture,' \
+                         'NumberOfLogicalProcessors,' \
+                         'NumberOfCores FROM Win32_Processor'
           proc = win.exec_query(query_string)
           unless proc
-            log.debug 'WMI query returned no results'\
-            'for Win32_Processor with values Name, Architecture and NumberOfLogicalProcessors.'
+            log.debug 'WMI query returned no results' \
+                      'for Win32_Processor with values Name, Architecture and NumberOfLogicalProcessors.'
             return
           end
           result = iterate_proc(proc)

data/lib/facter/resolvers/windows/ssh.rb

@@ -33,7 +33,7 @@ module Facter
           end
 
           def determine_ssh_dir
-            progdata_dir = ENV['programdata']
+            progdata_dir = ENV['programdata'] # rubocop:disable Style/FetchEnvVar
 
             return if !progdata_dir || progdata_dir.empty?
 

data/lib/facter/resolvers/windows/system32.rb

@@ -15,7 +15,7 @@ module Facter
         def retrieve_windows_binaries_path
           require_relative '../../../facter/resolvers/windows/ffi/system32_ffi'
 
-          windows_path = ENV['SystemRoot']
+          windows_path = ENV['SystemRoot'] # rubocop:disable Style/FetchEnvVar
 
           if !windows_path || windows_path.empty?
             @log.debug 'Unable to find correct value for SystemRoot enviroment variable'

data/lib/facter/resolvers/windows/timezone.rb

@@ -22,7 +22,7 @@ module Facter
 
           def codepage
             result = codepage_from_api
-            result&.empty? ? codepage_from_registry : result
+            result && result.empty? ? codepage_from_registry : result
           end
 
           def codepage_from_registry

data/lib/facter/resolvers/windows/uptime.rb

@@ -19,8 +19,7 @@ module Facter
             win = Facter::Util::Windows::Win32Ole.new
             opsystem = win.return_first('SELECT LocalDateTime,LastBootUpTime FROM Win32_OperatingSystem')
             unless opsystem
-              @log.debug 'WMI query returned no results'\
-          'for Win32_OperatingSystem with values LocalDateTime and LastBootUpTime.'
+              @log.debug 'WMI query returned no results for Win32_OperatingSystem with values LocalDateTime and LastBootUpTime.'
               return
             end
 

data/lib/facter/resolvers/windows/virtualization.rb

@@ -30,8 +30,7 @@ module Facter
             win = Facter::Util::Windows::Win32Ole.new
             comp = win.exec_query('SELECT Manufacturer,Model,OEMStringArray FROM Win32_ComputerSystem')
             unless comp
-              @log.debug 'WMI query returned no results for Win32_ComputerSystem with values'\
-              ' Manufacturer, Model and OEMStringArray.'
+              @log.debug 'WMI query returned no results for Win32_ComputerSystem with values Manufacturer, Model and OEMStringArray.'
               return
             end
 

data/lib/facter/resolvers/windows/win_os_description.rb

@@ -16,8 +16,7 @@ module Facter
           win = Facter::Util::Windows::Win32Ole.new
           op_sys = win.return_first('SELECT ProductType,OtherTypeDescription FROM Win32_OperatingSystem')
           unless op_sys
-            @log.debug 'WMI query returned no results for Win32_OperatingSystem'\
-                       'with values ProductType and OtherTypeDescription.'
+            @log.debug 'WMI query returned no results for Win32_OperatingSystem with values ProductType and OtherTypeDescription.'
             return
           end
           @fact_list[:consumerrel] = (op_sys.ProductType == 1)

data/lib/facter/util/api_debugger.rb

@@ -4,7 +4,7 @@ module Facter
   module Util
     module ApiDebugger
       def self.prepended(receiver)
-        exclude, print_caller = parse_options(ENV['API_DEBUG'])
+        exclude, print_caller = parse_options(ENV.fetch('API_DEBUG', nil))
 
         receiver_methods = receiver.instance_methods - Object.methods
         receiver_methods.each do |meth|

data/lib/facter/util/facts/posix/virtual_detector.rb

@@ -8,8 +8,8 @@ module Facter
           class << self
             def platform
               @fact_value ||= # rubocop:disable Naming/MemoizedInstanceVariableName
-                check_docker_lxc || check_freebsd || check_openbsd || check_gce || check_illumos_lx || \
-                retrieve_from_virt_what || check_vmware || check_open_vz || check_vserver || \
+                check_docker_lxc || check_freebsd || check_openbsd || check_gce || check_illumos_lx ||
+                retrieve_from_virt_what || check_vmware || check_open_vz || check_vserver ||
                 check_xen || check_other_facts || check_lspci || 'physical'
             end
 

data/lib/facter/util/facts/unit_converter.rb

@@ -42,7 +42,7 @@ module Facter
           def determine_exponent(bytes)
             prefix = %w[KiB MiB GiB TiB PiB EiB]
             exp = (Math.log2(bytes) / 10.0).floor
-            converted_number = (100.0 * (bytes / 1024.0**exp)).round / 100.0
+            converted_number = (100.0 * (bytes / (1024.0**exp))).round / 100.0
 
             if (converted_number - 1024.0).abs < Float::EPSILON
               exp += 1
@@ -57,7 +57,7 @@ module Facter
           def determine_metric_prefix(num)
             metric_prefix = { 0 => '', 3 => 'k', 6 => 'M', 9 => 'G', 12 => 'T' }
             power = Math.log10(num).floor
-            display_exponent = power - power % 3
+            display_exponent = power - (power % 3)
             coefficient = power.zero? ? num.to_f : num.fdiv(10**display_exponent)
             [coefficient, metric_prefix[display_exponent]]
           end

data/lib/facter/util/facts/uptime_parser.rb

@@ -75,23 +75,23 @@ module Facter
           def calculate_days_hours_minutes(output)
             return unless output =~ /(\d+) day(?:s|\(s\))?,?\s+(\d+):-?(\d+)/
 
-            SECS_IN_A_DAY * Regexp.last_match(1).to_i +
-              SECS_IN_AN_HOUR * Regexp.last_match(2).to_i +
-              SECS_IN_A_MINUTE * Regexp.last_match(3).to_i
+            (SECS_IN_A_DAY * Regexp.last_match(1).to_i) +
+              (SECS_IN_AN_HOUR * Regexp.last_match(2).to_i) +
+              (SECS_IN_A_MINUTE * Regexp.last_match(3).to_i)
           end
 
           def calculate_days_hours(output)
             return unless output =~ /(\d+) day(?:s|\(s\))?,\s+(\d+) hr(?:s|\(s\))?,/
 
-            SECS_IN_A_DAY * Regexp.last_match(1).to_i +
-              SECS_IN_AN_HOUR * Regexp.last_match(2).to_i
+            (SECS_IN_A_DAY * Regexp.last_match(1).to_i) +
+              (SECS_IN_AN_HOUR * Regexp.last_match(2).to_i)
           end
 
           def calculate_days_minutes(output)
             return unless output =~ /(\d+) day(?:s|\(s\))?,\s+(\d+) min(?:s|\(s\))?,/
 
-            SECS_IN_A_DAY * Regexp.last_match(1).to_i +
-              SECS_IN_A_MINUTE * Regexp.last_match(2).to_i
+            (SECS_IN_A_DAY * Regexp.last_match(1).to_i) +
+              (SECS_IN_A_MINUTE * Regexp.last_match(2).to_i)
           end
 
           def calculate_days(output)
@@ -106,8 +106,8 @@ module Facter
           def calculate_hours_minutes(output)
             return unless output =~ /up\s+(\d+):-?(\d+),/
 
-            SECS_IN_AN_HOUR * Regexp.last_match(1).to_i +
-              SECS_IN_A_MINUTE * Regexp.last_match(2).to_i
+            (SECS_IN_AN_HOUR * Regexp.last_match(1).to_i) +
+              (SECS_IN_A_MINUTE * Regexp.last_match(2).to_i)
           end
 
           def calculate_hours(output)