better abstraction for system infos

app/models/additionals_info.rb

@@ -3,73 +3,74 @@
 class AdditionalsInfo
   include Redmine::I18n
 
-  class << self
+  def system_infos
-    def system_infos
+    { system_info: { label: l(:label_system_info),
-      { system_info: { label: l(:label_system_info), value: system_info },
+                     value: system_info },
-        system_uptime: { label: l(:label_uptime), value: system_uptime } }
+      system_uptime: { label: l(:label_uptime),
-    end
+                       value: system_uptime,
+                       api_value: system_uptime(format: :datetime) } }
+  end
 
-    def system_info
+  def system_info
-      if windows_platform?
+    if windows_platform?
-        win_info = `wmic os get Caption,CSDVersion,BuildNumber /value`
+      win_info = `wmic os get Caption,CSDVersion,BuildNumber /value`
-        return 'unknown' if win_info.blank?
+      return 'unknown' if win_info.blank?
 
-        windows_version = ''
+      windows_version = ''
-        windows_build = ''
+      windows_build = ''
-        build_names = %w[BuildNumber CSDVersion]
+      build_names = %w[BuildNumber CSDVersion]
-        win_info.split(/\n+/).each do |line|
+      win_info.split(/\n+/).each do |line|
-          line_info = line.split '='
+        line_info = line.split '='
-          if line_info[0] == 'Caption'
+        if line_info[0] == 'Caption'
-            windows_version = line_info[1]
+          windows_version = line_info[1]
-          elsif build_names.include?(line_info[0]) && line_info[1]&.present?
+        elsif build_names.include?(line_info[0]) && line_info[1]&.present?
-            windows_build = line_info[1]
+          windows_build = line_info[1]
-          end
-        end
-        "#{windows_version} build #{windows_build}"
-      else
-        `uname -a`
-      end
-    end
-
-    def system_uptime(format: :time_tag)
-      if windows_platform?
-        `net stats srv | find "Statist"`
-      elsif File.exist? '/proc/uptime'
-        secs = `cat /proc/uptime`.to_i
-        min = 0
-        hours = 0
-        days = 0
-        if secs.positive?
-          min = (secs / 60).round
-          hours = (secs / 3_600).round
-          days = (secs / 86_400).round
-        end
-        if days >= 1
-          "#{days} #{l :days, count: days}"
-        elsif hours >= 1
-          "#{hours} #{l :hours, count: hours}"
-        else
-          "#{min} #{l :minutes, count: min}"
-        end
-      else
-        # this should be work on macOS
-        seconds = `sysctl -n kern.boottime | awk '{print $4}'`.tr ',', ''
-        so = DateTime.strptime seconds.strip, '%s'
-        if so.present?
-          if format == :datetime
-            so
-          else
-            ApplicationController.helpers.time_tag so
-          end
-        else
-          days = `uptime | awk '{print $3}'`.to_i.round
-          "#{days} #{l :days, count: days}"
         end
       end
-    end
+      "#{windows_version} build #{windows_build}"
-
+    else
-    def windows_platform?
+      `uname -a`
-      /cygwin|mswin|mingw|bccwin|wince|emx/.match? RUBY_PLATFORM
     end
   end
+
+  def system_uptime(format: :time_tag)
+    if windows_platform?
+      `net stats srv | find "Statist"`
+    elsif File.exist? '/proc/uptime'
+      secs = `cat /proc/uptime`.to_i
+      min = 0
+      hours = 0
+      days = 0
+      if secs.positive?
+        min = (secs / 60).round
+        hours = (secs / 3_600).round
+        days = (secs / 86_400).round
+      end
+      if days >= 1
+        "#{days} #{l :days, count: days}"
+      elsif hours >= 1
+        "#{hours} #{l :hours, count: hours}"
+      else
+        "#{min} #{l :minutes, count: min}"
+      end
+    else
+      # this should be work on macOS
+      seconds = `sysctl -n kern.boottime | awk '{print $4}'`.tr ',', ''
+      so = DateTime.strptime seconds.strip, '%s'
+      if so.present?
+        if format == :datetime
+          so
+        else
+          ApplicationController.helpers.time_tag so
+        end
+      else
+        days = `uptime | awk '{print $3}'`.to_i.round
+        "#{days} #{l :days, count: days}"
+      end
+    end
+  end
+
+  def windows_platform?
+    /cygwin|mswin|mingw|bccwin|wince|emx/.match? RUBY_PLATFORM
+  end
 end

app/views/admin/_system_info.html.slim

@@ -1,6 +1,13 @@
 table.list
-  - AdditionalsInfo.system_infos.each_value do |system_info|
+  - AdditionalsInfo.new.system_infos.each do |type, system_info|
-    tr
+    tr class=type
       td.name
-        = "#{system_info[:label]}:"
+        = "#{system_info[:label].presence || type}:"
-      td.name = system_info[:value]
+      td.name
+        - case system_info[:value]
+          - when true
+            = image_tag 'true.png'
+          - when false
+            = image_tag 'exclamation.png'
+          - else
+            = system_info[:value]

test/unit/additionals_info_test.rb

@@ -4,12 +4,12 @@ require File.expand_path '../../test_helper', __FILE__
 
 class AdditionalsInfoTest < Additionals::TestCase
   def test_system_info
-    text = AdditionalsInfo.system_info
+    text = AdditionalsInfo.new.system_info
     assert_not_equal '', text
     assert_not_equal 'unknown', text
   end
 
   def test_windows_platform
-    assert_not AdditionalsInfo.windows_platform?
+    assert_not AdditionalsInfo.new.windows_platform?
   end
 end