machinery-tool 1.18.0 → 1.19.0

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

@@ -0,0 +1,93 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+  "required": [
+    "_elements"
+  ],
+  "oneOf": [
+    {
+      "properties": {
+        "_attributes": {
+          "type": "object",
+          "required": [
+            "init_system"
+          ],
+          "properties": {
+            "init_system": {
+              "not": {
+                "enum": [
+                  "upstart"
+                ]
+              },
+              "type": "string",
+              "minLength": 1
+            }
+          }
+        },
+        "_elements": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "name",
+              "state"
+            ],
+            "properties": {
+              "name": {
+                "type": "string",
+                "minLength": 1
+              },
+              "state": {
+                "type": "string",
+                "minLength": 1
+              }
+            }
+          }
+        }
+      }
+    },
+    {
+      "properties": {
+        "_attributes": {
+          "type": "object",
+          "required": [
+            "init_system"
+          ],
+          "properties": {
+            "init_system": {
+              "enum": [
+                "upstart"
+              ]
+            }
+          }
+        },
+        "_elements": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "name",
+              "state",
+              "legacy_sysv"
+            ],
+            "properties": {
+              "name": {
+                "type": "string",
+                "minLength": 1
+              },
+              "state": {
+                "type": "string",
+                "minLength": 1
+              },
+              "legacy_sysv": {
+                "type": "boolean"
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}
+

data/plugins/services/services.yml

@@ -7,4 +7,4 @@
   The scope determines which services are configured to be started in which
   runlevel. It uses the `chkconfig` command to obtain that information.
   The xinetd services that are also displayed by `chkconfig` are switched
-  on/off by editing config files and are ignored in this context.
+  on/off by editing configuration files and are ignored in this context.

data/plugins/services/services_inspector.rb

@@ -45,7 +45,7 @@ class ServicesInspector < Inspector
   end
 
   def summary
-    "Found #{@description.services.length} services."
+    "Found #{Machinery.pluralize(@description.services.length, "%d service")}."
   end
 
   private

data/plugins/unmanaged_files/schema/system-description-unmanaged-files.schema-v8.json

@@ -0,0 +1,124 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+  "required": [
+    "_elements"
+  ],
+  "properties": {
+    "_attributes": {
+      "type": "object",
+      "required": [
+        "extracted",
+        "has_metadata"
+      ],
+      "properties": {
+        "extracted": {
+          "type": "boolean"
+        },
+        "has_metadata": {
+          "type": "boolean"
+        }
+      }
+    },
+    "_elements": {
+      "type": "array",
+      "items": {
+        "anyOf": [
+          {
+            "$ref": "#/definitions/file"
+          },
+          {
+            "$ref": "#/definitions/file_remote_dir"
+          }
+        ]
+      }
+    }
+  },
+  "definitions": {
+    "file_common": {
+      "type": "object",
+      "required": ["name", "type"],
+      "properties": {
+        "name": {
+          "type": "string"
+        }
+      }
+    },
+    "file": {
+      "allOf": [
+        { "$ref": "#/definitions/file_common" },
+        {
+          "properties": {
+          "user": {
+          "type": "string",
+          "minLength": 1
+          },
+          "group": {
+          "type": "string",
+          "minLength": 1
+          }
+          },
+          "oneOf": [
+          { "$ref": "#/definitions/file_file" },
+          { "$ref": "#/definitions/file_dir" },
+          { "$ref": "#/definitions/file_link" }
+          ]
+        }
+      ]
+    },
+    "file_file": {
+      "properties": {
+        "type": {
+          "enum": ["file"]
+        },
+        "size": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "mode": {
+          "type": "string",
+          "pattern": "^[0-7]{3,4}$"
+        }
+      }
+    },
+    "file_dir": {
+      "properties": {
+        "type": {
+          "enum": ["dir"]
+        },
+        "size": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "mode": {
+          "type": "string",
+          "pattern": "^[0-4]?[0-7]{3}$"
+        },
+        "files": {
+          "type": "integer",
+          "minimum": 0
+        }
+      }
+    },
+    "file_link": {
+      "properties": {
+        "type": {
+          "enum": ["link"]
+        }
+      }
+    },
+    "file_remote_dir": {
+      "allOf": [
+        { "$ref": "#/definitions/file_common" },
+        {
+          "properties": {
+            "type": {
+              "enum": ["remote_dir"]
+            }
+          }
+        }
+      ]
+    }
+  }
+}

data/plugins/unmanaged_files/unmanaged_files_inspector.rb

@@ -72,7 +72,7 @@ class UnmanagedFilesInspector < Inspector
   def run_helper_inspection(helper, filter, file_store_tmp, file_store_final, scope, options)
     begin
       helper.inject_helper
-      if !helper.has_compatible_version?
+      unless helper.has_compatible_version?
         raise Machinery::Errors::UnsupportedHelperVersion.new(
           "Error: machinery-helper is not compatible with this Machinery version." \
             "\nTry to reinstall the package or gem to fix the issue."
@@ -120,14 +120,19 @@ class UnmanagedFilesInspector < Inspector
 
   def summary
     "#{@description.unmanaged_files.extracted ? "Extracted" : "Found"} " +
-      "#{@description.unmanaged_files.count} unmanaged files and trees."
+      Machinery.pluralize(
+        @description.unmanaged_files.count,
+        "%d unmanaged file or tree.",
+        "%d unmanaged files and/or trees."
+      )
   end
 
   private
 
   def show_extraction_progress(count)
-    progress = Machinery::pluralize(
-      count, " -> Extracted %d file or tree", " -> Extracted %d files and trees",
+    progress = Machinery.pluralize(
+      count, " -> Extracted %d unmanaged file or tree...",
+        " -> Extracted %d unmanaged files and/or trees..."
     )
     Machinery::Ui.progress(progress)
   end

data/plugins/unmanaged_files/unmanaged_files_model.rb

@@ -40,14 +40,14 @@ class UnmanagedFilesScope < FileScope
     both = []
     only_self = []
     elements.each do |element|
-      if other_hash.has_key?(element.name) && files_match(element, other_hash[element.name])
+      if other_hash.key?(element.name) && files_match(element, other_hash[element.name])
         both << element
       else
         only_self << element
       end
     end
     only_other = other.elements.reject do |element|
-      self_hash.has_key?(element.name) && files_match(element, self_hash[element.name])
+      self_hash.key?(element.name) && files_match(element, self_hash[element.name])
     end
     changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
 
@@ -58,12 +58,19 @@ class UnmanagedFilesScope < FileScope
       only_other_attributes = other.attributes
     end
 
-    [
+    comparison = [
       self.class.new(only_self, only_self_attributes || {}),
       self.class.new(only_other, only_other_attributes || {}),
-      changed,
-      self.class.new(both, common_attributes || {})
+      changed
     ].map { |e| e.empty? ? nil : e }
+
+    common = if both.empty? && common_attributes && common_attributes.empty?
+      nil
+    else
+      self.class.new(both, common_attributes || {})
+    end
+
+    comparison.push(common)
   end
 
   private

data/plugins/unmanaged_files/unmanaged_files_renderer.rb

@@ -46,7 +46,7 @@ class UnmanagedFilesRenderer < Renderer
   end
 
   def display_name
-    "Unmanaged files"
+    "Unmanaged Files"
   end
 
   def compare_content_changed(changed_elements)

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

@@ -33,7 +33,7 @@ class UsersInspector < Inspector
   end
 
   def summary
-    "Found #{@description.users.size} users."
+    "Found #{Machinery.pluralize(@description.users.size, "%d user")}."
   end
 
   private
@@ -83,12 +83,12 @@ class UsersInspector < Inspector
       result = {
         encrypted_password: passwd
       }
-      result[:last_changed_date] = changed.to_i if !changed.empty?
-      result[:min_days] = min.to_i if !min.empty?
-      result[:max_days] = max.to_i if !max.empty?
-      result[:warn_days] = warn.to_i if !warn.empty?
-      result[:disable_days] = inactive.to_i if !inactive.empty?
-      result[:disabled_date] = expire.to_i if !expire.empty?
+      result[:last_changed_date] = changed.to_i unless changed.empty?
+      result[:min_days] = min.to_i unless min.empty?
+      result[:max_days] = max.to_i unless max.empty?
+      result[:warn_days] = warn.to_i unless warn.empty?
+      result[:disable_days] = inactive.to_i unless inactive.empty?
+      result[:disabled_date] = expire.to_i unless expire.empty?
 
       result
     else

data/schema/migrations/migrate1to2.rb

@@ -34,10 +34,10 @@ class Migrate1To2 < Migration
       "changed_managed_files",
       "unmanaged_files"
     ].each do |scope|
-      next if !@hash.has_key?(scope)
+      next unless @hash.key?(scope)
 
       files = @hash[scope]
-      is_extracted = Dir.exists?(File.join(@path, scope))
+      is_extracted = Dir.exist?(File.join(@path, scope))
 
       @hash[scope] = {
         "extracted" => is_extracted,
@@ -45,9 +45,9 @@ class Migrate1To2 < Migration
       }
     end
 
-    if @hash.has_key?("groups")
+    if @hash.key?("groups")
       @hash["groups"].each do |element|
-        if !element["gid"]
+        unless element["gid"]
           element["gid"] = nil
         end
       end