Merge pull request #93 from raphinesse/cleanup
Cleanup
diff --git a/config.js b/config.js
deleted file mode 100644
index 407608e..0000000
--- a/config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
-*/
-module.exports = {
- registry: "http://registry.cordova.io"
-}
diff --git a/main.js b/main.js
index 600faa1..1a61ac4 100755
--- a/main.js
+++ b/main.js
@@ -19,44 +19,38 @@
*/
// copyright (c) 2013 Andrew Lunny, Adobe Systems
-var path = require('path')
- , package = require(path.join(__dirname, 'package'))
- , help = require('./src/help')
- , url = require('url')
- , nopt
- , Q
- , cordova_lib
- , plugman;
-try {
- nopt = require('nopt');
- Q = require('q');
- cordova_lib = require('cordova-lib');
- plugman = cordova_lib.plugman;
-} catch(e) {
- console.error(
- 'Please run npm install from this directory:\n\t' +
- __dirname
- );
- process.exit(2);
-}
+const url = require('url');
+const path = require('path');
-var known_opts = { 'platform' : [ 'ios', 'osx', 'android', 'amazon-fireos', 'blackberry10', 'wp8' , 'windows8', 'windows', 'firefoxos' ]
- , 'project' : path
- , 'plugin' : [String, path, url, Array]
- , 'version' : Boolean
- , 'help' : Boolean
- , 'debug' : Boolean
- , 'silent' : Boolean
- , 'plugins': path
- , 'link': Boolean
- , 'variable' : Array
- , 'www': path
- , 'searchpath' : [path, Array]
- , 'browserify': Boolean
- , 'fetch': Boolean
- , 'save': Boolean
-}, shortHands = { 'var' : ['--variable'], 'v': ['--version'], 'h': ['--help'] };
+const Q = require('q');
+const nopt = require('nopt');
+
+const pkg = require('./package');
+const help = require('./src/help');
+const plugman = require('./plugman');
+
+const known_opts = {
+ platform: [
+ 'ios', 'osx', 'android', 'amazon-fireos', 'blackberry10',
+ 'wp8', 'windows8', 'windows', 'firefoxos'
+ ],
+ project: path,
+ plugin: [String, path, url, Array],
+ version: Boolean,
+ help: Boolean,
+ debug: Boolean,
+ silent: Boolean,
+ plugins: path,
+ link: Boolean,
+ variable: Array,
+ www: path,
+ searchpath: [path, Array],
+ browserify: Boolean,
+ fetch: Boolean,
+ save: Boolean
+};
+const shortHands = { var: ['--variable'], v: ['--version'], h: ['--help'] };
var cli_opts = nopt(known_opts, shortHands);
@@ -64,12 +58,12 @@
// Without these arguments, the commands will fail and print the usage anyway.
if (cli_opts.plugins_dir || cli_opts.project) {
- cli_opts.plugins_dir = typeof cli_opts.plugins_dir == 'string' ?
+ cli_opts.plugins_dir = typeof cli_opts.plugins_dir === 'string' ?
cli_opts.plugins_dir :
path.join(cli_opts.project, 'cordova', 'plugins');
}
-process.on('uncaughtException', function(error) {
+process.on('uncaughtException', function (error) {
if (cli_opts.debug) {
console.error(error.message, error.stack);
} else {
@@ -92,7 +86,7 @@
plugman.on('error', console.error);
if (cli_opts.version) {
- console.log(package.version);
+ console.log(pkg.version);
} else if (cli_opts.help) {
console.log(help());
} else if (plugman.commands[cmd]) {
diff --git a/package.json b/package.json
index bfb2c23..16affc1 100644
--- a/package.json
+++ b/package.json
@@ -29,15 +29,14 @@
"eslint-plugin-node": "^5.0.0",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-standard": "^3.0.1",
- "jasmine-node": "1.14.5"
+ "jasmine": "^3.1.0"
},
"bin": {
"plugman": "./main.js"
},
"scripts": {
- "test": "npm run jasmine && npm run eslint",
- "eslint": "node node_modules/eslint/bin/eslint src",
- "jasmine": "jasmine-node --captureExceptions --color spec"
+ "test": "npm run eslint && jasmine",
+ "eslint": "eslint ."
},
"license": "Apache-2.0",
"contributors": [
diff --git a/spec/.eslintrc.yml b/spec/.eslintrc.yml
new file mode 100644
index 0000000..043fd14
--- /dev/null
+++ b/spec/.eslintrc.yml
@@ -0,0 +1,2 @@
+env:
+ jasmine: true
diff --git a/spec/nopt.interface.spec.js b/spec/nopt.interface.spec.js
index 95f5b22..88eb1b5 100644
--- a/spec/nopt.interface.spec.js
+++ b/spec/nopt.interface.spec.js
@@ -18,10 +18,10 @@
*/
var nopt = require('nopt');
-describe('nopt interface check', function() {
+describe('nopt interface check', function () {
// https://issues.apache.org/jira/browse/CB-7915
- it('parameters without assignment operator should be assigned', function() {
- var cli_opts = nopt(null, null, ['plugman', 'create', '--name', 'MyName', '--platform_id', 'MyId', '--platform_version','1.0.0']);
+ it('parameters without assignment operator should be assigned', function () {
+ var cli_opts = nopt(null, null, ['plugman', 'create', '--name', 'MyName', '--platform_id', 'MyId', '--platform_version', '1.0.0']);
expect(cli_opts.name).toEqual('MyName');
expect(cli_opts.platform_id).toEqual('MyId');
expect(cli_opts.platform_version).toEqual('1.0.0');
diff --git a/spec/support/jasmine.json b/spec/support/jasmine.json
new file mode 100644
index 0000000..370fc44
--- /dev/null
+++ b/spec/support/jasmine.json
@@ -0,0 +1,11 @@
+{
+ "spec_dir": "spec",
+ "spec_files": [
+ "**/*[sS]pec.js"
+ ],
+ "helpers": [
+ "helpers/**/*.js"
+ ],
+ "stopSpecOnExpectationFailure": false,
+ "random": true
+}
