machinery-tool 1.16.4 → 1.17.0

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

@@ -0,0 +1,17 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+  "required": ["locale"],
+  "properties": {
+    "locale": {
+      "type": "string",
+      "minLength": 1
+    },
+    "system_type": {
+      "type": "string",
+      "enum": ["local", "remote", "docker"]
+    }
+  }
+}
+

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

@@ -0,0 +1,49 @@
+{
+  "$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",
+          "gid",
+          "users"
+        ],
+        "properties": {
+          "name": {
+            "type": "string",
+            "minLength": 1
+          },
+          "password": {
+            "type": "string"
+          },
+          "gid": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "minimum": 0
+          },
+          "users": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 1
+            }
+          }
+        }
+      }
+    }
+  }
+}
+

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

@@ -0,0 +1,21 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+  "required": ["name", "version", "architecture"],
+  "properties": {
+    "name": {
+      "type": ["string", "null"],
+      "minLength": 1
+    },
+    "version": {
+      "type": ["string", "null"],
+      "minLength": 1
+    },
+    "architecture": {
+      "type": ["string", "null"],
+      "minLength": 1
+    }
+  }
+}
+

data/plugins/packages/packages_inspector.rb

@@ -23,9 +23,26 @@ class PackagesInspector < Inspector
   end
 
   def inspect(_filter, _options = {})
-    @system.check_requirement("rpm", "--version")
+    @system.check_requirement(["rpm", "dpkg"], "--version")
 
-    packages = Array.new
+    if @system.has_command?("rpm")
+      inspect_rpm
+    elsif @system.has_command?("dpkg")
+      @system.check_requirement("apt-cache", "--version")
+      inspect_dpkg
+    end
+
+    @description
+  end
+
+  def summary
+    "Found #{@description.packages.length} packages."
+  end
+
+  private
+
+  def inspect_rpm
+    packages = Machinery::Array.new
     rpm_data = @system.run_command(
       "rpm","-qa","--qf",
       "%{NAME}|%{VERSION}|%{RELEASE}|%{ARCH}|%{VENDOR}|%{SIGMD5}$",
@@ -36,7 +53,7 @@ class PackagesInspector < Inspector
     rpm_data.scan(/(.*?)\|(.*?)\|(.*?)\|(.*?)\|(.*?)\|(.*?)\$/).reject do |name, *attrs|
       name =~ /^gpg-pubkey$/
     end.each do |name, version, release, arch, vendor, checksum|
-      packages << Package.new(
+      packages << RpmPackage.new(
         :name     => name,
         :version  => version,
         :release  => release,
@@ -46,10 +63,63 @@ class PackagesInspector < Inspector
       )
     end
 
-    @description.packages = PackagesScope.new(packages.sort_by(&:name))
+    @description.packages = PackagesScope.new(
+      packages.sort_by(&:name),
+      package_system: "rpm"
+    )
   end
 
-  def summary
-    "Found #{@description.packages.size} packages."
+  def inspect_dpkg
+    dpkg_data = @system.run_command(
+      "dpkg", "-l", stdout: :capture
+    )
+
+    lines = dpkg_data.lines.reject { |line| !line.start_with?("ii ") }
+
+    packages = lines.map do |line|
+      name, version, arch = line.split[1..3]
+      version_segments = version.split("-")
+      release = version_segments.pop if version_segments.length > 1
+      version = version_segments.join("-")
+
+      DpkgPackage.new(
+        name: name,
+        version: version,
+        release: release,
+        arch: arch
+      )
+    end
+    packages.each_slice(100) do |packages_slice|
+      apt_cache_output = @system.run_command(
+        "apt-cache",
+        "show",
+        *packages_slice.map { |p| "#{p.name}=#{[p.version, p.release].compact.join("-")}" },
+        stdout: :capture
+      )
+
+      apt_cache_elements = Hash[
+        *apt_cache_output.split("\n\n").flat_map do |element|
+          name = element[/Package: (\w+)$/, 1]
+          [name, element]
+        end
+      ]
+
+      packages_slice.each do |package|
+        name = package.name.sub(/:[^:]+$/, "")
+        apt_cache_element = apt_cache_elements[name]
+        if apt_cache_element
+          checksum = apt_cache_element[/MD5sum: (\w+)\n/, 1]
+          vendor = apt_cache_element[/Origin: (\w+)\n/, 1]
+        end
+        package.checksum = checksum || ""
+        package.vendor = vendor || ""
+        package.release ||= ""
+      end
+    end
+
+    @description.packages = PackagesScope.new(
+      packages.sort_by(&:name),
+      package_system: "dpkg"
+    )
   end
 end

data/plugins/packages/packages_model.rb

@@ -19,22 +19,41 @@
 class Package < Machinery::Object
 end
 
+class RpmPackage < Package
+end
+
+class DpkgPackage < Package
+end
+
 class PackagesScope < Machinery::Array
   include Machinery::Scope
 
-  has_elements class: Package
+  has_attributes :package_system
+  has_elements class: DpkgPackage, if: { package_system: "dpkg" }
+  has_elements class: RpmPackage, if: { package_system: "rpm" }
 
   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 }
+    if self.package_system != other.package_system
+      [self, other, nil, nil]
+    else
+      only_self = self - other
+      only_other = other - self
+      common = self & other
+      changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
+      changed = nil if changed.empty?
+
+      [
+        package_list_to_scope(only_self),
+        package_list_to_scope(only_other),
+        changed,
+        package_list_to_scope(common)
+      ].map { |e| (e && !e.empty?) ? e : nil }
+    end
+  end
+
+  private
+
+  def package_list_to_scope(packages)
+    self.class.new(packages, package_system: package_system) unless packages.elements.empty?
   end
 end

data/plugins/packages/packages_renderer.rb

@@ -23,13 +23,14 @@ class PackagesRenderer < Renderer
   def content(description)
     return unless description.packages
 
-    if description.packages.empty?
+    if description.packages.elements.empty?
       puts "There are no packages."
     end
 
     list do
       description.packages.each do |p|
-        item "#{p.name}-#{p.version}-#{p.release}.#{p.arch} (#{p.vendor})"
+        vendor = !p.vendor.empty? ? p.vendor : "N/A"
+        item [p.name, p.version, p.release].reject(&:empty?).join("-") + ".#{p.arch} (#{vendor})"
       end
     end
   end
@@ -37,6 +38,8 @@ class PackagesRenderer < Renderer
   # In the comparison case we only want to show the package name, not all details like version,
   # architecture etc.
   def compare_content_only_in(description)
+    return if description.packages.empty?
+
     list do
       description.packages.each do |p|
         item "#{p.name}"

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

@@ -0,0 +1,115 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "required": [
+    "_elements"
+  ],
+  "oneOf": [
+    {
+      "properties": {
+        "_attributes": {
+          "type": "object",
+          "required": [
+            "package_system"
+          ],
+          "properties": {
+            "package_system": {
+              "enum": ["rpm"]
+            }
+          }
+        },
+        "_elements": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "name",
+              "version",
+              "release",
+              "arch",
+              "vendor",
+              "checksum"
+            ],
+            "properties": {
+              "name": {
+                "type": "string",
+                "minLength": 1
+              },
+              "version": {
+                "type": "string",
+                "minLength": 1
+              },
+              "release": {
+                "type": "string"
+              },
+              "arch": {
+                "type": "string",
+                "minLength": 1
+              },
+              "vendor": {
+                "type": "string"
+              },
+              "checksum": {
+                "type": "string",
+                "pattern": "^[a-f0-9]+$"
+              }
+            }
+          }
+        }
+      }
+    },
+    {
+      "properties": {
+        "_attributes": {
+          "type": "object",
+          "required": [
+            "package_system"
+          ],
+          "properties": {
+            "package_system": {
+              "enum": ["dpkg"]
+            }
+          }
+        },
+        "_elements": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "name",
+              "version",
+              "release",
+              "arch",
+              "vendor",
+              "checksum"
+            ],
+            "properties": {
+              "name": {
+                "type": "string",
+                "minLength": 1
+              },
+              "version": {
+                "type": "string",
+                "minLength": 1
+              },
+              "release": {
+                "type": "string"
+              },
+              "arch": {
+                "type": "string",
+                "minLength": 1
+              },
+              "vendor": {
+                "type": "string"
+              },
+              "checksum": {
+                "type": "string",
+                "pattern": "^[a-f0-9]*$"
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

data/plugins/patterns/patterns_inspector.rb

@@ -26,10 +26,20 @@ class PatternsInspector < Inspector
     if @system.has_command?("zypper")
       @patterns_supported = true
       inspect_with_zypper
+    elsif @system.has_command?("dpkg")
+      if @system.has_command?("tasksel")
+        @patterns_supported = true
+        inspect_with_tasksel
+      else
+        @patterns_supported = false
+        @status = "For a patterns inspection please install the package tasksel " \
+          "on the inspected system."
+        @description.patterns = PatternsScope.new
+      end
     else
       @patterns_supported = false
+      @status = "Patterns are not supported on this system."
       @description.patterns = PatternsScope.new
-      "Patterns are not supported on this system."
     end
   end
 
@@ -37,7 +47,7 @@ class PatternsInspector < Inspector
     if @patterns_supported
       "Found #{@description.patterns.count} patterns."
     else
-      "Patterns are not supported on this system."
+      @status
     end
   end
 
@@ -74,4 +84,18 @@ class PatternsInspector < Inspector
 
     @description.patterns = PatternsScope.new(patterns)
   end
+
+  def inspect_with_tasksel
+    tasksel_out = @system.run_command("tasksel", "--list-tasks", stdout: :capture)
+    tasklist = tasksel_out.lines.map(&:chomp)
+    installed = tasklist.select { |line| line.start_with?("i") }
+    installed.map! { |l| l.split[1] }
+    patterns = installed.map do |pattern|
+      Pattern.new(
+        name: pattern
+      )
+    end.uniq.sort_by(&:name)
+
+    @description.patterns = PatternsScope.new(patterns)
+  end
 end

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

@@ -0,0 +1,58 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+  "required": [
+    "_elements"
+  ],
+  "properties": {
+    "_attributes": {
+      "type": "object"
+    },
+    "_elements": {
+      "oneof": [
+        {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "name",
+              "version",
+              "release"
+            ],
+            "properties": {
+              "name": {
+                "type": "string",
+                "minLength": 1
+              },
+              "version": {
+                "type": "string",
+                "minLength": 1
+              },
+              "release": {
+                "type": "string",
+                "minLength": 1
+              }
+            }
+          }
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "name"
+            ],
+            "properties": {
+              "name": {
+                "type": "string",
+                "minLength": 1
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+