Permalink
Browse files

Merge pull request #809 from feons/patch-eslint

linting
  • Loading branch information...
2 parents 58b3572 + a5c3d85 commit 34550b27107c50ba4a54dfee6c21573c05901e77 @feons feons committed on GitHub Dec 6, 2016
Showing 308 changed files with 3,022 additions and 2,990 deletions.
View
@@ -0,0 +1,22 @@
+**/syntaxhighlighter
+test/**/widgets
+test/**/lib
+test/**/backbone
+test/**/grammar
+test/**/underscore
+**/_generated
+test/lib
+test/specs
+test/projects
+jake/lib
+locales/
+docs/
+**/jasmine.js
+**/lib/colors.js
+**/underscore.js
+**/backbone.js
+Alloy/grammar
+Alloy/builtins/social.js
+Alloy/builtins/moment
+Alloy/builtins/moment.js
+Alloy/template
View
@@ -0,0 +1,31 @@
+var OFF = 0;
+var WARNING = 1;
+var ERROR = 2;
+
+module.exports = {
+ env: {
+ 'node': true
+ },
+
+ extends: 'eslint:recommended',
+
+ rules: {
+ 'brace-style': [ERROR, '1tbs', {'allowSingleLine': true}],
+ 'comma-spacing': [ERROR, {'before': false, 'after': true}],
+ 'indent': [ERROR, 'tab', {'SwitchCase': 1, 'FunctionExpression': {'body': 1}}],
+ 'keyword-spacing': ERROR,
+ 'linebreak-style': [ERROR, 'unix'],
+ 'no-cond-assign': OFF,
+ 'no-console': OFF,
+ 'no-control-regex': OFF,
+ 'no-fallthrough': OFF,
+ 'no-unused-vars': OFF,
+ 'no-undef': OFF,
+ 'no-octal': OFF,
+ 'quotes': [ERROR, 'single', {'avoidEscape': true, allowTemplateLiterals: true}],
+ 'space-before-blocks': [ERROR, 'always'],
+ 'space-infix-ops': [ERROR, {'int32Hint': false}],
+ 'semi': [ERROR, 'always'],
+ 'valid-typeof': OFF
+ }
+};
View
@@ -3,12 +3,12 @@
* Copyright (c) 2012 by Appcelerator, Inc. All Rights Reserved.
* See LICENSE for more information on licensing.
*/
- var program = require('commander'),
- logger = require("./logger"),
+var program = require('commander'),
+ logger = require('./logger'),
os = require('os'),
U = require('./utils'),
- colors = require("colors"),
- _ = require("./lib/alloy/underscore")._,
+ colors = require('colors'),
+ _ = require('./lib/alloy/underscore')._,
pkginfo = require('pkginfo')(module, 'version'),
path = require('path'),
fs = require('fs'),
@@ -21,10 +21,10 @@ path.existsSync = fs.existsSync || path.existsSync;
if (process.env.ALLOY_TESTS && /^win/i.test(os.platform())) {
console.error = function(m) {
fs.writeSync(2, m);
- }
+ };
console.log = console.warn = console.info = function(m) {
fs.writeSync(1, m);
- }
+ };
}
////////////////////////////////////
@@ -39,40 +39,40 @@ program
.option('-a, --app <app>', 'Test app folder for running "alloy test"')
.option('-A, --apply', 'Applies command changes [extract-i18n]')
.option('-b, --noBanner', 'Disable the banner')
- .option('-c, --config <config>','Pass in compiler configuration')
- .option('-f, --force','Force the command to execute')
+ .option('-c, --config <config>', 'Pass in compiler configuration')
+ .option('-f, --force', 'Force the command to execute')
.option('-l, --logLevel <logLevel>', 'Log level (default: 3 [DEBUG])')
- .option('-n, --no-colors','Turn off colors')
+ .option('-n, --no-colors', 'Turn off colors')
.option('-o, --outputPath <outputPath>', 'Output path for generated code')
.option('-p, --project-dir <project-dir>', 'Titanium project directory')
.option('-q, --platform <platform>', 'Target mobile platform [android,ios,mobileweb]')
.option('-s, --spec <spec>', 'test spec to use with "alloy test"')
- .option('-w, --all','require flag for generate styles')
+ .option('-w, --all', 'require flag for generate styles')
.option('-x, --column <column>', 'Column for source map query', 1)
.option('-y, --line <line>', 'Line for source map query', 1)
.option('-z, --source <source>', 'Source original file for source map query')
.option('--widgetname <name>', 'Widget name, used with generate command')
.option('--testapp <name>', 'Test app name to import, used with new command');
-program.command('new'.blue+' <dir>'.white)
+program.command('new'.blue + ' <dir>'.white)
.description(' create a new alloy project'.grey);
-program.command('compile'.blue+' [dir]'.white)
+program.command('compile'.blue + ' [dir]'.white)
.description(' compile into titanium source code'.grey);
-program.command('extract-i18n'.blue+' <language>'.white)
+program.command('extract-i18n'.blue + ' <language>'.white)
.description(' extracts i18n strings from the source code (js and tss files)'.grey);
-program.command('generate'.blue+' <type> <name>'.white)
+program.command('generate'.blue + ' <type> <name>'.white)
.description(' generate a new alloy type such as a controller'.grey);
-program.command('copy'.blue+' <source> <destination>'.white)
+program.command('copy'.blue + ' <source> <destination>'.white)
.description(' copy the controller, view, and style files from <source> to <destination>'.grey);
-program.command('move'.blue+' <source> <destination>'.white)
+program.command('move'.blue + ' <source> <destination>'.white)
.description(' move the controller, view, and style files from <source> to <destination>'.grey);
-program.command('remove'.blue+' <source>'.white)
+program.command('remove'.blue + ' <source>'.white)
.description(' remove the controller, view, and style files at <source>'.grey);
program.parse(process.argv);
@@ -82,18 +82,17 @@ program.parse(process.argv);
Error.stackTraceLimit = Infinity;
logger.stripColors = program['colors'] === false;
logger.logLevel = program['logLevel'] || logger.TRACE;
-if(program.config && program.config.indexOf('logLevel')!==-1) {
+if (program.config && program.config.indexOf('logLevel') !== -1) {
logger.logLevel = -1;
}
-if (!program.noBanner && program.args[0] !== 'info' && (program.config && program.config.indexOf('noBanner')===-1)) {
+if (!program.noBanner && program.args[0] !== 'info' && (program.config && program.config.indexOf('noBanner') === -1)) {
banner();
}
-if (program.args.length === 0)
-{
+if (program.args.length === 0) {
var help = program.helpInformation();
- help = help.replace('Usage: alloy COMMAND [ARGS] [OPTIONS]','Usage: '+'alloy'.blue+' COMMAND'.white+' [ARGS] [OPTIONS]'.grey);
+ help = help.replace('Usage: alloy COMMAND [ARGS] [OPTIONS]', 'Usage: ' + 'alloy'.blue + ' COMMAND'.white + ' [ARGS] [OPTIONS]'.grey);
help = logger.stripColors ? colors.stripColors(help) : help;
console.log(help);
process.exit(0);
@@ -117,25 +116,25 @@ if (!_.contains(getCommands(), command)) {
///////////////////////////////
function banner() {
var str =
- " .__ .__ \n"+
- "_____ | | | | ____ ___.__.\n"+
- "\\__ \\ | | | | / _ < | |\n"+
- " / __ \\| |_| |_( <_> )___ |\n"+
- "(____ /____/____/\\____// ____|\n"+
- " \\/ \\/";
+ ' .__ .__ \n' +
+ '_____ | | | | ____ ___.__.\n' +
+ '\\__ \\ | | | | / _ < | |\n' +
+ ' / __ \\| |_| |_( <_> )___ |\n' +
+ '(____ /____/____/\\____// ____|\n' +
+ ' \\/ \\/';
if (!program.dump) {
console.log(logger.stripColors ? str : str.blue);
- var m = "Alloy " + module.exports.version + " by Appcelerator. The MVC app framework for Titanium.\n".white;
+ var m = 'Alloy ' + module.exports.version + ' by Appcelerator. The MVC app framework for Titanium.\n'.white;
console.log(logger.stripColors ? colors.stripColors(m) : m);
}
}
function getCommands() {
try {
- var commandsPath = path.join(__dirname,'commands');
+ var commandsPath = path.join(__dirname, 'commands');
return _.filter(fs.readdirSync(commandsPath), function(file) {
- return path.existsSync(path.join(commandsPath,file,'index.js'));
+ return path.existsSync(path.join(commandsPath, file, 'index.js'));
});
} catch (e) {
U.die('Error getting command list', e);
Oops, something went wrong.

0 comments on commit 34550b2

Please sign in to comment.