You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ka...@apache.org on 2014/05/02 20:29:34 UTC
[10/10] git commit: Fix require paths to use cordova-lib
Fix require paths to use cordova-lib
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/1b3b1f03
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/1b3b1f03
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/1b3b1f03
Branch: refs/heads/cordova-lib
Commit: 1b3b1f03a1a94283540d94dd7e790c9b0625ef3a
Parents: 89db695
Author: Mark Koudritsky <ka...@gmail.com>
Authored: Tue Apr 29 22:14:58 2014 -0400
Committer: Mark Koudritsky <ka...@gmail.com>
Committed: Thu May 1 11:22:50 2014 -0400
----------------------------------------------------------------------
cordova.js | 5 +
npm-shrinkwrap.json | 812 -----------------------------------------------
spec/cli.spec.js | 5 +-
spec/help.spec.js | 6 +-
src/cli.js | 14 +-
src/help.js | 5 +-
6 files changed, 23 insertions(+), 824 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1b3b1f03/cordova.js
----------------------------------------------------------------------
diff --git a/cordova.js b/cordova.js
new file mode 100644
index 0000000..17e2f5c
--- /dev/null
+++ b/cordova.js
@@ -0,0 +1,5 @@
+// All cordova js API moved to cordova-lib . This is a temporary shim for
+// dowstream packages that use cordova-cli for the API.
+
+var cordova_lib = require('cordova-lib');
+module.exports = cordova_lib.cordova;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1b3b1f03/npm-shrinkwrap.json
----------------------------------------------------------------------
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
deleted file mode 100644
index 3547b50..0000000
--- a/npm-shrinkwrap.json
+++ /dev/null
@@ -1,812 +0,0 @@
-{
- "name": "cordova",
- "version": "3.4.1-0.1.0",
- "dependencies": {
- "elementtree": {
- "version": "0.1.5",
- "from": "elementtree@0.1.5",
- "dependencies": {
- "sax": {
- "version": "0.3.5",
- "from": "sax@0.3.5"
- }
- }
- },
- "mime": {
- "version": "1.2.11",
- "from": "mime@1.2.11"
- },
- "npmconf": {
- "version": "0.1.13",
- "from": "npmconf@0.1.13",
- "dependencies": {
- "config-chain": {
- "version": "1.1.8",
- "from": "config-chain@1.1.8",
- "dependencies": {
- "proto-list": {
- "version": "1.2.2",
- "from": "proto-list@1.2.2"
- }
- }
- },
- "inherits": {
- "version": "2.0.1",
- "from": "inherits@2.0.1"
- },
- "once": {
- "version": "1.3.0",
- "from": "once@1.3.0"
- },
- "mkdirp": {
- "version": "0.3.5",
- "from": "mkdirp@0.3.5"
- },
- "osenv": {
- "version": "0.0.3",
- "from": "osenv@0.0.3"
- },
- "nopt": {
- "version": "2.2.0",
- "from": "nopt@2.2.0",
- "dependencies": {
- "abbrev": {
- "version": "1.0.4",
- "from": "abbrev@1.0.4"
- }
- }
- },
- "ini": {
- "version": "1.1.0",
- "from": "ini@1.1.0"
- }
- }
- },
- "optimist": {
- "version": "0.6.0",
- "from": "optimist@0.6.0",
- "dependencies": {
- "wordwrap": {
- "version": "0.0.2",
- "from": "wordwrap@0.0.2"
- },
- "minimist": {
- "version": "0.0.8",
- "from": "minimist@0.0.8"
- }
- }
- },
- "plist-with-patches": {
- "version": "0.5.1",
- "from": "plist-with-patches@0.5.1",
- "dependencies": {
- "xmlbuilder": {
- "version": "0.4.3",
- "from": "xmlbuilder@0.4.3"
- },
- "xmldom": {
- "version": "0.1.19",
- "from": "xmldom@0.1.19"
- }
- }
- },
- "plugman": {
- "version": "0.21.0",
- "from": "plugman@0.21.0",
- "resolved": "https://registry.npmjs.org/plugman/-/plugman-0.21.0.tgz",
- "dependencies": {
- "nopt": {
- "version": "1.0.10",
- "from": "nopt@1.0.10",
- "dependencies": {
- "abbrev": {
- "version": "1.0.4",
- "from": "abbrev@1.0.4"
- }
- }
- },
- "glob": {
- "version": "3.2.9",
- "from": "glob@3.2.9",
- "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.9.tgz",
- "dependencies": {
- "minimatch": {
- "version": "0.2.14",
- "from": "minimatch@0.2.14",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
- "dependencies": {
- "lru-cache": {
- "version": "2.5.0",
- "from": "lru-cache@2.5.0"
- },
- "sigmund": {
- "version": "1.0.0",
- "from": "sigmund@1.0.0"
- }
- }
- },
- "inherits": {
- "version": "2.0.1",
- "from": "inherits@2.0.1"
- }
- }
- },
- "bplist-parser": {
- "version": "0.0.5",
- "from": "bplist-parser@0.0.5"
- },
- "dep-graph": {
- "version": "1.1.0",
- "from": "dep-graph@1.1.0",
- "dependencies": {
- "underscore": {
- "version": "1.2.1",
- "from": "underscore@1.2.1",
- "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"
- }
- }
- },
- "npm": {
- "version": "1.3.4",
- "from": "npm@1.3.4",
- "dependencies": {
- "semver": {
- "version": "2.0.8",
- "from": "semver@latest"
- },
- "ini": {
- "version": "1.1.0",
- "from": "ini@latest"
- },
- "slide": {
- "version": "1.1.4",
- "from": "slide@latest"
- },
- "abbrev": {
- "version": "1.0.4",
- "from": "abbrev@latest"
- },
- "graceful-fs": {
- "version": "2.0.0",
- "from": "graceful-fs@2"
- },
- "minimatch": {
- "version": "0.2.12",
- "from": "minimatch@latest",
- "dependencies": {
- "sigmund": {
- "version": "1.0.0",
- "from": "sigmund@~1.0.0",
- "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
- }
- }
- },
- "nopt": {
- "version": "2.1.1",
- "from": "nopt@latest"
- },
- "rimraf": {
- "version": "2.2.0",
- "from": "rimraf@2.2"
- },
- "request": {
- "version": "2.21.0",
- "from": "request@latest",
- "dependencies": {
- "qs": {
- "version": "0.6.5",
- "from": "qs@~0.6.0"
- },
- "json-stringify-safe": {
- "version": "4.0.0",
- "from": "json-stringify-safe@~4.0.0"
- },
- "forever-agent": {
- "version": "0.5.0",
- "from": "forever-agent@~0.5.0"
- },
- "tunnel-agent": {
- "version": "0.3.0",
- "from": "tunnel-agent@~0.3.0"
- },
- "http-signature": {
- "version": "0.9.11",
- "from": "http-signature@~0.9.11",
- "dependencies": {
- "assert-plus": {
- "version": "0.1.2",
- "from": "assert-plus@0.1.2"
- },
- "asn1": {
- "version": "0.1.11",
- "from": "asn1@0.1.11"
- },
- "ctype": {
- "version": "0.5.2",
- "from": "ctype@0.5.2"
- }
- }
- },
- "hawk": {
- "version": "0.13.1",
- "from": "hawk@~0.13.0",
- "dependencies": {
- "hoek": {
- "version": "0.8.5",
- "from": "hoek@0.8.x"
- },
- "boom": {
- "version": "0.4.2",
- "from": "boom@0.4.x",
- "dependencies": {
- "hoek": {
- "version": "0.9.1",
- "from": "hoek@0.9.x",
- "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
- }
- }
- },
- "cryptiles": {
- "version": "0.2.1",
- "from": "cryptiles@0.2.x"
- },
- "sntp": {
- "version": "0.2.4",
- "from": "sntp@0.2.x",
- "dependencies": {
- "hoek": {
- "version": "0.9.1",
- "from": "hoek@0.9.x",
- "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
- }
- }
- }
- }
- },
- "aws-sign": {
- "version": "0.3.0",
- "from": "aws-sign@~0.3.0"
- },
- "oauth-sign": {
- "version": "0.3.0",
- "from": "oauth-sign@~0.3.0"
- },
- "cookie-jar": {
- "version": "0.3.0",
- "from": "cookie-jar@~0.3.0"
- },
- "node-uuid": {
- "version": "1.4.0",
- "from": "node-uuid@~1.4.0"
- },
- "mime": {
- "version": "1.2.9",
- "from": "mime@~1.2.9"
- },
- "form-data": {
- "version": "0.0.8",
- "from": "form-data@0.0.8",
- "dependencies": {
- "combined-stream": {
- "version": "0.0.4",
- "from": "combined-stream@~0.0.4",
- "dependencies": {
- "delayed-stream": {
- "version": "0.0.5",
- "from": "delayed-stream@0.0.5"
- }
- }
- },
- "async": {
- "version": "0.2.9",
- "from": "async@~0.2.7"
- }
- }
- }
- }
- },
- "which": {
- "version": "1.0.5",
- "from": "which@1"
- },
- "tar": {
- "version": "0.1.17",
- "from": "tar@0.1.17",
- "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.17.tgz"
- },
- "fstream": {
- "version": "0.1.23",
- "from": "fstream@latest"
- },
- "block-stream": {
- "version": "0.0.6",
- "from": "block-stream@*"
- },
- "inherits": {
- "version": "1.0.0",
- "from": "git://github.com/isaacs/inherits"
- },
- "mkdirp": {
- "version": "0.3.5",
- "from": "mkdirp@0.3.5",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
- },
- "read": {
- "version": "1.0.4",
- "from": "read@~1.0.3",
- "dependencies": {
- "mute-stream": {
- "version": "0.0.3",
- "from": "mute-stream@~0.0.2"
- }
- }
- },
- "lru-cache": {
- "version": "2.3.0",
- "from": "lru-cache@latest"
- },
- "node-gyp": {
- "version": "0.10.6",
- "from": "node-gyp@latest"
- },
- "fstream-npm": {
- "version": "0.1.4",
- "from": "fstream-npm@latest",
- "dependencies": {
- "fstream-ignore": {
- "version": "0.0.6",
- "from": "fstream-ignore@~0.0.5"
- }
- }
- },
- "uid-number": {
- "version": "0.0.3",
- "from": "../uid-number"
- },
- "archy": {
- "version": "0.0.2",
- "from": "archy@0.0.2"
- },
- "chownr": {
- "version": "0.0.1",
- "from": "../chownr"
- },
- "npmlog": {
- "version": "0.0.4",
- "from": "npmlog@latest"
- },
- "ansi": {
- "version": "0.1.2",
- "from": "ansi@~0.1.2"
- },
- "npm-registry-client": {
- "version": "0.2.27",
- "from": "npm-registry-client@latest",
- "dependencies": {
- "couch-login": {
- "version": "0.1.17",
- "from": "couch-login@~0.1.15"
- }
- }
- },
- "read-package-json": {
- "version": "1.1.0",
- "from": "read-package-json@1",
- "dependencies": {
- "normalize-package-data": {
- "version": "0.2.0",
- "from": "normalize-package-data@~0.2",
- "dependencies": {
- "github-url-from-git": {
- "version": "1.1.1",
- "from": "github-url-from-git@~1.1.1"
- }
- }
- }
- }
- },
- "read-installed": {
- "version": "0.2.2",
- "from": "read-installed@latest"
- },
- "glob": {
- "version": "3.2.3",
- "from": "glob@latest",
- "dependencies": {
- "inherits": {
- "version": "2.0.0",
- "from": "inherits@2"
- }
- }
- },
- "init-package-json": {
- "version": "0.0.10",
- "from": "init-package-json@latest",
- "dependencies": {
- "promzard": {
- "version": "0.2.0",
- "from": "promzard@~0.2.0"
- }
- }
- },
- "osenv": {
- "version": "0.0.3",
- "from": "osenv@latest"
- },
- "lockfile": {
- "version": "0.4.0",
- "from": "lockfile@latest"
- },
- "retry": {
- "version": "0.6.0",
- "from": "retry"
- },
- "once": {
- "version": "1.1.1",
- "from": "once"
- },
- "npmconf": {
- "version": "0.1.1",
- "from": "npmconf@latest",
- "dependencies": {
- "config-chain": {
- "version": "1.1.7",
- "from": "config-chain@~1.1.1",
- "dependencies": {
- "proto-list": {
- "version": "1.2.2",
- "from": "proto-list@~1.2.1"
- }
- }
- }
- }
- },
- "opener": {
- "version": "1.3.0",
- "from": "opener@latest"
- },
- "chmodr": {
- "version": "0.1.0",
- "from": "chmodr@latest"
- },
- "cmd-shim": {
- "version": "1.1.0",
- "from": "cmd-shim@"
- },
- "sha": {
- "version": "1.0.1",
- "from": "sha@~1.0.1"
- },
- "editor": {
- "version": "0.0.4",
- "from": "editor@"
- },
- "child-process-close": {
- "version": "0.1.1",
- "from": "child-process-close@",
- "resolved": "https://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz"
- },
- "npm-user-validate": {
- "version": "0.0.3",
- "from": "npm-user-validate@0.0.3",
- "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"
- }
- }
- },
- "rc": {
- "version": "0.3.0",
- "from": "rc@0.3.0",
- "dependencies": {
- "optimist": {
- "version": "0.3.7",
- "from": "optimist@0.3.7",
- "dependencies": {
- "wordwrap": {
- "version": "0.0.2",
- "from": "wordwrap@0.0.2"
- }
- }
- },
- "deep-extend": {
- "version": "0.2.8",
- "from": "deep-extend@0.2.8"
- },
- "ini": {
- "version": "1.1.0",
- "from": "ini@1.1.0"
- }
- }
- },
- "request": {
- "version": "2.22.0",
- "from": "request@2.22.0",
- "resolved": "https://registry.npmjs.org/request/-/request-2.22.0.tgz",
- "dependencies": {
- "qs": {
- "version": "0.6.6",
- "from": "qs@0.6.6"
- },
- "json-stringify-safe": {
- "version": "4.0.0",
- "from": "json-stringify-safe@4.0.0"
- },
- "forever-agent": {
- "version": "0.5.2",
- "from": "forever-agent@0.5.2"
- },
- "tunnel-agent": {
- "version": "0.3.0",
- "from": "tunnel-agent@0.3.0"
- },
- "http-signature": {
- "version": "0.10.0",
- "from": "http-signature@0.10.0",
- "dependencies": {
- "assert-plus": {
- "version": "0.1.2",
- "from": "assert-plus@0.1.2"
- },
- "asn1": {
- "version": "0.1.11",
- "from": "asn1@0.1.11"
- },
- "ctype": {
- "version": "0.5.2",
- "from": "ctype@0.5.2",
- "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
- }
- }
- },
- "hawk": {
- "version": "0.13.1",
- "from": "hawk@0.13.1",
- "dependencies": {
- "hoek": {
- "version": "0.8.5",
- "from": "hoek@0.8.5"
- },
- "boom": {
- "version": "0.4.2",
- "from": "boom@0.4.2",
- "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
- "dependencies": {
- "hoek": {
- "version": "0.9.1",
- "from": "hoek@0.9.1",
- "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
- }
- }
- },
- "cryptiles": {
- "version": "0.2.2",
- "from": "cryptiles@0.2.2"
- },
- "sntp": {
- "version": "0.2.4",
- "from": "sntp@0.2.4",
- "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
- "dependencies": {
- "hoek": {
- "version": "0.9.1",
- "from": "hoek@0.9.1",
- "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
- }
- }
- }
- }
- },
- "aws-sign": {
- "version": "0.3.0",
- "from": "aws-sign@0.3.0"
- },
- "oauth-sign": {
- "version": "0.3.0",
- "from": "oauth-sign@0.3.0"
- },
- "cookie-jar": {
- "version": "0.3.0",
- "from": "cookie-jar@0.3.0"
- },
- "node-uuid": {
- "version": "1.4.1",
- "from": "node-uuid@1.4.1"
- },
- "form-data": {
- "version": "0.0.8",
- "from": "form-data@0.0.8",
- "dependencies": {
- "combined-stream": {
- "version": "0.0.4",
- "from": "combined-stream@0.0.4",
- "dependencies": {
- "delayed-stream": {
- "version": "0.0.5",
- "from": "delayed-stream@0.0.5"
- }
- }
- },
- "async": {
- "version": "0.2.10",
- "from": "async@0.2.10",
- "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
- }
- }
- }
- }
- }
- }
- },
- "q": {
- "version": "0.9.7",
- "from": "q@0.9.7"
- },
- "request": {
- "version": "2.21.0",
- "from": "request@2.21.0",
- "dependencies": {
- "qs": {
- "version": "0.6.6",
- "from": "qs@0.6.6"
- },
- "json-stringify-safe": {
- "version": "4.0.0",
- "from": "json-stringify-safe@4.0.0"
- },
- "forever-agent": {
- "version": "0.5.2",
- "from": "forever-agent@0.5.2"
- },
- "tunnel-agent": {
- "version": "0.3.0",
- "from": "tunnel-agent@0.3.0"
- },
- "http-signature": {
- "version": "0.9.11",
- "from": "http-signature@0.9.11",
- "dependencies": {
- "assert-plus": {
- "version": "0.1.2",
- "from": "assert-plus@0.1.2"
- },
- "asn1": {
- "version": "0.1.11",
- "from": "asn1@0.1.11"
- },
- "ctype": {
- "version": "0.5.2",
- "from": "ctype@0.5.2"
- }
- }
- },
- "hawk": {
- "version": "0.13.1",
- "from": "hawk@0.13.1",
- "dependencies": {
- "hoek": {
- "version": "0.8.5",
- "from": "hoek@0.8.5"
- },
- "boom": {
- "version": "0.4.2",
- "from": "boom@0.4.2",
- "dependencies": {
- "hoek": {
- "version": "0.9.1",
- "from": "hoek@0.9.1"
- }
- }
- },
- "cryptiles": {
- "version": "0.2.2",
- "from": "cryptiles@0.2.2"
- },
- "sntp": {
- "version": "0.2.4",
- "from": "sntp@0.2.4",
- "dependencies": {
- "hoek": {
- "version": "0.9.1",
- "from": "hoek@0.9.1"
- }
- }
- }
- }
- },
- "aws-sign": {
- "version": "0.3.0",
- "from": "aws-sign@0.3.0"
- },
- "oauth-sign": {
- "version": "0.3.0",
- "from": "oauth-sign@0.3.0"
- },
- "cookie-jar": {
- "version": "0.3.0",
- "from": "cookie-jar@0.3.0"
- },
- "node-uuid": {
- "version": "1.4.1",
- "from": "node-uuid@1.4.1"
- },
- "form-data": {
- "version": "0.0.8",
- "from": "form-data@0.0.8",
- "dependencies": {
- "combined-stream": {
- "version": "0.0.4",
- "from": "combined-stream@0.0.4",
- "dependencies": {
- "delayed-stream": {
- "version": "0.0.5",
- "from": "delayed-stream@0.0.5"
- }
- }
- },
- "async": {
- "version": "0.2.10",
- "from": "async@0.2.10"
- }
- }
- }
- }
- },
- "semver": {
- "version": "2.0.11",
- "from": "semver@2.0.11"
- },
- "shelljs": {
- "version": "0.1.4",
- "from": "shelljs@0.1.4"
- },
- "tar": {
- "version": "0.1.19",
- "from": "tar@0.1.19",
- "dependencies": {
- "inherits": {
- "version": "2.0.1",
- "from": "inherits@2.0.1"
- },
- "block-stream": {
- "version": "0.0.7",
- "from": "block-stream@0.0.7"
- },
- "fstream": {
- "version": "0.1.25",
- "from": "fstream@0.1.25",
- "dependencies": {
- "rimraf": {
- "version": "2.2.6",
- "from": "rimraf@2.2.6"
- },
- "mkdirp": {
- "version": "0.3.5",
- "from": "mkdirp@0.3.5"
- },
- "graceful-fs": {
- "version": "2.0.2",
- "from": "graceful-fs@2.0.2"
- }
- }
- }
- }
- },
- "underscore": {
- "version": "1.4.4",
- "from": "underscore@1.4.4"
- },
- "xcode": {
- "version": "0.6.6",
- "from": "xcode@0.6.6",
- "dependencies": {
- "pegjs": {
- "version": "0.6.2",
- "from": "pegjs@0.6.2"
- },
- "node-uuid": {
- "version": "1.3.3",
- "from": "node-uuid@1.3.3"
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1b3b1f03/spec/cli.spec.js
----------------------------------------------------------------------
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index c09042d..ec10815 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -19,8 +19,9 @@
var CLI = require("../src/cli"),
Q = require('q'),
- plugman = require('plugman'),
- cordova = require("../cordova");
+ cordova_lib = require('cordova-lib'),
+ plugman = cordova_lib.plugman,
+ cordova = cordova_lib.cordova;
describe("cordova cli", function () {
beforeEach(function () {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1b3b1f03/spec/help.spec.js
----------------------------------------------------------------------
diff --git a/spec/help.spec.js b/spec/help.spec.js
index 1cff29d..4ee0883 100644
--- a/spec/help.spec.js
+++ b/spec/help.spec.js
@@ -16,7 +16,9 @@
specific language governing permissions and limitations
under the License.
*/
-var cordova = require('../cordova');
+var cordova_lib = require('cordova-lib'),
+ cordova = cordova_lib.cordova,
+ help = require('../src/help');
describe('help command', function() {
it('should emit a results event with help contents', function(done) {
@@ -27,6 +29,6 @@ describe('help command', function() {
expect(h).toMatch(/synopsis/gi);
done();
});
- cordova.help();
+ help();
});
});
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1b3b1f03/src/cli.js
----------------------------------------------------------------------
diff --git a/src/cli.js b/src/cli.js
index 4c81892..a44673d 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -18,8 +18,8 @@
*/
var path = require('path'),
- CordovaError = require('./CordovaError'),
optimist, // required in try-catch below to print a nice error message if it's not installed.
+ help = require('./help'),
_;
module.exports = function CLI(inputArgs) {
@@ -31,7 +31,10 @@ module.exports = function CLI(inputArgs) {
path.dirname(__dirname));
process.exit(2);
}
- var cordova = require('../cordova');
+ var cordova_lib = require('cordova-lib'),
+ CordovaError = cordova_lib.CordovaError,
+ cordova = cordova_lib.cordova,
+ plugman = cordova_lib.plugman;
// If no inputArgs given, use process.argv.
var tokens;
@@ -80,7 +83,6 @@ module.exports = function CLI(inputArgs) {
if (!opts.silent) {
cordova.on('log', console.log);
cordova.on('warn', console.warn);
- var plugman = require('plugman');
plugman.on('log', console.log);
plugman.on('results', console.log);
plugman.on('warn', console.warn);
@@ -93,7 +95,7 @@ module.exports = function CLI(inputArgs) {
if (opts.verbose) {
// Add handlers for verbose logging.
cordova.on('verbose', console.log);
- require('plugman').on('verbose', console.log);
+ plugman.on('verbose', console.log);
//Remove the corresponding token
if(args.d && args.verbose) {
@@ -107,7 +109,7 @@ module.exports = function CLI(inputArgs) {
var cmd = tokens && tokens.length ? tokens.splice(0,1) : undefined;
if (cmd === undefined) {
- return cordova.help();
+ return help();
}
if (!cordova.hasOwnProperty(cmd)) {
@@ -116,7 +118,7 @@ module.exports = function CLI(inputArgs) {
if (cmd == 'emulate' || cmd == 'build' || cmd == 'prepare' || cmd == 'compile' || cmd == 'run') {
// Filter all non-platforms into options
- var platforms = require("../platforms");
+ var platforms = cordova_lib.cordova_platforms;
tokens.forEach(function(option, index) {
if (platforms.hasOwnProperty(option)) {
opts.platforms.push(option);
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1b3b1f03/src/help.js
----------------------------------------------------------------------
diff --git a/src/help.js b/src/help.js
index f0bcb1a..45d400c 100644
--- a/src/help.js
+++ b/src/help.js
@@ -17,12 +17,13 @@
under the License.
*/
var fs = require('fs'),
- events = require('./events'),
+ cordova_lib = require('cordova-lib'),
+ cordova = cordova_lib.cordova,
Q = require('q'),
path = require('path');
module.exports = function help () {
var raw = fs.readFileSync(path.join(__dirname, '..', 'doc', 'help.txt')).toString('utf8');
- events.emit('results', raw);
+ cordova.emit('results', raw);
return Q();
};