machinery-tool 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8755dd722d4450f406fe08db1700528783ff297
-  data.tar.gz: 3709616bfe0e90ac03543cda9ad942cc60ee8800
+  metadata.gz: 0248c07e10c874fd1b90d77d42b98e27ce2f5aa2
+  data.tar.gz: cf74177f9c3e73febd1137c9e9c4a028a1dc6676
 SHA512:
-  metadata.gz: e8f9fd19e24aeced39f9c6218461aa35145484b53e99de5961d90a9e8933928538aceb53da569714210a2d5fb1d32b6859a73fb383b6b7db2942c601e468c0a7
-  data.tar.gz: a634e571b90b353f7c3f878ccb9dec19ced958df03d0401d7851226847cf4bbc7ce643b8acd7aebc5bc5c69a7cda5db0f445d1a2e19b5886b5e560db74a6dc60
+  metadata.gz: bd8586da9a47fbff50c9b9c4e59ed2fbd6b31e4cd8cdf17c3abc56d2b10a91c0ffa205cae7619255620a27cd852a400e197482707b5189cf1da7e8668f28be3c
+  data.tar.gz: 94af88fa5b75517220f9a5383d8306da20a729ccc0c93c09b64e28042577806e98b7d839aedc26e261fdb0da10ee085641fef636980f6d8a2f346419d67c317b

data/NEWS

@@ -1,6 +1,13 @@
 # Machinery Release Notes
 
 
+## Version 1.10.0 - Thu Jul 09 16:26:35 CEST 2015 - thardeck@suse.de
+
+* Data which hasn't changed is not shown in the comparison HTML view by default
+* Improve display of package differences in compare command
+* Add `man` command to show the Machinery man page
+* Content of extracted files can be displayed in HTML view
+
 ## Version 1.9.1 - Tue Jun 23 16:57:35 CEST 2015 - thardeck@suse.de
 
 * `machinery config` takes arguments of the form 'key=value' as well

data/html/assets/compare/machinery-compare.js

@@ -22,6 +22,11 @@ angular.module("machinery-compare")
       template: "<h3>In both descriptions:</h3>"
     };
   })
+  .directive("changed", function() {
+    return {
+      template: "<h3>In both with different attributes:</h3>"
+    };
+  })
   .directive("renderTemplate", function() {
     return {
       restrict: "E",
@@ -34,3 +39,41 @@ angular.module("machinery-compare")
       template: '<div ng-include="templateUrl"></div>'
     };
   });
+
+
+// Scope specific directives
+angular.module("machinery-compare")
+  .directive("changedPackages", function() {
+    return {
+      restrict: "E",
+      scope: {
+        object: "=object"
+      },
+      link: function(scope, element, attrs) {
+        var elements = [];
+
+        angular.forEach(scope.object, function(value) {
+          var changes = [];
+          var relevant_attributes = ["version", "vendor", "arch"];
+
+          if(value[0].version == value[1].version) {
+            relevant_attributes.push("release");
+            if(value[0].version == value[1].version) {
+              relevant_attributes.push("checksum");
+            }
+          }
+
+          angular.forEach(relevant_attributes, function(attribute) {
+            if(value[0][attribute] != value[1][attribute]) {
+              changes.push(attribute + ": " + value[0][attribute] + " ↔ " + value[1][attribute]);
+            }
+          });
+
+          elements.push(value[0].name + " (" + changes.join(", ") + ")");
+        });
+
+        scope.changed_elements = elements;
+      },
+      templateUrl: "scope_packages_changed_partial"
+    };
+  });

data/html/assets/compare/machinery.js

@@ -50,4 +50,21 @@ $(document).ready(function () {
     $(this).hide();
     $("#collapse-all").show();
   });
+
+  // Show or hide elements which are common in scope
+  $(".show-common-elements").click(function(){
+    $scope = $(this).closest(".scope");
+    $scope.find(".scope_common_content").collapse("show");
+    $(this).hide();
+    $scope.find(".hide-common-elements").show();
+    return false;
+  });
+
+  $(".hide-common-elements").click(function(){
+    $scope = $(this).closest(".scope");
+    $scope.find(".scope_common_content").collapse("hide");
+    $(this).hide();
+    $scope.find(".show-common-elements").show();
+    return false;
+  });
 });

data/html/assets/machinery.css

@@ -24,6 +24,8 @@ a.both_anchor {
   visibility: hidden;
 }
 
+.scope_content{border-bottom: 1px dotted #d58512}
+
 .scope-summary {
   display: inline;
   font-weight: normal;
@@ -84,10 +86,15 @@ span.toggle {
   height: 24px;
   background: url("arrow_up.png");
   cursor: pointer;
+  background-color: white;
+  border-radius: 50%;
+
 }
 
 span.toggle.collapsed {
   background :url("arrow_down.png");
+  background-color: white;
+  border-radius: 50%;
 }
 
 .popover{
@@ -177,3 +184,9 @@ li.filter {
 h1 {
   display: inline-block;
 }
+
+#file-modal-file-content {
+  width: 100%;
+  min-height: 450px;
+  font-family: monospace;
+}

data/html/assets/modal.js

@@ -0,0 +1,280 @@
+/* ========================================================================
+ * Bootstrap: modal.js v3.2.0
+ * http://getbootstrap.com/javascript/#modals
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // MODAL CLASS DEFINITION
+  // ======================
+
+  var Modal = function (element, options) {
+    this.options        = options
+    this.$body          = $(document.body)
+    this.$element       = $(element)
+    this.$backdrop      =
+    this.isShown        = null
+    this.scrollbarWidth = 0
+
+    if (this.options.remote) {
+      this.$element
+        .find('.modal-content')
+        .load(this.options.remote, $.proxy(function () {
+          this.$element.trigger('loaded.bs.modal')
+        }, this))
+    }
+  }
+
+  Modal.VERSION  = '3.2.0'
+
+  Modal.DEFAULTS = {
+    backdrop: true,
+    keyboard: true,
+    show: true
+  }
+
+  Modal.prototype.toggle = function (_relatedTarget) {
+    return this.isShown ? this.hide() : this.show(_relatedTarget)
+  }
+
+  Modal.prototype.show = function (_relatedTarget) {
+    var that = this
+    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
+
+    this.$element.trigger(e)
+
+    if (this.isShown || e.isDefaultPrevented()) return
+
+    this.isShown = true
+
+    this.checkScrollbar()
+    this.$body.addClass('modal-open')
+
+    this.setScrollbar()
+    this.escape()
+
+    this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
+
+    this.backdrop(function () {
+      var transition = $.support.transition && that.$element.hasClass('fade')
+
+      if (!that.$element.parent().length) {
+        that.$element.appendTo(that.$body) // don't move modals dom position
+      }
+
+      that.$element
+        .show()
+        .scrollTop(0)
+
+      if (transition) {
+        that.$element[0].offsetWidth // force reflow
+      }
+
+      that.$element
+        .addClass('in')
+        .attr('aria-hidden', false)
+
+      that.enforceFocus()
+
+      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
+
+      transition ?
+        that.$element.find('.modal-dialog') // wait for modal to slide in
+          .one('bsTransitionEnd', function () {
+            that.$element.trigger('focus').trigger(e)
+          })
+          .emulateTransitionEnd(300) :
+        that.$element.trigger('focus').trigger(e)
+    })
+  }
+
+  Modal.prototype.hide = function (e) {
+    if (e) e.preventDefault()
+
+    e = $.Event('hide.bs.modal')
+
+    this.$element.trigger(e)
+
+    if (!this.isShown || e.isDefaultPrevented()) return
+
+    this.isShown = false
+
+    this.$body.removeClass('modal-open')
+
+    this.resetScrollbar()
+    this.escape()
+
+    $(document).off('focusin.bs.modal')
+
+    this.$element
+      .removeClass('in')
+      .attr('aria-hidden', true)
+      .off('click.dismiss.bs.modal')
+
+    $.support.transition && this.$element.hasClass('fade') ?
+      this.$element
+        .one('bsTransitionEnd', $.proxy(this.hideModal, this))
+        .emulateTransitionEnd(300) :
+      this.hideModal()
+  }
+
+  Modal.prototype.enforceFocus = function () {
+    $(document)
+      .off('focusin.bs.modal') // guard against infinite focus loop
+      .on('focusin.bs.modal', $.proxy(function (e) {
+        if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
+          this.$element.trigger('focus')
+        }
+      }, this))
+  }
+
+  Modal.prototype.escape = function () {
+    if (this.isShown && this.options.keyboard) {
+      this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) {
+        e.which == 27 && this.hide()
+      }, this))
+    } else if (!this.isShown) {
+      this.$element.off('keyup.dismiss.bs.modal')
+    }
+  }
+
+  Modal.prototype.hideModal = function () {
+    var that = this
+    this.$element.hide()
+    this.backdrop(function () {
+      that.$element.trigger('hidden.bs.modal')
+    })
+  }
+
+  Modal.prototype.removeBackdrop = function () {
+    this.$backdrop && this.$backdrop.remove()
+    this.$backdrop = null
+  }
+
+  Modal.prototype.backdrop = function (callback) {
+    var that = this
+    var animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+    if (this.isShown && this.options.backdrop) {
+      var doAnimate = $.support.transition && animate
+
+      this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+        .appendTo(this.$body)
+
+      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
+        if (e.target !== e.currentTarget) return
+        this.options.backdrop == 'static'
+          ? this.$element[0].focus.call(this.$element[0])
+          : this.hide.call(this)
+      }, this))
+
+      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+      this.$backdrop.addClass('in')
+
+      if (!callback) return
+
+      doAnimate ?
+        this.$backdrop
+          .one('bsTransitionEnd', callback)
+          .emulateTransitionEnd(150) :
+        callback()
+
+    } else if (!this.isShown && this.$backdrop) {
+      this.$backdrop.removeClass('in')
+
+      var callbackRemove = function () {
+        that.removeBackdrop()
+        callback && callback()
+      }
+      $.support.transition && this.$element.hasClass('fade') ?
+        this.$backdrop
+          .one('bsTransitionEnd', callbackRemove)
+          .emulateTransitionEnd(150) :
+        callbackRemove()
+
+    } else if (callback) {
+      callback()
+    }
+  }
+
+  Modal.prototype.checkScrollbar = function () {
+    if (document.body.clientWidth >= window.innerWidth) return
+    this.scrollbarWidth = this.scrollbarWidth || this.measureScrollbar()
+  }
+
+  Modal.prototype.setScrollbar = function () {
+    var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
+    if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
+  }
+
+  Modal.prototype.resetScrollbar = function () {
+    this.$body.css('padding-right', '')
+  }
+
+  Modal.prototype.measureScrollbar = function () { // thx walsh
+    var scrollDiv = document.createElement('div')
+    scrollDiv.className = 'modal-scrollbar-measure'
+    this.$body.append(scrollDiv)
+    var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth
+    this.$body[0].removeChild(scrollDiv)
+    return scrollbarWidth
+  }
+
+
+  // MODAL PLUGIN DEFINITION
+  // =======================
+
+  function Plugin(option, _relatedTarget) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.modal')
+      var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
+
+      if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option](_relatedTarget)
+      else if (options.show) data.show(_relatedTarget)
+    })
+  }
+
+  var old = $.fn.modal
+
+  $.fn.modal             = Plugin
+  $.fn.modal.Constructor = Modal
+
+
+  // MODAL NO CONFLICT
+  // =================
+
+  $.fn.modal.noConflict = function () {
+    $.fn.modal = old
+    return this
+  }
+
+
+  // MODAL DATA-API
+  // ==============
+
+  $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
+    var $this   = $(this)
+    var href    = $this.attr('href')
+    var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7
+    var option  = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
+
+    if ($this.is('a')) e.preventDefault()
+
+    $target.one('show.bs.modal', function (showEvent) {
+      if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown
+      $target.one('hidden.bs.modal', function () {
+        $this.is(':visible') && $this.trigger('focus')
+      })
+    })
+    Plugin.call($target, option, this)
+  })
+
+}(jQuery);

data/html/assets/show/machinery-show.js

@@ -4,17 +4,24 @@ angular.module("machinery-show")
   .config(function($locationProvider) {
     $locationProvider.html5Mode({enabled: true, requireBase: false});
   })
-  .controller("showController", function($scope) {
-    $scope.description = getDescription();
+  .controller("showController", function($scope, $http, $timeout, $anchorScroll) {
+    $http.get("/descriptions/" + $("body").data("description") + ".js").then(function(result) {
+      // Setup links and scroll to desired scope when rendering is done
+      $timeout(function() {
+        setupDynamicContent();
+        $anchorScroll();
+      }, 0);
+      $scope.description = result.data;
 
 
-    $scope.description.meta_info = {};
-    angular.forEach($scope.description, function(index, scope) {
-      if($scope.description.meta[scope]) {
-        $scope.description.meta_info[scope] = " (" +
-        "inspected host: '" + $scope.description.meta[scope].hostname + "', " +
-        "at: " + new Date($scope.description.meta[scope].modified).toLocaleString() + ")";
-      }
+      $scope.description.meta_info = {};
+      angular.forEach($scope.description, function(index, scope) {
+        if($scope.description.meta[scope]) {
+          $scope.description.meta_info[scope] = " (" +
+          "inspected host: '" + $scope.description.meta[scope].hostname + "', " +
+          "at: " + new Date($scope.description.meta[scope].modified).toLocaleString() + ")";
+        }
+      });
     });
   })
   .directive("scopeHeader", function(){