machinery-tool 1.16.4 → 1.17.0

data/plugins/unmanaged_files/unmanaged_files_model.rb

@@ -19,9 +19,21 @@ class UnmanagedFile < Machinery::SystemFile
 end
 
 class UnmanagedFileList < Machinery::Array
+end
+
+class UnmanagedFilesScope < FileScope
+  include Machinery::Scope
+  include ScopeFileAccessArchive
+
+  has_attributes :extracted
   has_elements class: UnmanagedFile
 
   def compare_with(other)
+    if extracted != other.extracted
+      Machinery::Ui.warn("Warning: Comparing extracted with unextracted" \
+        " unmanaged files. Only common attributes are considered.")
+    end
+
     self_hash = elements.inject({}) { |hash, e| hash[e.name] = e; hash }
     other_hash = other.elements.inject({}) { |hash, e| hash[e.name] = e; hash }
 
@@ -39,11 +51,18 @@ class UnmanagedFileList < Machinery::Array
     end
     changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
 
+    if self.attributes == other.attributes
+      common_attributes = self.attributes
+    else
+      only_self_attributes = self.attributes
+      only_other_attributes = other.attributes
+    end
+
     [
-      self.class.new(only_self),
-      self.class.new(only_other),
+      self.class.new(only_self, only_self_attributes || {}),
+      self.class.new(only_other, only_other_attributes || {}),
       changed,
-      self.class.new(both)
+      self.class.new(both, common_attributes || {})
     ].map { |e| e.empty? ? nil : e }
   end
 
@@ -56,18 +75,3 @@ class UnmanagedFileList < Machinery::Array
     end
   end
 end
-
-class UnmanagedFilesScope < FileScope
-  include Machinery::Scope
-  include ScopeFileAccessArchive
-  has_property :files, class: UnmanagedFileList
-
-  def compare_with(other)
-    if extracted != other.extracted
-      Machinery::Ui.warn("Warning: Comparing extracted with unextracted" \
-        " unmanaged files. Only common attributes are considered.")
-    end
-
-    super
-  end
-end

data/plugins/unmanaged_files/unmanaged_files_renderer.rb

@@ -22,14 +22,14 @@ class UnmanagedFilesRenderer < Renderer
     list do
       file_status = description["unmanaged_files"].extracted
 
-      if description["unmanaged_files"].files.empty?
+      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"].files
-        description["unmanaged_files"].files.each do |p|
+      if description["unmanaged_files"]
+        description["unmanaged_files"].each do |p|
           if description["unmanaged_files"].extracted
             item "#{p.name} (#{p.type})" do
               puts "User/Group: #{p.user}:#{p.group}" if p.user || p.group

data/plugins/users/schema/system-description-users.schema-v6.json

@@ -0,0 +1,86 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+  "required": [
+    "_elements"
+  ],
+  "properties": {
+    "_attributes": {
+      "type": "object"
+    },
+    "_elements": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": [
+          "name",
+          "password",
+          "uid",
+          "gid",
+          "comment",
+          "home",
+          "shell"
+        ],
+        "properties": {
+          "name": {
+            "type": "string",
+            "minLength": 1
+          },
+          "password": {
+            "type": "string"
+          },
+          "uid": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "minimum": 0
+          },
+          "gid": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "minimum": 0
+          },
+          "comment": {
+            "type": "string"
+          },
+          "home": {
+            "type": "string"
+          },
+          "shell": {
+            "type": "string"
+          },
+          "encrypted_password": {
+            "type": "string"
+          },
+          "last_changed_date": {
+            "type": "integer"
+          },
+          "min_days": {
+            "type": "integer",
+            "minimum": 0
+          },
+          "max_days": {
+            "type": "integer",
+            "minimum": 0
+          },
+          "warn_days": {
+            "type": "integer",
+            "minimum": 0
+          },
+          "disable_days": {
+            "type": "integer",
+            "minimum": 0
+          },
+          "disabled_date": {
+            "type": "integer"
+          }
+        }
+      }
+    }
+  }
+}
+

data/schema/migrations/migrate5to6.rb

@@ -0,0 +1,101 @@
+# Copyright (c) 2013-2014 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 Migrate5To6 < Migration
+  desc <<-EOT
+    Schema version 6 adds support for Ubuntu 14.04 systems.
+    There are now three types of repositories: zypper, yum and apt
+  EOT
+
+  def migrate
+    if @hash.key?("packages")
+      @hash["packages"] = {
+        "_attributes" => {
+          "package_system" => "rpm"
+        },
+        "_elements" => @hash["packages"]
+      }
+    end
+
+    if @hash.key?("repositories")
+      if @hash["repositories"].first
+        repository_system = @hash["repositories"].first["package_manager"]
+      else
+        repository_system = "zypp"
+      end
+
+      @hash["repositories"] = {
+        "_attributes" => {
+          "repository_system" => repository_system
+        },
+        "_elements" => @hash["repositories"].map do |repository|
+          repository.delete("package_manager")
+          if repository_system == "yum"
+            repository["gpgkey"] = []
+            repository["mirrorlist"] = ""
+            repository["url"] = [repository["url"]]
+          end
+          repository
+        end
+      }
+    end
+
+    ["changed_managed_files", "config_files", "unmanaged_files"].each do |scope|
+      next unless @hash.key?(scope)
+
+      @hash[scope] = {
+        "_attributes" => {
+          "extracted" => @hash[scope]["extracted"]
+        },
+        "_elements" => @hash[scope]["files"]
+      }
+    end
+
+    if @hash.key?("services")
+      @hash["services"] = {
+        "_attributes" => {
+          "init_system" => @hash["services"]["init_system"]
+        },
+        "_elements" => @hash["services"]["services"]
+      }
+
+      if @hash.key?("os") && @hash["os"]["name"] == "Red Hat Enterprise Linux Server" &&
+          @hash["os"]["version"].start_with?("6.")
+
+        @hash["services"]["_attributes"]["init_system"] = "upstart"
+
+        @hash["services"]["_elements"].each { |service| service["legacy_sysv"] = true }
+      end
+    end
+
+    ["users", "patterns"].each do |scope|
+      next unless @hash.key?(scope)
+
+      @hash[scope] = {
+        "_elements" => @hash[scope]
+      }
+    end
+
+    if @hash.key?("groups")
+      @hash["groups"] = {
+        "_elements" => @hash["groups"]
+      }
+    end
+
+    @hash
+  end
+end

data/schema/system-description-global.schema-v6.json

@@ -0,0 +1,43 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+  "required": ["meta"],
+  "properties": {
+    "meta": {
+      "required": ["format_version"],
+      "properties": {
+        "format_version": {
+          "type": "integer",
+          "minimum": 1
+        },
+        "filters": {
+          "type": "object",
+          "required": ["inspect"],
+          "properties": {
+            "inspect": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      },
+      "additionalProperties": {
+        "type": "object",
+        "required": ["modified", "hostname"],
+        "properties": {
+          "modified": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "hostname": {
+            "type": "string",
+            "format": "hostname"
+          }
+        }
+      }
+    }
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: machinery-tool
 version: !ruby/object:Gem::Version
-  version: 1.16.4
+  version: 1.17.0
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cheetah
@@ -254,7 +254,6 @@ files:
 - html/assets/file_loader.gif
 - html/assets/jquery-2.1.1.min.js
 - html/assets/jquery.searcher.min.js
-- html/assets/landing_page/landing_page.js
 - html/assets/machinery-base.css
 - html/assets/machinery-base.js
 - html/assets/machinery.css
@@ -282,7 +281,9 @@ files:
 - html/partials/compare/pattern_list.html.haml
 - html/partials/compare/patterns.html.haml
 - html/partials/compare/repositories.html.haml
-- html/partials/compare/repository_list.html.haml
+- html/partials/compare/repository_list_apt.html.haml
+- html/partials/compare/repository_list_yum.html.haml
+- html/partials/compare/repository_list_zypp.html.haml
 - html/partials/compare/service_list.html.haml
 - html/partials/compare/services.html.haml
 - html/partials/compare/summary.html.haml
@@ -297,11 +298,15 @@ files:
 - html/partials/packages.html.haml
 - html/partials/patterns.html.haml
 - html/partials/repositories.html.haml
+- html/partials/repositories_apt.html.haml
+- html/partials/repositories_yum.html.haml
+- html/partials/repositories_zypp.html.haml
 - html/partials/scope_header.html.haml
 - html/partials/services.html.haml
 - html/partials/unmanaged_files.html.haml
 - html/partials/users.html.haml
 - inspect_helpers/changed_files.sh
+- inspect_helpers/dpkg_unmanaged_files.sh
 - inspect_helpers/yum_repositories.py
 - lib/analyze_config_file_diffs_task.rb
 - lib/array.rb
@@ -320,6 +325,7 @@ files:
 - lib/current_user.rb
 - lib/deploy_task.rb
 - lib/docker_system.rb
+- lib/dpkg_database.rb
 - lib/element_filter.rb
 - lib/exceptions.rb
 - lib/export_task.rb
@@ -344,6 +350,7 @@ files:
 - lib/machinery_helper.rb
 - lib/machinery_logger.rb
 - lib/man_task.rb
+- lib/managed_files_database.rb
 - lib/manifest.rb
 - lib/migration.rb
 - lib/mountpoints.rb
@@ -395,6 +402,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/changed_managed_files/schema/system-description-changed-managed-files.schema-v6.json
 - plugins/config_files/config_files.yml
 - plugins/config_files/config_files_inspector.rb
 - plugins/config_files/config_files_model.rb
@@ -404,10 +412,12 @@ files:
 - plugins/config_files/schema/system-description-config-files.schema-v3.json
 - plugins/config_files/schema/system-description-config-files.schema-v4.json
 - plugins/config_files/schema/system-description-config-files.schema-v5.json
+- plugins/config_files/schema/system-description-config-files.schema-v6.json
 - plugins/environment/environment.md
 - plugins/environment/environment_inspector.rb
 - plugins/environment/environment_model.rb
 - plugins/environment/schema/system-description-environment.schema-v5.json
+- plugins/environment/schema/system-description-environment.schema-v6.json
 - plugins/groups/groups.yml
 - plugins/groups/groups_inspector.rb
 - plugins/groups/groups_model.rb
@@ -417,6 +427,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/groups/schema/system-description-groups.schema-v6.json
 - plugins/os/os.yml
 - plugins/os/os_inspector.rb
 - plugins/os/os_model.rb
@@ -426,6 +437,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/os/schema/system-description-os.schema-v6.json
 - plugins/packages/packages.yml
 - plugins/packages/packages_inspector.rb
 - plugins/packages/packages_model.rb
@@ -435,6 +447,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/packages/schema/system-description-packages.schema-v6.json
 - plugins/patterns/patterns.yml
 - plugins/patterns/patterns_inspector.rb
 - plugins/patterns/patterns_model.rb
@@ -444,6 +457,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/patterns/schema/system-description-patterns.schema-v6.json
 - plugins/repositories/repositories.yml
 - plugins/repositories/repositories_inspector.rb
 - plugins/repositories/repositories_model.rb
@@ -453,11 +467,13 @@ files:
 - plugins/repositories/schema/system-description-repositories.schema-v3.json
 - plugins/repositories/schema/system-description-repositories.schema-v4.json
 - plugins/repositories/schema/system-description-repositories.schema-v5.json
+- plugins/repositories/schema/system-description-repositories.schema-v6.json
 - plugins/services/schema/system-description-services.schema-v1.json
 - plugins/services/schema/system-description-services.schema-v2.json
 - 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/schema/system-description-services.schema-v6.json
 - plugins/services/services.yml
 - plugins/services/services_inspector.rb
 - plugins/services/services_model.rb
@@ -467,6 +483,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/schema/system-description-unmanaged-files.schema-v6.json
 - plugins/unmanaged_files/unmanaged_files.yml
 - plugins/unmanaged_files/unmanaged_files_inspector.rb
 - plugins/unmanaged_files/unmanaged_files_model.rb
@@ -476,6 +493,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/schema/system-description-users.schema-v6.json
 - plugins/users/users.yml
 - plugins/users/users_inspector.rb
 - plugins/users/users_model.rb
@@ -484,11 +502,13 @@ files:
 - schema/migrations/migrate2to3.rb
 - schema/migrations/migrate3to4.rb
 - schema/migrations/migrate4to5.rb
+- schema/migrations/migrate5to6.rb
 - schema/system-description-global.schema-v1.json
 - schema/system-description-global.schema-v2.json
 - schema/system-description-global.schema-v3.json
 - schema/system-description-global.schema-v4.json
 - schema/system-description-global.schema-v5.json
+- schema/system-description-global.schema-v6.json
 - tools/helper_builder.rb
 - workload_mapper/docker-registry/clue.rb
 - workload_mapper/docker-registry/compose-template.yml