machinery-tool 1.18.0 → 1.19.0

data/plugins/environment/schema/system-description-environment.schema-v8.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/groups_inspector.rb

@@ -32,7 +32,7 @@ class GroupsInspector < Inspector
   end
 
   def summary
-    "Found #{@description.groups.size} groups."
+    "Found #{Machinery.pluralize(@description.groups.size, "%d group")}."
   end
 
   private

data/plugins/groups/groups_renderer.rb

@@ -23,7 +23,7 @@ class GroupsRenderer < Renderer
       description.groups.each do |group|
         gid = group.gid || "N/A"
         details ="gid: #{gid}"
-        details += ", users: #{group.users.join(",")}" if !group.users.empty?
+        details += ", users: #{group.users.join(",")}" unless group.users.empty?
 
         item "#{group.name} (#{details})"
       end

data/plugins/groups/schema/system-description-groups.schema-v8.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/os_inspector.rb

@@ -65,12 +65,12 @@ class OsInspector < Inspector
     os = get_os_from_os_release
 
     # Fall back to SuSE-release file
-    if !os
+    unless os
       os = get_os_from_suse_release
     end
 
     # Fall back to redhat-release file
-    if !os
+    unless os
       os = get_os_from_redhat_release
     end
 
@@ -80,7 +80,7 @@ class OsInspector < Inspector
   # check for freedesktop standard: /etc/os-release
   def get_os_from_os_release
     os_release = @system.read_file("/etc/os-release")
-    return if !os_release
+    return unless os_release
 
     result = Hash.new
     key_value_pairs = Hash[os_release.split("\n").reject(&:empty?).map { |l| l.split("=") }]
@@ -124,7 +124,7 @@ class OsInspector < Inspector
   # checks for old suse standard: /etc/SuSE-release
   def get_os_from_suse_release
     suse_release = @system.read_file("/etc/SuSE-release")
-    return if !suse_release
+    return unless suse_release
 
     result = Hash.new
     # name is always the first line in /etc/SuSE-release
@@ -132,7 +132,7 @@ class OsInspector < Inspector
 
     result["patchlevel"] = nil
     suse_release.split("\n").slice(1, suse_release.length).each do |line|
-      if !line.start_with?("#")
+      unless line.start_with?("#")
         key, value = line.split("=")
         result[key.strip.downcase] = value.strip
       end
@@ -155,7 +155,7 @@ class OsInspector < Inspector
   # checks for redhat standard: /etc/redhat-release
   def get_os_from_redhat_release
     redhat_release = @system.read_file("/etc/redhat-release")
-    return if !redhat_release
+    return unless redhat_release
 
     result = Hash.new
     result["name"], result["version"] = redhat_release.split("\n").first.split(" release ")

data/plugins/os/os_renderer.rb

@@ -26,6 +26,6 @@ class OsRenderer < Renderer
   end
 
   def display_name
-    "Operating system"
+    "Operating System"
   end
 end

data/plugins/os/schema/system-description-os.schema-v8.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

@@ -36,7 +36,7 @@ class PackagesInspector < Inspector
   end
 
   def summary
-    "Found #{@description.packages.length} packages."
+    "Found #{Machinery.pluralize(@description.packages.length, "%d package")}."
   end
 
   private

data/plugins/packages/schema/system-description-packages.schema-v8.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.yml

@@ -2,8 +2,10 @@
 :name: Patterns
 :initials: pt
 :description: |
-  Contains all patterns installed on the inspected system. A pattern is a
-  collection of software packages.
+  Contains all patterns or tasks installed on the inspected system. A pattern is a
+  collection of software packages, similar to the idea of tasks on Debian/Ubuntu-
+  like systems.
   The meaning of software patterns depends on the package manager of the
   distribution. Therefore, the pattern scope on SUSE based systems uses the
-  `zypper` command to obtain the information about installed pattern names.
+  `zypper` command to obtain the information about installed pattern names, whereas
+  on Debian based systems the `tasksel` tool is necessary to list installed tasks.

data/plugins/patterns/patterns_inspector.rb

@@ -28,24 +28,25 @@ class PatternsInspector < Inspector
       inspect_with_zypper
     elsif @system.has_command?("dpkg")
       if @system.has_command?("tasksel")
+        Machinery::Ui.puts "Note: Tasks on Debian-like systems are treated as patterns."
         @patterns_supported = true
         inspect_with_tasksel
       else
         @patterns_supported = false
-        @status = "For a patterns inspection please install the package tasksel " \
+        @status = "For a patterns (tasks) 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."
+      @status = "Patterns or tasks are not supported on this system."
       @description.patterns = PatternsScope.new
     end
   end
 
   def summary
     if @patterns_supported
-      "Found #{@description.patterns.count} patterns."
+      "Found #{Machinery.pluralize(@description.patterns.count, "%d pattern")}."
     else
       @status
     end

data/plugins/patterns/patterns_renderer.rb

@@ -20,7 +20,11 @@ class PatternsRenderer < Renderer
     return unless description.patterns
 
     if description.patterns.empty?
-      puts "There are no patterns."
+      puts "There are no patterns or tasks."
+    end
+
+    if description.packages && description.packages.package_system == "dpkg"
+      puts "Note: Tasks on Debian-like systems are treated as patterns."
     end
 
     list do

data/plugins/patterns/schema/system-description-patterns.schema-v8.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
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+

data/plugins/repositories/repositories_inspector.rb

@@ -37,7 +37,8 @@ class RepositoriesInspector < Inspector
   end
 
   def summary
-    "Found #{@description.repositories.size} repositories."
+    "Found " \
+      "#{Machinery.pluralize(@description.repositories.size, "%d repository", "%d repositories")}."
   end
 
   private

data/plugins/repositories/schema/system-description-repositories.schema-v8.json

@@ -0,0 +1,165 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "required": [
+    "_elements"
+  ],
+  "oneOf": [
+    {
+      "properties": {
+        "_attributes": {
+          "type": "object",
+          "required": [
+            "repository_system"
+          ],
+          "properties": {
+            "repository_system": {
+              "enum": ["zypp"]
+            }
+          }
+        },
+        "_elements": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": ["alias", "name", "url", "type", "enabled", "gpgcheck", "autorefresh", "priority"],
+            "properties": {
+              "alias": {
+                "type": "string",
+                "minLength": 1
+              },
+              "name": {
+                "type": "string",
+                "minLength": 1
+              },
+              "type": {
+                "enum": ["yast2", "rpm-md", "plaindir", null]
+              },
+              "url": {
+                "type": "string",
+                "format": "uri",
+                "minLength": 1
+              },
+              "enabled": {
+                "type": "boolean"
+              },
+              "autorefresh": {
+                "type": "boolean"
+              },
+              "gpgcheck": {
+                "type": "boolean"
+              },
+              "priority": {
+                "type": "integer",
+                "minimum": 1
+              }
+            }
+          }
+        }
+      }
+    },
+    {
+      "properties": {
+        "_attributes": {
+          "type": "object",
+          "required": [
+            "repository_system"
+          ],
+          "properties": {
+            "repository_system": {
+              "enum": ["yum"]
+            }
+          }
+        },
+        "_elements": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": ["alias", "name", "url", "type", "enabled", "gpgcheck", "gpgkey", "mirrorlist"],
+            "properties": {
+              "alias": {
+                "type": "string",
+                "minLength": 1
+              },
+              "mirrorlist": {
+                "type": "string"
+              },
+              "name": {
+                "type": "string",
+                "minLength": 1
+              },
+              "type": {
+                "enum": ["rpm-md", null]
+              },
+              "url": {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "format": "url",
+                  "minLength": 1
+                }
+              },
+              "enabled": {
+                "type": "boolean"
+              },
+              "gpgcheck": {
+                "type": "boolean"
+              },
+              "gpgkey": {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "format": "url",
+                  "minLength": 1
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    {
+      "properties": {
+        "_attributes": {
+          "type": "object",
+          "required": [
+            "repository_system"
+          ],
+          "properties": {
+            "repository_system": {
+              "enum": ["apt"]
+            }
+          }
+        },
+        "_elements": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": ["url", "type", "distribution", "components"],
+            "properties": {
+              "distribution": {
+                "type": "string",
+                "minLength": 1
+              },
+              "type": {
+                "enum": ["deb", "deb-src"]
+              },
+              "url": {
+                "type": "string",
+                "format": "uri",
+                "minLength": 1
+              },
+              "components": {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "minLength": 1
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}