Hello community, here is the log from the commit of package python-halite for openSUSE:Factory checked in at 2013-11-30 14:22:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-halite (Old) and /work/SRC/openSUSE:Factory/.python-halite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-halite" Changes: -------- --- /work/SRC/openSUSE:Factory/python-halite/python-halite.changes 2013-11-19 16:28:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-halite.new/python-halite.changes 2013-11-30 14:22:06.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Nov 29 22:22:23 UTC 2013 - aboe76@gmail.com + +- Updated to halite 0.1.08 +- Feature support for aggregate progress bars +- Feature Hide progress elements +- Fixed wheel to work with new returners +- Fixed fetch docs check box not activating + +------------------------------------------------------------------- Old: ---- halite-0.1.07.tar.gz New: ---- halite-0.1.08.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-halite.spec ++++++ --- /var/tmp/diff_new_pack.COLiL7/_old 2013-11-30 14:22:07.000000000 +0100 +++ /var/tmp/diff_new_pack.COLiL7/_new 2013-11-30 14:22:07.000000000 +0100 @@ -16,7 +16,7 @@ # Name: python-halite -Version: 0.1.07 +Version: 0.1.08 Release: 1%{?dist} License: MIT Summary: Halite the salt Web UI ++++++ halite-0.1.07.tar.gz -> halite-0.1.08.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/halite-0.1.07/PKG-INFO new/halite-0.1.08/PKG-INFO --- old/halite-0.1.07/PKG-INFO 2013-11-18 22:11:23.000000000 +0100 +++ new/halite-0.1.08/PKG-INFO 2013-11-27 18:08:39.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: halite -Version: 0.1.07 +Version: 0.1.08 Summary: SaltStack Web UI Home-page: https://github.com/saltstack/halite Author: SaltStack Inc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/halite-0.1.07/README.rst new/halite-0.1.08/README.rst --- old/halite-0.1.07/README.rst 2013-10-31 17:25:11.000000000 +0100 +++ new/halite-0.1.08/README.rst 2013-11-22 18:15:41.000000000 +0100 @@ -199,7 +199,7 @@ .. image:: screenshots/EventMonitor.png -More Details comming. TBD +More details coming. TBD Browser requirements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/halite-0.1.07/halite/app/appConfigSrvc.js new/halite-0.1.08/halite/app/appConfigSrvc.js --- old/halite-0.1.07/halite/app/appConfigSrvc.js 2013-11-18 22:10:29.000000000 +0100 +++ new/halite-0.1.08/halite/app/appConfigSrvc.js 2013-11-27 18:02:51.000000000 +0100 @@ -4,8 +4,8 @@ configuration = { baseUrl: "", - date: "2013-11-01", - version: "0.1.04", + date: "2013-11-27", + version: "0.1.08", views: { home: { label: "home", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/halite-0.1.07/halite/app/main.css new/halite-0.1.08/halite/app/main.css --- old/halite-0.1.07/halite/app/main.css 2013-11-18 21:44:57.000000000 +0100 +++ new/halite-0.1.08/halite/app/main.css 2013-11-22 20:03:37.000000000 +0100 @@ -1,3 +1,12 @@ +div.progress { + position: relative; + margin-bottom: 0px; + width: 70px; + display: inline-block; +} +kvl div.progress { + bottom: -6px; +} div.height-controlled { height: 20px; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/halite-0.1.07/halite/app/util/appDrtv.js new/halite-0.1.08/halite/app/util/appDrtv.js --- old/halite-0.1.07/halite/app/util/appDrtv.js 2013-11-18 22:10:29.000000000 +0100 +++ new/halite-0.1.08/halite/app/util/appDrtv.js 2013-11-27 18:02:51.000000000 +0100 @@ -15,7 +15,7 @@ ddo = { restrict: 'E', replace: true, - templateUrl: "app/util/template/progressbar/progress.html", + templateUrl: "app/util/template/progressbar/ss_progress.html", scope: { percentage: '@' } @@ -661,10 +661,8 @@ $templateCache.put("template/alert/ss_alert.html", "<div class=\"alert\" ng-class=\"'alert-' + (type || 'warning')\">\n <button ng-show=\"closeable\" type=\"button\" class=\"close\" ng-click=\"close()\">×</button>\n <div ng-transclude></div>\n</div>"); $templateCache.put("template/pagination/ss_pagination.html", "<ul class=\"pagination\">\n <li ng-repeat=\"page in pages\" ng-class=\"{active: page.active, disabled: page.disabled}\"><a ng-click=\"selectPage(page.number)\">{{page.text}}</a></li>\n</ul>"); $templateCache.put("template/pagination/ss_pager.html", "<ul class=\"pager\">\n <li ng-repeat=\"page in pages\" ng-class=\"{disabled: page.disabled, previous: page.previous, next: page.next}\"><a ng-click=\"selectPage(page.number)\">{{page.text}}</a></li>\n</ul>"); - return $templateCache.put("app/util/template/progressbar/progress.html", "<div class=\"progress\">\n <div class=\"progress-bar\" role=\"progressbar\" aria-valuenow=\"{{percentage}}\" aria-valuemin=\"0\" aria-valuemax=\"100\" style=\"width: {{percentage}}%\">\n <span class=\"sr-only\">{{percentage}}% Complete</span>\n </div>\n</div>"); + return $templateCache.put("app/util/template/progressbar/ss_progress.html", "<div class=\"progress\">\n <div class=\"progress-bar\" role=\"progressbar\" aria-valuenow=\"{{percentage}}\" aria-valuemin=\"0\" aria-valuemax=\"100\" style=\"width: {{percentage}}%\">\n <span class=\"sr-only\">{{percentage}}% Complete</span>\n </div>\n</div>"); } ]); - "template/pagination/pagination.html"; - }).call(this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/halite-0.1.07/halite/app/util/appUtilSrvc.js new/halite-0.1.08/halite/app/util/appUtilSrvc.js --- old/halite-0.1.07/halite/app/util/appUtilSrvc.js 2013-11-18 22:10:29.000000000 +0100 +++ new/halite-0.1.08/halite/app/util/appUtilSrvc.js 2013-11-27 18:02:51.000000000 +0100 @@ -418,6 +418,10 @@ this.results = new Itemizer(); this.minions = new Itemizer(); this.progressEvents = new Itemizer(); + this.resolveOnAnyPass = false; + this.totalEvents = 0; + this.completedEvents = 0; + this.eventInfo = new Itemizer(); for (_i = 0, _len = mids.length; _i < _len; _i++) { mid = mids[_i]; this.results.set(mid, new Resulter(mid)); @@ -467,7 +471,7 @@ }; Jobber.prototype.checkDone = function() { - var result, _ref, _ref1; + var anyDone, result, _ref, _ref1; this.done = _((function() { var _i, _len, _ref, _results; _ref = this.results.values(); @@ -481,6 +485,21 @@ return _results; }).call(this)).all(); if (!this.done) { + anyDone = _((function() { + var _i, _len, _ref, _results; + _ref = this.results.values(); + _results = []; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + result = _ref[_i]; + if (result.active !== false) { + _results.push(result.done); + } + } + return _results; + }).call(this)).any(); + if (this.resolveOnAnyPass && anyDone) { + this.defer.resolve(this); + } return false; } this.fail = _((function() { @@ -603,6 +622,26 @@ return this.getLatestProgEvent(mid).state; }; + Jobber.prototype.hasNestedProgressEvents = function() { + if (this.progressEvents.keys().length === 0) { + return false; + } else { + return true; + } + }; + + Jobber.prototype.totalPercentageComplete = function() { + return Math.round(this.completedEvents / this.totalEvents * 100); + }; + + Jobber.prototype.updateProgessEventInfo = function(mid, runNum) { + this.eventInfo.set(mid, runNum); + this.completedEvents = _.reduce(this.eventInfo.values(), function(memo, num) { + return memo + num; + }, 0); + return true; + }; + Jobber.prototype.processProgEvent = function(edata) { var data, eventInfo, hasChanges, mid, result, results, runNum; data = edata.data; @@ -635,6 +674,8 @@ } } results.push(result); + this.totalEvents = this.minions.keys().length * result['numEvents']; + this.updateProgessEventInfo(mid, result['runNum']); return this; }; @@ -682,10 +723,10 @@ result.fail = !result.success; this.fail = result.fail; if (result.success === true) { - result["return"] = data.ret; + result["return"] = data["return"]; } else { - result.error = data.ret; - this.errors.push(data.ret); + result.error = data["return"]; + this.errors.push(data["return"]); } console.log("Run/Wheel Done. Fail = " + this.fail); console.log(this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/halite-0.1.07/halite/app/view/console.html new/halite-0.1.08/halite/app/view/console.html --- old/halite-0.1.07/halite/app/view/console.html 2013-11-18 21:44:57.000000000 +0100 +++ new/halite-0.1.08/halite/app/view/console.html 2013-11-26 01:44:01.000000000 +0100 @@ -369,34 +369,35 @@ </button> </span> </div> + <div class="height-controlled" ng-if="job.fail"> + <ss-progress percentage="{{job.totalPercentageComplete()}}" ng-if="job.hasNestedProgressEvents()"></ss-progress> + </div> <div class="clearfix"></div> <div class="box top-border bottom-border animate-fade" ng-show="jobMode"> <div class="col-md-12 " ng-if="jobMode == 'result'"> <kvl class="row" ng-repeat="result in job.results.values()"> <kvi> - <div class="col-md-6"> - <span class="label" ng-class="result.done?'label-info':'label-primary'"> - {{result.id}} - </span>  - <span class="badge" ng-class="result.fail?'badge-danger':'badge-success'"> - <i ng-if="result.retcode == null" class="fa-icon-certificate icon-white"></i> - <b ng-if="result.retcode != null">{{result.retcode}}</b> - </span>  - <span ng-repeat="ensual in result.results()" - ng-include="'ensual_nested.html'"> + <span class="label" ng-class="result.done?'label-info':'label-primary'"> + {{result.id}} + </span>  + <span class="badge" ng-class="result.fail?'badge-danger':'badge-success'"> + <i ng-if="result.retcode == null" class="fa-icon-certificate icon-white"></i> + <b ng-if="result.retcode != null">{{result.retcode}}</b> + </span>   + <span ng-hide="result.done"> + <span ng-if="job.hasProgressEvents(result.id)"> + <span class="badge badge-{{job.currentState(result.id)}}">{{job.getCurrentRunNumber(result.id)}}</span> + <span>of</span> + <span class="badge badge-info">{{job.totalProgEvents(result.id)}}</span> </span> - </div> - <div class="col-md-1" ng-if="job.hasProgressEvents(result.id)"> - <span class="badge badge-{{job.currentState(result.id)}}">{{job.getCurrentRunNumber(result.id)}}</span> - <span>of</span> - <span class="badge badge-info">{{job.totalProgEvents(result.id)}}</span> - </div> - <div class="col-md-2 height-controlled"> <ss-progress ng-if="job.hasProgressEvents(result.id)" percentage="{{job.getPercentageComplete(result.id)}}"></ss-progress> - </div> - <div class="col-md-3" ng-if="job.hasProgressEvents(result.id)"> - <p class="text-{{job.currentState(result.id)}}">{{job.getLatestComment(result.id)|truncate:40}}</p> - </div> + <span ng-if="job.hasProgressEvents(result.id)"> + <span class="text-{{job.currentState(result.id)}}">{{job.getLatestComment(result.id)|truncate:40}}</span> + </span> + </span> + <span ng-repeat="ensual in result.results()" + ng-include="'ensual_nested.html'"> + </span> </kvi> </kvl> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/halite-0.1.07/halite/app/view/console.js new/halite-0.1.08/halite/app/view/console.js --- old/halite-0.1.07/halite/app/view/console.js 2013-11-18 22:10:29.000000000 +0100 +++ new/halite-0.1.08/halite/app/view/console.js 2013-11-27 18:02:51.000000000 +0100 @@ -590,9 +590,6 @@ $scope.docKeys = []; $scope.docSearchResults = ''; $scope.docs = {}; - $scope.getPercentageComplete = function(job, mid) { - return job.getPercentageComplete(mid); - }; $scope.searchDocs = function() { var key, matching, matchingDocs; if (($scope.command.cmd.fun == null) || !$scope.docSearch || $scope.command.cmd.fun === '') { @@ -657,6 +654,7 @@ result = (_ref = data["return"]) != null ? _ref[0] : void 0; if (result) { job = $scope.startJob(result, command); + job.resolveOnAnyPass = true; job.commit($q).then($scope.fetchDocsDone, $scope.fetchDocsFailed); return true; } @@ -665,18 +663,16 @@ }); return true; }; - $scope.startWheel = function(tag, cmd) { + $scope.startWheel = function(data, cmd) { var jid, job, parts; - console.log("Start Wheel " + ($scope.humanize(cmd))); - console.log(tag); - parts = tag.split("/"); + parts = data.tag.split("/"); jid = parts[2]; job = $scope.snagWheel(jid, cmd); return job; }; - $scope.startRun = function(tag, cmd) { + $scope.startRun = function(data, cmd) { var jid, job, parts; - parts = tag.split("/"); + parts = data.tag.split("/"); jid = parts[2]; job = $scope.snagRunner(jid, cmd); return job; @@ -702,6 +698,8 @@ job.processRetEvent(data); job.checkDone(); } else if (kind === 'prog') { + minion = $scope.snagMinion(data.id); + job.linkMinion(minion); job.processProgEvent(edata); } return job; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/halite-0.1.07/halite.egg-info/PKG-INFO new/halite-0.1.08/halite.egg-info/PKG-INFO --- old/halite-0.1.07/halite.egg-info/PKG-INFO 2013-11-18 22:11:11.000000000 +0100 +++ new/halite-0.1.08/halite.egg-info/PKG-INFO 2013-11-27 18:08:33.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: halite -Version: 0.1.07 +Version: 0.1.08 Summary: SaltStack Web UI Home-page: https://github.com/saltstack/halite Author: SaltStack Inc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/halite-0.1.07/setup.py new/halite-0.1.08/setup.py --- old/halite-0.1.07/setup.py 2013-11-18 22:10:20.000000000 +0100 +++ new/halite-0.1.08/setup.py 2013-11-27 17:59:42.000000000 +0100 @@ -11,7 +11,7 @@ setup( name = 'halite', - version = '0.1.07', + version = '0.1.08', description = 'SaltStack Web UI', url = 'https://github.com/saltstack/halite', author='SaltStack Inc', -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org