machinery-tool 1.22.1 → 1.22.2

data/plugins/changed_managed_files/changed_managed_files_renderer.rb

@@ -15,58 +15,62 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class ChangedManagedFilesRenderer < Renderer
-  def content(description)
-    return unless description["changed_managed_files"]
+module Machinery
+  class Ui
+    class ChangedManagedFilesRenderer < Machinery::Ui::Renderer
+      def content(description)
+        return unless description["changed_managed_files"]
 
-    if description["changed_managed_files"]
-      files, errors = description["changed_managed_files"].partition do |file|
-        file.status != "error"
-      end
-    end
+        if description["changed_managed_files"]
+          files, errors = description["changed_managed_files"].partition do |file|
+            file.status != "error"
+          end
+        end
 
-    list do
-      file_status = description["changed_managed_files"].extracted
+        list do
+          file_status = description["changed_managed_files"].extracted
 
-      if files.empty?
-        puts "There are no changed managed files."
-      elsif !file_status.nil?
-        puts "Files extracted: #{file_status ? "yes" : "no"}"
-      end
+          if files.empty?
+            puts "There are no changed managed files."
+          elsif !file_status.nil?
+            puts "Files extracted: #{file_status ? "yes" : "no"}"
+          end
 
-      if files && !files.empty?
-        files.each do |p|
-          item "#{p.name} (#{p.changes.join(", ")})"
+          if files && !files.empty?
+            files.each do |p|
+              item "#{p.name} (#{p.changes.join(", ")})"
+            end
+          end
         end
-      end
-    end
 
-    if errors && !errors.empty?
-      list("Errors") do
-        errors.each do |p|
-          item "#{p.name}: #{p.error_message}"
+        if errors && !errors.empty?
+          list("Errors") do
+            errors.each do |p|
+              item "#{p.name}: #{p.error_message}"
+            end
+          end
         end
       end
-    end
-  end
 
-  def display_name
-    "Changed Managed Files"
-  end
+      def display_name
+        "Changed Managed Files"
+      end
 
-  def compare_content_changed(changed_elements)
-    list do
-      changed_elements.each do |one, two|
-        changes = []
-        relevant_attributes = (one.attributes.keys & two.attributes.keys)
+      def compare_content_changed(changed_elements)
+        list do
+          changed_elements.each do |one, two|
+            changes = []
+            relevant_attributes = (one.attributes.keys & two.attributes.keys)
 
-        relevant_attributes.each do |attribute|
-          if one[attribute] != two[attribute]
-            changes << "#{attribute}: #{one[attribute]} <> #{two[attribute]}"
+            relevant_attributes.each do |attribute|
+              if one[attribute] != two[attribute]
+                changes << "#{attribute}: #{one[attribute]} <> #{two[attribute]}"
+              end
+            end
+
+            item "#{one.name} (#{changes.join(", ")})"
           end
         end
-
-        item "#{one.name} (#{changes.join(", ")})"
       end
     end
   end

data/plugins/environment/environment_inspector.rb

@@ -15,36 +15,38 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class EnvironmentInspector < Inspector
-  has_priority 5
+module Machinery
+  class EnvironmentInspector < Machinery::Inspector
+    has_priority 5
 
-  def initialize(system, description)
-    @system = system
-    @description = description
-  end
+    def initialize(system, description)
+      @system = system
+      @description = description
+    end
 
-  def inspect(_filter = nil, _options = {})
-    environment = EnvironmentScope.new
+    def inspect(_filter = nil, _options = {})
+      environment = EnvironmentScope.new
 
-    environment.locale = get_locale
-    environment.system_type = @system.type
+      environment.locale = get_locale
+      environment.system_type = @system.type
 
-    @description.environment = environment
-  end
+      @description.environment = environment
+    end
 
-  private
+    private
 
-  def get_locale
-    output = nil
-    begin
-      output = Machinery.scrub(@system.run_command("locale", "-a", stdout: :capture))
-    rescue
-      return "C"
-    end
+    def get_locale
+      output = nil
+      begin
+        output = Machinery.scrub(@system.run_command("locale", "-a", stdout: :capture))
+      rescue
+        return "C"
+      end
 
-    all_locales = output.split
-    locale = all_locales.find { |l| l.downcase.match(/en_us.utf.?8/) }
+      all_locales = output.split
+      locale = all_locales.find { |l| l.downcase.match(/en_us.utf.?8/) }
 
-    locale || "C"
+      locale || "C"
+    end
   end
 end

data/plugins/environment/environment_model.rb

@@ -15,8 +15,10 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class EnvironmentScope < Machinery::Object
-  include Machinery::Scope
+module Machinery
+  class EnvironmentScope < Machinery::Object
+    include Machinery::Scope
 
-  hidden_scope
+    hidden_scope
+  end
 end

data/plugins/groups/groups_inspector.rb

@@ -15,44 +15,46 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class GroupsInspector < Inspector
-  has_priority 60
+module Machinery
+  class GroupsInspector < Machinery::Inspector
+    has_priority 60
 
-  def initialize(system, description)
-    @system = system
-    @description = description
-  end
+    def initialize(system, description)
+      @system = system
+      @description = description
+    end
 
-  def inspect(_filter, _options = {})
-    group_content = @system.read_file("/etc/group")
+    def inspect(_filter, _options = {})
+      group_content = @system.read_file("/etc/group")
 
-    groups = group_content ? parse_groups(group_content) : []
+      groups = group_content ? parse_groups(group_content) : []
 
-    @description.groups = GroupsScope.new(groups.sort_by(&:name))
-  end
+      @description.groups = GroupsScope.new(groups.sort_by(&:name))
+    end
 
-  def summary
-    "Found #{Machinery.pluralize(@description.groups.size, "%d group")}."
-  end
+    def summary
+      "Found #{Machinery.pluralize(@description.groups.size, "%d group")}."
+    end
 
-  private
+    private
 
-  def parse_groups(content)
-    content.lines.map do |line|
-      # prevent split from ignoring the last entry if it is empty and there is no newline
-      line += "\n" if line.end_with?(":")
-      name, password, gid, users = line.split(":").map(&:chomp)
+    def parse_groups(content)
+      content.lines.map do |line|
+        # prevent split from ignoring the last entry if it is empty and there is no newline
+        line += "\n" if line.end_with?(":")
+        name, password, gid, users = line.split(":").map(&:chomp)
 
-      gid = Machinery::is_int?(gid) ? gid.to_i : nil
+        gid = Machinery.is_int?(gid) ? gid.to_i : nil
 
-      attrs = {
-        name: name,
-        password: password,
-        gid: gid,
-        users: users.split(",")
-      }
+        attrs = {
+          name: name,
+          password: password,
+          gid: gid,
+          users: users.split(",")
+        }
 
-      Group.new(attrs)
+        Group.new(attrs)
+      end
     end
   end
 end

data/plugins/groups/groups_model.rb

@@ -15,26 +15,27 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
+module Machinery
+  class Group < Machinery::Object
+  end
 
-class Group < Machinery::Object
-end
-
-class GroupsScope < Machinery::Array
-  include Machinery::Scope
+  class GroupsScope < Machinery::Array
+    include Machinery::Scope
 
-  has_elements class: Group
+    has_elements class: Group
 
-  def compare_with(other)
-    only_self = self - other
-    only_other = other - self
-    common = self & other
-    changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
+    def compare_with(other)
+      only_self = self - other
+      only_other = other - self
+      common = self & other
+      changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
 
-    [
-      only_self,
-      only_other,
-      changed,
-      common
-    ].map { |e| (e && !e.empty?) ? e : nil }
+      [
+        only_self,
+        only_other,
+        changed,
+        common
+      ].map { |e| e && !e.empty? ? e : nil }
+    end
   end
 end

data/plugins/groups/groups_renderer.rb

@@ -15,40 +15,44 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class GroupsRenderer < Renderer
-  def content(description)
-    return unless description.groups
+module Machinery
+  class Ui
+    class GroupsRenderer < Machinery::Ui::Renderer
+      def content(description)
+        return unless description.groups
 
-    na_note("group ID") if description.groups.any? { |a| a[:gid].nil? }
+        na_note("group ID") if description.groups.any? { |a| a[:gid].nil? }
 
-    list do
-      description.groups.each do |group|
-        gid = group.gid || "N/A"
-        details ="gid: #{gid}"
-        details += ", users: #{group.users.join(",")}" unless group.users.empty?
+        list do
+          description.groups.each do |group|
+            gid = group.gid || "N/A"
+            details = "gid: #{gid}"
+            details += ", users: #{group.users.join(",")}" unless group.users.empty?
 
-        item "#{group.name} (#{details})"
+            item "#{group.name} (#{details})"
+          end
+        end
       end
-    end
-  end
 
-  def display_name
-    "Groups"
-  end
+      def display_name
+        "Groups"
+      end
 
-  def compare_content_changed(changed_elements)
-    list do
-      changed_elements.each do |one, two|
-        changes = []
-        relevant_attributes = one.attributes.keys
+      def compare_content_changed(changed_elements)
+        list do
+          changed_elements.each do |one, two|
+            changes = []
+            relevant_attributes = one.attributes.keys
 
-        relevant_attributes.each do |attribute|
-          if one[attribute] != two[attribute]
-            changes << "#{attribute}: #{one[attribute]} <> #{two[attribute]}"
+            relevant_attributes.each do |attribute|
+              if one[attribute] != two[attribute]
+                changes << "#{attribute}: #{one[attribute]} <> #{two[attribute]}"
+              end
+            end
+
+            item "#{one.name} (#{changes.join(", ")})"
           end
         end
-
-        item "#{one.name} (#{changes.join(", ")})"
       end
     end
   end

data/plugins/os/os_inspector.rb

@@ -16,152 +16,154 @@
 # you may find current contact information at www.suse.com
 
 #  Inspect name, version, and other attributes of the operating system
-class OsInspector < Inspector
-  has_priority 10
-
-  def strip_arch_from_name(name)
-    # architecture information in the name might be misleading
-    # information with regards to the real architecture name.
-    # in addition the architecture information is not consistently
-    # added for all distributions. Thus we strip this part
-    name.gsub(/\((i.86|x86_64|s390|ia64|ppc|arm).*\)/, "").strip
-  end
-
-  # checks for additional version information like Beta or RC
-  def get_additional_version
-    issue = @system.read_file("/etc/issue")
-    special_version = issue.scan(/Beta\d+|RC\d|GMC\d*/).first if issue
-
-    special_version ? " #{special_version.gsub(/[0-9]{1,2}/," \\0")}" : ""
-  end
-
-  def initialize(system, description)
-    @system = system
-    @description = description
-  end
+module Machinery
+  class OsInspector < Machinery::Inspector
+    has_priority 10
+
+    def strip_arch_from_name(name)
+      # architecture information in the name might be misleading
+      # information with regards to the real architecture name.
+      # in addition the architecture information is not consistently
+      # added for all distributions. Thus we strip this part
+      name.gsub(/\((i.86|x86_64|s390|ia64|ppc|arm).*\)/, "").strip
+    end
 
-  def inspect(_filter, _options = {})
-    @system.check_requirement("cat", "--version") if @system.is_a?(RemoteSystem)
+    # checks for additional version information like Beta or RC
+    def get_additional_version
+      issue = @system.read_file("/etc/issue")
+      special_version = issue.scan(/Beta\d+|RC\d|GMC\d*/).first if issue
 
-    os = get_os
-    if os
-      os.architecture = @system.arch
-      os.version += get_additional_version if os.version
-    else
-      raise Machinery::Errors::UnknownOs
+      special_version ? " #{special_version.gsub(/[0-9]{1,2}/, " \\0")}" : ""
     end
 
-    @description.os = os
-  end
-
-  def summary
-    "Found operating system '#{@description.os.name}' version '#{@description.os.version}'."
-  end
+    def initialize(system, description)
+      @system = system
+      @description = description
+    end
 
-  private
+    def inspect(_filter, _options = {})
+      @system.check_requirement("cat", "--version") if @system.is_a?(Machinery::RemoteSystem)
 
-  def get_os
-    # Use os-release file by default
-    os = get_os_from_os_release
+      os = get_os
+      if os
+        os.architecture = @system.arch
+        os.version += get_additional_version if os.version
+      else
+        raise Machinery::Errors::UnknownOs
+      end
 
-    # Fall back to SuSE-release file
-    unless os
-      os = get_os_from_suse_release
+      @description.os = os
     end
 
-    # Fall back to redhat-release file
-    unless os
-      os = get_os_from_redhat_release
+    def summary
+      "Found operating system '#{@description.os.name}' version '#{@description.os.version}'."
     end
 
-    os
-  end
-
-  # check for freedesktop standard: /etc/os-release
-  def get_os_from_os_release
-    os_release = @system.read_file("/etc/os-release")
-    return unless os_release
+    private
 
-    result = Hash.new
-    key_value_pairs = Hash[os_release.split("\n").reject(&:empty?).map { |l| l.split("=") }]
-    key_value_pairs.each_pair do |k,v|
-      result[k.downcase] = v.strip.gsub(/^"|"$/,"")
-    end
-    if result["pretty_name"]
-      result["pretty_name"] = strip_arch_from_name(result["pretty_name"])
+    def get_os
+      # Use os-release file by default
+      os = get_os_from_os_release
 
-      # remove always changing Tumbleweed version from pretty name
-      if result["pretty_name"] =~ /^openSUSE.*Tumbleweed/
-        result["pretty_name"] = "openSUSE Tumbleweed"
+      # Fall back to SuSE-release file
+      unless os
+        os = get_os_from_suse_release
       end
 
-      # remove Leap version from pretty name
-      if result["pretty_name"] =~ /^openSUSE.*Leap/
-        result["pretty_name"] = "openSUSE Leap"
+      # Fall back to redhat-release file
+      unless os
+        os = get_os_from_redhat_release
       end
 
-      # converts SLES11 SP4 result to SP3 style
-      # the results are different because SP4 has an os-release
-      if result["pretty_name"] =~ /^SUSE Linux Enterprise Server 11 (SP\d)$/
-        result["pretty_name"] = "SUSE Linux Enterprise Server 11"
-        result["version"] = "11 #{$1}"
-      end
-    end
-    # return pretty_name as name as it contains the actual full length
-    # name instead of an abbreviation
-    os = Os.for(result["pretty_name"] || result["name"])
-    os.version = result["version"]
-
-    # since Tumbleweed does no longer store the version number in the
-    # "version" property, we've to read from the "version_id" property
-    if os.version == "Tumbleweed" || os.name == "openSUSE Tumbleweed"
-      os.version = result["version_id"]
+      os
     end
 
-    os
-  end
+    # check for freedesktop standard: /etc/os-release
+    def get_os_from_os_release
+      os_release = @system.read_file("/etc/os-release")
+      return unless os_release
 
-  # checks for old suse standard: /etc/SuSE-release
-  def get_os_from_suse_release
-    suse_release = @system.read_file("/etc/SuSE-release")
-    return unless suse_release
+      result = Hash.new
+      key_value_pairs = Hash[os_release.split("\n").reject(&:empty?).map { |l| l.split("=") }]
+      key_value_pairs.each_pair do |k, v|
+        result[k.downcase] = v.strip.gsub(/^"|"$/, "")
+      end
+      if result["pretty_name"]
+        result["pretty_name"] = strip_arch_from_name(result["pretty_name"])
+
+        # remove always changing Tumbleweed version from pretty name
+        if result["pretty_name"] =~ /^openSUSE.*Tumbleweed/
+          result["pretty_name"] = "openSUSE Tumbleweed"
+        end
+
+        # remove Leap version from pretty name
+        if result["pretty_name"] =~ /^openSUSE.*Leap/
+          result["pretty_name"] = "openSUSE Leap"
+        end
+
+        # converts SLES11 SP4 result to SP3 style
+        # the results are different because SP4 has an os-release
+        if result["pretty_name"] =~ /^SUSE Linux Enterprise Server 11 (SP\d)$/
+          result["pretty_name"] = "SUSE Linux Enterprise Server 11"
+          result["version"] = "11 #{$1}"
+        end
+      end
+      # return pretty_name as name as it contains the actual full length
+      # name instead of an abbreviation
+      os = Os.for(result["pretty_name"] || result["name"])
+      os.version = result["version"]
+
+      # since Tumbleweed does no longer store the version number in the
+      # "version" property, we've to read from the "version_id" property
+      if os.version == "Tumbleweed" || os.name == "openSUSE Tumbleweed"
+        os.version = result["version_id"]
+      end
 
-    result = Hash.new
-    # name is always the first line in /etc/SuSE-release
-    result["name"] = strip_arch_from_name(suse_release.split("\n").first)
+      os
+    end
 
-    result["patchlevel"] = nil
-    suse_release.split("\n").slice(1, suse_release.length).each do |line|
-      unless line.start_with?("#")
-        key, value = line.split("=")
-        result[key.strip.downcase] = value.strip
+    # checks for old suse standard: /etc/SuSE-release
+    def get_os_from_suse_release
+      suse_release = @system.read_file("/etc/SuSE-release")
+      return unless suse_release
+
+      result = Hash.new
+      # name is always the first line in /etc/SuSE-release
+      result["name"] = strip_arch_from_name(suse_release.split("\n").first)
+
+      result["patchlevel"] = nil
+      suse_release.split("\n").slice(1, suse_release.length).each do |line|
+        unless line.start_with?("#")
+          key, value = line.split("=")
+          result[key.strip.downcase] = value.strip
+        end
       end
-    end
 
-    if result["version"] && !result["patchlevel"].nil?
-      result["version"] = "#{result["version"]} SP#{result["patchlevel"]}"
-    end
+      if result["version"] && !result["patchlevel"].nil?
+        result["version"] = "#{result["version"]} SP#{result["patchlevel"]}"
+      end
 
-    if result["codename"] == "Tumbleweed"
-      os = Os.for ("openSUSE Tumbleweed")
-    else
-      os = Os.for(result["name"])
-    end
+      os = if result["codename"] == "Tumbleweed"
+        Os.for "openSUSE Tumbleweed"
+      else
+        Os.for result["name"]
+      end
 
-    os.version = result["version"]
-    os
-  end
+      os.version = result["version"]
+      os
+    end
 
-  # checks for redhat standard: /etc/redhat-release
-  def get_os_from_redhat_release
-    redhat_release = @system.read_file("/etc/redhat-release")
-    return unless redhat_release
+    # checks for redhat standard: /etc/redhat-release
+    def get_os_from_redhat_release
+      redhat_release = @system.read_file("/etc/redhat-release")
+      return unless redhat_release
 
-    result = Hash.new
-    result["name"], result["version"] = redhat_release.split("\n").first.split(" release ")
+      result = Hash.new
+      result["name"], result["version"] = redhat_release.split("\n").first.split(" release ")
 
-    os = Os.for(result["name"])
-    os.version = result["version"]
-    os
+      os = Os.for(result["name"])
+      os.version = result["version"]
+      os
+    end
   end
 end