Skip to content

Commit

Permalink
Lint JS files w/out extension too (#453)
Browse files Browse the repository at this point in the history 
Prior to this change, JS files without extension had not been linted.

To match them, we need a combination of positive and negative globbing
that does not mix well with the existing file selection for linting. Thus, we use
npm-run-all to run two ESLint invocations unconditionally in sequence
while still preserving the error code.

* Lint JS w/out extension too
* Fix newly surfaced linting errors
* Make use of npm-run-all for test script too
  • Loading branch information
@raphinesse
raphinesse authored Jun 18, 2018
1 parent 2c3db19 commit 393dad6
Show file tree
Hide file tree
Showing 16 changed files with 87 additions and 84 deletions.
4 changes: 1 addition & 3 deletions bin/android_sdk_version
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@

var android_sdk = require('./templates/cordova/lib/android_sdk');

android_sdk.print_newest_available_sdk_target().done(null, function(err) {
android_sdk.print_newest_available_sdk_target().done(null, function (err) {
console.error(err);
process.exit(2);
});


5 changes: 3 additions & 2 deletions bin/check_reqs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@
var check_reqs = require('./templates/cordova/lib/check_reqs');

check_reqs.run().done(
function success() {
function success () {
console.log('Looks like your environment fully supports cordova-android development!');
}, function fail(err) {
},
function fail (err) {
console.log(err);
process.exit(2);
}
Expand Down
12 changes: 6 additions & 6 deletions bin/create
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ var ConfigParser = require('cordova-common').ConfigParser;
var Api = require('./templates/cordova/Api');

var argv = require('nopt')({
'help' : Boolean,
'cli' : Boolean,
'shared' : Boolean,
'link' : Boolean,
'activity-name' : [String, undefined]
}, { 'd' : '--verbose' });
'help': Boolean,
'cli': Boolean,
'shared': Boolean,
'link': Boolean,
'activity-name': [String, undefined]
}, { 'd': '--verbose' });

if (argv.help || argv.argv.remain.length === 0) {
console.log('Usage: ' + path.relative(process.cwd(), path.join(__dirname, 'create')) + ' <path_to_new_project> <package_name> <project_name> [<template_path>] [--activity-name <activity_name>] [--link]');
Expand Down
19 changes: 10 additions & 9 deletions bin/templates/cordova/build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,33 @@
under the License.
*/

var args = process.argv;
var args = process.argv;
var Api = require('./Api');
var nopt = require('nopt');
var path = require('path');

// Support basic help commands
if(['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0)
if (['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(args[2]) >= 0) {
require('./lib/build').help();
}

// Do some basic argument parsing
var buildOpts = nopt({
'verbose' : Boolean,
'silent' : Boolean,
'debug' : Boolean,
'release' : Boolean,
'verbose': Boolean,
'silent': Boolean,
'debug': Boolean,
'release': Boolean,
'nobuild': Boolean,
'buildConfig' : path
}, { 'd' : '--verbose' });
'buildConfig': path
}, { 'd': '--verbose' });

// Make buildOptions compatible with PlatformApi build method spec
buildOpts.argv = buildOpts.argv.original;

require('./loggingHelper').adjustLoggerLevel(buildOpts);

new Api().build(buildOpts)
.catch(function(err) {
.catch(function (err) {
console.error(err.stack);
process.exit(2);
});
12 changes: 6 additions & 6 deletions bin/templates/cordova/clean
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@
*/

var Api = require('./Api');
var path = require('path');
var path = require('path');
var nopt = require('nopt');

// Support basic help commands
if(['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0) {
if (['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0) {
console.log('Usage: ' + path.relative(process.cwd(), process.argv[1]));
console.log('Cleans the project directory.');
process.exit(0);
}

// Do some basic argument parsing
var opts = nopt({
'verbose' : Boolean,
'silent' : Boolean
}, { 'd' : '--verbose' });
'verbose': Boolean,
'silent': Boolean
}, { 'd': '--verbose' });

// Make buildOptions compatible with PlatformApi clean method spec
opts.argv = opts.argv.original;
Expand All @@ -45,7 +45,7 @@ opts.noPrepare = true;
require('./loggingHelper').adjustLoggerLevel(opts);

new Api().clean(opts)
.catch(function(err) {
.catch(function (err) {
console.error(err.stack);
process.exit(2);
});
16 changes: 8 additions & 8 deletions bin/templates/cordova/lib/install-device
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@
under the License.
*/

var device = require('./device'),
args = process.argv;
var device = require('./device');
var args = process.argv;

if(args.length > 2) {
if (args.length > 2) {
var install_target;
if (args[2].substring(0, 9) == '--target=') {
if (args[2].substring(0, 9) === '--target=') {
install_target = args[2].substring(9, args[2].length);
device.install(install_target).done(null, function(err) {
device.install(install_target).done(null, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
} else {
} else {
console.error('ERROR : argument \'' + args[2] + '\' not recognized.');
process.exit(2);
}
}
} else {
device.install().done(null, function(err) {
device.install().done(null, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
Expand Down
14 changes: 7 additions & 7 deletions bin/templates/cordova/lib/install-emulator
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
under the License.
*/

var emulator = require('./emulator'),
args = process.argv;
var emulator = require('./emulator');
var args = process.argv;

var install_target;
if(args.length > 2) {
if (args[2].substring(0, 9) == '--target=') {
if (args.length > 2) {
if (args[2].substring(0, 9) === '--target=') {
install_target = args[2].substring(9, args[2].length);
} else {
} else {
console.error('ERROR : argument \'' + args[2] + '\' not recognized.');
process.exit(2);
}
}
}

emulator.install(install_target).done(null, function(err) {
emulator.install(install_target).done(null, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
8 changes: 4 additions & 4 deletions bin/templates/cordova/lib/list-devices
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
var devices = require('./device');

// Usage support for when args are given
require('./check_reqs').check_android().then(function() {
devices.list().done(function(device_list) {
device_list && device_list.forEach(function(dev) {
require('./check_reqs').check_android().then(function () {
devices.list().done(function (device_list) {
device_list && device_list.forEach(function (dev) {
console.log(dev);
});
}, function(err) {
}, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
Expand Down
8 changes: 4 additions & 4 deletions bin/templates/cordova/lib/list-emulator-images
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
var emulators = require('./emulator');

// Usage support for when args are given
require('./check_reqs').check_android().then(function() {
emulators.list_images().done(function(emulator_list) {
emulator_list && emulator_list.forEach(function(emu) {
require('./check_reqs').check_android().then(function () {
emulators.list_images().done(function (emulator_list) {
emulator_list && emulator_list.forEach(function (emu) {
console.log(emu.name);
});
}, function(err) {
}, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
Expand Down
8 changes: 4 additions & 4 deletions bin/templates/cordova/lib/list-started-emulators
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
var emulators = require('./emulator');

// Usage support for when args are given
require('./check_reqs').check_android().then(function() {
emulators.list_started().done(function(emulator_list) {
emulator_list && emulator_list.forEach(function(emu) {
require('./check_reqs').check_android().then(function () {
emulators.list_started().done(function (emulator_list) {
emulator_list && emulator_list.forEach(function (emu) {
console.log(emu);
});
}, function(err) {
}, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
Expand Down
15 changes: 7 additions & 8 deletions bin/templates/cordova/lib/start-emulator
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,20 @@
under the License.
*/

var emulator = require('./emulator'),
args = process.argv;
var emulator = require('./emulator');
var args = process.argv;

var install_target;
if(args.length > 2) {
if (args[2].substring(0, 9) == '--target=') {
if (args.length > 2) {
if (args[2].substring(0, 9) === '--target=') {
install_target = args[2].substring(9, args[2].length);
} else {
} else {
console.error('ERROR : argument \'' + args[2] + '\' not recognized.');
process.exit(2);
}
}
}

emulator.start(install_target).done(null, function(err) {
emulator.start(install_target).done(null, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});

12 changes: 6 additions & 6 deletions bin/templates/cordova/log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
under the License.
*/

var log = require('./lib/log'),
reqs = require('./lib/check_reqs'),
args = process.argv;
var log = require('./lib/log');
var reqs = require('./lib/check_reqs');
var args = process.argv;

// Usage support for when args are given
if(args.length > 2) {
if (args.length > 2) {
log.help();
} else {
reqs.run().done(function() {
reqs.run().done(function () {
return log.run();
}, function(err) {
}, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
Expand Down
23 changes: 12 additions & 11 deletions bin/templates/cordova/run
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,31 @@ var nopt = require('nopt');
var path = require('path');

// Support basic help commands
if(['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0)
if (['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0) {
require('./lib/run').help();
}

// Do some basic argument parsing
var runOpts = nopt({
'verbose' : Boolean,
'silent' : Boolean,
'debug' : Boolean,
'release' : Boolean,
'verbose': Boolean,
'silent': Boolean,
'debug': Boolean,
'release': Boolean,
'nobuild': Boolean,
'buildConfig' : path,
'archs' : String,
'device' : Boolean,
'buildConfig': path,
'archs': String,
'device': Boolean,
'emulator': Boolean,
'target' : String
}, { 'd' : '--verbose' });
'target': String
}, { 'd': '--verbose' });

// Make runOptions compatible with PlatformApi run method spec
runOpts.argv = runOpts.argv.remain;

require('./loggingHelper').adjustLoggerLevel(runOpts);

new Api().run(runOpts)
.catch(function(err) {
.catch(function (err) {
console.error(err, err.stack);
process.exit(2);
});
2 changes: 1 addition & 1 deletion bin/templates/cordova/version
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

// Coho updates this line:
var VERSION = "7.2.0-dev";
var VERSION = '7.2.0-dev';

module.exports.version = VERSION;

Expand Down
6 changes: 3 additions & 3 deletions bin/update
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
specific language governing permissions and limitations
under the License.
*/
var path = require('path');
var path = require('path');
var Api = require('./templates/cordova/Api');
var args = require('nopt')({
var args = require('nopt')({
'link': Boolean,
'shared': Boolean,
'help': Boolean
}, { 'd' : '--verbose' });
}, { 'd': '--verbose' });

if (args.help || args.argv.remain.length === 0) {
console.log('Usage: ' + path.relative(process.cwd(), path.join(__dirname, 'update')) + ' <path_to_project> [--link]');
Expand Down
7 changes: 5 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@
"apache"
],
"scripts": {
"test": "npm run eslint && npm run unit-tests && npm run java-unit-tests && npm run e2e-tests",
"test": "run-s eslint unit-tests java-unit-tests e2e-tests",
"unit-tests": "jasmine --config=spec/unit/jasmine.json",
"cover": "istanbul cover --root bin --print detail jasmine -- --config=spec/unit/jasmine.json",
"e2e-tests": "jasmine --config=spec/e2e/jasmine.json",
"java-unit-tests": "node test/run_java_unit_tests.js",
"eslint": "eslint bin spec test"
"eslint": "run-s -c eslint:*",
"eslint:scripts": "eslint bin spec test",
"eslint:bins": "eslint 'bin/**/*' --ignore-pattern '**/*.*' --ignore-pattern '**/gitignore'"
},
"author": "Apache Software Foundation",
"license": "Apache-2.0",
Expand Down Expand Up @@ -56,6 +58,7 @@
"eslint-plugin-standard": "^3.0.1",
"istanbul": "^0.4.2",
"jasmine": "~2.6.0",
"npm-run-all": "^4.1.3",
"promise-matchers": "~0",
"rewire": "^2.1.3"
},
Expand Down

0 comments on commit 393dad6

Please sign in to comment.