machinery-tool 1.14.2 → 1.15.0

data/lib/system_description.rb

@@ -291,14 +291,6 @@ class SystemDescription < Machinery::Object
         return parse_variable_assignment(file.content, key) if file
       end
     end
-    # if scope_extracted?("config_files")
-    #   file = self["config_files"].files.find { |f| f.name == path }
-    #   return parse_variable_assignment(file.content, key) if file
-    # end
-    # if scope_extracted?("unmanaged_files")
-    #   file = self["unmanaged_files"].files.find { |f| f.name == path }
-    #   return parse_variable_assignment(file.content, key) if file
-    # end
   end
 
   private

data/lib/try.rb

@@ -0,0 +1,28 @@
+# Copyright (c) 2013-2015 SUSE LLC
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 3 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE about this file by physical or electronic mail,
+# you may find current contact information at www.suse.com
+
+class Object
+  def try(*args)
+    send(*args)
+  end
+end
+
+class NilClass
+  def try(*_args)
+    nil
+  end
+end

data/lib/version.rb

@@ -17,6 +17,6 @@
 
 module Machinery
 
-  VERSION = "1.14.2"
+  VERSION = "1.15.0"
 
 end

data/machinery-helper/version.go

@@ -2,4 +2,4 @@
 
 package main
 
-const VERSION = "b8c8eec01238e18a5ce1d9c53590c5c971e01703"
+const VERSION = "b333b1358568df9a508e7d92c61d3280395911d9"

data/man/generated/machinery.1.html

@@ -241,22 +241,36 @@ scope to <code>packages</code>. This will output only the requested information.
 <p>Machinery supports the following scopes:</p>
 
 <ul>
-<li><p>os</p>
+<li>os</li>
+</ul>
+
 
 <p>Contains information about the operating system, name, version, and
-architecture of the inspected system.</p></li>
-<li><p>packages</p>
+architecture of the inspected system.</p>
+
+<ul>
+<li>packages</li>
+</ul>
+
 
 <p>Contains information on all installed RPM packages installed on the
-inspected system.</p></li>
-<li><p>patterns</p>
+inspected system.</p>
+
+<ul>
+<li>patterns</li>
+</ul>
+
 
 <p>Contains all patterns installed on the inspected system. A pattern is a
 collection of software packages.
 The meaning of software patterns depends on the package manager of the
 distribution. Therefore, the pattern scope on SUSE based systems uses the
-<code>zypper</code> command to obtain the information about installed pattern names.</p></li>
-<li><p>repositories</p>
+<code>zypper</code> command to obtain the information about installed pattern names.</p>
+
+<ul>
+<li>repositories</li>
+</ul>
+
 
 <p>Contains all information about software repositories configured on the
 inspected system. The information about repositories depends on the package
@@ -277,40 +291,60 @@ this repository should be checked by their gpg key or not.</p></li>
 <li><p>A numeric value for a priority. The priority of a repository is compared
 to the priorities of all other activated repositories. Values can
 range from 1 (highest) to 99 (lowest, default).</p></li>
+<li><p>users</p></li>
 </ul>
-</li>
-<li><p>users</p>
+
 
 <p>Contains information about the system users including user and group ids,
 login information, such as password hashes and - if available - additional
-password properties.</p></li>
-<li><p>groups</p>
+password properties.</p>
+
+<ul>
+<li>groups</li>
+</ul>
+
 
 <p>Contains information about the system groups such as group attributes and the
-list of group members.</p></li>
-<li><p>services</p>
+list of group members.</p>
+
+<ul>
+<li>services</li>
+</ul>
+
 
 <p>Services are applications running in the background doing continuous work
 or waiting for requests to do work.
 The scope determines which services are configured to be started in which
 runlevel. It uses the <code>chkconfig</code> command to obtain that information.
 The xinetd services that are also displayed by <code>chkconfig</code> are switched
-on/off by editing config files and are ignored in this context.</p></li>
-<li><p>config_files</p>
+on/off by editing config files and are ignored in this context.</p>
+
+<ul>
+<li>config_files</li>
+</ul>
+
 
 <p>Contains all configuration files which have been changed since they were
 installed.
 Configuration files are all those files which are marked as such in the
 package which has installed them. A configuration file change is reported
 if its content or its attributes like Linux permission bits or ownership
-have changed.</p></li>
-<li><p>changed_managed_files</p>
+have changed.</p>
+
+<ul>
+<li>changed_managed_files</li>
+</ul>
+
 
 <p>Contains the names and contents of all non-configuration files which have
 been changed compared to the files in the package. A file change is reported
 if its content or its attributes like Linux permission bits or ownership
-have changed.</p></li>
-<li><p>unmanaged_files</p>
+have changed.</p>
+
+<ul>
+<li>unmanaged_files</li>
+</ul>
+
 
 <p>Contains the names and contents of all files which are not part of any RPM
 package. The list of unmanaged files contains only plain files and
@@ -325,9 +359,7 @@ extracted during inspection.</p>
 
 <p>Using the <code>--extract-unmanaged-files</code> option, the files are transferred from
 the system and stored in the system description. Depending on the content of
-the inspected system, the amount of data stored may be huge.</p></li>
-</ul>
-
+the inspected system, the amount of data stored may be huge.</p>
 
 <h3 id="System-Description">System Description</h3>
 

data/plugins/changed_managed_files/{changed_managed_files.md → changed_managed_files.yml}

@@ -1,3 +1,7 @@
+---
+:name: Changed Managed Files
+:initials: cmf
+:description: |
   Contains the names and contents of all non-configuration files which have
   been changed compared to the files in the package. A file change is reported
   if its content or its attributes like Linux permission bits or ownership

data/plugins/changed_managed_files/changed_managed_files_model.rb

@@ -20,6 +20,20 @@ end
 
 class ChangedManagedFileList < Machinery::Array
   has_elements class: ChangedManagedFile
+
+  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 }
+  end
 end
 
 class ChangedManagedFilesScope < FileScope

data/plugins/changed_managed_files/changed_managed_files_renderer.rb

@@ -50,4 +50,21 @@ class ChangedManagedFilesRenderer < Renderer
   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)
+
+        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
+  end
 end

data/plugins/config_files/{config_files.md → config_files.yml}

@@ -1,3 +1,7 @@
+---
+:name: Config Files
+:initials: cf
+:description: |
   Contains all configuration files which have been changed since they were
   installed.
   Configuration files are all those files which are marked as such in the

data/plugins/config_files/config_files_model.rb

@@ -20,6 +20,20 @@ end
 
 class ConfigFileList < Machinery::Array
   has_elements class: ConfigFile
+
+  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 }
+  end
 end
 
 class ConfigFilesScope < FileScope

data/plugins/config_files/config_files_renderer.rb

@@ -55,6 +55,23 @@ class ConfigFilesRenderer < Renderer
     "Changed configuration 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)
+
+        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
+  end
+
   private
 
   def render_diff_file(diffs_dir, name)

data/plugins/groups/{groups.md → groups.yml}

@@ -1,2 +1,6 @@
+---
+:name: Groups
+:initials: g
+:description: |
   Contains information about the system groups such as group attributes and the
   list of group members.

data/plugins/groups/groups_model.rb

@@ -23,4 +23,18 @@ class GroupsScope < Machinery::Array
   include Machinery::Scope
 
   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)
+
+    [
+      only_self,
+      only_other,
+      changed,
+      common
+    ].map { |e| (e && !e.empty?) ? e : nil }
+  end
 end

data/plugins/groups/groups_renderer.rb

@@ -33,4 +33,21 @@ class GroupsRenderer < Renderer
   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
+
+        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
+  end
 end

data/plugins/os/{os.md → os.yml}

@@ -1,2 +1,6 @@
+---
+:name: Operating System
+:initials: os
+:description: |
   Contains information about the operating system, name, version, and
   architecture of the inspected system.

data/plugins/packages/{packages.md → packages.yml}

@@ -1,2 +1,6 @@
+---
+:name: Packages
+:initials: pk
+:description: |
   Contains information on all installed RPM packages installed on the
   inspected system.

data/plugins/packages/packages_model.rb

@@ -28,18 +28,7 @@ class PackagesScope < Machinery::Array
     only_self = self - other
     only_other = other - self
     common = self & other
-
-    changed_package_names = only_self.map(&:name) & only_other.map(&:name)
-    changed = []
-
-    changed_package_names.each do |name|
-      changed << [
-        only_self.find { |package| package.name == name },
-        only_other.find { |package| package.name == name },
-      ]
-      only_self.reject! { |package| package.name == name }
-      only_other.reject! { |package| package.name == name }
-    end
+    changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
 
     [
       only_self,

data/plugins/patterns/{patterns.md → patterns.yml}

@@ -1,3 +1,7 @@
+---
+:name: Patterns
+:initials: pt
+:description: |
   Contains all patterns installed on the inspected system. A pattern is a
   collection of software packages.
   The meaning of software patterns depends on the package manager of the

data/plugins/patterns/patterns_model.rb

@@ -23,4 +23,18 @@ class PatternsScope < Machinery::Array
   include Machinery::Scope
 
   has_elements class: Pattern
+
+  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 }
+  end
 end

data/plugins/patterns/patterns_renderer.rb

@@ -29,4 +29,25 @@ class PatternsRenderer < Renderer
   def display_name
     "Patterns"
   end
+
+  def compare_content_changed(changed_elements)
+    list do
+      changed_elements.each do |one, two|
+        changes = []
+        relevant_attributes = ["version"]
+
+        if one.version == two.version
+          relevant_attributes << "release"
+        end
+
+        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
+  end
 end