jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-23 19:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable ES6 in JSHint

Browse Source 
- Also rename `Promise` to `Bluebird` since now JSHint complains that
`Promise` is already defined.
This commit is contained in:
Juan Cruz Viotti 2016-01-22 10:53:16 -04:00
parent ee9a12dcca
commit f7ddce3000
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.jshintrc
View File

@ -19,6 +19,8 @@
// @author http://michael.haschke.biz/
// @license http://unlicense.org/
"esversion" : 6,
// == Enforcing Options ===============================================
//
// These options tell JSHint to be more strict towards your code. Use
@ -53,8 +55,7 @@
"boss" : false, // Tolerate assignments inside if, for & while. Usually conditions & loops are for comparison, not assignments.
"debug" : false, // Allow debugger statements e.g. browser breakpoints.
"eqnull" : false, // Tolerate use of `== null`.
"es5" : false, // Allow EcmaScript 5 syntax.
"esnext" : false, // Allow ES.next specific features such as `const` and `let`.
"esnext" : true, // Allow ES.next specific features such as `const` and `let`.
"evil" : false, // Tolerate use of `eval`.
"expr" : true, // Tolerate `ExpressionStatement` as Programs.
"funcscope" : false, // Tolerate declarations of variables inside of control structures while accessing them later from the outside.

4
lib/src/dialog.js
View File

@ -15,7 +15,7 @@
*/
var electron = require('electron');
var Promise = require('bluebird');
var Bluebird = require('bluebird');
var _ = require('lodash');
/**
@ -37,7 +37,7 @@ var _ = require('lodash');
exports.selectImage = function() {
'use strict';
return new Promise(function(resolve) {
return new Bluebird(function(resolve) {
electron.dialog.showOpenDialog({
properties: [ 'openFile' ],
filters: [

4
lib/src/drives.js
View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
var Promise = require('bluebird');
var drivelist = Promise.promisifyAll(require('drivelist'));
var Bluebird = require('bluebird');
var drivelist = Bluebird.promisifyAll(require('drivelist'));
/**
* @summary List all available removable drives

8
lib/src/writer.js
View File

@ -15,14 +15,14 @@
*/
var imageWrite = require('resin-image-write');
var Promise = require('bluebird');
var umount = Promise.promisifyAll(require('umount'));
var Bluebird = require('bluebird');
var umount = Bluebird.promisifyAll(require('umount'));
var fs = require('fs');
var os = require('os');
var isWindows = os.platform() === 'win32';
if (isWindows) {
var removedrive = Promise.promisifyAll(require('removedrive'));
var removedrive = Bluebird.promisifyAll(require('removedrive'));
}
/**
@ -79,7 +79,7 @@ exports.writeImage = function(image, drive, onProgress) {
var stream = exports.getImageStream(image);
return imageWrite.write(drive.device, stream);
}).then(function(writer) {
return new Promise(function(resolve, reject) {
return new Bluebird(function(resolve, reject) {
writer.on('progress', onProgress);
writer.on('error', reject);
writer.on('done', resolve);

10
tests/src/drives.spec.js
View File

@ -1,5 +1,5 @@
var m = require('mochainon');
var Promise = require('bluebird');
var Bluebird = require('bluebird');
var drivelist = require('drivelist');
var drives = require('../../lib/src/drives');
@ -12,7 +12,7 @@ describe('Drives:', function() {
beforeEach(function() {
this.drivesListStub = m.sinon.stub(drivelist, 'listAsync');
this.drivesListStub.returns(Promise.resolve([]));
this.drivesListStub.returns(Bluebird.resolve([]));
});
afterEach(function() {
@ -40,7 +40,7 @@ describe('Drives:', function() {
];
this.drivesListStub = m.sinon.stub(drivelist, 'listAsync');
this.drivesListStub.returns(Promise.resolve(this.drives));
this.drivesListStub.returns(Bluebird.resolve(this.drives));
});
afterEach(function() {
@ -82,7 +82,7 @@ describe('Drives:', function() {
];
this.drivesListStub = m.sinon.stub(drivelist, 'listAsync');
this.drivesListStub.returns(Promise.resolve(this.drives));
this.drivesListStub.returns(Bluebird.resolve(this.drives));
});
afterEach(function() {
@ -115,7 +115,7 @@ describe('Drives:', function() {
beforeEach(function() {
this.drivesListStub = m.sinon.stub(drivelist, 'listAsync');
this.drivesListStub.returns(Promise.reject(new Error('scan error')));
this.drivesListStub.returns(Bluebird.reject(new Error('scan error')));
});
afterEach(function() {