Merge lp:~sergiusens/snapweb/profileUnconfinedNoScrubSnappy into lp:~stephen-stewart/snapweb/npm-shrinkwrap

[Sergio Schvezov]

Allowing snappy unpack to work by no scrubbing the env in the apparmor profile

Unmerged revisions

=== modified file 'package.json'
--- package.json	2015-05-28 19:37:45 +0000
+++ package.json	2015-05-29 20:57:09 +0000
@@ -39,7 +39,7 @@
     "normalize.css": "^3.0.3",
     "postcss-bem-linter": "^0.3.0",
     "postcss-custom-media": "^3.0.0",
-    "pretty-bytes": "^1.0.4",
+    "pretty-bytes": "^2.0.1",
     "vinyl-buffer": "~1.0.0",
     "vinyl-source-stream": "~1.1.0",
     "watchify": "~3.1.2"

=== modified file 'pkg/meta/package.yaml'
--- pkg/meta/package.yaml	2015-05-08 19:21:46 +0000
+++ pkg/meta/package.yaml	2015-05-29 20:57:09 +0000
@@ -3,7 +3,7 @@
 icon: meta/webdm-icon.png
 source: lp:webdm
 type: framework
-version: 0.6.1
+version: 0.7
 architecture: UNKNOWN_ARCH
 services:
     - name: snappyd

=== modified file 'pkg/meta/readme.md'
--- pkg/meta/readme.md	2014-11-27 11:36:50 +0000
+++ pkg/meta/readme.md	2015-05-29 20:57:09 +0000
@@ -1,6 +1,6 @@
-# Snappyd
+# Ubuntu Core Snappy Device Manager
 
-This service allows you to manage your core device from a web interface.
+This service allows you to manage your Ubuntu Core device from a web interface or REST API.
 
 Features include:
 

=== modified file 'pkg/meta/snappyd.profile'
--- pkg/meta/snappyd.profile	2015-05-08 20:15:01 +0000
+++ pkg/meta/snappyd.profile	2015-05-29 20:57:09 +0000
@@ -64,7 +64,7 @@
 
 
   # snappy unpack
-  /usr/bin/snappy                                                 Uxr,
+  /usr/bin/snappy                                                 uxr,
 
   # snappy tty change
   /dev/tty                                                          r,

=== added file 'www/src/css/button.css'
--- www/src/css/button.css	1970-01-01 00:00:00 +0000
+++ www/src/css/button.css	2015-05-29 20:57:09 +0000
@@ -0,0 +1,50 @@
+/** @define b-button; weak */
+
+.b-button__group {
+  display:flex;
+}
+
+.b-button__group + .b-button__group {
+  margin-left:8px;
+}
+
+.b-button__group > * {
+  padding:3px 10px;
+}
+
+.b-button__group .b-button {
+  border:1px solid #ccc;
+  border-radius:3px;
+  background-color:#efefef;
+  color:#666;
+  user-select: none;
+  cursor: pointer;
+}
+
+.b-button__group .b-button_active {
+  background-color:#fff;
+}
+
+.b-button__group .b-button:hover {
+  background-color:#fff;
+}
+
+.b-button__group .b-button:nth-of-type(1) {
+  border-right:none;
+  border-top-right-radius:0;
+  border-bottom-right-radius:0;
+}
+
+.b-button__group .b-button:nth-last-of-type(1) {
+  border-top-left-radius:0;
+  border-bottom-left-radius:0;
+}
+
+.b-button__group .b-button:not(:nth-of-type(1)):not(:nth-last-of-type(1)) {
+  border-right:none;
+  border-radius:0;
+}
+
+.b-button__group .b-button:nth-of-type(1):nth-last-of-type(1) {
+  border-radius:3px;
+}

=== modified file 'www/src/css/headline.css'
--- www/src/css/headline.css	2015-05-22 12:46:22 +0000
+++ www/src/css/headline.css	2015-05-29 20:57:09 +0000
@@ -3,7 +3,13 @@
 .b-headline {
 }
 
+.b-headline .b-layout__container {
+  display:flex;
+  align-items: baseline;
+}
+
 .b-headline__h1 {
+  flex:1;
   font-size:18px;
   font-weight:400;
   margin:20px 15px 5px 15px;

=== modified file 'www/src/css/icon.css'
--- www/src/css/icon.css	2015-05-21 16:11:37 +0000
+++ www/src/css/icon.css	2015-05-29 20:57:09 +0000
@@ -15,6 +15,7 @@
   background-repeat:no-repeat;
   background-position:50% 50%;
   background-size:100% 100%;
+  z-index:10;
 }
 
 .b-icon img {

=== modified file 'www/src/css/snap.css'
--- www/src/css/snap.css	2015-05-22 15:21:34 +0000
+++ www/src/css/snap.css	2015-05-29 20:57:09 +0000
@@ -63,5 +63,5 @@
 }
 
 .b-snap__tab-content {
-  padding:1.3em 3em 1.3em;
+  padding:1.3em 0;
 }

=== modified file 'www/src/css/snaplist.css'
--- www/src/css/snaplist.css	2015-05-22 12:46:22 +0000
+++ www/src/css/snaplist.css	2015-05-29 20:57:09 +0000
@@ -5,9 +5,13 @@
 
 .b-snaplist__item {
   cursor: pointer;
-  font-size:0;
 }
 
+.b-snaplist__actions {
+  display:flex;
+  font-size: 11px;
+  justify-content: flex-end;
+}
 
 /** grid style **/
 
@@ -19,6 +23,13 @@
 .b-snaplist_grid .b-snaplist__item {
   flex: 0 1 auto;
   padding:7px;
+  font-size:0;
+}
+
+.b-snaplist_grid .b-snaplist__item * {
+  font-size: 12px;
+  color:#999;
+  text-align: center;
 }
 
 .b-snaplist_grid .b-snaplist__name {
@@ -26,8 +37,6 @@
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  font-size:12px;
-  color:#999;
   margin-top:4px;
 }
 
@@ -36,7 +45,25 @@
   width:90px;
 }
 
-.b-snaplist_grid .b-snaplist__name ~ * {
+.b-snaplist_grid :not(.b-snaplist__item-app) .b-icon::after {
+  content: attr(data-type);
+  position:absolute;
+  width:100%;
+  bottom:0;
+  left:0;
+  right:0;
+  background: rgba(221,72,20,0.8);
+  color:#fff;
+  z-index:0;
+  padding:3px 0 5px;
+  text-transform:uppercase;
+  font-size:10px;
+}
+
+.b-snaplist_grid .b-snaplist__version,
+.b-snaplist_grid .b-snaplist__type,
+.b-snaplist_grid .b-snaplist__origin,
+.b-snaplist_grid .b-snaplist__actions {
   display:none;
 }
 
@@ -61,7 +88,7 @@
 /** row style **/
 
 .b-snaplist_row {
-  margin:3em;
+  margin:1em 0;
 }
 
 .b-snaplist_row .b-snaplist__item {
@@ -88,6 +115,7 @@
   background-image: url(/public/images/icon-mask-on-white.png);
 }
 
+
 .b-snaplist_row .b-icon img {
   display:block;
   width: 40px;

=== modified file 'www/src/js/collections/snaplist.js'
--- www/src/js/collections/snaplist.js	2015-04-24 11:15:41 +0000
+++ www/src/js/collections/snaplist.js	2015-05-29 20:57:09 +0000
@@ -7,5 +7,8 @@
 
 module.exports = Backbone.Collection.extend({
   url: CONF.PACKAGES,
-  model: Snap
+  model: Snap,
+  comparator: function(model) {
+    return model.get('name');
+  }
 });

=== modified file 'www/src/js/controllers/store.js'
--- www/src/js/controllers/store.js	2015-04-24 11:15:41 +0000
+++ www/src/js/controllers/store.js	2015-05-29 20:57:09 +0000
@@ -2,14 +2,14 @@
 var Marionette = require('backbone.marionette');
 var Radio = require('backbone.radio');
 var StoreLayoutView = require('../views/store.js');
-var Bask = require('../collections/snaplist.js');
+var Snaplist = require('../collections/snaplist.js');
 
 module.exports = {
   index: function() {
     var chan = Radio.channel('root');
-    var storeBask = new Bask();
+    var storeSnaplist = new Snaplist();
 
-    storeBask.fetch({
+    storeSnaplist.fetch({
       success: function(snaplist) {
         var view =  new StoreLayoutView({
           collection: snaplist

=== modified file 'www/src/js/templates/home.hbs'
--- www/src/js/templates/home.hbs	2015-05-22 12:46:22 +0000
+++ www/src/js/templates/home.hbs	2015-05-29 20:57:09 +0000
@@ -1,6 +1,1 @@
-<div class="b-headline">
-  <div class="b-layout__container">
-    <h1 class="b-headline__h1">Installed snaps</h1>
-  </div>
-</div>
 <div class="region-installed"></div>

=== modified file 'www/src/js/templates/snap-detail.hbs'
--- www/src/js/templates/snap-detail.hbs	2015-05-26 11:30:56 +0000
+++ www/src/js/templates/snap-detail.hbs	2015-05-29 20:57:09 +0000
@@ -0,0 +1,9 @@
+{{#if description}}
+<p>{{ description }}</p>
+{{/if}}
+{{#if prettyInstalledSize}}
+<p>Installed size: {{prettyInstalledSize}}</p>
+{{/if}}
+{{#if prettyDownloadSize}}
+<p>Download size: {{prettyDownloadSize}}</p>
+{{/if}}

=== modified file 'www/src/js/templates/snap-layout.hbs'
--- www/src/js/templates/snap-layout.hbs	2015-05-22 15:21:34 +0000
+++ www/src/js/templates/snap-layout.hbs	2015-05-29 20:57:09 +0000
@@ -16,4 +16,6 @@
   </div>
 </div>
 <div class="region-menu"></div>
-<div class="region-tab"></div>
+<div class="b-layout__container">
+  <div class="region-tab"></div>
+</div>

=== modified file 'www/src/js/templates/snaplist-item.hbs'
--- www/src/js/templates/snaplist-item.hbs	2015-05-21 16:11:37 +0000
+++ www/src/js/templates/snaplist-item.hbs	2015-05-29 20:57:09 +0000
@@ -1,11 +1,12 @@
-<div class="b-icon">
+<div class="b-icon" data-type="{{type}}">
   <img src="{{ icon }}" width="90" height="90">
 </div>
 <div class="b-snaplist__name">{{ name }}</div>
 {{!-- only name is shown in grid view, everything after is hidden --}}
+<div class="b-snaplist__size" title="Installed file size">{{ prettyInstalledSize }}</div>
 <div class="b-snaplist__version">{{ version }}</div>
+<div class="b-snaplist__type">{{ type }}</div>
 <div class="b-snaplist__origin">{{ origin }}</div>
-<div class="b-snaplist__type">{{ type }}</div>
 <div class="b-snaplist__actions">
   {{> installer}}
 </div>

=== added file 'www/src/js/templates/snaplist.hbs'
--- www/src/js/templates/snaplist.hbs	1970-01-01 00:00:00 +0000
+++ www/src/js/templates/snaplist.hbs	2015-05-29 20:57:09 +0000
@@ -0,0 +1,23 @@
+{{#if title}}
+<div class="b-headline">
+  <div class="b-layout__container">
+    <h1 class="b-headline__h1">{{ title }}</h1>
+    <div class="b-snaplist__actions">
+      {{#if canSort}}
+      <div class="b-button__group">
+        <div id="sortAlpha" class="b-button b-button_small{{#if isAlpha}} b-button_active{{/if}}">A-Z</div>
+        <div id="sortBytes" class="b-button b-button_small{{#unless isAlpha}} b-button_active{{/unless}}">kB</div>
+      </div>
+      {{/if}}
+      {{#if canStyle}}
+      <div class="b-button__group">
+        <div id="styleGrid" class="b-button b-button_small{{#if isGrid}} b-button_active{{/if}}">Grid</div>
+        <div id="styleRow" class="b-button b-button_small{{#unless isGrid}} b-button_active{{/unless}}">Row</div>
+      </div>
+      {{/if}}
+    </div>
+  </div>
+</div>
+{{/if}}
+<div class="b-snaplist b-snaplist_{{#if isGrid}}grid{{else}}row{{/if}}">
+</div>

=== modified file 'www/src/js/templates/store.hbs'
--- www/src/js/templates/store.hbs	2015-05-21 16:11:37 +0000
+++ www/src/js/templates/store.hbs	2015-05-29 20:57:09 +0000
@@ -1,1 +1,1 @@
-<div class="region-product"></div>
+<div class="region-snaplist"></div>

=== added file 'www/src/js/templates/storelist-item.hbs'
--- www/src/js/templates/storelist-item.hbs	1970-01-01 00:00:00 +0000
+++ www/src/js/templates/storelist-item.hbs	2015-05-29 20:57:09 +0000
@@ -0,0 +1,11 @@
+<div class="b-icon" data-type="{{type}}">
+  <img src="{{ icon }}" width="90" height="90">
+</div>
+<div class="b-snaplist__name">{{ name }}</div>
+{{!-- only name is shown in grid view, everything after is hidden --}}
+<div class="b-snaplist__version">{{ version }}</div>
+<div class="b-snaplist__type">{{ type }}</div>
+<div class="b-snaplist__origin">{{ origin }}</div>
+<div class="b-snaplist__actions">
+  {{> installer}}
+</div>

=== modified file 'www/src/js/views/home.js'
--- www/src/js/views/home.js	2015-05-22 12:46:22 +0000
+++ www/src/js/views/home.js	2015-05-29 20:57:09 +0000
@@ -1,7 +1,7 @@
 // home view
 var Backbone = require('backbone');
 var Marionette = require('backbone.marionette');
-var BaskView = require('./snaplist.js');
+var SnapListView = require('./snaplist.js');
 var template = require('../templates/home.hbs');
 
 module.exports = Backbone.Marionette.LayoutView.extend({
@@ -14,9 +14,15 @@
 
   onBeforeShow: function() {
     // TODO if collection empty use emptyView
-    this.showChildView('installedRegion', new BaskView({
-      collection: this.collection,
-      style: 'grid'
+    this.showChildView('installedRegion', new SnapListView({
+      model: new Backbone.Model({
+        title: 'Installed snaps',
+        isGrid: true,
+        isAlpha: true,
+        canSort: true,
+        canStyle: true
+      }),
+      collection: this.collection
     }));
   },
 

=== modified file 'www/src/js/views/snaplist-item.js'
--- www/src/js/views/snaplist-item.js	2015-05-08 14:53:07 +0000
+++ www/src/js/views/snaplist-item.js	2015-05-29 20:57:09 +0000
@@ -13,7 +13,14 @@
 
 module.exports = Marionette.ItemView.extend({
 
-  className: 'b-snaplist__item',
+  className: function() {
+    var type = this.model.get('type');
+    var className = 'b-snaplist__item';
+    if (type) {
+      className += ' b-snaplist__item-' + type;
+    }
+    return className;
+  },
 
   template: function(model) {
     return template(model);

=== modified file 'www/src/js/views/snaplist.js'
--- www/src/js/views/snaplist.js	2015-05-08 20:03:48 +0000
+++ www/src/js/views/snaplist.js	2015-05-29 20:57:09 +0000
@@ -1,21 +1,72 @@
 // snaplist view
 var _ = require('lodash');
+var $ = require('jquery');
 var Backbone = require('backbone');
+Backbone.$ = $;
 var Marionette = require('backbone.marionette');
 var SnaplistItemView = require('../views/snaplist-item.js');
 var EmptySnaplistView = require('./empty-snaplist.js');
+var template = require('../templates/snaplist.hbs');
 var CONF = require('../config.js');
 
-module.exports = Marionette.CollectionView.extend({
-
-  className: function() {
-    var style = this.options.style || 'row';
-
-    if (style === 'row') {
-      return 'b-snaplist b-snaplist_row';
-    } else if (style === 'grid') {
-      return 'b-snaplist b-snaplist_grid';
-    }
+module.exports = Marionette.CompositeView.extend({
+
+  childViewContainer: '.b-snaplist',
+
+  template : function(model) {
+    return template(model);
+  },
+
+  ui: {
+    'sortAlpha': '#sortAlpha',
+    'sortBytes': '#sortBytes',
+    'styleRow': '#styleRow',
+    'styleGrid': '#styleGrid'
+  },
+
+  events: {
+    'click @ui.sortBytes':  'sortBytes',
+    'click @ui.sortAlpha':  'sortAlpha',
+    'click @ui.styleRow':   'styleRow',
+    'click @ui.styleGrid':  'styleGrid'
+  },
+
+  sortAlpha: function() {
+    this.model.set('isAlpha', true);
+    this.viewComparator = function(model) {
+      return model.get('name');
+    };
+    this.render();
+  },
+
+  sortBytes: function() {
+    this.model.set('isAlpha', false);
+    this.viewComparator = function(model) {
+      return -model.get('installed_size');
+    };
+    this.render();
+  },
+
+  styleGrid: function() {
+    this.model.set('isGrid', true);
+
+    this.$('.b-snaplist')
+    .removeClass('b-snaplist_row')
+    .addClass('b-snaplist_grid');
+
+    this.$('#styleRow').removeClass('b-button_active');
+    this.$('#styleGrid').addClass('b-button_active');
+  },
+
+  styleRow: function() {
+    this.model.set('isGrid', false);
+
+    this.$('.b-snaplist')
+    .removeClass('b-snaplist_grid')
+    .addClass('b-snaplist_row');
+
+    this.$('#styleGrid').removeClass('b-button_active');
+    this.$('#styleRow').addClass('b-button_active');
   },
 
   childView: SnaplistItemView,

=== modified file 'www/src/js/views/store.js'
--- www/src/js/views/store.js	2015-04-24 20:47:44 +0000
+++ www/src/js/views/store.js	2015-05-29 20:57:09 +0000
@@ -1,22 +1,31 @@
 // store layout view
 var Backbone = require('backbone');
 var Marionette = require('backbone.marionette');
-var BaskView = require('./snaplist.js');
+var StorelistView = require('./storelist.js');
 var template = require('../templates/store.hbs');
 
 module.exports = Backbone.Marionette.LayoutView.extend({
 
+  className: 'b-layout__container',
+
   template : function() {
     return template();
   },
 
   onBeforeShow: function() {
-    this.showChildView('productRegion', new BaskView({
+    this.showChildView('store', new StorelistView({
+      model: new Backbone.Model({
+        title: 'Store snaps',
+        isGrid: false,
+        isAlpha: true,
+        canSort: false,
+        canStyle: true
+      }),
       collection: this.collection
     }));
   },
 
   regions: {
-    productRegion: '.region-product'
+    store: '.region-snaplist'
   }
 });

=== added file 'www/src/js/views/storelist-item.js'
--- www/src/js/views/storelist-item.js	1970-01-01 00:00:00 +0000
+++ www/src/js/views/storelist-item.js	2015-05-29 20:57:09 +0000
@@ -0,0 +1,10 @@
+// store list item view
+
+var SnapListItemView = require('./snaplist-item.js');
+var template = require('../templates/storelist-item.hbs');
+
+module.exports = SnapListItemView.extend({
+  template: function(model) {
+    return template(model);
+  }
+});

=== added file 'www/src/js/views/storelist.js'
--- www/src/js/views/storelist.js	1970-01-01 00:00:00 +0000
+++ www/src/js/views/storelist.js	2015-05-29 20:57:09 +0000
@@ -0,0 +1,7 @@
+// storelist view
+var Snaplist = require('./snaplist.js');
+var StorelistItemView = require('./storelist-item.js');
+
+module.exports = Snaplist.extend({
+  childView: StorelistItemView
+});

=== modified file 'www/tests/snapItemViewSpec.js'
--- www/tests/snapItemViewSpec.js	2015-05-05 14:40:14 +0000
+++ www/tests/snapItemViewSpec.js	2015-05-29 20:57:09 +0000
@@ -1,10 +1,15 @@
 var Backbone = require('backbone');
+var Snap = require('../src/js/models/snap.js');
 var SnapItemView = require('../src/js/views/snaplist-item.js');
 
 describe('SnapItemView', function() {
 
   beforeEach(function() {
-    this.view = new SnapItemView();
+    this.view = new SnapItemView({
+      model: new Snap({
+        id: 'foo'
+      })
+    });
   });
 
   afterEach(function() {
@@ -16,4 +21,11 @@
     expect(this.view).toEqual(jasmine.any(Backbone.View));
   });
 
+  it('should have a b-snaplist className with type modifier when present in model', function() {
+    this.view.model.unset('type');
+    expect(this.view.className()).toBe('b-snaplist__item');
+    this.view.model.set('type', 'foo');
+    expect(this.view.className()).toBe('b-snaplist__item b-snaplist__item-foo');
+  });
+
 });