Settings
diff --git a/lib/gui/scss/components/_modal.scss b/lib/gui/scss/components/_modal.scss
index 4f6b25c7..19d17ae3 100644
--- a/lib/gui/scss/components/_modal.scss
+++ b/lib/gui/scss/components/_modal.scss
@@ -93,6 +93,18 @@
padding-right: 0 !important;
}
+.modal-fat-and-short {
+ width: 400px;
+
+ // Move it a bit to the top for
+ // aesthetic reasons
+ margin-top: -10px;
+
+ .modal-content {
+ height: 245px;
+ }
+}
+
.modal-footer {
flex-grow: 0;
border: 0;
@@ -101,3 +113,18 @@
.modal .btn-primary[disabled] {
background-color: darken($gray-lighter, 10%);
}
+
+// Center the modal using Flexbox so we can
+// freely use any height.
+
+.modal {
+ display: flex !important;
+ justify-content: center;
+ align-items: center;
+}
+
+.modal-dialog {
+ margin: 0;
+ position: initial;
+}
+
diff --git a/lib/gui/scss/main.scss b/lib/gui/scss/main.scss
index fc8a831b..27791f2a 100644
--- a/lib/gui/scss/main.scss
+++ b/lib/gui/scss/main.scss
@@ -41,10 +41,12 @@ $alert-padding: 13px;
@import "./components/caption";
@import "./components/button";
@import "./components/tick";
-@import "../components/progress-button/styles/progress-button";
-@import "../components/svg-icon/styles/svg-icon";
@import "./components/modal";
@import "./components/alert-ribbon";
+@import "../components/update-notifier/styles/update-notifier";
+@import "../components/progress-button/styles/progress-button";
+@import "../components/svg-icon/styles/svg-icon";
+@import "../pages/settings/styles/settings";
.icon-caption {
@extend .caption;
diff --git a/lib/gui/scss/modules/_bootstrap.scss b/lib/gui/scss/modules/_bootstrap.scss
index b31e0893..31f4bfae 100644
--- a/lib/gui/scss/modules/_bootstrap.scss
+++ b/lib/gui/scss/modules/_bootstrap.scss
@@ -28,10 +28,6 @@ html {
margin-right: 2px;
}
-.checkbox input[type="checkbox"]:not(:checked) + * {
- color: $gray-light;
-}
-
// Disable modal opacity
.modal-backdrop.in {
opacity: 0;
diff --git a/lib/gui/utils/manifest-bind/directives/manifest-bind.js b/lib/gui/utils/manifest-bind/directives/manifest-bind.js
index 6326c458..0af162ae 100644
--- a/lib/gui/utils/manifest-bind/directives/manifest-bind.js
+++ b/lib/gui/utils/manifest-bind/directives/manifest-bind.js
@@ -16,9 +16,6 @@
'use strict';
-const _ = require('lodash');
-const packageJSON = require('../../../../../package.json');
-
/**
* @summary ManifestBind directive
* @function
@@ -28,17 +25,18 @@ const packageJSON = require('../../../../../package.json');
* This directive provides an attribute to bind the current
* element value to a property in `package.json`.
*
+ * @param {Object} ManifestBindService - ManifestBindService
* @returns {Object} directive
*
* @example
*
*/
-module.exports = function() {
+module.exports = function(ManifestBindService) {
return {
restrict: 'A',
scope: false,
link: function(scope, element, attributes) {
- const value = _.get(packageJSON, attributes.manifestBind);
+ const value = ManifestBindService.get(attributes.manifestBind);
if (!value) {
throw new Error('ManifestBind: Unknown property `' + attributes.manifestBind + '`');
diff --git a/lib/gui/utils/manifest-bind/manifest-bind.js b/lib/gui/utils/manifest-bind/manifest-bind.js
index 9c097c81..0fc303b8 100644
--- a/lib/gui/utils/manifest-bind/manifest-bind.js
+++ b/lib/gui/utils/manifest-bind/manifest-bind.js
@@ -27,6 +27,7 @@
const angular = require('angular');
const MODULE_NAME = 'Etcher.Utils.ManifestBind';
const ManifestBind = angular.module(MODULE_NAME, []);
+ManifestBind.service('ManifestBindService', require('./services/manifest-bind'));
ManifestBind.directive('manifestBind', require('./directives/manifest-bind'));
module.exports = MODULE_NAME;
diff --git a/lib/gui/utils/manifest-bind/services/manifest-bind.js b/lib/gui/utils/manifest-bind/services/manifest-bind.js
new file mode 100644
index 00000000..4a21adf2
--- /dev/null
+++ b/lib/gui/utils/manifest-bind/services/manifest-bind.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2016 Resin.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+'use strict';
+
+const _ = require('lodash');
+const packageJSON = require('../../../../../package.json');
+
+module.exports = function() {
+
+ /**
+ * @summary Get a package.json property
+ * @function
+ * @public
+ *
+ * @param {String} attribute - attribute
+ * @returns {*} property value
+ *
+ * @example
+ * const version = ManifestBindService.get('version');
+ */
+ this.get = function(attribute) {
+ return _.get(packageJSON, attribute);
+ };
+
+};
diff --git a/package.json b/package.json
index f91ecbbe..fce8c66e 100644
--- a/package.json
+++ b/package.json
@@ -65,10 +65,12 @@
"resin-cli-errors": "^1.2.0",
"resin-cli-form": "^1.4.1",
"resin-cli-visuals": "^1.2.8",
+ "semver": "^5.1.0",
"sudo-prompt": "^3.1.0",
"trackjs": "^2.1.16",
"umount": "^1.1.3",
"username": "^2.1.0",
+ "xml2js": "^0.4.16",
"yargs": "^4.6.0"
},
"devDependencies": {
diff --git a/tests/gui/components/update-notifier.spec.js b/tests/gui/components/update-notifier.spec.js
new file mode 100644
index 00000000..62c30ea9
--- /dev/null
+++ b/tests/gui/components/update-notifier.spec.js
@@ -0,0 +1,325 @@
+
+'use strict';
+
+const m = require('mochainon');
+const angular = require('angular');
+require('angular-mocks');
+
+describe('Browser: UpdateNotifier', function() {
+
+ beforeEach(angular.mock.module(
+ require('../../../lib/gui/components/update-notifier/update-notifier')
+ ));
+
+ describe('UpdateNotifierService', function() {
+
+ describe('.shouldCheckForUpdates()', function() {
+
+ let UpdateNotifierService;
+ let SettingsModel;
+ let UPDATE_NOTIFIER_SLEEP_TIME;
+
+ beforeEach(angular.mock.inject(function(_UpdateNotifierService_, _SettingsModel_, _UPDATE_NOTIFIER_SLEEP_TIME_) {
+ UpdateNotifierService = _UpdateNotifierService_;
+ SettingsModel = _SettingsModel_;
+ UPDATE_NOTIFIER_SLEEP_TIME = _UPDATE_NOTIFIER_SLEEP_TIME_;
+ }));
+
+ describe('given the `sleepUpdateCheck` is disabled', function() {
+
+ beforeEach(function() {
+ SettingsModel.data.sleepUpdateCheck = false;
+ });
+
+ it('should return true', function() {
+ const result = UpdateNotifierService.shouldCheckForUpdates();
+ m.chai.expect(result).to.be.true;
+ });
+
+ });
+
+ describe('given the `sleepUpdateCheck` is enabled', function() {
+
+ beforeEach(function() {
+ SettingsModel.data.sleepUpdateCheck = true;
+ });
+
+ describe('given the `lastUpdateNotify` was never updated', function() {
+
+ beforeEach(function() {
+ SettingsModel.data.lastUpdateNotify = undefined;
+ });
+
+ it('should return true', function() {
+ const result = UpdateNotifierService.shouldCheckForUpdates();
+ m.chai.expect(result).to.be.true;
+ });
+
+ });
+
+ describe('given the `lastUpdateNotify` was very recently updated', function() {
+
+ beforeEach(function() {
+ SettingsModel.data.lastUpdateNotify = Date.now() + 1000;
+ });
+
+ it('should return false', function() {
+ const result = UpdateNotifierService.shouldCheckForUpdates();
+ m.chai.expect(result).to.be.false;
+ });
+
+ });
+
+ describe('given the `lastUpdateNotify` was updated long ago', function() {
+
+ beforeEach(function() {
+ SettingsModel.data.lastUpdateNotify = Date.now() + UPDATE_NOTIFIER_SLEEP_TIME + 1;
+ });
+
+ it('should return true', function() {
+ const result = UpdateNotifierService.shouldCheckForUpdates();
+ m.chai.expect(result).to.be.true;
+ });
+
+ it('should unset the `sleepUpdateCheck` setting', function() {
+ m.chai.expect(SettingsModel.data.sleepUpdateCheck).to.be.true;
+ UpdateNotifierService.shouldCheckForUpdates();
+ m.chai.expect(SettingsModel.data.sleepUpdateCheck).to.be.false;
+ });
+
+ });
+
+ });
+
+ });
+
+ describe('.isLatestVersion()', function() {
+
+ describe('given the latest version is equal to the current version', function() {
+
+ let $q;
+ let $rootScope;
+ let UpdateNotifierService;
+ let ManifestBindService;
+
+ beforeEach(function() {
+ angular.mock.module(function($provide) {
+ $provide.value('UpdateNotifierS3Service', {
+ getLatestVersion: function() {
+ return $q.resolve(ManifestBindService.get('version'));
+ }
+ });
+ });
+ });
+
+ beforeEach(angular.mock.inject(function(_$q_, _$rootScope_, _UpdateNotifierService_, _ManifestBindService_) {
+ $q = _$q_;
+ $rootScope = _$rootScope_;
+ UpdateNotifierService = _UpdateNotifierService_;
+ ManifestBindService = _ManifestBindService_;
+ }));
+
+ it('should resolve true', function() {
+ let result = null;
+
+ UpdateNotifierService.isLatestVersion().then(function(isLatestVersion) {
+ result = isLatestVersion;
+ });
+
+ $rootScope.$apply();
+ m.chai.expect(result).to.be.true;
+ });
+
+ });
+
+ describe('given the latest version is greater than the current version', function() {
+
+ let $q;
+ let $rootScope;
+ let UpdateNotifierService;
+
+ beforeEach(function() {
+ angular.mock.module(function($provide) {
+ $provide.value('UpdateNotifierS3Service', {
+ getLatestVersion: function() {
+ return $q.resolve('99999.9.9');
+ }
+ });
+ });
+ });
+
+ beforeEach(angular.mock.inject(function(_$q_, _$rootScope_, _UpdateNotifierService_) {
+ $q = _$q_;
+ $rootScope = _$rootScope_;
+ UpdateNotifierService = _UpdateNotifierService_;
+ }));
+
+ it('should resolve false', function() {
+ let result = null;
+
+ UpdateNotifierService.isLatestVersion().then(function(isLatestVersion) {
+ result = isLatestVersion;
+ });
+
+ $rootScope.$apply();
+ m.chai.expect(result).to.be.false;
+ });
+
+ });
+
+ describe('given the latest version is less than the current version', function() {
+
+ let $q;
+ let $rootScope;
+ let UpdateNotifierService;
+
+ beforeEach(function() {
+ angular.mock.module(function($provide) {
+ $provide.value('UpdateNotifierS3Service', {
+ getLatestVersion: function() {
+ return $q.resolve('0.0.0');
+ }
+ });
+ });
+ });
+
+ beforeEach(angular.mock.inject(function(_$q_, _$rootScope_, _UpdateNotifierService_) {
+ $q = _$q_;
+ $rootScope = _$rootScope_;
+ UpdateNotifierService = _UpdateNotifierService_;
+ }));
+
+ it('should resolve true', function() {
+ let result = null;
+
+ UpdateNotifierService.isLatestVersion().then(function(isLatestVersion) {
+ result = isLatestVersion;
+ });
+
+ $rootScope.$apply();
+ m.chai.expect(result).to.be.true;
+ });
+
+ });
+
+ });
+
+ });
+
+ describe('UpdateNotifierS3Service', function() {
+
+ let UpdateNotifierS3Service;
+ let $rootScope;
+
+ beforeEach(angular.mock.inject(function(_$rootScope_, _UpdateNotifierS3Service_) {
+ $rootScope = _$rootScope_;
+ UpdateNotifierS3Service = _UpdateNotifierS3Service_;
+ }));
+
+ describe('given a mocked S3 XML response', function() {
+
+ let $httpBackend;
+ let UPDATE_NOTIFIER_URL;
+
+ beforeEach(angular.mock.inject(function($injector) {
+ $httpBackend = $injector.get('$httpBackend');
+ UPDATE_NOTIFIER_URL = $injector.get('UPDATE_NOTIFIER_URL');
+
+ $httpBackend.whenGET(UPDATE_NOTIFIER_URL).respond(`
+
+ resin-production-downloads
+
+
+ 1000
+ false
+
+ etcher/1.0.0-beta.0/Etcher-darwin-x64.dmg
+ 2016-03-10T17:34:21.000Z
+ "5a715255aa25686688bf1e23bc1d3fc6"
+ 46109720
+ STANDARD
+
+
+ etcher/1.0.0-beta.1/Etcher-darwin-x64.dmg
+ 2016-04-08T20:12:03.000Z
+ "cc1d6d9d53385e3edd099416fcd894c1"
+ 47071474
+ STANDARD
+
+
+ etcher/1.0.0-beta.2/Etcher-darwin-x64.dmg
+ 2016-04-08T19:03:18.000Z
+ "5f1849f7781197ce2ee6129c16bcd498"
+ 48650090
+ STANDARD
+
+
+ etcher/1.0.0-beta.3/Etcher-darwin-x64.dmg
+ 2016-04-18T01:32:09.000Z
+ "c173895886f44d115c66e7206ce3dff8"
+ 50585335
+ STANDARD
+
+
+ etcher/1.0.0-beta.3/Etcher-darwin-x64.zip
+ 2016-04-18T01:42:37.000Z
+ "e9f6e957e65373b232530215d98df141"
+ 129327442
+ STANDARD
+
+
+ etcher/1.0.0-beta.4/Etcher-darwin-x64.dmg
+ 2016-04-22T17:29:49.000Z
+ "bccb0024c58747a9b7516cbdfc5a7ecb"
+ 55240852
+ STANDARD
+
+
+ etcher/1.0.0-beta.4/Etcher-darwin-x64.zip
+ 2016-04-22T17:43:27.000Z
+ "c93e26e68b3c4f2b7e8e88e6befc8e64"
+ 135443284
+ STANDARD
+
+
+ etcher/1.0.0-beta.5/Etcher-darwin-x64.dmg
+ 2016-05-04T08:27:11.000Z
+ "fb596bfdb8bbaf09807b5fc4a940ce14"
+ 77757305
+ STANDARD
+
+
+ etcher/1.0.0-beta.5/Etcher-darwin-x64.zip
+ 2016-05-04T08:39:56.000Z
+ "3f11c1b6f06644f9ceb2aea4b1947fdf"
+ 157933876
+ STANDARD
+
+
+ `);
+ }));
+
+ afterEach(function() {
+ $httpBackend.verifyNoOutstandingExpectation();
+ $httpBackend.verifyNoOutstandingRequest();
+ });
+
+ it('should resolve the latest version', function() {
+ $httpBackend.expectGET(UPDATE_NOTIFIER_URL);
+
+ let latestVersion = null;
+ UpdateNotifierS3Service.getLatestVersion().then(function(result) {
+ latestVersion = result;
+ });
+
+ $rootScope.$apply();
+ $httpBackend.flush();
+
+ m.chai.expect(latestVersion).to.equal('1.0.0-beta.5');
+ });
+
+ });
+
+ });
+
+});
diff --git a/tests/gui/utils/manifest-bind.spec.js b/tests/gui/utils/manifest-bind.spec.js
index 550ea8ab..b0d26343 100644
--- a/tests/gui/utils/manifest-bind.spec.js
+++ b/tests/gui/utils/manifest-bind.spec.js
@@ -35,6 +35,31 @@ describe('Browser: ManifestBind', function() {
$rootScope = _$rootScope_;
}));
+ describe('ManifestBindService', function() {
+
+ let ManifestBindService;
+
+ beforeEach(angular.mock.inject(function(_ManifestBindService_) {
+ ManifestBindService = _ManifestBindService_;
+ }));
+
+ it('should be able to fetch top level properties', function() {
+ const value = ManifestBindService.get('version');
+ m.chai.expect(value).to.equal(packageJSON.version);
+ });
+
+ it('should be able to fetch nested properties', function() {
+ const value = ManifestBindService.get('repository.type');
+ m.chai.expect(value).to.equal(packageJSON.repository.type);
+ });
+
+ it('should return undefined if the property does not exist', function() {
+ const value = ManifestBindService.get('foo.bar');
+ m.chai.expect(value).to.be.undefined;
+ });
+
+ });
+
describe('manifestBind', function() {
it('should bind to top level properties', function() {