machinery-tool 1.14.2 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff11a934561d9adad04837ec1de84ed5024afe81
-  data.tar.gz: 591a93b21e2746297042cf185f7f6633f08f21fe
+  metadata.gz: b7bb69c63715c0f27c39688ddb791ee35a6467e4
+  data.tar.gz: a214db91229631088de485747ef4e1907d10f561
 SHA512:
-  metadata.gz: b9eb62471db592d4d575fe9374a09704b2d7bbb8480904087bf546819a562df955cad13d35d6f890403eba1b11806e44245a84737f53a3f41d49f6555c5ff201
-  data.tar.gz: db1e12957fd5b529871e47b0bec09379f1351d9345e7553d87f4d737aa63586e61789bcbaeca85434b90ec94b124f98a1551f7f6945e457afbe7d13b2f7eebe3
+  metadata.gz: a062352d64c37f3e67e1082cdef8a0958b74b0f4f2adc8edcd1eede673686e2940994542066811b91ebe51cb55af7cf3c72a578f348331a3f9f7a65381abdb30
+  data.tar.gz: 489b549c5188697403a50e29525ece98e46e3e12bf987c71a2faaccd029e167bbd43265bae9a09b923c6981f219d5887aa94b779b5317fda4f43d41b98275d7f

data/.git_revision

@@ -1 +1 @@
-b8c8eec01238e18a5ce1d9c53590c5c971e01703
+b333b1358568df9a508e7d92c61d3280395911d9

data/NEWS

@@ -1,6 +1,20 @@
 # Machinery Release Notes
 
 
+## Version 1.15.0 - Mon Oct 26 17:42:25 CET 2015 - thardeck@suse.de
+
+* No information is cut off in the HTML view
+* Files containing special characters can now be downloaded
+  (gh#SUSE/machinery#1497)
+* Links to common elements work in HTML when all scopes are collapsed
+  (gh#SUSE/machinery#1469)
+* Show if description was result of a container inspection
+  (gh#SUSE/machinery#1495)
+* Disable nav bar buttons when scope has been excluded (gh#SUSE/machinery#1199)
+* Show details of elements with changed attributes for all scopes in
+  comparison view
+* Show progress indicator while loading file content in HTML view
+
 ## Version 1.14.2 - Wed Oct 14 18:00:51 CEST 2015 - thardeck@suse.de
 
 * Fix typo in HTML package view  (gh#SUSE/machinery#1493)

data/html/assets/compare/machinery.js

@@ -5,17 +5,11 @@ $(document).ready(function () {
   $("a.scope_anchor, a.both_anchor").css("height", header_height);
   $("a.scope_anchor, a.both_anchor").css("margin-top", -header_height);
 
-  $('.scope_logo_big').each(function(){
-    var icon = $(this);
+  $('.scope_anchor').each(function(){
+    var anchor = $(this);
     $(window).scroll(function() {
-      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');
-      }
+      setCurrentScopeState(anchor);
+      highlightCurrentScope();
     })
   });
 
@@ -55,6 +49,10 @@ $(document).ready(function () {
   // Show or hide elements which are common in scope
   $(".show-common-elements").click(function(){
     $scope = $(this).closest(".scope");
+    if ($scope.find(".toggle").hasClass("collapsed")){
+      $scope.find(".scope_content").collapse("show");
+      $scope.find(".toggle").removeClass("collapsed");
+    }
     $scope.find(".scope_common_content").collapse("show");
     $scope.find(".scope_content").find(".show-common-elements").hide();
     $scope.find(".hide-common-elements").show();
@@ -73,15 +71,18 @@ $(document).ready(function () {
   });
 
   // Unmanaged files diffs
-  $("#diff-unmanaged-files-file").prop("selectedIndex", -1)
-  $("#diff-unmanaged-files-file").change(function(){
+  $("#diff-unmanaged-files").on("show.bs.modal", function(e) {
+    var trigger = $(e.relatedTarget);
+
     $("#diff-unmanaged-files-content").hide();
     $("#diff-unmanaged-files-error").hide();
     $("#diff-unmanaged-files-spinner").show();
 
     var description1 = $("body").data("description-a");
     var description2 = $("body").data("description-b");
-    var url = "/compare/" + description1 + "/" + description2 + "/files/unmanaged_files" + $(this).val();
+    var url = "/compare/" + description1 + "/" + description2 + "/files/unmanaged_files" +
+      trigger.data("file");
+    $("#diff-unmanaged-files-file").text(trigger.data("file"));
     $.get(url, function(res) {
       $("#diff-unmanaged-files-spinner").hide();
         if(res.length === 0) {
@@ -102,4 +103,10 @@ $(document).ready(function () {
         }
       });
   });
+
+  $('.scope_anchor').each(function(){
+    var anchor = $(this);
+    setCurrentScopeState(anchor);
+  });
+  highlightCurrentScope();
 });

data/html/assets/machinery-base.css

@@ -2033,8 +2033,8 @@ fieldset[disabled] .btn {
 }
 .btn-default {
     color: #333333;
-    background-color: #ffffff;
-    border-color: #cccccc;
+    background-color: #eec792;
+    border-color: #7f694f;
 }
 .btn-default:hover,
 .btn-default:focus,
@@ -2042,8 +2042,8 @@ fieldset[disabled] .btn {
 .btn-default.active,
 .open .dropdown-toggle.btn-default {
     color: #333333;
-    background-color: #ebebeb;
-    border-color: #adadad;
+    background-color: #E6AC5B;
+    border-color: #7f694f;
 }
 .btn-default:active,
 .btn-default.active,
@@ -2065,8 +2065,9 @@ fieldset[disabled] .btn-default:active,
 .btn-default.disabled.active,
 .btn-default[disabled].active,
 fieldset[disabled] .btn-default.active {
-    background-color: #ffffff;
-    border-color: #cccccc;
+    background-color: #cccccc;
+    border-color: #000000;
+    color: #000000;
 }
 .btn-default .badge {
     color: #ffffff;
@@ -2312,17 +2313,25 @@ fieldset[disabled] .btn-link:focus {
 }
 .btn-lg,
 .btn-group-lg > .btn {
-    padding: 10px 16px;
-    font-size: 18px;
-    line-height: 1.33;
-    border-radius: 6px;
+    font-size: 21px;
+    line-height: 2;
+    border-width: 2px;
+    border-radius: 8px;
+    padding: 2px;
+    width: 100%;
+    max-width: 50px;
+    min-width: 50px;
 }
 .btn-sm,
 .btn-group-sm > .btn {
-    padding: 5px 10px;
-    font-size: 12px;
+    padding: 6px 3px;
+    font-size: 11px;
+    font-weight: bold;
     line-height: 1.5;
     border-radius: 3px;
+    width:100%;
+    max-width: 30px;
+    min-width: 30px;
 }
 .btn-xs,
 .btn-group-xs > .btn {

data/html/assets/machinery-base.js

@@ -0,0 +1,19 @@
+function highlightCurrentScope() {
+  $(".scope-navigation a").removeClass("active");
+  current = $('.over-the-top:last');
+  if(current.length == 0) {
+    current = $('.scope_logo_big:first');
+  }
+  $(".scope-navigation a[href='#" + current.attr("id") + "']").addClass("active");
+}
+
+function setCurrentScopeState(anchor) {
+  var header_height =  $("#nav-bar").height() + 20;
+  var pos = anchor.offset();
+  var top_pos = $(this).scrollTop() + header_height;
+  if(top_pos >= pos.top) {
+    anchor.addClass("over-the-top");
+  } else {
+    anchor.removeClass("over-the-top");
+  }
+}

data/html/assets/machinery.css

@@ -18,6 +18,15 @@ body {
   text-decoration: none;
 }
 
+.nav-bar-title {
+  float: left;
+  padding: 5px;
+}
+
+.nav-buttons {
+  padding: 9px 0px;
+}
+
 .scope{
   border-spacing: 5px;
 }
@@ -38,8 +47,10 @@ a.both_anchor {
   font-size: 65%;
 }
 
-.scope-navigation {
-  margin-left: 30px;
+.btn-reset {
+  height: 30px;
+  line-height: 1;
+  margin-left: 5px;
 }
 
 .inspection_details {
@@ -65,6 +76,10 @@ a.both_anchor {
 }
 
 .scope th.small {
+  width: 8%;
+}
+
+.scope th.medium {
   width: 12%;
 }
 
@@ -72,14 +87,6 @@ a.both_anchor {
   padding-left: 20px;
 }
 
-.filter-input {
-  margin-bottom: 10px;
-}
-
-.filter-input input {
-  width: 250px;
-}
-
 .fixed {
   position: fixed;
 }
@@ -214,6 +221,10 @@ h1 {
   margin-bottom: 1em;
 }
 
+.diff-unmanaged-files {
+  padding-left: 10px;
+}
+
 .well .dismiss{
   margin: -14px;
 }
@@ -228,6 +239,19 @@ h1 {
   border-radius: 50%;
 }
 
-.show-common-elements, .hide-common-elements {
+.scope-summary a,
+.show-common-elements,
+.hide-common-elements {
   text-decoration: underline;
 }
+
+.spinner {
+  background-image: url("file_loader.gif");
+  background-repeat: no-repeat;
+  margin-left: auto;
+  margin-right: auto;
+  width: 32px;
+  height: 32px;
+  min-width: 32px;
+  min-height: 32px;
+}

data/html/assets/show/machinery.js

@@ -27,6 +27,14 @@ $(document).ready(function () {
     })
   });
 
+  $('.scope_anchor').each(function(){
+    var anchor = $(this);
+    $(window).scroll(function() {
+      setCurrentScopeState(anchor);
+      highlightCurrentScope();
+    })
+  });
+
   // Hook up the toggle links
   $(".toggle").click(function(){
     $(this).closest(".scope").find(".scope_content").collapse("toggle");
@@ -47,12 +55,6 @@ $(document).ready(function () {
     $("#collapse-all").show();
   });
 
-  // Set up scope icon popovers
-  $("img").popover({
-    trigger: "hover",
-    html: true
-  });
-
   // Set up inspection details popover
   $("a.inspection_details").popover({
     template: "<div class='popover inspection-details-popover' role='tooltip'>\
@@ -76,15 +78,22 @@ $(document).ready(function () {
   });
   $('.inspection-details-popover .close').click(function() { $(".inspection_details").popover("hide") });
 
+  // Set up scope icon popovers
+  $(".btn[data-toggle]").popover({
+    trigger: "hover",
+    html: true
+  });
+
   // Set up file download links
   $(".file-download").click(function() {
+    $("#file-modal .spinner").show();
     $("#file-modal-file-content").hide();
     $("#file-modal-error").hide();
 
     var file = $(this);
     var scope = file.parents(".scope").data("scope");
     var description = $("body").data("description");
-    var url = "/descriptions/" + description + "/files/" + scope + file.text().trim();
+    var url = encodeURI("/descriptions/" + description + "/files/" + scope + file.text().trim());
 
     $("#file-modal-download-link").attr("href", url);
     $.get(url, function(res) {
@@ -94,8 +103,10 @@ $(document).ready(function () {
           $("#file-modal-file-content").val(res).show();
           $("#file-modal-file-content").scrollTop(0);
         }
+        $("#file-modal .spinner").hide();
       }, "text").
       error(function(res) {
+        $("#file-modal .spinner").hide();
         if(res.readyState == 0) {
           $("#file-modal-error").html("Could not download file content. Is the web server still running?").show();
         } else if(res.status == 406) {
@@ -160,4 +171,10 @@ $(document).ready(function () {
       $this.attr('title', $this.text());
     }
   });
+
+  $('.scope_anchor').each(function(){
+    var anchor = $(this);
+    setCurrentScopeState(anchor);
+  });
+  highlightCurrentScope();
 });

data/html/comparison.html.haml

@@ -15,11 +15,14 @@
     %style
       = Diffy::CSS
 
+    %script{:src => "/assets/machinery-base.js"}
     %script{:src => "/assets/compare/machinery.js"}
     %script{:src => "/assets/bootstrap-tooltip.js"}
     %script{:src => "/assets/bootstrap-popover.js"}
 
   %body{ "data-description-a" => @description_a.name, "data-description-b" => @description_b.name }
+    - scopes = ["os", "packages", "patterns", "repositories", "users", "groups",
+       "services", "config_files", "changed_managed_files", "unmanaged_files"]
     #diff-unmanaged-files.modal.fade
       .modal-dialog.modal-lg
         .modal-content
@@ -29,13 +32,10 @@
             %h4
               Diff Unmanaged Files
           .modal-body
-            .row
-              File
-              %select#diff-unmanaged-files-file
-                - diffable_unmanaged_files.each do |file|
-                  %option{ label: file, value: file }
             .row#diff-unmanaged-files-content{"style" => "display: none"}
-              Diff ('#{@description_a.name}' -> '#{@description_b.name}')
+              Diff for '
+              %span#diff-unmanaged-files-file>
+              ' ('#{@description_a.name}' -> '#{@description_b.name}')
               #diff-unmanaged-files-diff
             #diff-unmanaged-files-error{"style" => "display: none"}
             #diff-unmanaged-files-spinner{"style" => "display: none"}
@@ -53,26 +53,11 @@
               Comparing '#{@description_a.name}' with '#{@description_b.name}'
             %span.scope-navigation
               Scopes:
-              %a{:href => "#os", :title => "Operating System", "ng-show" => "diff.os"}
-                %img{:src => "/assets/logo-os-small.png"}/
-              %a{:href => "#packages", :title => "Packages", "ng-show" => "diff.packages"}
-                %img{:src => "/assets/logo-packages-small.png"}/
-              %a{:href => "#patterns", :title => "Patterns", "ng-show" => "diff.patterns"}
-                %img{:src => "/assets/logo-patterns-small.png"}/
-              %a{:href => "#users", :title => "Users", "ng-show" => "diff.users"}
-                %img{:src => "/assets/logo-users-small.png"}/
-              %a{:href => "#groups", :title => "Groups", "ng-show" => "diff.groups"}
-                %img{:src => "/assets/logo-groups-small.png"}/
-              %a{:href => "#repositories", :title => "Repositories", "ng-show" => "diff.repositories"}
-                %img{:src => "/assets/logo-repositories-small.png"}/
-              %a{:href => "#unmanaged_files", :title => "Unmanaged Files", "ng-show" => "diff.unmanaged_files"}
-                %img{:src => "/assets/logo-unmanaged-files-small.png"}/
-              %a{:href => "#changed_managed_files", :title => "Changed Managed Files", "ng-show" => "diff.changed_managed_files"}
-                %img{:src => "/assets/logo-changed-managed-files-small.png"}/
-              %a{:href => "#config_files", :title => "Config Files", "ng-show" => "diff.config_files"}
-                %img{:src => "/assets/logo-config-files-small.png"}/
-              %a{:href => "#services", :title => "Services", "ng-show" => "diff.services"}
-                %img{:src => "/assets/logo-services-small.png"}/
+              - scopes.each do |scope|
+                %a.btn.btn-default.btn-sm{ :href => "##{scope}", :title => scope_title(scope),
+                  "data-toggle"=>"popover", "data-content" => scope_help(scope),
+                  :class => nav_class(scope), "ng-show" => "diff.#{scope}" }
+                  %span= scope_initials(scope)
         .row
           .col-xs-1
             %a#expand-all{:href => "#", :style => "display: none"}
@@ -89,13 +74,5 @@
       #content_container
         %div
           = render_partial "compare/alert"
-          = render_partial "compare/os"
-          = render_partial "compare/packages"
-          = render_partial "compare/patterns"
-          = render_partial "compare/users"
-          = render_partial "compare/groups"
-          = render_partial "compare/repositories"
-          = render_partial "compare/unmanaged_files"
-          = render_partial "compare/changed_managed_files"
-          = render_partial "compare/config_files"
-          = render_partial "compare/services"
+          - scopes.each do |scope|
+            = render_partial "compare/#{scope}"

data/html/index.html.haml

@@ -11,11 +11,14 @@
     %script{ :src => "assets/collapse.js" }
     %script{ :src => "assets/modal.js" }
     %script{ :src => "assets/jquery.searcher.min.js" }
+    %script{ :src => "assets/machinery-base.js" }
     %script{ :src => "assets/show/machinery.js" }
     %script{ :src => "assets/bootstrap-tooltip.js" }
     %script{ :src => "assets/bootstrap-popover.js" }
 
   %body{ "data-description" => @description.name }
+    - scopes = ["os", "packages", "patterns", "repositories", "users", "groups",
+       "services", "config_files", "changed_managed_files", "unmanaged_files"]
     #file-modal.modal.fade
       .modal-dialog.modal-lg
         .modal-content
@@ -24,6 +27,7 @@
               ×
             %h4#file-modal-title
           .modal-body
+            .spinner
             %textarea#file-modal-file-content{ "readonly" => "true" }
             #file-modal-error{ "style" => "display: none" }
           .modal-footer
@@ -53,65 +57,46 @@
               Expand all
             %a#collapse-all{ :href => "#" }
               Collapse all
-          .col-xs-9
+          .col-xs-9.nav-buttons
             %small.pull-right.pad-top
               created by
               %a{ :href => "http://machinery-project.org", :target => "_blank" }
                 Machinery
-            .filter-input.col-md-3
-              %input#filter{ :placeholder => "Type To Filter" }
-              %a{ :href => "#" }
-                %img#reset-filter{ :src => "assets/reset.png", :titel => "Reset Filter" }
+            .filter-input.col-md-4
+              %input.col-md-8#filter{ :placeholder => "Type To Filter" }
+              %a.btn.btn-default.btn-reset{ :href => "#", :title => "Reset Filter" }
+                %span Reset
 
             %span.scope-navigation
-              Scopes:
-              %a{ :href => "#os", :title => "Operating System" }
-                %img{ :src => "assets/logo-os-small.png", :title=>"Operating System",
-                  "data-toggle"=>"popover", "data-content" => scope_help('os') }
-              %a{ :href => "#packages", :title => "Packages" }
-                %img{ :src => "assets/logo-packages-small.png", :title => "Packages",
-                  "data-toggle"=>"popover", "data-content" => scope_help('packages') }
-              %a{ :href => "#patterns", :title => "Patterns" }
-                %img{ :src => "assets/logo-patterns-small.png", :title => "Patterns",
-                  "data-toggle"=>"popover", "data-content" => scope_help('patterns') }
-              %a{ :href => "#repositories", :title => "Repositories" }
-                %img{ :src => "assets/logo-repositories-small.png", :title => "Repositories",
-                  "data-toggle"=>"popover", "data-content" => scope_help('repositories') }
-              %a{ :href => "#users", :title => "Users" }
-                %img{ :src => "assets/logo-users-small.png", :title => "Users",
-                  "data-toggle"=>"popover", "data-content" => scope_help('users') }
-              %a{ :href => "#groups", :title => "Groups" }
-                %img{ :src => "assets/logo-groups-small.png", :title => "Groups",
-                  "data-toggle"=>"popover", "data-content" => scope_help('groups') }
-              %a{ :href => "#services", :title => "Services" }
-                %img{ :src => "assets/logo-services-small.png", :title => "Services",
-                  "data-toggle"=>"popover", "data-content" => scope_help('services') }
-              %a{ :href => "#config_files", :title => "Config Files" }
-                %img{ :src => "assets/logo-config-files-small.png", :title => "Config Files",
-                  "data-toggle"=>"popover", "data-content" => scope_help('config_files') }
-              %a{ :href => "#changed_managed_files", :title => "Changed Managed Files" }
-                %img{ :src => "assets/logo-changed-managed-files-small.png",
-                 :title => "Changed Managed Files", "data-toggle" => "popover",
-                 "data-content" => scope_help('changed_managed_files') }
-              %a{ :href => "#unmanaged_files", :title => "Unmanaged Files" }
-                %img{ :src => "assets/logo-unmanaged-files-small.png", :title => "Unmanaged Files",
-                  :"data-toggle" => "popover", "data-content" => scope_help('unmanaged_files') }
+              %span.nav-bar-title
+                Scopes:
 
+              - scopes.each do |scope|
+                %a.btn.btn-default.btn-sm{ :href => "##{scope}", :title => scope_title(scope),
+                  "data-toggle"=>"popover", "data-content" => scope_help(scope),
+                  :class => nav_class(scope) }
+                  %span= scope_initials(scope)
 
       #content_container
 
-        = render_scope "os"
-        = render_scope "packages"
-        = render_scope "patterns"
-        = render_scope "repositories"
-        = render_scope "users"
-        = render_scope "groups"
-        = render_scope "services"
-        = render_scope "config_files"
-        = render_scope "changed_managed_files"
-        = render_scope "unmanaged_files"
+        - scopes.each do |scope|
+          = render_scope scope
 
         .hidden#inspection_details
+          - if @description[:environment].system_type == "docker"
+            #container_type
+              .row
+                .col-xs-1
+                .col-xs-11
+                  %h3 Type of Inspected Container
+
+              .row
+                .col-xs-1
+                .col-xs-11
+                  %ul
+                    %li
+                      = @description[:environment].system_type
+
           #filters
             .row
               .col-xs-1