machinery-tool 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3e26096068d827b9178938a39eead5000562a09
-  data.tar.gz: 78c08edb97fc7993b173cf477821f6eee75bb27c
+  metadata.gz: 53f3e1829f050fd550e3440debba26aa7a809d02
+  data.tar.gz: 5826ca3868fbadec1b75b6ecd43b179653818abd
 SHA512:
-  metadata.gz: 370cb5832ee25886ade589381967014b8bb8d746d9b3451fcd52e30d08ff32ce4a71670ab2c2debfa451d8c2673f5dc7fd5e7fbf66db76e616af7e1753d2fbfa
-  data.tar.gz: 74487bdaf7324bc54bf8b1a62f0437d69086570a1f61de8f7517c7c6c7d2c6debfdd8f83c60954432be28c40fa2505831bf910a80aecdcb1db879157aac582f5
+  metadata.gz: 63953c2f507e6191a4c7bced722aeb749469d4c549efabb1d60709fca0162bb09a807501e001c8ee38167c530cc0095a980f0b8ba8b635d5f82b5ed0fca1b88f
+  data.tar.gz: d5ea80efa210b5a35ac2d696e065f52fd2749636949ddef90f64fe8ff39ec30e79fe51555a197176d5ea38b619547e7d6176b86bfb8e41e650ed4836e281c67a

data/NEWS

@@ -1,6 +1,22 @@
 # Machinery Release Notes
 
 
+## Version 1.4.0 - Wed Feb 18 16:51:43 CET 2015 - thardeck@suse.de
+
+* Support inspection of Red Hat Enterprise Linux 6 systems
+* Introduce system description format version 3 (see https://github.com/SUSE/machinery/wiki/System-Description-Format#version-3)
+* Usability improvements of the HTML view (gh#SUSE/machinery#359)
+* Speed up `machinery list` command
+
+## Version 1.3.0 - Mon Jan 26 16:00:08 CET 2015 - chuller@novell.com
+
+* Added support for inspecting System z systems
+* Added support for inspecting POWER LE systems
+* Added support to run Machinery on System z
+* Added support to run Machinery on POWER LE
+* Handle system description errors as warnings
+* Added `machinery upgrade-format --force` command
+
 ## Version 1.2.0 - Mon Dec 22 15:06:20 CET 2014 - aduffeck@suse.de
 
 * Added AutoYaST export for system descriptions

data/bin/machinery

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# Copyright (c) 2013-2014 SUSE LLC
+# 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

data/export_helpers/merge_users_and_groups.pl.erb

@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 
-# Copyright (c) 2013-2014 SUSE LLC
+# 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

data/export_helpers/unmanaged_files_autoyast_excludes

@@ -0,0 +1,10 @@
+var/lib/rpm/*
+etc/passwd*
+etc/shadow*
+etc/group*
+etc/fstab
+lib/mkinitrd
+etc/udev/rules.d/70-persistent-net.rules
+var/log/*
+etc/default/grub*
+etc/zypp/repos.d/*

data/export_helpers/{unmanaged_files_build_excludes → unmanaged_files_kiwi_excludes}

@@ -5,3 +5,4 @@ etc/group*
 etc/fstab
 lib/mkinitrd
 etc/udev/rules.d/70-persistent-net.rules
+etc/zypp/repos.d/*

data/helpers/changed_managed_files.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2013-2014 SUSE LLC
+# 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

data/helpers/yum_repositories.py

@@ -0,0 +1,37 @@
+#!/usr/bin/python
+# 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
+
+import yum
+import json
+
+yb = yum.YumBase()
+
+repositories = []
+
+for repo in yb.repos.sort():
+  repo_dict = dict()
+  repo_dict["alias"] = repo.id
+  repo_dict["name"] = repo.name
+  repo_dict["type"] = "rpm-md"
+  repo_dict["url"] = repo.baseurl[0] if repo.baseurl else ""
+  repo_dict["enabled"] = repo.enabled
+  repo_dict["gpgcheck"] = repo.gpgcheck
+  repo_dict["package_manager"] = "yum"
+  repositories.append(repo_dict)
+
+print(json.dumps(repositories))

data/html/assets/machinery.js

@@ -1,8 +1,8 @@
 $(document).ready(function () {
   // Render the system description
-  var description = getDescription()
+  var description = getDescription();
 
-  templates = {}
+  templates = {};
   scopes = [
     "os",
     "changed_managed_files",
@@ -14,26 +14,26 @@ $(document).ready(function () {
     "patterns",
     "repositories",
     "services"
-  ]
+  ];
 
 
   // Enrich description with meta information summaries
-  description.meta_info = {}
+  description.meta_info = {};
   $.each(scopes, function(index, scope) {
     if(description.meta[scope]) {
       description.meta_info[scope] = " (" +
         "inspected host: '" + description.meta[scope].hostname + "', " +
-        "at: " + new Date(description.meta[scope].modified).toLocaleString() + ")"
+        "at: " + new Date(description.meta[scope].modified).toLocaleString() + ")";
     }
-  })
+  });
 
   $.each(scopes, function(index, scope) {
-    templates[scope] = Hogan.compile($("#scope_" + scope).html())
-  })
-  template = Hogan.compile($('#content').html())
+    templates[scope] = Hogan.compile($("#scope_" + scope).html());
+  });
+  template = Hogan.compile($('#content').html());
   $("#content_container").html(
     template.render(description, templates)
-  )
+  );
 
   // Implement filter functionality
   var run_when_done_typing = (function(){
@@ -42,74 +42,82 @@ $(document).ready(function () {
       clearTimeout(timer);
       timer = setTimeout(callback, timeout);
       };
-  })()
+  })();
 
-  $("#filter").keyup(function() {
-    run_when_done_typing(function() {
-      window.scrollTo(0, 0)
-      var rows = $("body").find("tr");
-      if($("#filter").val() == "") {
-        rows.show();
-        return;
-      }
+  var filterdocument = function() {
+    window.scrollTo(0, 0);
+    var rows = $("body").find("tr");
+    if($("#filter").val() == "") {
+      rows.show();
+      return;
+    }
 
-      var filters = $("#filter").val().split(" ");
+    var filters = $("#filter").val().split(" ");
 
-      rows
-        .hide()
-        .filter(function() {
-          var $t = $(this);
-          for(var i = 0; i < filters.length; ++i) {
-            if($t.is(":contains('" + filters[i] + "')")) {
-              return true;
-            }
+    rows
+      .hide()
+      .filter(function() {
+        var $t = $(this);
+        for(var i = 0; i < filters.length; ++i) {
+          if($t.is(":contains('" + filters[i] + "')")) {
+            return true;
           }
-          return false;
-        })
-        .show();
+        }
+        return false;
+      })
+      .show();
+  };
+
+  $("#filter").keyup(function() {
+    run_when_done_typing(function() {
+      filterdocument();
     }, 500)
-  })
+  });
+
+  clearFilter = function() {
+    $("#filter").val("");
+    filterdocument();
+  };
 
   // Align content below floating menu
-  var header_height =  $("#nav-bar").height() + 20
-  $("#content_container").css("margin-top", header_height)
-  $("a.scope_anchor").css("height", header_height)
-  $("a.scope_anchor").css("margin-top", -header_height)
+  var header_height =  $("#nav-bar").height() + 20;
+  $("#content_container").css("margin-top", header_height);
+  $("a.scope_anchor").css("height", header_height);
+  $("a.scope_anchor").css("margin-top", -header_height);
 
   $('.scope_logo_big').each(function(){
-    var icon = $(this)
+    var icon = $(this);
     $(window).scroll(function() {
       icon.removeClass('fixed');
-      var pos = icon.offset()
+      var pos = icon.offset();
       var top_pos = $(this).scrollTop() + header_height;
-      console.log(pos, top_pos)
       if(top_pos >= pos.top && icon.css('position') == 'static') {
         icon.addClass('fixed').css("top", header_height);
       } else if(top_pos <= pos.top && icon.hasClass('fixed')) {
         icon.removeClass('fixed');
       }
     })
-  })
+  });
 
   // Hook up the toggle links
   $('.toggle').click(function(){
-    $(this).closest('.scope').find('.scope_content').collapse('toggle')
-    $(this).toggleClass("collapsed")
-  })
+    $(this).closest('.scope').find('.scope_content').collapse('toggle');
+    $(this).toggleClass("collapsed");
+  });
 
   $("#collapse-all").click(function(){
-    $(".scope_content").collapse('hide')
-    $(".toggle").addClass("collapsed")
-    $(this).hide()
-    $("#expand-all").show()
-  })
+    $(".scope_content").collapse('hide');
+    $(".toggle").addClass("collapsed");
+    $(this).hide();
+    $("#expand-all").show();
+  });
 
   $("#expand-all").click(function(){
-    $(".scope_content").collapse('show')
-    $(".toggle").removeClass("collapsed")
-    $(this).hide()
-    $("#collapse-all").show()
-  })
+    $(".scope_content").collapse('show');
+    $(".toggle").removeClass("collapsed");
+    $(this).hide();
+    $("#collapse-all").show();
+  });
 
   $("img").popover({
     trigger: "hover",
@@ -121,11 +129,11 @@ $(document).ready(function () {
     html: true,
     template: '<div class="popover diff-popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>',
     content: function() {
-      file = $(this).data("config-file")
-      return $('*[data-config-file-diff="' + file + '"]').html()
+      file = $(this).data("config-file");
+      return $('*[data-config-file-diff="' + file + '"]').html();
     },
     title: function() {
-      return "Changes for '" + $(this).data("config-file") + "'"
+      return "Changes for '" + $(this).data("config-file") + "'";
     }
   }).on("mouseenter",function () {
     clearTimeout(counter);
@@ -145,4 +153,15 @@ $(document).ready(function () {
       }
     }, 500);
   });
-})
+
+  // Tooltips for service states
+  $("td.systemd_enabled, td.systemd_enabled-runtime").attr("title", 'Enabled through a symlink in .wants directory (permanently or just in /run).')
+  $("td.systemd_linked, td.systemd_linked-runtime").attr("title", 'Made available through a symlink to the unit file (permanently or just in /run).')
+  $("td.systemd_masked, td.systemd_masked-runtime").attr("title", 'Disabled entirely (permanently or just in /run).')
+  $("td.systemd_static").attr("title", 'Unit file is not enabled, and has no provisions for enabling in the "[Install]" section.')
+  $("td.systemd_indirect").attr("title", 'Unit file itself is not enabled, but it has a non-empty Also= setting in the "[Install]" section, listing other unit files that might be enabled.')
+  $("td.systemd_disabled").attr("title", 'Unit file is not enabled.')
+  $("td.sysvinit_on").attr("title", 'Service is enabled')
+  $("td.sysvinit_off").attr("title", 'Service is disabled')
+
+});

data/html/index.html.haml

@@ -263,7 +263,8 @@
                   %td {{name}}
                   %td {{alias}}
                   %td {{type}}
-                  %td {{url}}
+                  %td
+                    %a{:href => "{{url}}" } {{url}}
                   %td {{enabled}}
                   %td {{autorefresh}}
                   %td {{gpgcheck}}
@@ -414,7 +415,8 @@
                 {{#services.services}}
                 %tr
                   %td {{name}}
-                  %td {{state}}
+                  %td{:class=>"{{services.init_system}}_{{state}}"}
+                    {{state}}
                 {{/services.services}}
       {{/services.services.length}}
 
@@ -466,4 +468,6 @@
                 Machinery
             .filter-input
               %input#filter{:placeholder => "Type To Filter"}/
+              %img{:src => "assets/reset.png", :titel => "Reset Filter", :onclick=>"clearFilter()" }
+
       #content_container

data/lib/analyze_config_file_diffs_task.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# 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
@@ -17,17 +17,18 @@
 
 class AnalyzeConfigFileDiffsTask
   def analyze(description)
+    description.assert_scopes("os")
+    description.validate_analysis_compatibility
     description.assert_scopes(
       "repositories",
-      "config_files",
-      "os"
+      "config_files"
     )
     if !description.scope_extracted?("config_files")
       raise Machinery::Errors::MissingExtractedFiles.new(description, ["config_files"])
     end
 
     with_repositories(description) do |zypper|
-      file_store = description.scope_file_store("config-file-diffs")
+      file_store = description.scope_file_store("analyze/config_file_diffs")
       file_store.create
       diffs_path = file_store.path
       extracted_files_path = description.scope_file_store("config_files").path

data/lib/array.rb

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

data/lib/autoyast.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# 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
@@ -16,25 +16,33 @@
 # you may find current contact information at www.suse.com
 
 class Autoyast < Exporter
+  attr_accessor :name
+
   def initialize(description)
+    @name = "autoyast"
     @chroot_scripts = []
     @system_description = description
     @system_description.assert_scopes(
       "repositories",
       "packages"
     )
+    if !description.users
+      Machinery::Ui.puts(
+        "\nWarning: Exporting a description without the scope 'users' as AutoYaST" \
+        " profile will result in a root account without a password which prevents" \
+        " logging in.\n" \
+        "So either inspect or add the scope 'users' before the export or" \
+        " add a section for the root user to the AutoYaST profile."
+      )
+    end
   end
 
   def write(output_dir)
     FileUtils.cp(
-      File.join(Machinery::ROOT, "export_helpers/unmanaged_files_build_excludes"),
+      File.join(Machinery::ROOT, "export_helpers/unmanaged_files_#{@name}_excludes"),
       output_dir
     )
-    # Filter log files to prevent an issue with hanging gzip during installation
-    File.open(File.join(output_dir, "unmanaged_files_build_excludes"), "a") do |file|
-      file.puts "var/log/*"
-    end
-    FileUtils.chmod(0600, File.join(output_dir, "unmanaged_files_build_excludes"))
+    FileUtils.chmod(0600, File.join(output_dir, "unmanaged_files_#{@name}_excludes"))
     FileUtils.cp(
       File.join(Machinery::ROOT, "export_helpers/autoyast_export_readme.md"),
       File.join(output_dir, "README.md")
@@ -279,7 +287,7 @@ class Autoyast < Exporter
 
     base = Pathname(@system_description.scope_file_store("unmanaged_files").path)
     @chroot_scripts << <<-EOF
-      curl -o '/mnt/tmp/filter' "`cat /tmp/description_url`/unmanaged_files_build_excludes"
+      curl -o '/mnt/tmp/filter' "`cat /tmp/description_url`/unmanaged_files_#{@name}_excludes"
     EOF
 
     Dir["#{base}/**/*.tgz"].sort.each do |path|

data/lib/build_task.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# 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
@@ -17,6 +17,7 @@
 
 class BuildTask
   def build(system_description, output_path, options = {})
+    LocalSystem.validate_architecture("x86_64")
     LocalSystem.validate_build_compatibility(system_description)
     LocalSystem.validate_existence_of_package("kiwi")
     LocalSystem.validate_existence_of_package("kiwi-desc-vmxboot")