machinery-tool 1.16.4 → 1.17.0

data/html/partials/repositories.html.haml

@@ -13,26 +13,4 @@
           - if count == 0
             There are no repositories.
           - if count > 0
-            %table.table.table-striped.table-hover.table-condensed.filterable
-              %thead
-                %tr
-                  %th Name
-                  %th Alias
-                  %th.small Type
-                  %th URL
-                  %th.small Enabled
-                  %th.small Autorefresh
-                  %th.small GPG Check
-                  %th.small Priority
-              %tbody
-                - repositories.each do |repo|
-                  %tr
-                    %td= repo.name
-                    %td= repo.alias
-                    %td= repo.type
-                    %td
-                      %a{ href: repo.url }= repo.url
-                    %td= repo.enabled
-                    %td= repo.autorefresh
-                    %td= repo.gpgcheck
-                    %td= repo.priority
+            = render_partial "repositories_#{repositories.repository_system}", repositories: repositories

data/html/partials/repositories_apt.html.haml

@@ -0,0 +1,15 @@
+%table.table.table-striped.table-hover.table-condensed.filterable
+  %thead
+    %tr
+      %th.small Type
+      %th URL
+      %th Distribution
+      %th Components
+  %tbody
+    - repositories.each do |repo|
+      %tr
+        %td= repo.type
+        %td
+          %a{ href: repo.url }= repo.url
+        %td= repo.distribution
+        %td= repo.components.join(", ")

data/html/partials/repositories_yum.html.haml

@@ -0,0 +1,30 @@
+%table.table.table-striped.table-hover.table-condensed.filterable
+  %thead
+    %tr
+      %th Name
+      %th Alias
+      %th.small Type
+      %th URL
+      %th Mirrorlist
+      %th.small Enabled
+      %th.small GPG Check
+      %th GPG Keys
+  %tbody
+    - repositories.each do |repo|
+      %tr
+        %td= repo.name
+        %td= repo.alias
+        %td= repo.type
+        %td
+          - repo.url.each do |url|
+            %a{ href: url }= url
+            %br
+        %td
+          - unless repo.mirrorlist.empty?
+            %a{ href: repo.mirrorlist }= repo.mirrorlist
+        %td= repo.enabled
+        %td= repo.gpgcheck
+        %td
+          - repo.gpgkey.each do |url|
+            %a{ href: url }= url
+            %br

data/html/partials/repositories_zypp.html.haml

@@ -0,0 +1,24 @@
+%table.table.table-striped.table-hover.table-condensed.filterable
+  %thead
+    %tr
+      %th Name
+      %th Alias
+      %th.small Type
+      %th URL
+      %th.small Enabled
+      %th.small Autorefresh
+      %th.small GPG Check
+      %th.small Priority
+  %tbody
+    - repositories.each do |repo|
+      %tr
+        %td= repo.name
+        %td= repo.alias
+        %td= repo.type
+        %td
+          %a{ href: repo.url }= repo.url
+        %td= repo.enabled
+        %td= repo.autorefresh
+        %td= repo.gpgcheck
+        %td= repo.priority
+

data/html/partials/services.html.haml

@@ -2,7 +2,7 @@
   %div
     %a.scope_anchor{ id: "services" }
     .scope#services_container
-      - count = services.services.length
+      - count = services.elements.length
       = render_partial "scope_header",
         :scope => "services",
         :title => "Services",
@@ -19,7 +19,7 @@
                   %th Name
                   %th.medium State
               %tbody
-                - services.services.each do |service|
+                - services.each do |service|
                   %tr
                     %td= service.name
                     %td{ class: "#{services.init_system}_#{service.state}" }

data/html/partials/unmanaged_files.html.haml

@@ -2,7 +2,7 @@
   %div
     %a.scope_anchor{ id: "unmanaged_files" }
     .scope#unmanaged_files_container{ "data-scope" => "unmanaged_files" }
-      - count = unmanaged_files.files.length
+      - count = unmanaged_files.length
       = render_partial "scope_header",
         :scope => "unmanaged_files",
         :title => "Unmanaged Files",
@@ -19,7 +19,7 @@
                   %th Name
                   %th.medium Type
               %tbody
-                - unmanaged_files.files.each do |file|
+                - unmanaged_files.each do |file|
                   %tr
                     %td
                       - if file.on_disk?

data/inspect_helpers/dpkg_unmanaged_files.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+# Copyright (c) 2013-2015 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
+
+if [ $UID -ne "0" ]; then
+   sudoprefix="sudo -n"
+fi
+
+for i in $($sudoprefix dpkg --get-selections | grep -v deinstall | awk '{print $1}'); do
+  while read f; do
+    type=""
+    link=""
+    path=${f#*:}
+    case "$f" in
+      directory:*)
+        type="d"
+        ;;
+      symbolic\ link:*)
+        type="l"
+        link=" -> $($sudoprefix readlink "$path")"
+        ;;
+      regular*\ file:*)
+        type="-"
+        ;;
+      *)
+        ;;
+    esac
+    echo "$type $path$link"
+  done <<< "$($sudoprefix dpkg -L $i | \
+    sed -e 's/^package diverts others to: //' \
+        -e 's/^diverted by .* to: //' \
+        -e 's/^locally diverted to: //' | xargs -n100 -d'\n' $sudoprefix stat -c "%F:%n")"
+done

data/inspect_helpers/yum_repositories.py

@@ -31,13 +31,11 @@ for repo in yb.repos.sort():
   repo_dict["alias"] = repo.id
   repo_dict["name"] = repo.name
   repo_dict["type"] = "rpm-md"
-  if repo.baseurl:
-    repo_dict["url"] = repo.baseurl[0]
-  else:
-    repo_dict["url"] = ""
+  repo_dict["url"] = repo.baseurl or []
+  repo_dict["mirrorlist"] = repo.mirrorlist or ""
   repo_dict["enabled"] = repo.enabled
   repo_dict["gpgcheck"] = repo.gpgcheck
-  repo_dict["package_manager"] = "yum"
+  repo_dict["gpgkey"] = repo.gpgkey
   repositories.append(repo_dict)
 
 print(json.dumps(repositories))

data/lib/analyze_config_file_diffs_task.rb

@@ -18,6 +18,7 @@
 class AnalyzeConfigFileDiffsTask
   def analyze(description)
     description.assert_scopes("os")
+    check_os(description)
     LocalSystem.validate_existence_of_packages(["zypper"])
     description.validate_analysis_compatibility
     description.assert_scopes(
@@ -74,6 +75,15 @@ class AnalyzeConfigFileDiffsTask
 
   private
 
+  def check_os(description)
+    unless description.os.is_a?(OsSuse)
+      raise Machinery::Errors::AnalysisFailed.new(
+        "Can not analyze the system description because its operating system" \
+          " '#{description.os.display_name}' is not supported."
+      )
+    end
+  end
+
   # Creates an array of hashes with the RPM names, version and the list of
   # changed file paths, e.g.
   #
@@ -85,7 +95,7 @@ class AnalyzeConfigFileDiffsTask
   #   }
   # ]
   def files_by_package(description)
-    files = description["config_files"].files.
+    files = description["config_files"].
       select { |f| f.changes.include?("md5") }
 
     files.inject({}) do |result, file|

data/lib/array.rb

@@ -18,41 +18,75 @@
 module Machinery
   class Array
     class << self
+      attr_reader :attribute_keys, :element_classes
+
+      def has_attributes(*keys)
+        @attribute_keys = keys.map(&:to_s)
+      end
+
       def has_elements(options)
-        @element_class = options[:class]
+        @element_classes ||= []
+        @element_classes << options
       end
 
-      def convert_element(element)
-        if @element_class
-          element.is_a?(@element_class) ? element : @element_class.from_json(element)
+      def from_json(json_object)
+        if json_object.is_a?(::Array)
+          new(json_object)
         else
-          case element
-          when ::Array
-            Machinery::Array.from_json(element)
-          when Hash
-            Machinery::Object.from_json(element)
-          else
-            element
-          end
+          new(json_object["_elements"], json_object["_attributes"])
         end
       end
+    end
 
-      def convert_raw_array(array)
-        array.map do |element|
-          convert_element(element)
-        end
+    attr_reader :elements
+    attr_accessor :attributes
+    attr_accessor :scope
+
+    def initialize(elements = [], attributes = {})
+      attributes ||= {}
+      @attribute_keys = self.class.attribute_keys || []
+
+      unknown_attributes = attributes.keys.map(&:to_s) - @attribute_keys
+      if unknown_attributes.length > 0
+        raise RuntimeError, "Unknown properties: #{unknown_attributes.join(",")}"
       end
 
-      def from_json(json_object)
-        new(json_object)
+      @attributes = {}
+      attributes.each do |k, v|
+        @attributes[k.to_s] = v
       end
+      @elements = convert_raw_array(elements)
     end
 
-    attr_reader :elements
-    attr_accessor :scope
+    def convert_element(element)
+      (self.class.element_classes || []).each do |definition|
+        condition = definition[:if]
+        klass = definition[:class]
+        if condition
+          next if condition.any? do |key, value|
+            @attributes[key.to_s] != value
+          end
+        end
 
-    def initialize(elements = [])
-      @elements = self.class.convert_raw_array(elements)
+        return element.is_a?(klass) ? element : klass.from_json(element)
+      end
+
+      case element
+      when Hash
+        if element.keys.include?("_elements")
+          Machinery::Array.from_json(element)
+        else
+          Machinery::Object.from_json(element)
+        end
+      else
+        element
+      end
+    end
+
+    def convert_raw_array(array)
+      array.map do |element|
+        convert_element(element)
+      end
     end
 
     def scope=(scope)
@@ -67,7 +101,7 @@ module Machinery
     end
 
     def ==(other)
-      self.class == other.class && @elements == other.elements
+      self.class == other.class && @elements == other.elements && @attributes == other.attributes
     end
 
     # Various Array operators such as "-" and "&" use #eql? and #hash to compare
@@ -80,50 +114,78 @@ module Machinery
     end
 
     def -(other)
-      self.class.new(@elements - other.elements)
+      self.class.new(@elements - other.elements, @attributes)
     end
 
     def &(other)
-      self.class.new(@elements & other.elements)
+      self.class.new(@elements & other.elements, @attributes)
     end
 
     def push(element)
-      @elements.push(self.class.convert_element(element))
+      @elements.push(convert_element(element))
     end
 
     def <<(element)
-      @elements << self.class.convert_element(element)
+      @elements << convert_element(element)
     end
 
     def +(array)
-      self.class.new(@elements + self.class.new(array).elements)
+      self.class.new(@elements + self.class.new(array).elements, @attributes)
     end
 
     def insert(index, *elements)
       @elements.insert(index, *self.class.new(elements).elements)
     end
 
+    def empty?
+      @elements.empty?
+    end
+
     def as_json
-      @elements.map do |element|
+      object = {}
+
+      object["_attributes"] = @attributes unless @attributes.empty?
+      object["_elements"] = @elements.map do |element|
         if element.is_a?(Machinery::Array) || element.is_a?(Machinery::Object)
           element.as_json
         else
           element
         end
       end
+
+      object
     end
 
     def compare_with(other)
+      only_self = self.class.new(self.elements - other.elements)
+      only_other = self.class.new(other.elements - self.elements)
+      common = self.class.new(self.elements & other.elements)
+
+      if self.attributes == other.attributes
+        common.attributes = self.attributes
+      else
+        only_self.attributes = self.attributes
+        only_other.attributes = other.attributes
+      end
+
       [
-        self - other,
-        other - self,
-        [],
-        self & other
-      ].map { |e| e.empty? ? nil : e }
+        only_self,
+        only_other,
+        Machinery::Array.new,
+        common
+      ].map { |e| (e.empty? && (e.is_a?(Machinery::Array) && e.attributes.empty?)) ? nil : e }
     end
 
     def method_missing(name, *args, &block)
-      @elements.send(name, *args, &block)
+      name = name.to_s
+
+      if @attribute_keys.include?(name)
+        @attributes[name]
+      elsif name.end_with?("=") and @attribute_keys.include?(name[0..-2])
+        @attributes[name[0..-2]] = args.first
+      else
+        @elements.send(name, *args, &block)
+      end
     end
 
     def respond_to?(name, include_all = false)

data/lib/autoyast.rb

@@ -23,9 +23,11 @@ class Autoyast < Exporter
     @chroot_scripts = []
     @system_description = description
     @system_description.assert_scopes(
+      "os",
       "repositories",
       "packages"
     )
+    check_exported_os
     if !description.users
       Machinery::Ui.puts(
         "\nWarning: Exporting a description without the scope 'users' as AutoYaST" \
@@ -108,6 +110,15 @@ class Autoyast < Exporter
 
   private
 
+  def check_exported_os
+    unless @system_description.os.is_a?(OsSuse)
+      raise Machinery::Errors::ExportFailed.new(
+        "Export is not possible because the operating system " \
+        "'#{@system_description.os.display_name}' is not supported."
+      )
+    end
+  end
+
   def apply_software_settings(xml)
     xml.install_recommended "false", "config:type" => "boolean"
   end
@@ -230,7 +241,7 @@ class Autoyast < Exporter
 
     xml.send("services-manager") do
       xml.services("config:type" => "list") do
-        @system_description.services.services.each do |service|
+        @system_description.services.each do |service|
           name = service.name
           if @system_description.services.init_system == "systemd"
             # Yast can only handle services right now
@@ -270,7 +281,7 @@ class Autoyast < Exporter
   def apply_changed_files(scope)
     return if !@system_description.scope_extracted?(scope)
 
-    @system_description[scope].files.each do |file|
+    @system_description[scope].each do |file|
       if file.deleted?
         @chroot_scripts << "rm -rf '#{quote(file.name)}'"
       elsif file.directory?