machinery-tool 1.17.0 → 1.18.0

data/plugins/environment/environment_inspector.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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

data/plugins/environment/environment_model.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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

data/plugins/groups/groups_model.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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

data/plugins/groups/groups_renderer.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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

data/plugins/os/os_model.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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

data/plugins/os/os_renderer.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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

data/plugins/packages/packages_model.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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

data/plugins/packages/packages_renderer.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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
@@ -55,7 +55,7 @@ class PatternsInspector < Inspector
 
   def inspect_with_zypper
     begin
-      xml = @system.run_command("zypper", "-xq", "--no-refresh", "patterns",
+      xml = @system.run_command("zypper", "--non-interactive", "-xq", "--no-refresh", "patterns",
         "-i", stdout: :capture)
     rescue Cheetah::ExecutionFailed => e
       if e.stdout.include?("locked")
@@ -67,7 +67,7 @@ class PatternsInspector < Inspector
         raise
       end
     end
-    pattern_list = Nokogiri::XML(xml).xpath("/stream/pattern-list/pattern")
+    pattern_list = REXML::Document.new(xml).get_elements("/stream/pattern-list/pattern")
 
     if pattern_list.count == 0
       @description.patterns = PatternsScope.new
@@ -76,9 +76,9 @@ class PatternsInspector < Inspector
 
     patterns = pattern_list.map do |pattern|
       Pattern.new(
-        name: pattern["name"],
-        version: pattern["version"],
-        release: pattern["release"]
+        name: pattern.attributes["name"],
+        version: pattern.attributes["version"],
+        release: pattern.attributes["release"]
       )
     end.uniq.sort_by(&:name)
 

data/plugins/patterns/patterns_model.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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

data/plugins/patterns/patterns_renderer.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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

data/plugins/patterns/schema/system-description-patterns.schema-v7.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

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 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
@@ -27,7 +27,7 @@ class RepositoriesInspector < Inspector
       @description.repositories = inspect_zypp_repositories
     elsif system.has_command?("yum")
       @description.repositories = inspect_yum_repositories
-    elsif system.has_command?("apt")
+    elsif system.has_command?("dpkg")
       @description.repositories = inspect_apt_repositories
     else
       raise Machinery::Errors::MissingRequirement.new(
@@ -105,7 +105,7 @@ class RepositoriesInspector < Inspector
   def parse_apt_repositories(content)
     repositories = []
     content.each_line do |line|
-      if line =~ /^\s*(deb|deb-src)\s+(\S+)\s+(\S+)(\s+\S[^#]*\S)?(\s*|\s*#.*)$/
+      if line =~ /^\s*(deb|deb-src)\s+(cdrom:\[.+\]\/|\S+)\s+(\S+)(\s+\S[^#]*\S)?(\s*|\s*#.*)$/
         repositories << AptRepository.new(
           type: $1,
           url: $2,
@@ -157,16 +157,16 @@ class RepositoriesInspector < Inspector
   end
 
   def parse_repositories_from_xml(xml, priorities, credentials)
-    reps = Nokogiri::XML(xml).xpath("/stream/repo-list/repo")
+    reps = REXML::Document.new(xml).get_elements("/stream/repo-list/repo")
     result = reps.map do |rep|
-      if rep["priority"]
-        pri_value = rep["priority"].to_i
+      if rep.attributes["priority"]
+        pri_value = rep.attributes["priority"].to_i
       else
-        pri_value = priorities[rep["alias"]]
+        pri_value = priorities[rep.attributes["alias"]]
       end
 
       # NCC
-      rep.at_xpath("./url").text.match(/\?credentials=(\w*)/)
+      rep.elements["url"].first.to_s.match(/\?credentials=(\w*)/)
       cred_value = $1
       if cred_value && credentials[cred_value]
         username = credentials[cred_value][:username]
@@ -174,7 +174,7 @@ class RepositoriesInspector < Inspector
       end
 
       # SCC
-      rep.at_xpath("./url").text.match(/(https:\/\/updates.suse.com\/SUSE\/)/)
+      rep.elements["url"].first.to_s.match(/(https:\/\/updates.suse.com\/SUSE\/)/)
       scc_url = $1
       cred_value = "SCCcredentials"
       if scc_url && credentials[cred_value]
@@ -183,13 +183,13 @@ class RepositoriesInspector < Inspector
       end
 
       repository = ZyppRepository.new(
-        alias:       rep["alias"],
-        name:        rep["name"],
-        type:        rep["type"],
-        url:         rep.at_xpath("./url").text,
-        enabled:     rep["enabled"] == "1",
-        autorefresh: rep["autorefresh"] == "1",
-        gpgcheck:    rep["gpgcheck"] == "1",
+        alias:       rep.attributes["alias"],
+        name:        rep.attributes["name"],
+        type:        rep.attributes["type"],
+        url:         rep.elements["url"].first.to_s,
+        enabled:     rep.attributes["enabled"] == "1",
+        autorefresh: rep.attributes["autorefresh"] == "1",
+        gpgcheck:    rep.attributes["gpgcheck"] == "1",
         priority:    pri_value
       )
       if username && password