machinery-tool 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 184d1ef94950678ea43a32a035f1b49393fcaa3a
-  data.tar.gz: 4e4135549b3a332ae78c453100797d8bcc121ecf
+  metadata.gz: 725a9e95df8830f8b6d31b967a03bc08286a99b4
+  data.tar.gz: e4ede1e631fb2e78d4d74ae0859cbdcb4a1da40b
 SHA512:
-  metadata.gz: 19f792e485da42fa7e8dad80d822cd0890f92ffc9cb96a89621bb86b8830388b061b8db39e96fd0afe86d3fe1d3f3a1f7728f8dc9d5788b756619831970b4e65
-  data.tar.gz: e692387ddaf55efb16418c5b2db7ff7be53b7d5f0ffb46a2cae6297e0ce4ad090b1455140fef1f4500d7223111f8e1ce9c705b19054cc8ed553f8d8b6e7f1ed1
+  metadata.gz: 74773fd5aa6a4b23b52c9d27771a4a3ca1762f76a6169ce92b6e9380bf3a5233dd28fd68c05b2ae73721edc5cebbbc57750d8b68ef93784dad5337c66f7b734e
+  data.tar.gz: 580e1e8201d3ea4e1d58bd68a60192988a4539eb9811f8312e40414fec65caaa9146138c46dd1a445aac4098f60e102149d9e9452771cc2597202a4e3fbf581e

data/NEWS

@@ -1,6 +1,24 @@
 # Machinery Release Notes
 
 
+## Version 1.6.0 - Wed Apr 01 15:43:17 CEST 2015 - thardeck@suse.de
+
+* Add experimental `--exclude` option to exclude elements from inspection.
+  Run `machinery config experimental-features on` to enable the option
+* Support global `--exclude` option for `show` command.
+  This feature is available when the experimental-features option is on.
+* Add `--verbose` option to `inspect` command to display the filters which
+  were used during inspection
+* Add `--verbose` option to `show` command to display the filters which were
+  applied before showing the system description
+* Show progress on upgrading the system description format
+* Improve help for users when upgrading system descriptions
+* Fix piping output of Machinery to less (gh#SUSE/machinery#521)
+* Better help for users when upgrading format of system descriptions
+* Add option to show command to display filters used during inspection
+* Support negated filter expressions in --exclude option
+* Show filters used during inspection in HTML view
+
 ## Version 1.5.0 - Fri Mar 13 13:03:47 CET 2015 - thardeck@suse.de
 
 * Fix issue with changes of managed files on RHEL (gh#SUSE/machinery#636)

data/html/assets/machinery.css

@@ -32,10 +32,12 @@ a.scope_anchor {
 }
 
 .scope-navigation {
-  font-size: 60%;
   margin-left: 30px;
 }
 
+.inspection_details {
+  margin-left: 30px;
+}
 
 .filter-input {
   margin-bottom: 10px;
@@ -66,6 +68,10 @@ span.toggle.collapsed {
   max-width: 800px;
 }
 
+.popover button.close {
+  padding: 6px;
+}
+
 h1 {
   color: #3D3A38;
 }
@@ -124,8 +130,21 @@ table.diff td.linenumber {
   border-right: solid 1px #cccccc;
 }
 
+.inspection-details-popover .popover-content,
 .diff-popover .popover-content {
   max-height: 500px;
   overflow-y: auto;
   font-family: monospace;
  }
+
+.inspection-details-popover {
+  min-width: 800px;
+}
+
+li.filter {
+  font-family: monospace;
+}
+
+h1 {
+  display: inline-block;
+}

data/html/assets/machinery.js

@@ -30,7 +30,9 @@ $(document).ready(function () {
   $.each(scopes, function(index, scope) {
     templates[scope] = Hogan.compile($("#scope_" + scope).html());
   });
-  template = Hogan.compile($('#content').html());
+  templates["inspection_details_template"] =
+    Hogan.compile($("#inspection_details_template").html());
+  template = Hogan.compile($("#content").html());
   $("#content_container").html(
     template.render(description, templates)
   );
@@ -71,7 +73,7 @@ $(document).ready(function () {
   $("#filter").keyup(function() {
     run_when_done_typing(function() {
       filterdocument();
-    }, 500)
+    }, 500);
   });
 
   clearFilter = function() {
@@ -85,52 +87,55 @@ $(document).ready(function () {
   $("a.scope_anchor").css("height", header_height);
   $("a.scope_anchor").css("margin-top", -header_height);
 
-  $('.scope_logo_big').each(function(){
+  $(".scope_logo_big").each(function(){
     var icon = $(this);
     $(window).scroll(function() {
-      icon.removeClass('fixed');
+      icon.removeClass("fixed");
       var pos = icon.offset();
       var top_pos = $(this).scrollTop() + header_height;
-      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');
+      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');
+  $(".toggle").click(function(){
+    $(this).closest(".scope").find(".scope_content").collapse("toggle");
     $(this).toggleClass("collapsed");
   });
 
   $("#collapse-all").click(function(){
-    $(".scope_content").collapse('hide');
+    $(".scope_content").collapse("hide");
     $(".toggle").addClass("collapsed");
     $(this).hide();
     $("#expand-all").show();
   });
 
   $("#expand-all").click(function(){
-    $(".scope_content").collapse('show');
+    $(".scope_content").collapse("show");
     $(".toggle").removeClass("collapsed");
     $(this).hide();
     $("#collapse-all").show();
   });
 
+  // Set up scope icon popovers
   $("img").popover({
     trigger: "hover",
     html: true
   });
+
+  // Set up config file diffs popovers
   var counter;
   $(".diff-toggle").popover({
     trigger: "mouseenter",
     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>',
+    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();
+      return $("*[data-config-file-diff='" + file + "']").html();
     },
     title: function() {
       return "Changes for '" + $(this).data("config-file") + "'";
@@ -138,30 +143,52 @@ $(document).ready(function () {
   }).on("mouseenter",function () {
     clearTimeout(counter);
     var _this = this;
-    $('.diff-toggle').not(_this).popover('hide');
+    $(".diff-toggle").not(_this).popover("hide");
 
     counter = setTimeout(function(){
       $(_this).popover("show");
       $(".diff-popover").on("mouseleave", function () {
-          $('.diff-toggle').popover('hide');
+          $(".diff-toggle").popover("hide");
       });
     }, 100);
   }).on("mouseleave", function () {
     counter = setTimeout(function(){
       if (!$(".diff-popover:hover").length) {
-        $('.diff-toggle').popover('hide');
+        $(".diff-toggle").popover("hide");
       }
     }, 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')
+  // Set up inspection details popover
+  $("a.inspection_details").popover({
+    template: "<div class='popover inspection-details-popover' role='tooltip'>\
+      <div class='arrow'></div>\
+      <div class='popover-header'>\
+      <button type='button' class='close' onclick='$(\".inspection_details\").popover(\"hide\")'\
+        aria-hidden='true'>&times;</button>\
+      <h3 class='popover-title'></h3>\
+      </div>\
+      <div class='popover-content'></div>\
+      </div>",
+    trigger: "click",
+    placement: "bottom",
+    html: true,
+    content: function() {
+      return $("#inspection_details").html();
+    },
+    title: function() {
+      return "Inspection details";
+    }
+  });
+  $('.inspection-details-popover .close').click(function() { $(".inspection_details").popover("hide") });
 
+  // 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

@@ -12,6 +12,9 @@
     %script{:src => "assets/collapse.js"}
 
     %script#content{:type => "text/html"}
+      .hidden
+        {{>inspection_details_template}}
+
       {{>os}}
       {{>packages}}
       {{>patterns}}
@@ -23,14 +26,38 @@
       {{>config_files}}
       {{>services}}
 
+    %script#inspection_details_template{:type => "text/html"}
+      #inspection_details
+        #filters
+          .row
+            .col-xs-1
+            .col-xs-11
+              %h3 Filters used during Inspection
+
+          .row
+            .col-xs-1
+            .col-xs-11
+              {{#meta.filters.inspect.length}}
+              %ul
+                {{#meta.filters.inspect}}
+                %li.filter
+                  {{.}}
+                {{/meta.filters.inspect}}
+              {{/meta.filters.inspect.length}}
+
+              {{^meta.filters.inspect.length}}
+              %p
+                No filters were used.
+              {{/meta.filters.inspect.length}}
+
+
     %script#scope_os.partial{:type => "text/html"}
       {{#os}}
       %a.scope_anchor{:id => "os"}
       #os_container.scope
         .row
           .col-xs-1
-            %a{:href => "#os"}
-              %img.scope_logo_big{:src => "assets/logo-os.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Operating System", :"data-content"=>"#{scope_help('os')}"}/
+            %img.scope_logo_big{:src => "assets/logo-os.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Operating System", :"data-content"=>"#{scope_help('os')}"}/
             %span.toggle{:title => "Collapse/Expand"}
           .col-xs-11
             %h2
@@ -57,8 +84,7 @@
       #packages_container.scope
         .row
           .col-xs-1
-            %a{:href => "#packages"}
-              %img.scope_logo_big{:src => "assets/logo-packages.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Packages", :"data-content"=>"#{scope_help('packages')}"}/
+            %img.scope_logo_big{:src => "assets/logo-packages.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Packages", :"data-content"=>"#{scope_help('packages')}"}/
             %span.toggle{:title => "Collapse/Expand"}
           .col-xs-11
             %h2
@@ -96,8 +122,7 @@
       #patterns_container.scope
         .row
           .col-xs-1
-            %a{:href => "#patterns"}
-              %img.scope_logo_big{:src => "assets/logo-patterns.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Patterns", :"data-content"=>"#{scope_help('patterns')}"}/
+            %img.scope_logo_big{:src => "assets/logo-patterns.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Patterns", :"data-content"=>"#{scope_help('patterns')}"}/
             %span.toggle{:title => "Collapse/Expand"}
           .col-xs-11
             %h2
@@ -129,8 +154,7 @@
       #users_container.scope
         .row
           .col-xs-1
-            %a{:href => "#users"}
-              %img.scope_logo_big{:src => "assets/logo-users.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Users", :"data-content"=>"#{scope_help('users')}"}/
+            %img.scope_logo_big{:src => "assets/logo-users.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Users", :"data-content"=>"#{scope_help('users')}"}/
             %span.toggle{:title => "Collapse/Expand"}
           .col-xs-11
             %h2
@@ -168,8 +192,7 @@
       #unmanaged_files_container.scope
         .row
           .col-xs-1
-            %a{:href => "#unmanaged_files"}
-              %img.scope_logo_big{:src => "assets/logo-unmanaged-files.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Unmanaged Files", :"data-content"=>"#{scope_help('unmanaged_files')}"}/
+            %img.scope_logo_big{:src => "assets/logo-unmanaged-files.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Unmanaged Files", :"data-content"=>"#{scope_help('unmanaged_files')}"}/
             %span.toggle{:title => "Collapse/Expand"}
           .col-xs-11
             %h2
@@ -199,8 +222,7 @@
       #groups_container.scope
         .row
           .col-xs-1
-            %a{:href => "#groups"}
-              %img.scope_logo_big{:src => "assets/logo-groups.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Groups", :"data-content"=>"#{scope_help('groups')}"}/
+            %img.scope_logo_big{:src => "assets/logo-groups.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Groups", :"data-content"=>"#{scope_help('groups')}"}/
             %span.toggle{:title => "Collapse/Expand"}
           .col-xs-11
             %h2
@@ -234,8 +256,7 @@
       #repositories_container.scope
         .row
           .col-xs-1
-            %a{:href => "#repositories"}
-              %img.scope_logo_big{:src => "assets/logo-repositories.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Repositories", :"data-content"=>"#{scope_help('repositories')}"}/
+            %img.scope_logo_big{:src => "assets/logo-repositories.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Repositories", :"data-content"=>"#{scope_help('repositories')}"}/
             %span.toggle{:title => "Collapse/Expand"}
           .col-xs-11
             %h2
@@ -278,8 +299,7 @@
       #changed_managed_files_container.scope
         .row
           .col-xs-1
-            %a{:href => "#changed_managed_files"}
-              %img.scope_logo_big{:src => "assets/logo-changed-managed-files.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Changed Managed Files", :"data-content"=>"#{scope_help('changed_managed_files')}"}/
+            %img.scope_logo_big{:src => "assets/logo-changed-managed-files.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Changed Managed Files", :"data-content"=>"#{scope_help('changed_managed_files')}"}/
             %span.toggle{:title => "Collapse/Expand"}
           .col-xs-11
             %h2
@@ -324,8 +344,7 @@
       #config_files_container.scope
         .row
           .col-xs-1
-            %a{:href => "#config_files"}
-              %img.scope_logo_big{:src => "assets/logo-config-files.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Config Files", :"data-content"=>"#{scope_help('config_files')}"}/
+            %img.scope_logo_big{:src => "assets/logo-config-files.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Config Files", :"data-content"=>"#{scope_help('config_files')}"}/
             %span.toggle{:title => "Collapse/Expand"}
           .col-xs-11
             %h2
@@ -393,8 +412,7 @@
       #services_container.scope
         .row
           .col-xs-1
-            %a{:href => "#services"}
-              %img.scope_logo_big{:src => "assets/logo-services.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Services", :"data-content"=>"#{scope_help('services')}"}/
+            %img.scope_logo_big{:src => "assets/logo-services.png", :class=>"over", :"data-toggle"=>"popover", :title=>"Services", :"data-content"=>"#{scope_help('services')}"}/
             %span.toggle{:title => "Collapse/Expand"}
           .col-xs-11
             %h2
@@ -433,41 +451,46 @@
           .col-xs-10
             %h1
               System '#{description.name}'
-              %span.scope-navigation
-                Scopes:
-                %a{:href => "#os", :title => "Operating System"}
-                  %img{:src => "assets/logo-os-small.png"}/
-                %a{:href => "#packages", :title => "Packages"}
-                  %img{:src => "assets/logo-packages-small.png"}/
-                %a{:href => "#patterns", :title => "Patterns"}
-                  %img{:src => "assets/logo-patterns-small.png"}/
-                %a{:href => "#users", :title => "Users"}
-                  %img{:src => "assets/logo-users-small.png"}/
-                %a{:href => "#groups", :title => "Groups"}
-                  %img{:src => "assets/logo-groups-small.png"}/
-                %a{:href => "#repositories", :title => "Repositories"}
-                  %img{:src => "assets/logo-repositories-small.png"}/
-                %a{:href => "#unmanaged_files", :title => "Unmanaged Files"}
-                  %img{:src => "assets/logo-unmanaged-files-small.png"}/
-                %a{:href => "#changed_managed_files", :title => "Changed Managed Files"}
-                  %img{:src => "assets/logo-changed-managed-files-small.png"}/
-                %a{:href => "#config_files", :title => "Config Files"}
-                  %img{:src => "assets/logo-config-files-small.png"}/
-                %a{:href => "#services", :title => "Services"}
-                  %img{:src => "assets/logo-services-small.png"}/
+
+            %a.inspection_details{:href => "#", "data-toggle" => "popover"} (inspection details)
         .row
           .col-xs-1
-            %a#expand-all{:style => "display: none"}
+            %a#expand-all{:href => "#", :style => "display: none"}
               Expand all
-            %a#collapse-all
+            %a#collapse-all{:href => "#"}
               Collapse all
           .col-xs-10
             %small.pull-right.pad-top
               created by
               %a{:href => "http://machinery-project.org", :target => "_blank"}
                 Machinery
-            .filter-input
+            .filter-input.col-md-3
               %input#filter{:placeholder => "Type To Filter"}/
-              %img{:src => "assets/reset.png", :titel => "Reset Filter", :onclick=>"clearFilter()" }
+              %a{:href => "#"}
+                %img{:src => "assets/reset.png", :titel => "Reset Filter", :onclick=>"clearFilter()" }
+
+            %span.scope-navigation
+              Scopes:
+              %a{:href => "#os", :title => "Operating System"}
+                %img{:src => "assets/logo-os-small.png"}/
+              %a{:href => "#packages", :title => "Packages"}
+                %img{:src => "assets/logo-packages-small.png"}/
+              %a{:href => "#patterns", :title => "Patterns"}
+                %img{:src => "assets/logo-patterns-small.png"}/
+              %a{:href => "#users", :title => "Users"}
+                %img{:src => "assets/logo-users-small.png"}/
+              %a{:href => "#groups", :title => "Groups"}
+                %img{:src => "assets/logo-groups-small.png"}/
+              %a{:href => "#repositories", :title => "Repositories"}
+                %img{:src => "assets/logo-repositories-small.png"}/
+              %a{:href => "#unmanaged_files", :title => "Unmanaged Files"}
+                %img{:src => "assets/logo-unmanaged-files-small.png"}/
+              %a{:href => "#changed_managed_files", :title => "Changed Managed Files"}
+                %img{:src => "assets/logo-changed-managed-files-small.png"}/
+              %a{:href => "#config_files", :title => "Config Files"}
+                %img{:src => "assets/logo-config-files-small.png"}/
+              %a{:href => "#services", :title => "Services"}
+                %img{:src => "assets/logo-services-small.png"}/
+
 
       #content_container

data/lib/analyze_config_file_diffs_task.rb

@@ -124,7 +124,7 @@ class AnalyzeConfigFileDiffsTask
           # available from the other repositories.
           # If they aren't an error message will then be generated for each of
           # the actually missing files instead.
-          Machinery.logger.error(e.message)
+          Machinery.logger.error("Error: " + e.message)
           Machinery.logger.debug(e.backtrace.join("\n"))
           Machinery.logger.debug("Standard output:\n #{e.stdout}")
           Machinery.logger.debug("Error output:\n #{e.stderr}")