machinery-tool 1.14.2 → 1.15.0

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

@@ -1,3 +1,7 @@
+---
+:name: Repositories
+:initials: r
+:description: |
   Contains all information about software repositories configured on the
   inspected system. The information about repositories depends on the package
   manager of the distribution. Thus on SUSE-based systems the `zypper` command

data/plugins/repositories/repositories_model.rb

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

data/plugins/repositories/repositories_renderer.rb

@@ -40,4 +40,21 @@ class RepositoriesRenderer < Renderer
   def display_name
     "Repositories"
   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.alias} (#{changes.join(", ")})"
+      end
+    end
+  end
 end

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

@@ -1,3 +1,7 @@
+---
+:name: Services
+:initials: s
+:description: |
   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

data/plugins/services/services_model.rb

@@ -40,18 +40,28 @@ class ServicesScope < Machinery::Object
     if self.init_system != other.init_system
       [self, other, nil, nil]
     else
+      only_self = self.services - other.services
+      only_other = other.services - self.services
+      common = self.services & other.services
+      changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
+      changed = nil if changed.empty?
+
       [
-        self.services - other.services,
-        other.services - self.services,
-        [],
-        self.services & other.services
-      ].map do |services|
-        if !services.empty?
-          self.class.new(:init_system => self.init_system, :services => services)
-        else
-          nil
-        end
-      end
+        service_list_to_scope(only_self),
+        service_list_to_scope(only_other),
+        changed,
+        service_list_to_scope(common)
+      ]
     end
   end
+
+  def length
+    services.try(:length) || 0
+  end
+
+  private
+
+  def service_list_to_scope(services)
+    self.class.new(init_system: init_system, services: services) if !services.empty?
+  end
 end

data/plugins/services/services_renderer.rb

@@ -29,4 +29,21 @@ class ServicesRenderer < Renderer
   def display_name
     "Services"
   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/unmanaged_files/{unmanaged_files.md → unmanaged_files.yml}

@@ -1,3 +1,7 @@
+---
+:name: Unmanaged Files
+:initials: uf
+:description: |
   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
   directories. Special files like device nodes, named pipes and Unix domain

data/plugins/unmanaged_files/unmanaged_files_model.rb

@@ -37,11 +37,12 @@ class UnmanagedFileList < Machinery::Array
     only_other = other.elements.reject do |element|
       self_hash.has_key?(element.name) && files_match(element, self_hash[element.name])
     end
+    changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
 
     [
       self.class.new(only_self),
       self.class.new(only_other),
-      [],
+      changed,
       self.class.new(both)
     ].map { |e| e.empty? ? nil : e }
   end

data/plugins/unmanaged_files/unmanaged_files_renderer.rb

@@ -45,4 +45,21 @@ class UnmanagedFilesRenderer < Renderer
   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)
+
+        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/users/{users.md → users.yml}

@@ -1,3 +1,7 @@
+---
+:name: Users
+:initials: u
+:description: |
   Contains information about the system users including user and group ids,
   login information, such as password hashes and - if available - additional
   password properties.

data/plugins/users/users_model.rb

@@ -17,10 +17,48 @@
 
 
 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
+
+    relevant_attributes.all? do |attribute|
+      self[attribute] == other[attribute]
+    end
+  end
+
+  def hash
+    @attributes.reject { |k, _v| IGNORED_ATTRIBUTES_IN_COMPARISON.include?(k) }.hash
+  end
 end
 
 class UsersScope < Machinery::Array
   include Machinery::Scope
 
   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)
+
+    [
+      only_self,
+      only_other,
+      changed,
+      common
+    ].map { |e| (e && !e.empty?) ? e : nil }
+  end
 end

data/plugins/users/users_renderer.rb

@@ -32,4 +32,21 @@ class UsersRenderer < Renderer
   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"]
+
+        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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: machinery-tool
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.15.0
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cheetah
@@ -251,29 +251,11 @@ files:
 - html/assets/collapse.js
 - html/assets/compare/machinery.js
 - html/assets/cross.png
+- html/assets/file_loader.gif
 - html/assets/jquery-2.1.1.min.js
 - html/assets/jquery.searcher.min.js
-- html/assets/logo-changed-managed-files-small.png
-- html/assets/logo-changed-managed-files.png
-- html/assets/logo-config-files-small.png
-- html/assets/logo-config-files.png
-- html/assets/logo-groups-small.png
-- html/assets/logo-groups.png
-- html/assets/logo-os-small.png
-- html/assets/logo-os.png
-- html/assets/logo-packages-small.png
-- html/assets/logo-packages.png
-- html/assets/logo-patterns-small.png
-- html/assets/logo-patterns.png
-- html/assets/logo-repositories-small.png
-- html/assets/logo-repositories.png
-- html/assets/logo-services-small.png
-- html/assets/logo-services.png
-- html/assets/logo-unmanaged-files-small.png
-- html/assets/logo-unmanaged-files.png
-- html/assets/logo-users-small.png
-- html/assets/logo-users.png
 - html/assets/machinery-base.css
+- html/assets/machinery-base.js
 - html/assets/machinery.css
 - html/assets/modal.js
 - html/assets/reset.png
@@ -286,6 +268,7 @@ files:
 - html/partials/compare/alert.html.haml
 - html/partials/compare/changed_managed_file_list.html.haml
 - html/partials/compare/changed_managed_files.html.haml
+- html/partials/compare/changes.html.haml
 - html/partials/compare/config_file_list.html.haml
 - html/partials/compare/config_files.html.haml
 - html/partials/compare/group_list.html.haml
@@ -300,6 +283,7 @@ files:
 - html/partials/compare/repository_list.html.haml
 - html/partials/compare/service_list.html.haml
 - html/partials/compare/services.html.haml
+- html/partials/compare/summary.html.haml
 - html/partials/compare/unmanaged_file_list.html.haml
 - html/partials/compare/unmanaged_files.html.haml
 - html/partials/compare/user_list.html.haml
@@ -381,6 +365,7 @@ files:
 - lib/system_description_store.rb
 - lib/system_file.rb
 - lib/tarball.rb
+- lib/try.rb
 - lib/ui.rb
 - lib/upgrade_format_task.rb
 - lib/validate_task.rb
@@ -398,7 +383,7 @@ files:
 - machinery-helper/version.go
 - man/generated/machinery.1.gz
 - man/generated/machinery.1.html
-- plugins/changed_managed_files/changed_managed_files.md
+- plugins/changed_managed_files/changed_managed_files.yml
 - plugins/changed_managed_files/changed_managed_files_inspector.rb
 - plugins/changed_managed_files/changed_managed_files_model.rb
 - plugins/changed_managed_files/changed_managed_files_renderer.rb
@@ -407,7 +392,7 @@ files:
 - plugins/changed_managed_files/schema/system-description-changed-managed-files.schema-v3.json
 - plugins/changed_managed_files/schema/system-description-changed-managed-files.schema-v4.json
 - plugins/changed_managed_files/schema/system-description-changed-managed-files.schema-v5.json
-- plugins/config_files/config_files.md
+- plugins/config_files/config_files.yml
 - plugins/config_files/config_files_inspector.rb
 - plugins/config_files/config_files_model.rb
 - plugins/config_files/config_files_renderer.rb
@@ -420,7 +405,7 @@ files:
 - plugins/environment/environment_inspector.rb
 - plugins/environment/environment_model.rb
 - plugins/environment/schema/system-description-environment.schema-v5.json
-- plugins/groups/groups.md
+- plugins/groups/groups.yml
 - plugins/groups/groups_inspector.rb
 - plugins/groups/groups_model.rb
 - plugins/groups/groups_renderer.rb
@@ -429,7 +414,7 @@ files:
 - plugins/groups/schema/system-description-groups.schema-v3.json
 - plugins/groups/schema/system-description-groups.schema-v4.json
 - plugins/groups/schema/system-description-groups.schema-v5.json
-- plugins/os/os.md
+- plugins/os/os.yml
 - plugins/os/os_inspector.rb
 - plugins/os/os_model.rb
 - plugins/os/os_renderer.rb
@@ -438,7 +423,7 @@ files:
 - plugins/os/schema/system-description-os.schema-v3.json
 - plugins/os/schema/system-description-os.schema-v4.json
 - plugins/os/schema/system-description-os.schema-v5.json
-- plugins/packages/packages.md
+- plugins/packages/packages.yml
 - plugins/packages/packages_inspector.rb
 - plugins/packages/packages_model.rb
 - plugins/packages/packages_renderer.rb
@@ -447,7 +432,7 @@ files:
 - plugins/packages/schema/system-description-packages.schema-v3.json
 - plugins/packages/schema/system-description-packages.schema-v4.json
 - plugins/packages/schema/system-description-packages.schema-v5.json
-- plugins/patterns/patterns.md
+- plugins/patterns/patterns.yml
 - plugins/patterns/patterns_inspector.rb
 - plugins/patterns/patterns_model.rb
 - plugins/patterns/patterns_renderer.rb
@@ -456,7 +441,7 @@ files:
 - plugins/patterns/schema/system-description-patterns.schema-v3.json
 - plugins/patterns/schema/system-description-patterns.schema-v4.json
 - plugins/patterns/schema/system-description-patterns.schema-v5.json
-- plugins/repositories/repositories.md
+- plugins/repositories/repositories.yml
 - plugins/repositories/repositories_inspector.rb
 - plugins/repositories/repositories_model.rb
 - plugins/repositories/repositories_renderer.rb
@@ -470,7 +455,7 @@ files:
 - plugins/services/schema/system-description-services.schema-v3.json
 - plugins/services/schema/system-description-services.schema-v4.json
 - plugins/services/schema/system-description-services.schema-v5.json
-- plugins/services/services.md
+- plugins/services/services.yml
 - plugins/services/services_inspector.rb
 - plugins/services/services_model.rb
 - plugins/services/services_renderer.rb
@@ -479,7 +464,7 @@ files:
 - plugins/unmanaged_files/schema/system-description-unmanaged-files.schema-v3.json
 - plugins/unmanaged_files/schema/system-description-unmanaged-files.schema-v4.json
 - plugins/unmanaged_files/schema/system-description-unmanaged-files.schema-v5.json
-- plugins/unmanaged_files/unmanaged_files.md
+- plugins/unmanaged_files/unmanaged_files.yml
 - plugins/unmanaged_files/unmanaged_files_inspector.rb
 - plugins/unmanaged_files/unmanaged_files_model.rb
 - plugins/unmanaged_files/unmanaged_files_renderer.rb
@@ -488,7 +473,7 @@ files:
 - plugins/users/schema/system-description-users.schema-v3.json
 - plugins/users/schema/system-description-users.schema-v4.json
 - plugins/users/schema/system-description-users.schema-v5.json
-- plugins/users/users.md
+- plugins/users/users.yml
 - plugins/users/users_inspector.rb
 - plugins/users/users_model.rb
 - plugins/users/users_renderer.rb