cordova-coho git commit: CB-11980: updated path to cordova-lib

2017-06-09 Thread steven 
Repository: cordova-coho
Updated Branches:
  refs/heads/master 7ce2b10cb -> d6c2a336a


CB-11980: updated path to cordova-lib


Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/d6c2a336
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/d6c2a336
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/d6c2a336

Branch: refs/heads/master
Commit: d6c2a336af8fba85e65bbbde623f9eb0b021744f
Parents: 7ce2b10
Author: Steve Gill 
Authored: Fri Jun 9 16:28:37 2017 -0700
Committer: Steve Gill 
Committed: Fri Jun 9 16:28:58 2017 -0700

--
 src/repoutil.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/d6c2a336/src/repoutil.js
--
diff --git a/src/repoutil.js b/src/repoutil.js
index a4cd410..14b14a2 100644
--- a/src/repoutil.js
+++ b/src/repoutil.js
@@ -308,8 +308,7 @@ var toolRepos = [
 title: 'Cordova Lib',
 id: 'lib',
 repoName: 'cordova-lib',
-jiraComponentName: 'cordova-lib',
-path: 'cordova-lib'
+jiraComponentName: 'cordova-lib'
 }, {
 title: 'Cordova Serve',
 id: 'serve',


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[03/17] cordova-lib git commit: remove no longer used module.

2017-06-09 Thread filmaj 
remove no longer used module.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/070eb318
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/070eb318
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/070eb318

Branch: refs/heads/no-lazy-load
Commit: 070eb318c17f366bd84927e9678403a1129e4bde
Parents: 0e3f7db
Author: filmaj 
Authored: Wed Jun 7 17:20:42 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 08:58:46 2017 -0500

--
 src/cordova/cordova.js | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/070eb318/src/cordova/cordova.js
--
diff --git a/src/cordova/cordova.js b/src/cordova/cordova.js
index 99c8078..f17cf69 100644
--- a/src/cordova/cordova.js
+++ b/src/cordova/cordova.js
@@ -55,7 +55,6 @@ exports.findProjectRoot = function(opt_startDir) {
 var addModuleProperty = cordova_util.addModuleProperty;
 addModuleProperty(module, 'prepare', './prepare', true);
 addModuleProperty(module, 'build', './build', true);
-addModuleProperty(module, 'help', './help');
 addModuleProperty(module, 'config', './config');
 addModuleProperty(module, 'create', './create', true);
 addModuleProperty(module, 'emulate', './emulate', true);


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[12/17] cordova-lib git commit: :snail: some derps on my part

2017-06-09 Thread filmaj 
:snail: some derps on my part


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/52c38889
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/52c38889
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/52c38889

Branch: refs/heads/no-lazy-load
Commit: 52c38889e8c625c6c808b21de9315f6078a9e07d
Parents: ca7a068
Author: filmaj 
Authored: Fri Jun 9 14:17:55 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 14:17:55 2017 -0500

--
 src/cordova/cordova.js | 2 +-
 src/cordova/util.js| 9 ++---
 src/plugman/plugman.js | 3 ++-
 src/util/alias.js  | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/52c38889/src/cordova/cordova.js
--
diff --git a/src/cordova/cordova.js b/src/cordova/cordova.js
index c180f7d..5b091e3 100644
--- a/src/cordova/cordova.js
+++ b/src/cordova/cordova.js
@@ -52,7 +52,7 @@ exports = module.exports = {
 emulate: require('./emulate'),
 plugin: require('./plugin'),
 plugins: require('./plugin'),
-serve: require('./serve'));
+serve: require('./serve'),
 platform: require('./platform'),
 platforms: require('./platform'),
 compile: require('./compile'),

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/52c38889/src/cordova/util.js
--
diff --git a/src/cordova/util.js b/src/cordova/util.js
index cf6845d..59c655d 100644
--- a/src/cordova/util.js
+++ b/src/cordova/util.js
@@ -27,6 +27,7 @@ var fs= require('fs'),
 nopt  = require('nopt'),
 Q = require('q'),
 semver= require('semver'),
+aliasMethod   = require('../util/alias'),
 platforms = require('../platforms/platforms');
 
 // Global configuration paths
@@ -55,14 +56,16 @@ Object.defineProperty(exports,'libDirectory', {
 }
 });
 
-addModuleProperty(module, 'plugin_parser', './plugin_parser');
-
+exports.plugin_parser = require('./plugin_parser');
+exports.raw = {};
+// Alias the plugin_parser method to the raw:{} object above.
+// Emits a deprecation warning if utilized, in prep for removal of `raw`.
+aliasMethod('plugin_parser', exports, 'cordova_util');
 exports.isCordova = isCordova;
 exports.cdProjectRoot = cdProjectRoot;
 exports.deleteSvnFolders = deleteSvnFolders;
 exports.listPlatforms = listPlatforms;
 exports.findPlugins = findPlugins;
-exports.addModuleProperty = addModuleProperty;
 exports.appDir = appDir;
 exports.projectWww = projectWww;
 exports.projectConfig = projectConfig;

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/52c38889/src/plugman/plugman.js
--
diff --git a/src/plugman/plugman.js b/src/plugman/plugman.js
index 3b65b73..f7c6bb6 100644
--- a/src/plugman/plugman.js
+++ b/src/plugman/plugman.js
@@ -20,6 +20,7 @@
 // copyright (c) 2013 Andrew Lunny, Adobe Systems
 
 var events = require('cordova-common').events;
+var aliasMethodToRawWithDeprecationNotice = require('../util/alias');
 var Q = require('q');
 
 var plugman = {
@@ -50,7 +51,7 @@ var modulesToAlias = ['install', 'uninstall', 'fetch', 
'browserify', 'help',
 'createpackagejson'];
 
 modulesToAlias.forEach(function(mod) {
-aliasMethodToRawWithDeprecationNotice(mod, module.exports, 'plugman');
+aliasMethodToRawWithDeprecationNotice(mod, plugman, 'plugman');
 });
 
 plugman.commands =  {

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/52c38889/src/util/alias.js
--
diff --git a/src/util/alias.js b/src/util/alias.js
index d44cb0b..edc32bc 100644
--- a/src/util/alias.js
+++ b/src/util/alias.js
@@ -24,4 +24,4 @@ module.exports = function 
aliasMethodToRawWithDeprecationNotice(property, target
 cordova_events.emit('warn', 'Use of `' + component + '.raw.*` methods 
is deprecated and `' + component + '.raw` will be removed in a future release. 
Please migrate to using the top-level `' + component + '.*` methods instead.');
 targetObj[property].apply(targetObj, arguments);
 };
-}
+};


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[05/17] cordova-lib git commit: plugman install require for top-level plugman module should be at runtime, otherwise without lazy loading we get into a circular dependency situation

2017-06-09 Thread filmaj 
plugman install require for top-level plugman module should be at runtime, 
otherwise without lazy loading we get into a circular dependency situation


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/57c212c6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/57c212c6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/57c212c6

Branch: refs/heads/no-lazy-load
Commit: 57c212c6378466562815a9764765754e19271a5a
Parents: 070eb31
Author: filmaj 
Authored: Thu Jun 8 17:47:47 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 08:58:46 2017 -0500

--
 src/plugman/install.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/57c212c6/src/plugman/install.js
--
diff --git a/src/plugman/install.js b/src/plugman/install.js
index 69b9aa3..fbc40aa 100644
--- a/src/plugman/install.js
+++ b/src/plugman/install.js
@@ -33,7 +33,6 @@ var path = require('path'),
 underscore = require('underscore'),
 shell   = require('shelljs'),
 events = require('cordova-common').events,
-plugman = require('./plugman'),
 HooksRunner = require('../hooks/HooksRunner'),
 isWindows = (os.platform().substr(0,3) === 'win'),
 pluginSpec = require('../cordova/plugin_spec_parser'),
@@ -98,7 +97,8 @@ function possiblyFetch(id, plugins_dir, options) {
 var opts = underscore.extend({}, options, {
 client: 'plugman'
 });
-return plugman.raw.fetch(id, plugins_dir, opts);
+// TODO: without runtime require below, we have a circular dependency.
+return require('./plugman').raw.fetch(id, plugins_dir, opts);
 }
 
 function checkEngines(engines) {


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[16/17] cordova-lib git commit: move platform module exports to the top, so clear what is exported.

2017-06-09 Thread filmaj 
move platform module exports to the top, so clear what is exported.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/b8b10139
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/b8b10139
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/b8b10139

Branch: refs/heads/no-lazy-load
Commit: b8b101392be972ae177f2f23b1cf53c3a9886b08
Parents: 7d865a9
Author: filmaj 
Authored: Fri Jun 9 18:25:46 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 18:25:46 2017 -0500

--
 src/cordova/platform.js | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b8b10139/src/cordova/platform.js
--
diff --git a/src/cordova/platform.js b/src/cordova/platform.js
index 3545b29..0b8a8c1 100644
--- a/src/cordova/platform.js
+++ b/src/cordova/platform.js
@@ -38,6 +38,15 @@ var config= require('./config'),
 npmUninstall  = require('cordova-fetch').uninstall,
 platformMetadata  = require('./platform_metadata');
 
+module.exports = platform;
+module.exports.add = add;
+module.exports.remove = remove;
+module.exports.update = update;
+module.exports.check = check;
+module.exports.list = list;
+module.exports.save = save;
+module.exports.getPlatformDetailsFromDir = getPlatformDetailsFromDir;
+
 // Expose the platform parsers on top of this command
 for (var p in platforms) {
 module.exports[p] = platforms[p];
@@ -647,7 +656,6 @@ function addDeprecatedInformationToPlatforms(platformsList){
  * @param {Object} opts
  * @returns {Promise}
  */
-module.exports = platform;
 function platform(command, targets, opts) {
 // CB-10519 wrap function code into promise so throwing error
 // would result in promise rejection instead of uncaught exception
@@ -760,10 +768,3 @@ function removePlatformPluginsJson(projectRoot, target) {
 shell.rm('-f', plugins_json);
 }
 
-module.exports.add = add;
-module.exports.remove = remove;
-module.exports.update = update;
-module.exports.check = check;
-module.exports.list = list;
-module.exports.save = save;
-module.exports.getPlatformDetailsFromDir = getPlatformDetailsFromDir;


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[09/17] cordova-lib git commit: ignore vim swap files.

2017-06-09 Thread filmaj 
ignore vim swap files.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/465079ec
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/465079ec
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/465079ec

Branch: refs/heads/no-lazy-load
Commit: 465079ec0e50d4984cfed1a345de6806f78e08ca
Parents: 472c31a
Author: filmaj 
Authored: Thu Jun 8 18:39:04 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 08:58:47 2017 -0500

--
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/465079ec/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 1cba455..ee96fde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ cordova-lib/src/plugman/defaults.json
 cordova-lib/spec-plugman/plugins/recursivePlug/demo/fetch.json
 cordova-lib/spec-plugman/plugins/recursivePlug/demo/test-recursive
 cordova-fetch/test/temp
+**/*.swp


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[10/17] cordova-lib git commit: Keep `raw` object around, alias to module directly, but drop in a deprecation warning if it is used. Update all code and specs to stop using the `raw` object.

2017-06-09 Thread filmaj 
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/ca7a068e/spec-cordova/plugin.spec.js
--
diff --git a/spec-cordova/plugin.spec.js b/spec-cordova/plugin.spec.js
index 1e4b606..35fef78 100644
--- a/spec-cordova/plugin.spec.js
+++ b/spec-cordova/plugin.spec.js
@@ -53,15 +53,15 @@ var results;
 // Runs: list, add, list
 function addPlugin(target, id, options) {
 // Check there are no plugins yet.
-return cordova.raw.plugin('list').then(function() {
+return cordova.plugin('list').then(function() {
 expect(results).toMatch(/No plugins added/gi);
 }).then(function() {
 // Add a fake plugin from fixtures.
-return cordova.raw.plugin('add', target, options);
+return cordova.plugin('add', target, options);
 }).then(function() {
 expect(path.join(project, 'plugins', id, 'plugin.xml')).toExist();
 }).then(function() {
-return cordova.raw.plugin('ls');
+return cordova.plugin('ls');
 }).then(function() {
 expect(results).toContain(id);
 });
@@ -69,12 +69,12 @@ function addPlugin(target, id, options) {
 
 // Runs: remove, list
 function removePlugin(id) {
-return cordova.raw.plugin('rm', id)
+return cordova.plugin('rm', id)
 .then(function() {
 // The whole dir should be gone.
 expect(path.join(project, 'plugins', id)).not.toExist();
 }).then(function() {
-return cordova.raw.plugin('ls');
+return cordova.plugin('ls');
 }).then(function() {
 expect(results).toMatch(/No plugins added/gi);
 });
@@ -91,7 +91,7 @@ var errorHandler = {
 // that use a searchpath. See loadLocalPlugins() in plugman/fetch.js for 
details.
 // The searchpath behavior gets tested in the plugman spec
 function mockPluginFetch(id, dir) {
-spyOn(plugman.raw, 'fetch').and.callFake(function(target, pluginPath, 
fetchOptions) {
+spyOn(plugman, 'fetch').and.callFake(function(target, pluginPath, 
fetchOptions) {
 var dest = path.join(project, 'plugins', id);
 var src = path.join(dir, 'plugin.xml');
 
@@ -200,7 +200,7 @@ describe('plugin end-to-end', function() {
 return addPlugin(npmInfoTestPlugin, npmInfoTestPlugin, {searchpath: 
pluginsDir}, done)
 .then(function() {
 expect(registry.info).not.toHaveBeenCalled();
-var fetchOptions = plugman.raw.fetch.calls.mostRecent().args[2];
+var fetchOptions = plugman.fetch.calls.mostRecent().args[2];
 expect(fetchOptions.searchpath[0]).toExist();
 })
 .fail(function(err) {
@@ -217,7 +217,7 @@ describe('plugin end-to-end', function() {
 .then(function() {
 expect(registry.info).not.toHaveBeenCalled();
 
-var fetchOptions = plugman.raw.fetch.calls.mostRecent().args[2];
+var fetchOptions = plugman.fetch.calls.mostRecent().args[2];
 expect(fetchOptions.noregistry).toBeTruthy();
 })
 .fail(function(err) {
@@ -246,7 +246,7 @@ describe('plugin end-to-end', function() {
 .then(function() {
 expect(registry.info).toHaveBeenCalled();
 
-var fetchTarget = plugman.raw.fetch.calls.mostRecent().args[0];
+var fetchTarget = plugman.fetch.calls.mostRecent().args[0];
 expect(fetchTarget).toEqual(npmInfoTestPlugin + '@' + 
npmInfoTestPluginVersion);
 })
 .fail(function(err) {
@@ -267,7 +267,7 @@ describe('plugin end-to-end', function() {
 
 expect(registry.info).toHaveBeenCalledWith([scopedPackage]);
 
-var fetchTarget = plugman.raw.fetch.calls.mostRecent().args[0];
+var fetchTarget = plugman.fetch.calls.mostRecent().args[0];
 expect(fetchTarget).toEqual(scopedPackage);
 })
 .fail(function(err) {
@@ -285,7 +285,7 @@ describe('plugin end-to-end', function() {
 .then(function() {
 expect(registry.info).not.toHaveBeenCalled();
 
-var fetchTarget = plugman.raw.fetch.calls.mostRecent().args[0];
+var fetchTarget = plugman.fetch.calls.mostRecent().args[0];
 expect(fetchTarget).toEqual(scopedPackage);
 })
 .fail(function(err) {

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/ca7a068e/spec-cordova/project-metadata-apis.spec.js
--
diff --git a/spec-cordova/project-metadata-apis.spec.js 
b/spec-cordova/project-metadata-apis.spec.js
index ef2bfca..acffaf9 100644
--- a/spec-cordova/project-metadata-apis.spec.js
+++ b/spec-cordova/project-metadata-apis.spec.js
@@ -27,7 +27,7 @@ describe('retrieval of project metadata', function () {
 var androidVersion = '3.7.1';
 var browserSrc = 'https://github.com/apache/cordova-browser.git';
 
-cordova.raw.projectMetadata.getPlatforms(projectRoot)
+cordova.projectMetadata.getPlatforms(projectRoot)

[13/17] cordova-lib git commit: for deprecation-warning-wrapped raw methods, ensure to return so we can send the promise back.

2017-06-09 Thread filmaj 
for deprecation-warning-wrapped raw methods, ensure to return so we can send 
the promise back.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/781c3c98
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/781c3c98
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/781c3c98

Branch: refs/heads/no-lazy-load
Commit: 781c3c98c2df14c3b4bbbff447af0cab149020f5
Parents: 52c3888
Author: filmaj 
Authored: Fri Jun 9 14:26:00 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 14:26:00 2017 -0500

--
 src/util/alias.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/781c3c98/src/util/alias.js
--
diff --git a/src/util/alias.js b/src/util/alias.js
index edc32bc..4435c08 100644
--- a/src/util/alias.js
+++ b/src/util/alias.js
@@ -22,6 +22,6 @@ var cordova_events = require('cordova-common').events;
 module.exports = function aliasMethodToRawWithDeprecationNotice(property, 
targetObj, component) {
 targetObj.raw[property] = function() {
 cordova_events.emit('warn', 'Use of `' + component + '.raw.*` methods 
is deprecated and `' + component + '.raw` will be removed in a future release. 
Please migrate to using the top-level `' + component + '.*` methods instead.');
-targetObj[property].apply(targetObj, arguments);
+return targetObj[property].apply(targetObj, arguments);
 };
 };


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[07/17] cordova-lib git commit: small tweaks to hooks runner tests

2017-06-09 Thread filmaj 
small tweaks to hooks runner tests


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/472c31aa
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/472c31aa
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/472c31aa

Branch: refs/heads/no-lazy-load
Commit: 472c31aa8808937438657377d3388ffdc1bf90e8
Parents: 91eef6f
Author: filmaj 
Authored: Thu Jun 8 18:38:33 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 08:58:47 2017 -0500

--
 spec-cordova/HooksRunner.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/472c31aa/spec-cordova/HooksRunner.spec.js
--
diff --git a/spec-cordova/HooksRunner.spec.js b/spec-cordova/HooksRunner.spec.js
index 54d2ddc..ef28fa8 100644
--- a/spec-cordova/HooksRunner.spec.js
+++ b/spec-cordova/HooksRunner.spec.js
@@ -30,7 +30,6 @@ var cordova = require('../src/cordova/cordova'),
 helpers = require('./helpers'),
 PluginInfo = require('cordova-common').PluginInfo,
 superspawn = require('cordova-common').superspawn,
-events = require('cordova-common').events,
 config = require('../src/cordova/config');
 
 var platform = os.platform();
@@ -69,6 +68,7 @@ shell.chmod('-R', 'ug+x', scriptsDir);
 
 // To get more verbose output to help trace program flow, uncomment the lines 
below
 // TODO: think about how to factor this out so that it can be invoked from the 
command line
+//var events = require('cordova-common').events;
 //events.on('log', function(msg) { console.log(msg); });
 //events.on('verbose', function(msg) { console.log(msg); });
 //events.on('warn', function(msg) { console.log(msg); });


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[17/17] cordova-lib git commit: move actual unit tests from the old (mostly integration-test-heavy) platform.spec to new spec-cordova/platform.spec.js.

2017-06-09 Thread filmaj 
move actual unit tests from the old (mostly integration-test-heavy) 
platform.spec to new spec-cordova/platform.spec.js.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/4b772eaf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/4b772eaf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/4b772eaf

Branch: refs/heads/no-lazy-load
Commit: 4b772eafda89be2b85789fd10e9025a2d73168b7
Parents: b8b1013
Author: filmaj 
Authored: Fri Jun 9 18:26:17 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 18:26:17 2017 -0500

--
 spec-cordova/platform.spec.js | 61 ++
 1 file changed, 61 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/4b772eaf/spec-cordova/platform.spec.js
--
diff --git a/spec-cordova/platform.spec.js b/spec-cordova/platform.spec.js
new file mode 100644
index 000..5df16d9
--- /dev/null
+++ b/spec-cordova/platform.spec.js
@@ -0,0 +1,61 @@
+/**
+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.
+*/
+
+var platform = require('../src/cordova/platform');
+var os = require('os');
+
+describe('cordova.platform', function() {
+describe('add function', function () {
+var opts;
+var hooksRunnerMock;
+var projectRoot = os.tmpdir();
+
+beforeEach(function(){
+opts = {};
+projectRoot = 
+hooksRunnerMock = {
+fire: function () {
+return Q();
+}
+};
+});
+
+it('Test 004 : throws if the target list is empty', function (done) {
+var targets = [];
+platform.add(hooksRunnerMock, projectRoot, targets, 
opts).fail(function (error) {
+expect(error.message).toBe('No platform specified. Please 
specify a platform to add. See `cordova platform list`.');
+done();
+});
+});
+
+it('Test 005 : throws if the target list is undefined or null', 
function (done) {
+
+// case 1 : target list undefined
+var targets; // = undefined;
+platform.add(hooksRunnerMock, projectRoot, targets, 
opts).fail(function (error) {
+expect(error.message).toBe('No platform specified. Please 
specify a platform to add. See `cordova platform list`.');
+});
+
+// case 2 : target list null
+targets = null;
+platform.add(hooksRunnerMock, projectRoot, targets, 
opts).fail(function (error) {
+expect(error.message).toBe('No platform specified. Please 
specify a platform to add. See `cordova platform list`.');
+done();
+});
+});
+});
+});


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[15/17] cordova-lib git commit: move platform specs to integration tests directory

2017-06-09 Thread filmaj 
move platform specs to integration tests directory


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/7d865a9c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/7d865a9c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/7d865a9c

Branch: refs/heads/no-lazy-load
Commit: 7d865a9c6191134ada3049b59036b66f684dfc70
Parents: 8cebc3c
Author: filmaj 
Authored: Fri Jun 9 17:33:05 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 17:33:05 2017 -0500

--
 integration-tests/platform.spec.js | 403 
 spec-cordova/platform.spec.js  | 403 
 2 files changed, 403 insertions(+), 403 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/7d865a9c/integration-tests/platform.spec.js
--
diff --git a/integration-tests/platform.spec.js 
b/integration-tests/platform.spec.js
new file mode 100644
index 000..ae23178
--- /dev/null
+++ b/integration-tests/platform.spec.js
@@ -0,0 +1,403 @@
+/**
+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.
+*/
+
+var helpers = require('./helpers'),
+path = require('path'),
+fs = require('fs'),
+shell = require('shelljs'),
+superspawn = require('cordova-common').superspawn,
+config = require('../src/cordova/config'),
+Q = require('q'),
+events = require('cordova-common').events,
+cordova = require('../src/cordova/cordova'),
+plugman = require('../src/plugman/plugman'),
+rewire = require('rewire'),
+platform = rewire('../src/cordova/platform.js');
+
+var projectRoot = 'C:\\Projects\\cordova-projects\\move-tracker';
+var pluginsDir = path.join(__dirname, 'fixtures', 'plugins');
+
+describe('platform end-to-end', function () {
+
+var tmpDir = helpers.tmpDir('platform_test');
+var project = path.join(tmpDir, 'project');
+
+var results;
+
+beforeEach(function() {
+shell.rm('-rf', tmpDir);
+
+// cp then mv because we need to copy everything, but that means it'll 
copy the whole directory.
+// Using /* doesn't work because of hidden files.
+shell.cp('-R', path.join(__dirname, 'fixtures', 'base'), tmpDir);
+shell.mv(path.join(tmpDir, 'base'), project);
+process.chdir(project);
+
+// Now we load the config.json in the newly created project and edit 
the target platform's lib entry
+// to point at the fixture version. This is necessary so that 
cordova.prepare can find cordova.js there.
+var c = config.read(project);
+c.lib[helpers.testPlatform].url = path.join(__dirname, 'fixtures', 
'platforms', helpers.testPlatform + '-lib');
+config.write(project, c);
+
+// The config.json in the fixture project points at fake "local" paths.
+// Since it's not a URL, the lazy-loader will just return the junk 
path.
+spyOn(superspawn, 'spawn').and.callFake(function(cmd, args) {
+if (cmd.match(/create\b/)) {
+// This is a call to the bin/create script, so do the copy 
ourselves.
+shell.cp('-R', path.join(__dirname, 'fixtures', 'platforms', 
'android'), path.join(project, 'platforms'));
+} else if(cmd.match(/version\b/)) {
+return Q('3.3.0');
+} else if(cmd.match(/update\b/)) {
+fs.writeFileSync(path.join(project, 'platforms', 
helpers.testPlatform, 'updated'), 'I was updated!', 'utf-8');
+}
+return Q();
+});
+
+events.on('results', function(res) { results = res; });
+});
+
+afterEach(function() {
+process.chdir(path.join(__dirname, '..'));  // Needed to rm the dir on 
Windows.
+shell.rm('-rf', tmpDir);
+});
+
+// Factoring out some repeated checks.
+function emptyPlatformList() {
+return cordova.platform('list').then(function() {
+var installed = results.match(/Installed

[06/17] cordova-lib git commit: Revert lazy loading of modules.

2017-06-09 Thread filmaj 
Revert lazy loading of modules.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/133d8d19
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/133d8d19
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/133d8d19

Branch: refs/heads/no-lazy-load
Commit: 133d8d196b8dbdb4a612a464873ab8851fd6f9b3
Parents: e69b9e4
Author: filmaj 
Authored: Wed Jun 7 14:43:29 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 08:58:46 2017 -0500

--
 cordova-lib.js | 32 
 src/plugman/plugman.js | 19 +--
 2 files changed, 13 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/133d8d19/cordova-lib.js
--
diff --git a/cordova-lib.js b/cordova-lib.js
index 1252412..7a51ed7 100644
--- a/cordova-lib.js
+++ b/cordova-lib.js
@@ -17,21 +17,7 @@
 under the License.
 */
 
-// For now expose plugman and cordova just as they were in the old repos
-
-
-function addProperty(obj, property, modulePath) {
-// Add properties as getter to delay load the modules on first invocation
-Object.defineProperty(obj, property, {
-configurable: true,
-get: function () {
-var module = require(modulePath);
-// We do not need the getter any more
-obj[property] = module;
-return module;
-}
-});
-}
+var common = require('cordova-common');
 
 exports = module.exports = {
 set binname(name) {
@@ -40,13 +26,11 @@ exports = module.exports = {
 get binname() {
 return this.cordova.binname;
 },
-get events() { return require('cordova-common').events },
-get configparser() { return require('cordova-common').ConfigParser },
-get PluginInfo() { return require('cordova-common').PluginInfo },
-get CordovaError() { return require('cordova-common').CordovaError }
-
+events: common.events,
+configparser: common.ConfigParser,
+PluginInfo: common.PluginInfo,
+CordovaError: common.CordovaError,
+plugman: require('./src/plugman/plugman'),
+cordova: require('./src/cordova/cordova'),
+cordova_platforms: require('./src/platforms/platforms')
 };
-
-addProperty(module.exports, 'plugman', './src/plugman/plugman');
-addProperty(module.exports, 'cordova', './src/cordova/cordova');
-addProperty(module.exports, 'cordova_platforms', './src/platforms/platforms');
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/133d8d19/src/plugman/plugman.js
--
diff --git a/src/plugman/plugman.js b/src/plugman/plugman.js
index 3a97824..63102a4 100644
--- a/src/plugman/plugman.js
+++ b/src/plugman/plugman.js
@@ -23,35 +23,26 @@ var events = require('cordova-common').events;
 var Q = require('q');
 
 function addProperty(o, symbol, modulePath, doWrap) {
-var val = null;
+var modewl = require(modulePath);
 
 if (doWrap) {
 o[symbol] = function() {
-val = val || require(modulePath);
 if (arguments.length && typeof arguments[arguments.length - 1] === 
'function') {
 // If args exist and the last one is a function, it's the 
callback.
 var args = Array.prototype.slice.call(arguments);
 var cb = args.pop();
-val.apply(o, args).done(function(result) {cb(undefined, 
result);}, cb);
+modewl.apply(o, args).done(function(result) {cb(undefined, 
result);}, cb);
 } else {
-val.apply(o, arguments).done(null, function(err){ throw err; 
});
+modewl.apply(o, arguments).done(null, function(err){ throw 
err; });
 }
 };
 } else {
 // The top-level plugman.foo
-Object.defineProperty(o, symbol, {
-configurable: true,
-get : function() { val = val || require(modulePath); return val; },
-set : function(v) { val = v; }
-});
+o[symbol] = modewl;
 }
 
 // The plugman.raw.foo
-Object.defineProperty(o.raw, symbol, {
-configurable: true,
-get : function() { val = val || require(modulePath); return val; },
-set : function(v) { val = v; }
-});
+o.raw[symbol] = modewl;
 }
 
 var plugman = {


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[08/17] cordova-lib git commit: fully remove the wrapper specs, why not

2017-06-09 Thread filmaj 
fully remove the wrapper specs, why not


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/91eef6fe
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/91eef6fe
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/91eef6fe

Branch: refs/heads/no-lazy-load
Commit: 91eef6fe51ecc3d0fded7333f8f445d8cc9b05c8
Parents: 199928f
Author: filmaj 
Authored: Thu Jun 8 18:37:42 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 08:58:47 2017 -0500

--
 spec-cordova/wrappers.spec.js | 61 -
 spec-plugman/wrappers.spec.js | 62 --
 2 files changed, 123 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/91eef6fe/spec-cordova/wrappers.spec.js
--
diff --git a/spec-cordova/wrappers.spec.js b/spec-cordova/wrappers.spec.js
deleted file mode 100644
index 35c6c2e..000
--- a/spec-cordova/wrappers.spec.js
+++ /dev/null
@@ -1,61 +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.
-*/
-
-/* jshint loopfunc: true */
-
-var Q = require('q'),
-cordova = require('../src/cordova/cordova');
-
-// TODO: remove this file, and instead add unit tests for addModuleProperty to 
spec-cordova/util.spec.js
-xdescribe('callback wrapper', function() {
-var calls = ['prepare', 'build', 'create', 'emulate', 'plugin', 
'platform', 'compile', 'run'];
-for (var i = 0; i < calls.length; i++) {
-var call = calls[i];
-
-describe('`' + call + '`', function() {
-var raw;
-beforeEach(function() {
-raw = spyOn(cordova.raw, call);
-});
-
-it('Test 001 : should work with no callback and success', 
function() {
-raw.and.returnValue(Q());
-cordova[call]();
-expect(raw).toHaveBeenCalled();
-});
-
-it('Test 002 : should call the callback on success', 
function(done) {
-raw.and.returnValue(Q());
-cordova[call](function(err) {
-expect(err).toBeUndefined();
-done();
-});
-});
-
-it('Test 003 : should call the callback with the error on 
failure', function(done) {
-var err = new Error('junk');
-raw.and.returnValue(Q.reject(err));
-cordova[call](function(e) {
-expect(e).toEqual(err);
-done();
-});
-});
-});
-}
-});

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/91eef6fe/spec-plugman/wrappers.spec.js
--
diff --git a/spec-plugman/wrappers.spec.js b/spec-plugman/wrappers.spec.js
deleted file mode 100644
index d7904a1..000
--- a/spec-plugman/wrappers.spec.js
+++ /dev/null
@@ -1,62 +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.
-*/
-
-/* jshint loopfunc:true */
-
-var Q = require('q'),
-plugman = require('../src/plugman/plugman');
-
-// TODO:  instead, test the addPropertyMethod of src/plugman/plugman

[14/17] cordova-lib git commit: move cocoapod plugin test to integration tests, rename for clarity

2017-06-09 Thread filmaj 
move cocoapod plugin test to integration tests, rename for clarity


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/8cebc3ca
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/8cebc3ca
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/8cebc3ca

Branch: refs/heads/no-lazy-load
Commit: 8cebc3cac744c4fb0aaf4739cb26bc7a19fd7794
Parents: 781c3c9
Author: filmaj 
Authored: Fri Jun 9 17:31:09 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 17:31:09 2017 -0500

--
 .../ios-add-plugin-with-cocoapod.spec.js| 137 +++
 spec-cordova/platform.spec.ios.js   | 137 ---
 2 files changed, 137 insertions(+), 137 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/8cebc3ca/integration-tests/ios-add-plugin-with-cocoapod.spec.js
--
diff --git a/integration-tests/ios-add-plugin-with-cocoapod.spec.js 
b/integration-tests/ios-add-plugin-with-cocoapod.spec.js
new file mode 100644
index 000..5a183bc
--- /dev/null
+++ b/integration-tests/ios-add-plugin-with-cocoapod.spec.js
@@ -0,0 +1,137 @@
+/**
+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.
+*/
+
+var helpers = require('./helpers'),
+path = require('path'),
+fs = require('fs'),
+shell = require('shelljs'),
+cordova_util = ('../src/cordova/util'),
+cordova = require('../src/cordova/cordova');
+
+
+describe('cocoapod plugin add and rm end-to-end', function () {
+
+var tmpDir = helpers.tmpDir('cocoapod_plugin_test');
+var project = path.join(tmpDir, 'hello4');
+
+var samplePlugin = path.join(__dirname, 'fixtures', 'plugins', 
'sample-cordova-plugin-cocoapod-dependent');
+var overlappingDependencyPlugin = path.join(__dirname, 'fixtures', 
'plugins', 'sample-cocoapod-plugin-overlapping-dependency');
+var AFNetworking = 'AFNetworking',
+CWStatusBarNotification = 'CWStatusBarNotification';
+var podfile, podsJSON, workspace;
+
+beforeEach(function() {
+process.chdir(tmpDir);
+});
+
+afterEach(function() {
+process.chdir(path.join(__dirname, '..'));  // Needed to rm the dir on 
Windows.
+shell.rm('-rf', tmpDir);
+});
+
+it('Test 001 : installs and uninstalls plugin depending on new pod and 
existing pod', function(done) {
+
+cordova.create('hello4')
+.then(function() {
+process.chdir(project);
+return cordova.platform('add', 
'https://git-wip-us.apache.org/repos/asf/cordova-ios.git');
+})
+.then(function() {
+return cordova.plugin('add', samplePlugin);
+})
+.then(function() {
+podfile = path.resolve('./platforms/ios/Podfile');
+podsJSON = path.resolve('./platforms/ios/pods.json');
+workspace = 
path.resolve('./platforms/ios/HelloCordova.xcworkspace');
+
+//podfile should have been created
+fs.exists(podfile, function(podfileExists){
+expect(podfileExists);
+});
+
+//pods.json should have been created
+fs.exists(podsJSON, function(podsJSONExists){
+expect(podsJSONExists);
+});
+
+//workspace should have been created
+fs.exists(workspace, function(workspaceCreated){
+expect(workspaceCreated);
+});
+
+var podfileContent = fs.readFileSync(podfile, {'encoding' : 
'utf8'});
+expect(podfileContent.indexOf(AFNetworking) !== -1 );
+
+var podsJSONContent = require(podsJSON);
+expect(podsJSONContent[AFNetworking] !== null);
+
+return cordova.plugin('add', overlappingDependencyPlugin);
+})
+.then(function() {
+var podfileContent = fs.readFileSync(podfile, {'encoding' : 
'utf8'});
+var numberOfTimesAFNetworkingIsInPodfile =

[11/17] cordova-lib git commit: Keep `raw` object around, alias to module directly, but drop in a deprecation warning if it is used. Update all code and specs to stop using the `raw` object.

2017-06-09 Thread filmaj 
Keep `raw` object around, alias to module directly, but drop in a deprecation 
warning if it is used. Update all code and specs to stop using the `raw` object.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/ca7a068e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/ca7a068e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/ca7a068e

Branch: refs/heads/no-lazy-load
Commit: ca7a068ef92b11a50fdf1fe44eb9df5adeb37bee
Parents: 465079e
Author: filmaj 
Authored: Fri Jun 9 14:04:17 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 14:04:17 2017 -0500

--
 integration-tests/fetch.spec.js|  42 +-
 integration-tests/pkgJson-restore.spec.js  | 102 
 integration-tests/pkgJson.spec.js  |  74 -
 spec-cordova/HooksRunner.spec.js   |   8 +-
 spec-cordova/build.spec.js |  22 ++---
 spec-cordova/compile.spec.js   |  18 ++---
 spec-cordova/create.spec.js|   8 +-
 spec-cordova/emulate.spec.js   |  28 +++
 spec-cordova/platform.spec.ios.js  |  14 ++--
 spec-cordova/platform.spec.js  |  60 +++---
 spec-cordova/platform1.spec.js |   2 +-
 spec-cordova/plugin.spec.js|  22 ++---
 spec-cordova/project-metadata-apis.spec.js |   4 +-
 spec-cordova/run.spec.js   |  28 +++
 spec-cordova/save.spec.js  |  50 ++--
 spec-cordova/serve.spec.js |   4 +-
 spec-cordova/util.spec.js  |   4 +-
 spec-plugman/install.spec.js   |   2 +-
 src/cordova/build.js   |   4 +-
 src/cordova/cordova.js |  57 +++--
 src/cordova/emulate.js |   2 +-
 src/cordova/platform.js|   6 +-
 src/cordova/plugin.js  |   8 +-
 src/cordova/restore-util.js|   2 +-
 src/cordova/run.js |   2 +-
 src/cordova/serve.js   |   2 +-
 src/cordova/util.js|  29 +--
 src/plugman/install.js |   2 +-
 src/plugman/plugman.js |  63 ++-
 src/util/alias.js  |  27 +++
 30 files changed, 345 insertions(+), 351 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/ca7a068e/integration-tests/fetch.spec.js
--
diff --git a/integration-tests/fetch.spec.js b/integration-tests/fetch.spec.js
index 28278ae..78e3b9b 100644
--- a/integration-tests/fetch.spec.js
+++ b/integration-tests/fetch.spec.js
@@ -49,15 +49,15 @@ describe('end-to-end plugin dependency tests', function() {
 });
 
 it('Test 029 : should fail if dependency already installed is wrong 
version', function(done) {
-cordova.raw.create('hello3')
+cordova.create('hello3')
 .then(function() {
 process.chdir(project);
-return cordova.raw.platform('add', 'android', {'fetch': true});
+return cordova.platform('add', 'android', {'fetch': true});
 }).then(function() {
-return cordova.raw.plugin('add', 'cordova-plugin-file', {'fetch': 
true});
+return cordova.plugin('add', 'cordova-plugin-file', {'fetch': 
true});
 }).then(function() {
 expect(path.join(pluginsDir, 'cordova-plugin-file')).toExist();
-return cordova.raw.plugin('add', plugins['Test1'], {'fetch': 
true});
+return cordova.plugin('add', plugins['Test1'], {'fetch': true});
 }).fail(function(err) {
 expect(err.message).toContain('does not satisfy dependency plugin 
requirement');
 })
@@ -65,17 +65,17 @@ describe('end-to-end plugin dependency tests', function() {
 }, TIMEOUT);
 
 it('Test 030 : should pass if dependency already installed is wrong 
version with --force', function(done) {
-cordova.raw.create('hello3')
+cordova.create('hello3')
 .then(function() {
 process.chdir(project);
-return cordova.raw.platform('add', 'android', {'fetch': true});
+return cordova.platform('add', 'android', {'fetch': true});
 })
 .then(function() {
-return cordova.raw.plugin('add', 'cordova-plugin-file', {'fetch': 
true});
+return cordova.plugin('add', 'cordova-plugin-file', {'fetch': 
true});
 })
 .then(function() {
 expect(path.join(pluginsDir, 'cordova-plugin-file')).toExist();
-return cordova.raw.plugin('add', plugins['Test1'], {'fetch': true, 
'force':true});
+return

[02/17] cordova-lib git commit: bump timeout on test that fetches/unpacks tarballs. also ensure failure cases invoke done so we dont wait in case error conditions get hit.

2017-06-09 Thread filmaj 
bump timeout on test that fetches/unpacks tarballs. also ensure failure cases 
invoke done so we dont wait in case error conditions get hit.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/0593e8ae
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/0593e8ae
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/0593e8ae

Branch: refs/heads/no-lazy-load
Commit: 0593e8aeb4a57b75e6b67f89c7fc4e5c279118be
Parents: 57c212c
Author: filmaj 
Authored: Thu Jun 8 18:06:48 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 08:58:46 2017 -0500

--
 spec-cordova/HooksRunner.spec.js | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/0593e8ae/spec-cordova/HooksRunner.spec.js
--
diff --git a/spec-cordova/HooksRunner.spec.js b/spec-cordova/HooksRunner.spec.js
index e121ee3..54d2ddc 100644
--- a/spec-cordova/HooksRunner.spec.js
+++ b/spec-cordova/HooksRunner.spec.js
@@ -30,6 +30,7 @@ var cordova = require('../src/cordova/cordova'),
 helpers = require('./helpers'),
 PluginInfo = require('cordova-common').PluginInfo,
 superspawn = require('cordova-common').superspawn,
+events = require('cordova-common').events,
 config = require('../src/cordova/config');
 
 var platform = os.platform();
@@ -66,6 +67,12 @@ shell.chmod('-R', 'ug+x', hooksDir);
 shell.chmod('-R', 'ug+x', hooksDirDot);
 shell.chmod('-R', 'ug+x', scriptsDir);
 
+// To get more verbose output to help trace program flow, uncomment the lines 
below
+// TODO: think about how to factor this out so that it can be invoked from the 
command line
+//events.on('log', function(msg) { console.log(msg); });
+//events.on('verbose', function(msg) { console.log(msg); });
+//events.on('warn', function(msg) { console.log(msg); });
+
 describe('HooksRunner', function() {
 var hooksRunner;
 var hookOptions;
@@ -120,6 +127,7 @@ describe('HooksRunner', function() {
 // Add the testing platform.
 cordova.raw.platform('add', [helpers.testPlatform]).fail(function 
(err) {
 expect(err).toBeUndefined();
+done();
 }).then(function () {
 // Add the testing plugin
 projectRoot = cordovaUtil.isCordova();
@@ -136,13 +144,14 @@ describe('HooksRunner', function() {
 
 cordova.raw.plugin('add', testPluginFixturePath).fail(function 
(err) {
 expect(err && err.stack).toBeUndefined();
+done();
 }).then(function () {
 testPluginInstalledPath = path.join(projectRoot, 'plugins', 
'com.plugin.withhooks');
 shell.chmod('-R', 'ug+x', path.join(testPluginInstalledPath, 
'scripts'));
 done();
 });
 });
-});
+}, 10);
 
 describe('fire method', function() {
 beforeEach(function() {


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[04/17] cordova-lib git commit: removing lazy load from cordova-util.

2017-06-09 Thread filmaj 
removing lazy load from cordova-util.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/0e3f7dbb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/0e3f7dbb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/0e3f7dbb

Branch: refs/heads/no-lazy-load
Commit: 0e3f7dbbce0de9bd3d28183dfead90e435f8ee84
Parents: 133d8d1
Author: filmaj 
Authored: Wed Jun 7 17:14:55 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 08:58:46 2017 -0500

--
 src/cordova/util.js | 21 +++--
 1 file changed, 7 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/0e3f7dbb/src/cordova/util.js
--
diff --git a/src/cordova/util.js b/src/cordova/util.js
index 987cb4e..8b62470 100644
--- a/src/cordova/util.js
+++ b/src/cordova/util.js
@@ -62,11 +62,11 @@ exports.cdProjectRoot = cdProjectRoot;
 exports.deleteSvnFolders = deleteSvnFolders;
 exports.listPlatforms = listPlatforms;
 exports.findPlugins = findPlugins;
+exports.addModuleProperty = addModuleProperty;
 exports.appDir = appDir;
 exports.projectWww = projectWww;
 exports.projectConfig = projectConfig;
 exports.preProcessOptions = preProcessOptions;
-exports.addModuleProperty = addModuleProperty;
 exports.getOrigWorkingDirectory = getOrigWorkingDirectory;
 exports._resetOrigCwd = _resetOrigCwd;
 exports.fixRelativePath = fixRelativePath;
@@ -378,32 +378,25 @@ function isSymbolicLink(dir) {
 // opt_wrap is a boolean: True means that a callback-based wrapper for the 
promise-based function
 // should be created.
 function addModuleProperty(module, symbol, modulePath, opt_wrap, opt_obj) {
-var val = null;
+var modewl = require(modulePath);
 if (opt_wrap) {
 module.exports[symbol] = function() {
-val = val || module.require(modulePath);
 if (arguments.length && typeof arguments[arguments.length - 1] === 
'function') {
 // If args exist and the last one is a function, it's the 
callback.
 var args = Array.prototype.slice.call(arguments);
 var cb = args.pop();
-val.apply(module.exports, args).done(function(result) { 
cb(undefined, result); }, cb);
+modewl.apply(module.exports, args).done(function(result) { 
cb(undefined, result); }, cb);
 } else {
-val.apply(module.exports, arguments).done(null, function(err) 
{ throw err; });
+modewl.apply(module.exports, arguments).done(null, 
function(err) { throw err; });
 }
 };
 } else {
-Object.defineProperty(opt_obj || module.exports, symbol, {
-get : function() { val = val || module.require(modulePath); return 
val; },
-set : function(v) { val = v; }
-});
+(opt_obj || module.exports)[symbol] = modewl;
 }
 
 // Add the module.raw.foo as well.
-if(module.exports.raw) {
-Object.defineProperty(module.exports.raw, symbol, {
-get : function() { val = val || module.require(modulePath); return 
val; },
-set : function(v) { val = v; }
-});
+if (module.exports.raw) {
+module.exports.raw[symbol] = modewl;
 }
 }
 


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[cordova-lib] Git Push Summary

2017-06-09 Thread filmaj 
Repository: cordova-lib
Updated Branches:
  refs/heads/no-lazy-load [deleted] 4b772eafd

-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[01/17] cordova-lib git commit: comment out wrapper specs, leave todo on how to properly unit test.

2017-06-09 Thread filmaj 
Repository: cordova-lib
Updated Branches:
  refs/heads/no-lazy-load [created] 4b772eafd


comment out wrapper specs, leave todo on how to properly unit test.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/199928f1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/199928f1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/199928f1

Branch: refs/heads/no-lazy-load
Commit: 199928f129b31267b5ff7ac922e0ad9b8b9fb25a
Parents: 0593e8a
Author: filmaj 
Authored: Thu Jun 8 18:24:34 2017 -0500
Committer: filmaj 
Committed: Fri Jun 9 08:58:46 2017 -0500

--
 spec-cordova/wrappers.spec.js | 5 +++--
 spec-plugman/wrappers.spec.js | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/199928f1/spec-cordova/wrappers.spec.js
--
diff --git a/spec-cordova/wrappers.spec.js b/spec-cordova/wrappers.spec.js
index 9c6af7f..35c6c2e 100644
--- a/spec-cordova/wrappers.spec.js
+++ b/spec-cordova/wrappers.spec.js
@@ -22,7 +22,8 @@
 var Q = require('q'),
 cordova = require('../src/cordova/cordova');
 
-describe('callback wrapper', function() {
+// TODO: remove this file, and instead add unit tests for addModuleProperty to 
spec-cordova/util.spec.js
+xdescribe('callback wrapper', function() {
 var calls = ['prepare', 'build', 'create', 'emulate', 'plugin', 
'platform', 'compile', 'run'];
 for (var i = 0; i < calls.length; i++) {
 var call = calls[i];
@@ -57,4 +58,4 @@ describe('callback wrapper', function() {
 });
 });
 }
-});
\ No newline at end of file
+});

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/199928f1/spec-plugman/wrappers.spec.js
--
diff --git a/spec-plugman/wrappers.spec.js b/spec-plugman/wrappers.spec.js
index b5877f8..d7904a1 100644
--- a/spec-plugman/wrappers.spec.js
+++ b/spec-plugman/wrappers.spec.js
@@ -22,7 +22,8 @@
 var Q = require('q'),
 plugman = require('../src/plugman/plugman');
 
-describe('callback wrapper', function() {
+// TODO:  instead, test the addPropertyMethod of src/plugman/plugman
+xdescribe('callback wrapper', function() {
 var calls = ['install', 'uninstall', 'fetch', 'config', 'owner', 
'adduser', 'publish', 'unpublish', 'search', 'info', 'create', 'platform'];
 for (var i = 0; i < calls.length; i++) {
 var call = calls[i];


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

ios commit: Add logging for malformed data

2017-06-09 Thread shazron 
Repository: cordova-ios
Updated Branches:
  refs/heads/master 8e74760ab -> 27d2919ca


Add logging for malformed data

 This closes #317


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/27d2919c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/27d2919c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/27d2919c

Branch: refs/heads/master
Commit: 27d2919ca27b4032c2cb8745562abecc2d52f6e4
Parents: 8e74760
Author: rafael-chavez 
Authored: Fri Jun 2 16:28:01 2017 -0700
Committer: Shazron Abdullah 
Committed: Fri Jun 9 16:01:56 2017 -0700

--
 CordovaLib/Classes/Private/CDVJSON_private.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/27d2919c/CordovaLib/Classes/Private/CDVJSON_private.m
--
diff --git a/CordovaLib/Classes/Private/CDVJSON_private.m 
b/CordovaLib/Classes/Private/CDVJSON_private.m
index 5385680..054d655 100644
--- a/CordovaLib/Classes/Private/CDVJSON_private.m
+++ b/CordovaLib/Classes/Private/CDVJSON_private.m
@@ -66,9 +66,9 @@
 id object = [NSJSONSerialization JSONObjectWithData:[self 
dataUsingEncoding:NSUTF8StringEncoding]
 
options:NSJSONReadingMutableContainers
   error:];
-
+
 if (error != nil) {
-NSLog(@"NSString JSONObject error: %@", [error localizedDescription]);
+NSLog(@"NSString JSONObject error: %@, Malformed Data: %@", [error 
localizedDescription], self);
 }
 
 return object;


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[2/2] ios commit: CB-12887 - cordova run --list does not show virtual devices in iOS 11

2017-06-09 Thread shazron 
CB-12887 - cordova run --list does not show virtual devices in iOS 11

 This closes #318


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/8e74760a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/8e74760a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/8e74760a

Branch: refs/heads/master
Commit: 8e74760abc5b9cd76ab5306f951eb3baf196b49e
Parents: 571c235
Author: Shazron Abdullah 
Authored: Tue Jun 6 15:13:24 2017 -0700
Committer: Shazron Abdullah 
Committed: Fri Jun 9 16:00:16 2017 -0700

--
 node_modules/ios-sim/.github/ISSUE_TEMPLATE.md  |   2 +-
 .../ios-sim/node_modules/simctl/.jscsrc |  40 ++
 .../ios-sim/node_modules/simctl/.npmignore  |   1 +
 .../ios-sim/node_modules/simctl/.travis.yml |  14 +
 .../ios-sim/node_modules/simctl/LICENSE |  22 +
 .../ios-sim/node_modules/simctl/README.md   |  10 +
 .../ios-sim/node_modules/simctl/appveyor.yml|  17 +
 .../simctl/lib/simctl-extensions.js |  63 ++
 .../node_modules/simctl/node_modules/.bin/shjs  |   1 +
 .../node_modules/shelljs/.documentup.json   |   6 +
 .../simctl/node_modules/shelljs/.jshintrc   |   7 +
 .../simctl/node_modules/shelljs/.npmignore  |   2 +
 .../simctl/node_modules/shelljs/.travis.yml |   5 +
 .../simctl/node_modules/shelljs/LICENSE |  26 +
 .../simctl/node_modules/shelljs/README.md   | 552 +
 .../simctl/node_modules/shelljs/bin/shjs|  51 ++
 .../simctl/node_modules/shelljs/global.js   |   3 +
 .../simctl/node_modules/shelljs/make.js |  47 ++
 .../simctl/node_modules/shelljs/package.json|  61 ++
 .../shelljs/scripts/generate-docs.js|  21 +
 .../node_modules/shelljs/scripts/run-tests.js   |  50 ++
 .../simctl/node_modules/shelljs/shell.js| 153 +
 .../simctl/node_modules/shelljs/src/cat.js  |  43 ++
 .../simctl/node_modules/shelljs/src/cd.js   |  19 +
 .../simctl/node_modules/shelljs/src/chmod.js| 208 +++
 .../simctl/node_modules/shelljs/src/common.js   | 189 ++
 .../simctl/node_modules/shelljs/src/cp.js   | 200 ++
 .../simctl/node_modules/shelljs/src/dirs.js | 191 ++
 .../simctl/node_modules/shelljs/src/echo.js |  20 +
 .../simctl/node_modules/shelljs/src/error.js|  10 +
 .../simctl/node_modules/shelljs/src/exec.js | 181 ++
 .../simctl/node_modules/shelljs/src/find.js |  51 ++
 .../simctl/node_modules/shelljs/src/grep.js |  52 ++
 .../simctl/node_modules/shelljs/src/ls.js   | 126 
 .../simctl/node_modules/shelljs/src/mkdir.js|  68 ++
 .../simctl/node_modules/shelljs/src/mv.js   |  80 +++
 .../simctl/node_modules/shelljs/src/popd.js |   1 +
 .../simctl/node_modules/shelljs/src/pushd.js|   1 +
 .../simctl/node_modules/shelljs/src/pwd.js  |  11 +
 .../simctl/node_modules/shelljs/src/rm.js   | 145 +
 .../simctl/node_modules/shelljs/src/sed.js  |  43 ++
 .../simctl/node_modules/shelljs/src/tempdir.js  |  56 ++
 .../simctl/node_modules/shelljs/src/test.js |  85 +++
 .../simctl/node_modules/shelljs/src/to.js   |  29 +
 .../simctl/node_modules/shelljs/src/toEnd.js|  29 +
 .../simctl/node_modules/shelljs/src/which.js|  79 +++
 .../ios-sim/node_modules/simctl/package.json|  45 ++
 .../ios-sim/node_modules/simctl/simctl.js   | 196 ++
 .../node_modules/simctl/spec/fixture/list.json  | 617 +++
 node_modules/ios-sim/package.json   |  49 +-
 node_modules/ios-sim/spec/fixture/list.json | 522 
 node_modules/ios-sim/src/lib.js |  45 +-
 package.json|   2 +-
 53 files changed, 4479 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/8e74760a/node_modules/ios-sim/.github/ISSUE_TEMPLATE.md
--
diff --git a/node_modules/ios-sim/.github/ISSUE_TEMPLATE.md 
b/node_modules/ios-sim/.github/ISSUE_TEMPLATE.md
index 55f05f4..bd3591d 100644
--- a/node_modules/ios-sim/.github/ISSUE_TEMPLATE.md
+++ b/node_modules/ios-sim/.github/ISSUE_TEMPLATE.md
@@ -17,7 +17,7 @@ Don't forget to check out the 
[README](https://github.com/phonegap/ios-sim/blob/
 
 Please run the commands below in your Terminal.app and include it in the 
issue. Check when done and include results below.
 
-- [ ] 1. sw_vers -productVersion
+- [ ] 1. system_profiler SPSoftwareDataType
 - [ ] 2. ios-sim --version
 - [ ] 3. xcodebuild -version
 - [ ] 4. xcode-select --print-path

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/8e74760a/node_modules/ios-sim/node_modules/simctl/.jscsrc
--
diff

[1/2] ios commit: CB-12887 - cordova run --list does not show virtual devices in iOS 11

2017-06-09 Thread shazron 
Repository: cordova-ios
Updated Branches:
  refs/heads/master 571c23516 -> 8e74760ab


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/8e74760a/node_modules/ios-sim/node_modules/simctl/node_modules/shelljs/src/ls.js
--
diff --git 
a/node_modules/ios-sim/node_modules/simctl/node_modules/shelljs/src/ls.js 
b/node_modules/ios-sim/node_modules/simctl/node_modules/shelljs/src/ls.js
new file mode 100644
index 000..3345db4
--- /dev/null
+++ b/node_modules/ios-sim/node_modules/simctl/node_modules/shelljs/src/ls.js
@@ -0,0 +1,126 @@
+var path = require('path');
+var fs = require('fs');
+var common = require('./common');
+var _cd = require('./cd');
+var _pwd = require('./pwd');
+
+//@
+//@ ### ls([options ,] path [,path ...])
+//@ ### ls([options ,] path_array)
+//@ Available options:
+//@
+//@ + `-R`: recursive
+//@ + `-A`: all files (include files beginning with `.`, except for `.` and 
`..`)
+//@
+//@ Examples:
+//@
+//@ ```javascript
+//@ ls('projs/*.js');
+//@ ls('-R', '/users/me', '/tmp');
+//@ ls('-R', ['/users/me', '/tmp']); // same as above
+//@ ```
+//@
+//@ Returns array of files in the given path, or in current directory if no 
path provided.
+function _ls(options, paths) {
+  options = common.parseOptions(options, {
+'R': 'recursive',
+'A': 'all',
+'a': 'all_deprecated'
+  });
+
+  if (options.all_deprecated) {
+// We won't support the -a option as it's hard to image why it's useful
+// (it includes '.' and '..' in addition to '.*' files)
+// For backwards compatibility we'll dump a deprecated message and proceed 
as before
+common.log('ls: Option -a is deprecated. Use -A instead');
+options.all = true;
+  }
+
+  if (!paths)
+paths = ['.'];
+  else if (typeof paths === 'object')
+paths = paths; // assume array
+  else if (typeof paths === 'string')
+paths = [].slice.call(arguments, 1);
+
+  var list = [];
+
+  // Conditionally pushes file to list - returns true if pushed, false 
otherwise
+  // (e.g. prevents hidden files to be included unless explicitly told so)
+  function pushFile(file, query) {
+// hidden file?
+if (path.basename(file)[0] === '.') {
+  // not explicitly asking for hidden files?
+  if (!options.all && !(path.basename(query)[0] === '.' && 
path.basename(query).length > 1))
+return false;
+}
+
+if (common.platform === 'win')
+  file = file.replace(/\\/g, '/');
+
+list.push(file);
+return true;
+  }
+
+  paths.forEach(function(p) {
+if (fs.existsSync(p)) {
+  var stats = fs.statSync(p);
+  // Simple file?
+  if (stats.isFile()) {
+pushFile(p, p);
+return; // continue
+  }
+
+  // Simple dir?
+  if (stats.isDirectory()) {
+// Iterate over p contents
+fs.readdirSync(p).forEach(function(file) {
+  if (!pushFile(file, p))
+return;
+
+  // Recursive?
+  if (options.recursive) {
+var oldDir = _pwd();
+_cd('', p);
+if (fs.statSync(file).isDirectory())
+  list = list.concat(_ls('-R'+(options.all?'A':''), file+'/*'));
+_cd('', oldDir);
+  }
+});
+return; // continue
+  }
+}
+
+// p does not exist - possible wildcard present
+
+var basename = path.basename(p);
+var dirname = path.dirname(p);
+// Wildcard present on an existing dir? (e.g. '/tmp/*.js')
+if (basename.search(/\*/) > -1 && fs.existsSync(dirname) && 
fs.statSync(dirname).isDirectory) {
+  // Escape special regular expression chars
+  var regexp = basename.replace(/(\^|\$|\(|\)|<|>|\[|\]|\{|\}|\.|\+|\?)/g, 
'\\$1');
+  // Translates wildcard into regex
+  regexp = '^' + regexp.replace(/\*/g, '.*') + '$';
+  // Iterate over directory contents
+  fs.readdirSync(dirname).forEach(function(file) {
+if (file.match(new RegExp(regexp))) {
+  if (!pushFile(path.normalize(dirname+'/'+file), basename))
+return;
+
+  // Recursive?
+  if (options.recursive) {
+var pp = dirname + '/' + file;
+if (fs.lstatSync(pp).isDirectory())
+  list = list.concat(_ls('-R'+(options.all?'A':''), pp+'/*'));
+  } // recursive
+} // if file matches
+  }); // forEach
+  return;
+}
+
+common.error('no such file or directory: ' + p, true);
+  });
+
+  return list;
+}
+module.exports = _ls;

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/8e74760a/node_modules/ios-sim/node_modules/simctl/node_modules/shelljs/src/mkdir.js
--
diff --git 
a/node_modules/ios-sim/node_modules/simctl/node_modules/shelljs/src/mkdir.js 
b/node_modules/ios-sim/node_modules/simctl/node_modules/shelljs/src/mkdir.js
new file mode 100644
index 000..5a7088f
--- /dev/null
+++

[2/2] ios commit: Lock down jasmine to ~2.6.0, update npm scripts to invoke jasmine in a compatible manner in jasmine 2.6.0.

2017-06-09 Thread shazron 
Lock down jasmine to ~2.6.0, update npm scripts to invoke jasmine in a 
compatible manner in jasmine 2.6.0.


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/451c41b0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/451c41b0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/451c41b0

Branch: refs/heads/4.4.0-ios-sim
Commit: 451c41b07606a139b7bd2b9550018a3af7eadfdd
Parents: 2d405c4
Author: filmaj 
Authored: Wed May 24 19:45:01 2017 +0200
Committer: Shazron Abdullah 
Committed: Fri Jun 9 11:46:30 2017 -0700

--
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/451c41b0/package.json
--
diff --git a/package.json b/package.json
index 38282cc..44831bf 100644
--- a/package.json
+++ b/package.json
@@ -18,12 +18,12 @@
 "test": "npm run e2e-tests && npm run objc-tests && npm run unit-tests",
 "posttest": "npm run jshint",
 "cover": "istanbul cover --root bin/templates/cordova --print detail 
jasmine",
-"e2e-tests": "jasmine --captureExceptions --color 
tests/spec/create.spec.js",
+"e2e-tests": "jasmine tests/spec/create.spec.js",
 "objc-tests": "npm run objc-tests-lib && npm run objc-tests-framework",
 "objc-tests-lib": "xcodebuild test -workspace 
tests/cordova-ios.xcworkspace -scheme CordovaLibTests -destination 
\"platform=iOS Simulator,name=iPhone 5\" CONFIGURATION_BUILD_DIR=\"`mktemp -d 
2>/dev/null || mktemp -d -t 'cordova-ios'`\"",
 "objc-tests-framework": "xcodebuild test -workspace 
tests/cordova-ios.xcworkspace -scheme CordovaFrameworkApp -destination 
\"platform=iOS Simulator,name=iPhone 5\" CONFIGURATION_BUILD_DIR=\"`mktemp -d 
2>/dev/null || mktemp -d -t 'cordova-ios'`\"",
 "preobjc-tests": "tests/scripts/killsim.js",
-"unit-tests": "jasmine --captureExceptions --color",
+"unit-tests": "jasmine",
 "jshint": "jshint bin tests"
   },
   "author": "Apache Software Foundation",
@@ -31,7 +31,7 @@
   "devDependencies": {
 "coffee-script": "^1.7.1",
 "istanbul": "^0.4.2",
-"jasmine": "^2.5.3",
+"jasmine": "~2.6.0",
 "jshint": "^2.6.0",
 "nodeunit": "^0.8.7",
 "rewire": "^2.5.1",


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[1/2] ios commit: CB-12869 - Update bundled ios-sim to 5.0.13

2017-06-09 Thread shazron 
Repository: cordova-ios
Updated Branches:
  refs/heads/4.4.0-ios-sim [created] 451c41b07


CB-12869 - Update bundled ios-sim to 5.0.13

 This closes #314


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/2d405c49
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/2d405c49
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/2d405c49

Branch: refs/heads/4.4.0-ios-sim
Commit: 2d405c49e63b1ba4be05719ce51c489d097cf172
Parents: 6b25611
Author: Shazron Abdullah 
Authored: Tue May 30 15:27:24 2017 -0700
Committer: Shazron Abdullah 
Committed: Fri Jun 9 11:45:28 2017 -0700

--
 node_modules/ios-sim/.github/ISSUE_TEMPLATE.md  |   2 +-
 .../node_modules/bplist-parser/package.json |  96 +-
 .../ios-sim/node_modules/nopt/package.json  | 101 +--
 node_modules/ios-sim/package.json   | 129 +++
 node_modules/ios-sim/src/lib.js |  13 +-
 package.json|   2 +-
 6 files changed, 124 insertions(+), 219 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/2d405c49/node_modules/ios-sim/.github/ISSUE_TEMPLATE.md
--
diff --git a/node_modules/ios-sim/.github/ISSUE_TEMPLATE.md 
b/node_modules/ios-sim/.github/ISSUE_TEMPLATE.md
index 92a642a..55f05f4 100644
--- a/node_modules/ios-sim/.github/ISSUE_TEMPLATE.md
+++ b/node_modules/ios-sim/.github/ISSUE_TEMPLATE.md
@@ -21,4 +21,4 @@ Please run the commands below in your Terminal.app and 
include it in the issue.
 - [ ] 2. ios-sim --version
 - [ ] 3. xcodebuild -version
 - [ ] 4. xcode-select --print-path
-- [ ] 5. gcc --version
+- [ ] 5. node --version

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/2d405c49/node_modules/ios-sim/node_modules/bplist-parser/package.json
--
diff --git a/node_modules/ios-sim/node_modules/bplist-parser/package.json 
b/node_modules/ios-sim/node_modules/bplist-parser/package.json
index e5ba054..48f072c 100644
--- a/node_modules/ios-sim/node_modules/bplist-parser/package.json
+++ b/node_modules/ios-sim/node_modules/bplist-parser/package.json
@@ -1,86 +1,52 @@
 {
-  "_args": [
-[
-  {
-"raw": "bplist-parser@^0.0.6",
-"scope": null,
-"escapedName": "bplist-parser",
-"name": "bplist-parser",
-"rawSpec": "^0.0.6",
-"spec": ">=0.0.6 <0.0.7",
-"type": "range"
-  },
-  "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/ios-sim"
-]
-  ],
-  "_from": "bplist-parser@>=0.0.6 <0.0.7",
-  "_id": "bplist-parser@0.0.6",
-  "_inCache": true,
-  "_location": "/ios-sim/bplist-parser",
-  "_npmUser": {
-"name": "joeferner",
-"email": "j...@fernsroth.com"
-  },
-  "_npmVersion": "1.4.14",
-  "_phantomChildren": {},
-  "_requested": {
-"raw": "bplist-parser@^0.0.6",
-"scope": null,
-"escapedName": "bplist-parser",
-"name": "bplist-parser",
-"rawSpec": "^0.0.6",
-"spec": ">=0.0.6 <0.0.7",
-"type": "range"
+  "name": "bplist-parser",
+  "version": "0.0.6",
+  "description": "Binary plist parser.",
+  "main": "bplistParser.js",
+  "scripts": {
+"test": "./node_modules/nodeunit/bin/nodeunit test"
   },
-  "_requiredBy": [
-"/ios-sim"
+  "keywords": [
+"bplist",
+"plist",
+"parser"
   ],
-  "_resolved": 
"https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz;,
-  "_shasum": "38da3471817df9d44ab3892e27707bbbd75a11b9",
-  "_shrinkwrap": null,
-  "_spec": "bplist-parser@^0.0.6",
-  "_where": 
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/ios-sim",
   "author": {
 "name": "Joe Ferner",
 "email": "joe.fer...@nearinfinity.com"
   },
-  "bugs": {
-"url": "https://github.com/nearinfinity/node-bplist-parser/issues;
-  },
-  "dependencies": {},
-  "description": "Binary plist parser.",
+  "license": "MIT",
   "devDependencies": {
 "nodeunit": "~0.7.4"
   },
-  "directories": {},
-  "dist": {
-"shasum": "38da3471817df9d44ab3892e27707bbbd75a11b9",
-"tarball": 
"https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz;
+  "repository": {
+"type": "git",
+"url": "git+https://github.com/nearinfinity/node-bplist-parser.git;
   },
   "gitHead": "a2230a5df3c7014ffbe5761bcb091ea2d061b47b",
+  "bugs": {
+"url": "https://github.com/nearinfinity/node-bplist-parser/issues;
+  },
   "homepage": "https://github.com/nearinfinity/node-bplist-parser;,
-  "keywords": [
-"bplist",
-"plist",
-"parser"
-  ],
-  "license": "MIT",
-  "main": "bplistParser.js",
+  "_id": "bplist-parser@0.0.6",
+  "_shasum": "38da3471817df9d44ab3892e27707bbbd75a11b9",
+