machinery-tool 1.20.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19148ad851542ec6f2b171ffcab79b0d06b81486
-  data.tar.gz: ba8adee56e97a903430afd5afc57a2997191c721
+  metadata.gz: 87228d0f2d8ad38866a4ce59c3f10a54e2991ce6
+  data.tar.gz: 7f962d709d33e097a7fbc022be920951aa038351
 SHA512:
-  metadata.gz: c40d861d81c6c2f1a3e35a83ea26cc8d0ed4fadd0c94e9cf3a83a3b38fe5b942be7e356a86c6e3368cb1457c4767a069056ead6fb42d10a2a9abd59a17992fc3
-  data.tar.gz: 4c4e9ef61bac58ba3284368dbac84b81d43d50395a394bf523232b972c930e156a40c925478e364b087aa11f370648b643a5d3cd944c91a6c81d580a7a008227
+  metadata.gz: 49ab73f8072183dcb1275dc1902a50512c58f6e492799fb1893875bc28cae759a596029db17770985de808d471896efa3d13acbbc5c070e6b5e0fc487e267050
+  data.tar.gz: 5de36d69acd9c187e50d0d5707e3a12970937f31f94a4f83a3bb691a29237b5369e6d143fdf6d55f5845ac47afae05fc86c0b5a3dc56d4ae2e5aa658a6d05f5e

data/.git_revision

@@ -1 +1 @@
-d0bee698f4e775076d7d4f619d68bb8e347444c5
+cf6d038ddefdf0d539b132c206336e141c39b418

data/NEWS

@@ -1,6 +1,18 @@
 # Machinery Release Notes
 
 
+## Version 1.21.0 - Tue Jun 21 16:28:31 CEST 2016 - thardeck@suse.de
+
+* Add attribute in patterns scope to identify the patterns manager
+* Improve navigation in HTML view to connect "list", "show" and "compare"
+  functionality
+* Fix service inspector on systemd to include instanciated services
+* Introduce format version 10 to allow distinction between files and directories
+  for meta data of unmanaged files.
+  This distinction is only available for newly inspected descriptions.
+  Additionally, an attribute in the patterns scope was added to identify the patterns manager.
+  https://github.com/SUSE/machinery/blob/master/docs/System-Description-Format.md#version-10
+
 ## Version 1.20.0 - Fri Apr 22 16:39:04 CEST 2016 - thardeck@suse.de
 
 * Added explanation for 'N/A' fields for each scope (gh#SUSE/machinery#1904)

data/html/assets/bootstrap-modal.js

@@ -0,0 +1,338 @@
+/* ========================================================================
+ * Bootstrap: modal.js v3.3.6
+ * http://getbootstrap.com/javascript/#modals
+ * ========================================================================
+ * Copyright 2011-2015 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.$dialog             = this.$element.find('.modal-dialog')
+    this.$backdrop           = null
+    this.isShown             = null
+    this.originalBodyPad     = null
+    this.scrollbarWidth      = 0
+    this.ignoreBackdropClick = false
+
+    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.3.6'
+
+  Modal.TRANSITION_DURATION = 300
+  Modal.BACKDROP_TRANSITION_DURATION = 150
+
+  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.setScrollbar()
+    this.$body.addClass('modal-open')
+
+    this.escape()
+    this.resize()
+
+    this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
+
+    this.$dialog.on('mousedown.dismiss.bs.modal', function () {
+      that.$element.one('mouseup.dismiss.bs.modal', function (e) {
+        if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true
+      })
+    })
+
+    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)
+
+      that.adjustDialog()
+
+      if (transition) {
+        that.$element[0].offsetWidth // force reflow
+      }
+
+      that.$element.addClass('in')
+
+      that.enforceFocus()
+
+      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
+
+      transition ?
+        that.$dialog // wait for modal to slide in
+          .one('bsTransitionEnd', function () {
+            that.$element.trigger('focus').trigger(e)
+          })
+          .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
+        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.escape()
+    this.resize()
+
+    $(document).off('focusin.bs.modal')
+
+    this.$element
+      .removeClass('in')
+      .off('click.dismiss.bs.modal')
+      .off('mouseup.dismiss.bs.modal')
+
+    this.$dialog.off('mousedown.dismiss.bs.modal')
+
+    $.support.transition && this.$element.hasClass('fade') ?
+      this.$element
+        .one('bsTransitionEnd', $.proxy(this.hideModal, this))
+        .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
+      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('keydown.dismiss.bs.modal', $.proxy(function (e) {
+        e.which == 27 && this.hide()
+      }, this))
+    } else if (!this.isShown) {
+      this.$element.off('keydown.dismiss.bs.modal')
+    }
+  }
+
+  Modal.prototype.resize = function () {
+    if (this.isShown) {
+      $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this))
+    } else {
+      $(window).off('resize.bs.modal')
+    }
+  }
+
+  Modal.prototype.hideModal = function () {
+    var that = this
+    this.$element.hide()
+    this.backdrop(function () {
+      that.$body.removeClass('modal-open')
+      that.resetAdjustments()
+      that.resetScrollbar()
+      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 = $(document.createElement('div'))
+        .addClass('modal-backdrop ' + animate)
+        .appendTo(this.$body)
+
+      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
+        if (this.ignoreBackdropClick) {
+          this.ignoreBackdropClick = false
+          return
+        }
+        if (e.target !== e.currentTarget) return
+        this.options.backdrop == 'static'
+          ? this.$element[0].focus()
+          : this.hide()
+      }, this))
+
+      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+      this.$backdrop.addClass('in')
+
+      if (!callback) return
+
+      doAnimate ?
+        this.$backdrop
+          .one('bsTransitionEnd', callback)
+          .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
+        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(Modal.BACKDROP_TRANSITION_DURATION) :
+        callbackRemove()
+
+    } else if (callback) {
+      callback()
+    }
+  }
+
+  // these following methods are used to handle overflowing modals
+
+  Modal.prototype.handleUpdate = function () {
+    this.adjustDialog()
+  }
+
+  Modal.prototype.adjustDialog = function () {
+    var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
+
+    this.$element.css({
+      paddingLeft:  !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
+      paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
+    })
+  }
+
+  Modal.prototype.resetAdjustments = function () {
+    this.$element.css({
+      paddingLeft: '',
+      paddingRight: ''
+    })
+  }
+
+  Modal.prototype.checkScrollbar = function () {
+    var fullWindowWidth = window.innerWidth
+    if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8
+      var documentElementRect = document.documentElement.getBoundingClientRect()
+      fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left)
+    }
+    this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth
+    this.scrollbarWidth = this.measureScrollbar()
+  }
+
+  Modal.prototype.setScrollbar = function () {
+    var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
+    this.originalBodyPad = document.body.style.paddingRight || ''
+    if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
+  }
+
+  Modal.prototype.resetScrollbar = function () {
+    this.$body.css('padding-right', this.originalBodyPad)
+  }
+
+  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/compare/machinery.js

@@ -118,3 +118,18 @@ $(document).ready(function () {
   });
   highlightCurrentScope();
 });
+
+$(document).on("click", ".open-description-selector", function () {
+  if ($(this).hasClass("show")) {
+    descriptionName = $(".description-name:last").val();
+    $(".description-selector-action").text("compare with description \"" + descriptionName + "\".");
+    $("a.show-description").show();
+    $("a.compare-description").hide();
+  }else{
+    descriptionName = $(".description-name:first").val();
+    $(".description-selector-action").text("compare with description \"" + descriptionName + "\".");
+    $("a.show-description").hide();
+    $("a.compare-description").show();
+  }
+});
+

data/html/assets/machinery-base.css

@@ -2377,8 +2377,8 @@ input[type="button"].btn-block {
 }
 @font-face {
     font-family: 'Glyphicons Halflings';
-    src: url('../app/fonts/glyphicons-halflings-regular.eot');
-    src: url('../app/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../app/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../app/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../app/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+    src: url('../fonts/glyphicons-halflings-regular.eot');
+    src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
 .glyphicon {
     position: relative;
@@ -2991,6 +2991,9 @@ input[type="button"].btn-block {
 .glyphicon-tree-deciduous:before {
     content: "\e200";
 }
+.glyphicon-option-horizontal:before {
+    content: "\e234";
+}
 .caret {
     display: inline-block;
     width: 0;

data/html/assets/machinery-base.js

@@ -23,7 +23,22 @@ $(document).ready(function () {
     $(this).closest(".scope").hide();
   });
 
-  $(".btn-reset").click(function(){
+  $(".reset-filter").click(function(){
     $("#filter").val("").change();
   });
+  $(".reset-descriptions-filter").click(function(){
+    $("#descriptions-filter").val("").change();
+  });
 })
+
+$(window).load(function(){
+  if (window.location.pathname == "/") {
+    descriptionSelector = $('#description-selector')
+    descriptionSelector.modal({backdrop: 'static', keyboard: false});
+    descriptionSelector.find("button[data-dismiss='modal']").hide();
+  }
+});
+
+$(document).on("click", ".description-name", function () {
+  $(this).parent().find(".open-description-selector").trigger("click");
+});

data/html/assets/machinery.css

@@ -12,6 +12,7 @@ body {
   padding-left: 15px;
   border-bottom-style: solid;
   border-bottom-width: 1px;
+  padding-top: 20px;
 }
 
 #nav-bar a:hover {
@@ -256,3 +257,43 @@ h1 {
   min-width: 32px;
   min-height: 32px;
 }
+
+.modal-dialog.large {
+  width: 90%; /* respsonsive width */
+}
+
+.description-name {
+  font-size: 2em ;
+  box-sizing: border-box ;
+  -webkit-box-sizing: border-box ;
+  -moz-box-sizing: border-box ;
+  outline: none ;
+  display: block ;
+  width: 100% ;
+  padding: 7px ;
+  border: none ;
+  background: transparent ;
+  border-radius: 0 ;
+  border-bottom: 1px solid #7f694f;
+  height: 45px;
+}
+
+.missing {
+  font-style: italic;
+  font-size: 1.2em !important;
+}
+
+.description-selector-action {
+  font-style: bold !important;
+}
+
+#filter {
+  height: 31px !important;
+}
+
+.reset-filter {
+  height: 31px !important;
+}
+.toolbar {
+  margin-top: 5px;
+}