machinery-tool 1.22.1 → 1.22.2

data/plugins/unmanaged_files/unmanaged_files_renderer.rb

@@ -15,59 +15,63 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class UnmanagedFilesRenderer < Renderer
-  def content(description)
-    return unless description["unmanaged_files"]
+module Machinery
+  class Ui
+    class UnmanagedFilesRenderer < Machinery::Ui::Renderer
+      def content(description)
+        return unless description["unmanaged_files"]
 
-    list do
-      file_status = description["unmanaged_files"].extracted
+        list do
+          file_status = description["unmanaged_files"].extracted
 
-      if description["unmanaged_files"].elements.empty?
-        puts "There are no unmanaged files."
-      elsif !file_status.nil?
-        puts "Files extracted: #{file_status ? "yes" : "no"}"
-      end
+          if description["unmanaged_files"].elements.empty?
+            puts "There are no unmanaged files."
+          elsif !file_status.nil?
+            puts "Files extracted: #{file_status ? "yes" : "no"}"
+          end
 
-      if description["unmanaged_files"]
-        description["unmanaged_files"].each do |p|
-          if description["unmanaged_files"].contains_metadata?
-            item "#{p.name} (#{p.type})" do
-              puts "User/Group: #{p.user}:#{p.group}" if p.user || p.group
-              puts "Mode: #{p.mode}" if p.mode
-              puts "Size: #{number_to_human_size(p.size)}" if p.size
-              if p.files && p.dirs
-                puts "Files: #{p.files}"
-                puts "Directories: #{p.dirs}"
-              end
-              if p.file_objects
-                puts "File Objects: #{p.file_objects}"
+          if description["unmanaged_files"]
+            description["unmanaged_files"].each do |p|
+              if description["unmanaged_files"].contains_metadata?
+                item "#{p.name} (#{p.type})" do
+                  puts "User/Group: #{p.user}:#{p.group}" if p.user || p.group
+                  puts "Mode: #{p.mode}" if p.mode
+                  puts "Size: #{number_to_human_size(p.size)}" if p.size
+                  if p.files && p.dirs
+                    puts "Files: #{p.files}"
+                    puts "Directories: #{p.dirs}"
+                  end
+                  if p.file_objects
+                    puts "File Objects: #{p.file_objects}"
+                  end
+                end
+              else
+                item "#{p.name} (#{p.type})"
               end
             end
-          else
-            item "#{p.name} (#{p.type})"
           end
         end
       end
-    end
-  end
 
-  def display_name
-    "Unmanaged Files"
-  end
+      def display_name
+        "Unmanaged 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/users/users_inspector.rb

@@ -15,84 +15,86 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class UsersInspector < Inspector
-  has_priority 50
+module Machinery
+  class UsersInspector < Machinery::Inspector
+    has_priority 50
 
-  def initialize(system, description)
-    @system = system
-    @description = description
-  end
+    def initialize(system, description)
+      @system = system
+      @description = description
+    end
 
-  def inspect(_filter, _options = {})
-    passwd = @system.read_file("/etc/passwd")
-    shadow = @system.read_file("/etc/shadow", privileged: true)
+    def inspect(_filter, _options = {})
+      passwd = @system.read_file("/etc/passwd")
+      shadow = @system.read_file("/etc/shadow", privileged: true)
 
-    users = passwd ? parse_users(passwd, shadow) : []
+      users = passwd ? parse_users(passwd, shadow) : []
 
-    @description.users = UsersScope.new(users.sort_by(&:name))
-  end
+      @description.users = UsersScope.new(users.sort_by(&:name))
+    end
 
-  def summary
-    "Found #{Machinery.pluralize(@description.users.size, "%d user")}."
-  end
+    def summary
+      "Found #{Machinery.pluralize(@description.users.size, "%d user")}."
+    end
 
-  private
+    private
 
-  def parse_users(passwd, shadow)
-    passwd = Machinery.scrub(passwd)
-    users = passwd.lines.map { |l| l.split(":").first }
+    def parse_users(passwd, shadow)
+      passwd = Machinery.scrub(passwd)
+      users = passwd.lines.map { |l| l.split(":").first }
 
-    users.map do |user|
-      attributes = passwd_attributes(passwd, user)
-      attributes.merge!(shadow_attributes(shadow, user)) if shadow
+      users.map do |user|
+        attributes = passwd_attributes(passwd, user)
+        attributes.merge!(shadow_attributes(shadow, user)) if shadow
 
-      User.new(attributes)
+        User.new(attributes)
+      end
     end
-  end
 
-  def passwd_attributes(passwd, user)
-    line = passwd.lines.find { |l| l.start_with?("#{user}:") }
-    user, passwd, uid, gid, comment, home, shell = line.split(":").map(&:chomp)
-
-    # In case the inspected machine uses NIS, /etc/passwd will contain a
-    # placeholder entry like this:
-    #
-    #   +::::::
-    #
-    # We need to handle it correctly, which means setting non-string attributes
-    # to nil.
-    uid = Machinery::is_int?(uid) ? uid.to_i : nil
-    gid = Machinery::is_int?(gid) ? gid.to_i : nil
-
-    {
-        name: user,
+    def passwd_attributes(passwd, user)
+      line = passwd.lines.find { |l| l.start_with?("#{user}:") }
+      user, passwd, uid, gid, comment, home, shell = line.split(":").map(&:chomp)
+
+      # In case the inspected machine uses NIS, /etc/passwd will contain a
+      # placeholder entry like this:
+      #
+      #   +::::::
+      #
+      # We need to handle it correctly, which means setting non-string attributes
+      # to nil.
+      uid = Machinery.is_int?(uid) ? uid.to_i : nil
+      gid = Machinery.is_int?(gid) ? gid.to_i : nil
+
+      {
+        name:     user,
         password: passwd,
-        uid: uid,
-        gid: gid,
-        comment: comment,
-        home: home,
-        shell: shell
-    }
-  end
-
-  def shadow_attributes(shadow, user)
-    line = shadow.lines.find { |l| l.start_with?("#{user}:") }
-    if line
-      user, passwd, changed, min, max, warn, inactive, expire = line.split(":").map(&:chomp)
-
-      result = {
-        encrypted_password: passwd
+        uid:      uid,
+        gid:      gid,
+        comment:  comment,
+        home:     home,
+        shell:    shell
       }
-      result[:last_changed_date] = changed.to_i unless changed.empty?
-      result[:min_days] = min.to_i unless min.empty?
-      result[:max_days] = max.to_i unless max.empty?
-      result[:warn_days] = warn.to_i unless warn.empty?
-      result[:disable_days] = inactive.to_i unless inactive.empty?
-      result[:disabled_date] = expire.to_i unless expire.empty?
-
-      result
-    else
-      {}
+    end
+
+    def shadow_attributes(shadow, user)
+      line = shadow.lines.find { |l| l.start_with?("#{user}:") }
+      if line
+        user, passwd, changed, min, max, warn, inactive, expire = line.split(":").map(&:chomp)
+
+        result = {
+          encrypted_password: passwd
+        }
+        result[:last_changed_date] = changed.to_i unless changed.empty?
+        result[:min_days] = min.to_i unless min.empty?
+        result[:max_days] = max.to_i unless max.empty?
+        result[:warn_days] = warn.to_i unless warn.empty?
+        result[:disable_days] = inactive.to_i unless inactive.empty?
+        result[:disabled_date] = expire.to_i unless expire.empty?
+
+        result
+      else
+        {}
+      end
     end
   end
 end

data/plugins/users/users_model.rb

@@ -15,50 +15,51 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
+module Machinery
+  class User < Machinery::Object
+    IGNORED_ATTRIBUTES_IN_COMPARISON = [
+      "password",
+      "encrypted_password",
+      "last_changed_date",
+      "min_days",
+      "max_days",
+      "warn_days"
+    ].freeze
 
-class User < Machinery::Object
-  IGNORED_ATTRIBUTES_IN_COMPARISON = [
-    "password",
-    "encrypted_password",
-    "last_changed_date",
-    "min_days",
-    "max_days",
-    "warn_days"
-  ]
+    # User objects contain some information which is not relevant in the context of comparison (e.g.
+    # metadata like "last_changed_date"). In order to ignore these attributes during comparison we
+    # have to overwrite some methods.
+    def eql?(other)
+      relevant_attributes = (attributes.keys & other.attributes.keys) -
+        IGNORED_ATTRIBUTES_IN_COMPARISON
 
-  # User objects contain some information which is not relevant in the context of comparison (e.g.
-  # metadata like "last_changed_date"). In order to ignore these attributes during comparison we
-  # have to overwrite some methods.
-  def eql?(other)
-    relevant_attributes = (attributes.keys & other.attributes.keys) -
-      IGNORED_ATTRIBUTES_IN_COMPARISON
+      relevant_attributes.all? do |attribute|
+        self[attribute] == other[attribute]
+      end
+    end
 
-    relevant_attributes.all? do |attribute|
-      self[attribute] == other[attribute]
+    def hash
+      @attributes.reject { |k, _v| IGNORED_ATTRIBUTES_IN_COMPARISON.include?(k) }.hash
     end
   end
 
-  def hash
-    @attributes.reject { |k, _v| IGNORED_ATTRIBUTES_IN_COMPARISON.include?(k) }.hash
-  end
-end
+  class UsersScope < Machinery::Array
+    include Machinery::Scope
 
-class UsersScope < Machinery::Array
-  include Machinery::Scope
+    has_elements class: User
 
-  has_elements class: User
+    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/users/users_renderer.rb

@@ -15,41 +15,45 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class UsersRenderer < Renderer
-  def content(description)
-    return unless description.users
+module Machinery
+  class Ui
+    class UsersRenderer < Machinery::Ui::Renderer
+      def content(description)
+        return unless description.users
 
-    if description.users.any? { |a| a[:comment] == "" || a[:uid].nil? || a[:gid].nil? }
-      na_note("user info, user ID or group ID")
-    end
+        if description.users.any? { |a| a[:comment] == "" || a[:uid].nil? || a[:gid].nil? }
+          na_note("user info, user ID or group ID")
+        end
 
-    list do
-      description.users.each do |user|
-        info = user.comment.empty? ? "N/A" : user.comment
-        uid = user.uid || "N/A"
-        gid = user.gid || "N/A"
-        item "#{user.name} (#{info}, uid: #{uid}, gid: #{gid}, shell: #{user.shell})"
+        list do
+          description.users.each do |user|
+            info = user.comment.empty? ? "N/A" : user.comment
+            uid = user.uid || "N/A"
+            gid = user.gid || "N/A"
+            item "#{user.name} (#{info}, uid: #{uid}, gid: #{gid}, shell: #{user.shell})"
+          end
+        end
       end
-    end
-  end
 
-  def display_name
-    "Users"
-  end
+      def display_name
+        "Users"
+      end
 
-  def compare_content_changed(changed_elements)
-    list do
-      changed_elements.each do |one, two|
-        changes = []
-        relevant_attributes = ["uid", "gid", "comment", "shell", "home"]
+      def compare_content_changed(changed_elements)
+        list do
+          changed_elements.each do |one, two|
+            changes = []
+            relevant_attributes = ["uid", "gid", "comment", "shell", "home"]
 
-        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/schema/migrations/migrate1to2.rb

@@ -15,7 +15,7 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class Migrate1To2 < Migration
+class Machinery::Migrate1To2 < Machinery::Migration
   desc <<-EOT
     Schema version 2 introduces an "extracted" flag for the config_files,
     changed_managed_files and unmanaged_files scope, indicating whether the

data/schema/migrations/migrate2to3.rb

@@ -15,7 +15,7 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class Migrate2To3 < Migration
+class Machinery::Migrate2To3 < Machinery::Migration
   desc <<-EOT
     Schema version 3 stores the analyzed data under the directory
     "analyze" and config files diffs in the config_file_diffs

data/schema/migrations/migrate3to4.rb

@@ -15,7 +15,7 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class Migrate3To4 < Migration
+class Machinery::Migrate3To4 < Machinery::Migration
   desc <<-EOT
     Schema version 4 adds a "type" attribute to changed_managed_files and config_files
     in order to support other file types like links.

data/schema/migrations/migrate4to5.rb

@@ -15,7 +15,7 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class Migrate4To5 < Migration
+class Machinery::Migrate4To5 < Machinery::Migration
   desc <<-EOT
     Schema version 5 adds a "environment" scope which stores information about the inspected system.
   EOT