[5/6] cordova-lib git commit: CB-11652 Update run and emulate to skip build
CB-11652 Update run and emulate to skip build We need to add this conditional logic to cordova's `run` and `emulate` methods to skip build when `--nobuild` option is specified. CLI previously has delegated this logic to platform's `run` method but since introducing `before_deploy` hook we call platform's `build` and `run` separately and so we need to handle this option in CLI Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/9b023d1b Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/9b023d1b Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/9b023d1b Branch: refs/heads/6.3.x Commit: 9b023d1bdd4c26bb94da751d3bc270dab3ae1ceb Parents: 647852e Author: Vladimir Kotikov Authored: Tue Aug 2 15:08:24 2016 +0300 Committer: Vladimir Kotikov Committed: Mon Aug 8 10:46:02 2016 +0300 -- cordova-lib/spec-cordova/emulate.spec.js | 24 ++ cordova-lib/spec-cordova/run.spec.js | 25 +++ cordova-lib/src/cordova/emulate.js | 29 ++- cordova-lib/src/cordova/run.js | 29 ++- 4 files changed, 79 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9b023d1b/cordova-lib/spec-cordova/emulate.spec.js -- diff --git a/cordova-lib/spec-cordova/emulate.spec.js b/cordova-lib/spec-cordova/emulate.spec.js index c04c16d..94b2ab9 100644 --- a/cordova-lib/spec-cordova/emulate.spec.js +++ b/cordova-lib/spec-cordova/emulate.spec.js @@ -131,6 +131,30 @@ describe('emulate command', function() { }).fin(done); }); }); + +it('should call platform\'s build method', function (done) { +cordova.raw.emulate({platforms: ['blackberry10']}) +.then(function() { +expect(prepare_spy).toHaveBeenCalled(); +expect(platformApi.build).toHaveBeenCalledWith({device: false, emulator: true}); + expect(platformApi.run).toHaveBeenCalledWith(jasmine.objectContaining({nobuild: true})); +}, function(err) { +expect(err).toBeUndefined(); +}) +.fin(done); +}); + +it('should not call build if --nobuild option is passed', function (done) { +cordova.raw.emulate({platforms: ['blackberry10'], options: { nobuild: true }}) +.then(function() { +expect(prepare_spy).toHaveBeenCalled(); +expect(platformApi.build).not.toHaveBeenCalled(); + expect(platformApi.run).toHaveBeenCalledWith(jasmine.objectContaining({nobuild: true})); +}, function(err) { +expect(err).toBeUndefined(); +}) +.fin(done); +}); }); describe('hooks', function() { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9b023d1b/cordova-lib/spec-cordova/run.spec.js -- diff --git a/cordova-lib/spec-cordova/run.spec.js b/cordova-lib/spec-cordova/run.spec.js index b1dedd3..2b09e04 100644 --- a/cordova-lib/spec-cordova/run.spec.js +++ b/cordova-lib/spec-cordova/run.spec.js @@ -107,6 +107,31 @@ describe('run command', function() { done(); }); }); + +it('should call platform\'s build method', function (done) { +cordova.raw.run({platforms: ['blackberry10']}) +.then(function() { +expect(prepare_spy).toHaveBeenCalled(); +expect(platformApi.build).toHaveBeenCalledWith({}); + expect(platformApi.run).toHaveBeenCalledWith(jasmine.objectContaining({nobuild: true})); +}, function(err) { +expect(err).toBeUndefined(); +}) +.fin(done); +}); + +it('should not call build if --nobuild option is passed', function (done) { +cordova.raw.run({platforms: ['blackberry10'], options: { nobuild: true }}) +.then(function() { +expect(prepare_spy).toHaveBeenCalled(); +expect(platformApi.build).not.toHaveBeenCalled(); + expect(platformApi.run).toHaveBeenCalledWith(jasmine.objectContaining({nobuild: true})); +}, function(err) { +expect(err).toBeUndefined(); +}) +.fin(done); +}); + describe('run parameters should not be altered by intermediate build command', function() { var originalBuildSpy; beforeEach(function() { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9b023d1b/cordova-lib/src/cordova/emulate.js
[2/6] cordova-lib git commit: CB-11205 Respect saved variables when installing plugin
CB-11205 Respect saved variables when installing plugin This closes #471 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/b5dc35ba Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/b5dc35ba Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/b5dc35ba Branch: refs/heads/6.3.x Commit: b5dc35bac1ac0391237c04bcb76a34fe82607d64 Parents: 6342022 Author: Nikita Matrosov Authored: Fri Jul 29 14:47:44 2016 +0300 Committer: Vladimir Kotikov Committed: Mon Aug 8 10:45:28 2016 +0300 -- cordova-lib/spec-cordova/save.spec.js | 27 +++ cordova-lib/src/cordova/plugin.js | 6 ++ 2 files changed, 33 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b5dc35ba/cordova-lib/spec-cordova/save.spec.js -- diff --git a/cordova-lib/spec-cordova/save.spec.js b/cordova-lib/spec-cordova/save.spec.js index e2be5a5..b5ece83 100644 --- a/cordova-lib/spec-cordova/save.spec.js +++ b/cordova-lib/spec-cordova/save.spec.js @@ -412,6 +412,33 @@ describe('(save flag)', function () { }); }, TIMEOUT); +it('spec.14.1 should restore plugin with variables', function (done) { +platform('add', platformLocalPathNewer) +.then(function () { +return cordova.raw.plugin('add', variablePluginUrl, { +'save': true, +'cli_variables': { +'APP_ID':'123456789', +'APP_NAME':'myApplication' +} +}); +}).then(function () { +expect(helpers.getPluginVariable(appPath, variablePluginName, 'APP_ID')).toBe('123456789'); +expect(helpers.getPluginVariable(appPath, variablePluginName, 'APP_NAME')).toBe('myApplication'); +return cordova.raw.plugin('rm', variablePluginName); +}).then(function() { +expect(path.join(appPath, 'plugins', variablePluginName)).not.toExist(); +return cordova.raw.plugin('add', variablePluginName); +}).then(function() { +expect(path.join(appPath, 'plugins', variablePluginName)).toExist(); +done(); +}).catch(function (err) { +console.log(err.message); +expect(true).toBe(false); +done(); +}); +}, TIMEOUT); + it('spec.15 save git url as spec', function (done) { platform('add', platformLocalPathNewer) .then(function () { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b5dc35ba/cordova-lib/src/cordova/plugin.js -- diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js index e8d6acb..d803425 100644 --- a/cordova-lib/src/cordova/plugin.js +++ b/cordova-lib/src/cordova/plugin.js @@ -155,6 +155,12 @@ module.exports = function plugin(command, targets, opts) { .then(function(pluginInfo) { // Validate top-level required variables var pluginVariables = pluginInfo.getPreferences(); +opts.cli_variables = opts.cli_variables || {}; +var pluginEntry = cfg.getPlugin(pluginInfo.id); +var pluginEntryVariables = pluginEntry ? pluginEntry.variables : {}; + Object.keys(pluginVariables).forEach(function(varName) { +opts.cli_variables[varName] = opts.cli_variables[varName] || pluginEntryVariables[varName]; +}); var missingVariables = Object.keys(pluginVariables) .filter(function (variableName) { // discard variables with default value - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[4/6] cordova-lib git commit: CB-11493: Add cordova emulate option to skip prepare
CB-11493: Add cordova emulate option to skip prepare This closes #459 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/e4f30cee Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/e4f30cee Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/e4f30cee Branch: refs/heads/6.3.x Commit: e4f30ceefd39e646d0513c50a1d17900995a4f50 Parents: b5dc35b Author: gruppjo Authored: Mon Jun 27 16:50:02 2016 +0200 Committer: Vladimir Kotikov Committed: Mon Aug 8 10:46:01 2016 +0300 -- cordova-lib/src/cordova/emulate.js | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e4f30cee/cordova-lib/src/cordova/emulate.js -- diff --git a/cordova-lib/src/cordova/emulate.js b/cordova-lib/src/cordova/emulate.js index b0b61aa..642e55c 100644 --- a/cordova-lib/src/cordova/emulate.js +++ b/cordova-lib/src/cordova/emulate.js @@ -35,8 +35,10 @@ module.exports = function emulate(options) { var hooksRunner = new HooksRunner(projectRoot); return hooksRunner.fire('before_emulate', options) .then(function() { -// Run a prepare first! -return require('./cordova').raw.prepare(options); +if (!options.options.noprepare) { +// Run a prepare first! +return require('./cordova').raw.prepare(options); +} }).then(function() { // Deploy in parallel (output gets intermixed though...) return Q.all(options.platforms.map(function(platform) { - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[cordova-lib] Git Push Summary
Repository: cordova-lib Updated Tags: refs/tags/6.3.1 [created] a2736f594 - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[3/6] cordova-lib git commit: CB-11194 Defer creating of libDir folder until something actually requests it
CB-11194 Defer creating of libDir folder until something actually requests it This closes #462 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/647852e5 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/647852e5 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/647852e5 Branch: refs/heads/6.3.x Commit: 647852e5e48f779cc99c91b470d35b177644c342 Parents: e4f30ce Author: Jesse MacFadyen Authored: Fri Jul 1 16:35:53 2016 -0700 Committer: Vladimir Kotikov Committed: Mon Aug 8 10:46:01 2016 +0300 -- cordova-lib/src/cordova/util.js | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/647852e5/cordova-lib/src/cordova/util.js -- diff --git a/cordova-lib/src/cordova/util.js b/cordova-lib/src/cordova/util.js index 1bc227e..e617e08 100644 --- a/cordova-lib/src/cordova/util.js +++ b/cordova-lib/src/cordova/util.js @@ -38,11 +38,22 @@ if (!global_config_path) { var origCwd = null; var lib_path = path.join(global_config_path, 'lib'); -shell.mkdir('-p', lib_path); + exports.binname = 'cordova'; exports.globalConfig = global_config_path; -exports.libDirectory = lib_path; + +// defer defining libDirectory on exports so we don't create it if +// someone simply requires this module +Object.defineProperty(exports,'libDirectory', { +configurable: true, +get: function () { +shell.mkdir('-p', lib_path); +exports.libDirectory = lib_path; +return lib_path; +} +}); + addModuleProperty(module, 'plugin_parser', './plugin_parser'); exports.isCordova = isCordova; - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
cordova-lib git commit: CB-11685 Increment package version to -dev
Repository: cordova-lib Updated Branches: refs/heads/master ced64c434 -> d1c63d68a CB-11685 Increment package version to -dev Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/d1c63d68 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/d1c63d68 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/d1c63d68 Branch: refs/heads/master Commit: d1c63d68a115bf16bb369107d7b4a459c873d86b Parents: ced64c4 Author: Vladimir Kotikov Authored: Tue Aug 9 10:46:27 2016 +0300 Committer: Vladimir Kotikov Committed: Tue Aug 9 10:46:27 2016 +0300 -- cordova-lib/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/d1c63d68/cordova-lib/package.json -- diff --git a/cordova-lib/package.json b/cordova-lib/package.json index 9010e48..ab1a898 100644 --- a/cordova-lib/package.json +++ b/cordova-lib/package.json @@ -2,7 +2,7 @@ "author": "Apache Software Foundation", "name": "cordova-lib", "description": "Apache Cordova tools core lib and API", - "version": "6.3.1-dev", + "version": "6.4.0-dev", "repository": { "type": "git", "url": "git://git-wip-us.apache.org/repos/asf/cordova-lib.git" - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[1/6] cordova-lib git commit: CB-11589: Fix missing plugin files after restore
Repository: cordova-lib Updated Branches: refs/heads/6.3.x 09ab5bbc7 -> a2736f594 CB-11589: Fix missing plugin files after restore This closes #464 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/63420225 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/63420225 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/63420225 Branch: refs/heads/6.3.x Commit: 634202255d1c0e86ed8845a673818e5add7d7b1b Parents: 09ab5bb Author: Darryl Pogue Authored: Fri Jul 15 11:23:27 2016 -0700 Committer: Vladimir Kotikov Committed: Mon Aug 8 10:45:07 2016 +0300 -- cordova-lib/src/cordova/platform.js | 24 ++-- cordova-lib/src/cordova/prepare.js | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/63420225/cordova-lib/src/cordova/platform.js -- diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js index 95f1af5..680fb3b 100644 --- a/cordova-lib/src/cordova/platform.js +++ b/cordova-lib/src/cordova/platform.js @@ -193,22 +193,26 @@ function addHelper(cmd, hooksRunner, projectRoot, targets, opts) { return promise() .then(function () { -return prepare.preparePlatforms([platform], projectRoot, { searchpath: opts.searchpath }); +if (!opts.restoring) { +return prepare.preparePlatforms([platform], projectRoot, { searchpath: opts.searchpath }); +} }) .then(function() { -if (cmd == 'add') { +if (cmd == 'add' && !opts.restoring) { return installPluginsForNewPlatform(platform, projectRoot, opts); } }) .then(function () { -// Call prepare for the current platform. -var prepOpts = { -platforms :[platform], -searchpath :opts.searchpath, -fetch: opts.fetch || false, -save: opts.save || false -}; -return require('./cordova').raw.prepare(prepOpts); +if (!opts.restoring) { +// Call prepare for the current platform if we're not restoring from config.xml +var prepOpts = { +platforms :[platform], +searchpath :opts.searchpath, +fetch: opts.fetch || false, +save: opts.save || false +}; +return require('./cordova').raw.prepare(prepOpts); +} }) .then(function() { var saveVersion = !spec || semver.validRange(spec, true); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/63420225/cordova-lib/src/cordova/prepare.js -- diff --git a/cordova-lib/src/cordova/prepare.js b/cordova-lib/src/cordova/prepare.js index ff4f119..00d50ad 100644 --- a/cordova-lib/src/cordova/prepare.js +++ b/cordova-lib/src/cordova/prepare.js @@ -43,7 +43,7 @@ function prepare(options) { var hooksRunner = new HooksRunner(projectRoot); return hooksRunner.fire('before_prepare', options) .then(function(){ -return restore.installPlatformsFromConfigXML(options.platforms, { searchpath : options.searchpath, fetch : options.fetch, save : options.save }); +return restore.installPlatformsFromConfigXML(options.platforms, { searchpath : options.searchpath, fetch : options.fetch, restoring : true }); }) .then(function(){ options = cordova_util.preProcessOptions(options); - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[6/6] cordova-lib git commit: CB-11685 Updated version and RELEASENOTES.md for 6.3.1 release
CB-11685 Updated version and RELEASENOTES.md for 6.3.1 release Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/a2736f59 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/a2736f59 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/a2736f59 Branch: refs/heads/6.3.x Commit: a2736f594c47c0ecb173ea7f17d9ffa18758752a Parents: 9b023d1 Author: Vladimir Kotikov Authored: Mon Aug 8 10:55:36 2016 +0300 Committer: Vladimir Kotikov Committed: Tue Aug 9 10:43:20 2016 +0300 -- cordova-lib/RELEASENOTES.md | 7 +++ cordova-lib/package.json| 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a2736f59/cordova-lib/RELEASENOTES.md -- diff --git a/cordova-lib/RELEASENOTES.md b/cordova-lib/RELEASENOTES.md index dc3f77d..95179ba 100644 --- a/cordova-lib/RELEASENOTES.md +++ b/cordova-lib/RELEASENOTES.md @@ -20,6 +20,13 @@ --> # Cordova-lib Release Notes +### 6.3.1 (Aug 08, 2016) +* [CB-11652](https://issues.apache.org/jira/browse/CB-11652) Update run and emulate to skip build +* [CB-11194](https://issues.apache.org/jira/browse/CB-11194) Defer creating of libDir folder until something actually requests it +* [CB-11493](https://issues.apache.org/jira/browse/CB-11493) Add cordova emulate option to skip prepare +* [CB-11205](https://issues.apache.org/jira/browse/CB-11205) Respect saved variables when installing plugin +* [CB-11589](https://issues.apache.org/jira/browse/CB-11589) Fix missing plugin files after restore + ### 6.3.0 (Jul 12, 2016) * [CB-11491](https://issues.apache.org/jira/browse/CB-11491) Introduce before_deploy hook * [CB-11412](https://issues.apache.org/jira/browse/CB-11412) template support for www folders http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a2736f59/cordova-lib/package.json -- diff --git a/cordova-lib/package.json b/cordova-lib/package.json index c5d89e3..c39b18b 100644 --- a/cordova-lib/package.json +++ b/cordova-lib/package.json @@ -2,7 +2,7 @@ "author": "Apache Software Foundation", "name": "cordova-lib", "description": "Apache Cordova tools core lib and API", - "version": "6.3.0", + "version": "6.3.1", "repository": { "type": "git", "url": "git://git-wip-us.apache.org/repos/asf/cordova-lib.git" - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[2/2] cordova-cli git commit: CB-11685 Updated version and RELEASENOTES for release 6.3.1
CB-11685 Updated version and RELEASENOTES for release 6.3.1 Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/d192399a Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/d192399a Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/d192399a Branch: refs/heads/6.3.x Commit: d192399a01edccbb87ca958aded3011d7c267337 Parents: 966200a Author: Vladimir Kotikov Authored: Tue Aug 9 10:54:27 2016 +0300 Committer: Vladimir Kotikov Committed: Tue Aug 9 10:54:27 2016 +0300 -- RELEASENOTES.md | 3 +++ package.json| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d192399a/RELEASENOTES.md -- diff --git a/RELEASENOTES.md b/RELEASENOTES.md index a423b05..9fe1ad8 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -20,6 +20,9 @@ --> # Cordova-cli Release Notes +### 6.3.1 (Aug 09, 2016) +* [CB-11685](https://issues.apache.org/jira/browse/CB-11685) Updated cordova-lib dependency to 6.3.1 + ### 6.3.0 (Jul 12, 2016) * [CB-11412](https://issues.apache.org/jira/browse/CB-11412) removed link-to, aliased copy-from to template * [CB-11349](https://issues.apache.org/jira/browse/CB-11349) passing --fetch to create http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d192399a/package.json -- diff --git a/package.json b/package.json index 0bed08c..77e3c81 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova", -"version": "6.3.0", +"version": "6.3.1", "preferGlobal": "true", "description": "Cordova command line interface tool", "main": "cordova", - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[1/2] cordova-cli git commit: CB-11685 Updated cordova-lib dependency to 6.3.1
Repository: cordova-cli Updated Branches: refs/heads/6.3.x d316576e1 -> d192399a0 CB-11685 Updated cordova-lib dependency to 6.3.1 Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/966200a7 Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/966200a7 Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/966200a7 Branch: refs/heads/6.3.x Commit: 966200a78f58dc5fc00a57d8a10424ff6aadc900 Parents: d316576 Author: Vladimir Kotikov Authored: Tue Aug 9 10:52:24 2016 +0300 Committer: Vladimir Kotikov Committed: Tue Aug 9 10:52:24 2016 +0300 -- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/966200a7/package.json -- diff --git a/package.json b/package.json index 50403bd..0bed08c 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "cli" ], "dependencies": { -"cordova-lib": "6.3.0", +"cordova-lib": "6.3.1", "cordova-common": "1.4.x", "q": "1.0.1", "nopt": "3.0.1", - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
cordova-cli git commit: CB-11685 Increment package version to -dev
Repository: cordova-cli Updated Branches: refs/heads/master 5e6e3bf10 -> 258eb28fc Updated Tags: refs/tags/6.3.1 [created] d192399a0 CB-11685 Increment package version to -dev Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/258eb28f Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/258eb28f Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/258eb28f Branch: refs/heads/master Commit: 258eb28fcf29de2a231c977a169b7a0448bb113f Parents: 5e6e3bf Author: Vladimir Kotikov Authored: Tue Aug 9 10:55:53 2016 +0300 Committer: Vladimir Kotikov Committed: Tue Aug 9 10:55:53 2016 +0300 -- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/258eb28f/package.json -- diff --git a/package.json b/package.json index 60bc1d5..88a326a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova", -"version": "6.3.1-dev", +"version": "6.4.0-dev", "preferGlobal": "true", "description": "Cordova command line interface tool", "main": "cordova", @@ -29,7 +29,7 @@ "cli" ], "dependencies": { -"cordova-lib": "6.3.0", +"cordova-lib": "6.4.0-dev", "cordova-common": "1.4.x", "q": "1.0.1", "nopt": "3.0.1", - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
svn commit: r14723 - in /dev/cordova/CB-11685: ./ cordova-6.3.1.tgz cordova-6.3.1.tgz.asc cordova-6.3.1.tgz.md5 cordova-6.3.1.tgz.sha cordova-lib-6.3.1.tgz cordova-lib-6.3.1.tgz.asc cordova-lib-6.3.1.
Author: an-selm Date: Tue Aug 9 09:35:49 2016 New Revision: 14723 Log: CB-11685 Uploading release candidates for tools release Added: dev/cordova/CB-11685/ dev/cordova/CB-11685/cordova-6.3.1.tgz (with props) dev/cordova/CB-11685/cordova-6.3.1.tgz.asc dev/cordova/CB-11685/cordova-6.3.1.tgz.md5 dev/cordova/CB-11685/cordova-6.3.1.tgz.sha dev/cordova/CB-11685/cordova-lib-6.3.1.tgz (with props) dev/cordova/CB-11685/cordova-lib-6.3.1.tgz.asc dev/cordova/CB-11685/cordova-lib-6.3.1.tgz.md5 dev/cordova/CB-11685/cordova-lib-6.3.1.tgz.sha Added: dev/cordova/CB-11685/cordova-6.3.1.tgz == Binary file - no diff available. Propchange: dev/cordova/CB-11685/cordova-6.3.1.tgz -- svn:mime-type = application/octet-stream Added: dev/cordova/CB-11685/cordova-6.3.1.tgz.asc == --- dev/cordova/CB-11685/cordova-6.3.1.tgz.asc (added) +++ dev/cordova/CB-11685/cordova-6.3.1.tgz.asc Tue Aug 9 09:35:49 2016 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQEcBAABAgAGBQJXqaOzAAoJEACV+K/YTjkMlLsH+QFpHT4Q8lzDX+4BYTwMxLQX +Q2F2OKKUNpx93u1DY2UlDlMA/p8TlXfSnVfv+cvO/kbxmRLFEjM6HiYGqMI5tv/K +IVNH9kxl1PBuMUOvIDkdcPoqwepP4eE3WyhCniUDI6kdTiIyelaWHcdcjxg/Owdo +7fdlmN0KMfqfES7IkBX3aU57Px4s8Sty74eY9xig9xIoSdlCIPhdWKISsGLGpYo5 +iyAqbqCoDGzmIIUVrvP/bSb+bcBc2jBmLI1TJdAbE8IsnE7BmzhL8W2kL9NQAJVT +MR6FnDgxHTuVHj1J/Bjy635gTRK/23dQoFV5djB4SbYvo7f5IFI6Bsnfe249ZGc= +=H56W +-END PGP SIGNATURE- Added: dev/cordova/CB-11685/cordova-6.3.1.tgz.md5 == --- dev/cordova/CB-11685/cordova-6.3.1.tgz.md5 (added) +++ dev/cordova/CB-11685/cordova-6.3.1.tgz.md5 Tue Aug 9 09:35:49 2016 @@ -0,0 +1 @@ +8f66b359f708a9ca07010fe6d020d0cc Added: dev/cordova/CB-11685/cordova-6.3.1.tgz.sha == --- dev/cordova/CB-11685/cordova-6.3.1.tgz.sha (added) +++ dev/cordova/CB-11685/cordova-6.3.1.tgz.sha Tue Aug 9 09:35:49 2016 @@ -0,0 +1 @@ +24d0d7e763b9dec8c5c003397a52dcc9003f5e9eb1e7a3598134b7bcca093b2ae454739338cd52d21db5896b18993807916231da4adfa0e0503520b3f90e8abb Added: dev/cordova/CB-11685/cordova-lib-6.3.1.tgz == Binary file - no diff available. Propchange: dev/cordova/CB-11685/cordova-lib-6.3.1.tgz -- svn:mime-type = application/octet-stream Added: dev/cordova/CB-11685/cordova-lib-6.3.1.tgz.asc == --- dev/cordova/CB-11685/cordova-lib-6.3.1.tgz.asc (added) +++ dev/cordova/CB-11685/cordova-lib-6.3.1.tgz.asc Tue Aug 9 09:35:49 2016 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQEcBAABAgAGBQJXqaO/AAoJEACV+K/YTjkMD0cIALW2SYEQTQBl2xL08DeSAwql +rbtJRlzkUQLEx3COnkTpwgQPcRH3UIDSgMQG8TurFEMr3Z66vcRN2AcvmmzVDrpP +e56+ImFZrcXqtz3P06E8cVnu/YjZqLic2OGnNSDCzmt6t/tnTQW5YoWo+/w1DgGh +xlXN8lCZtBGrMaQweCt0kkRX2r9SNJkBzv24l0Up/TrwGwpnuPF0N6NrhhnJj3Vq +U78Zkv2lmgIWmlciRNvOc5WNse9CryE3G+GmyhSwJQyA+26chWWEnnJPEtPf/mVU +JERK+aK7IKKndu56Gz1V0PDOIBd+iyIee/QmOd+s+U+2dQ94YWVIOt7pXnFlywI= +=/Uy5 +-END PGP SIGNATURE- Added: dev/cordova/CB-11685/cordova-lib-6.3.1.tgz.md5 == --- dev/cordova/CB-11685/cordova-lib-6.3.1.tgz.md5 (added) +++ dev/cordova/CB-11685/cordova-lib-6.3.1.tgz.md5 Tue Aug 9 09:35:49 2016 @@ -0,0 +1 @@ +0778ace50232ac0c77f081ebe038416d Added: dev/cordova/CB-11685/cordova-lib-6.3.1.tgz.sha == --- dev/cordova/CB-11685/cordova-lib-6.3.1.tgz.sha (added) +++ dev/cordova/CB-11685/cordova-lib-6.3.1.tgz.sha Tue Aug 9 09:35:49 2016 @@ -0,0 +1 @@ +9a24d16a78dbbc7c11e7f68a6c64ec0a1297976ace09dea4406b5f6dd9e462bc4f9341e70d63efdfea58625c2c10b14a5c483c909ab721adf31c250dcdbcf0d4 - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
cordova-lib git commit: CB-11679 Speed up save/restore tests
Repository: cordova-lib Updated Branches: refs/heads/master d1c63d68a -> 780439cd1 CB-11679 Speed up save/restore tests clone platform repos with --depth 1 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/780439cd Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/780439cd Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/780439cd Branch: refs/heads/master Commit: 780439cd116716641cd2831236d2c416564e Parents: d1c63d6 Author: Vladimir Kotikov Authored: Tue Apr 19 16:27:32 2016 +0300 Committer: Vladimir Kotikov Committed: Tue Aug 9 12:58:18 2016 +0300 -- cordova-lib/spec-cordova/save.spec.js | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/780439cd/cordova-lib/spec-cordova/save.spec.js -- diff --git a/cordova-lib/spec-cordova/save.spec.js b/cordova-lib/spec-cordova/save.spec.js index b5ece83..31f7e96 100644 --- a/cordova-lib/spec-cordova/save.spec.js +++ b/cordova-lib/spec-cordova/save.spec.js @@ -26,6 +26,7 @@ describe('(save flag)', function () { fs = require('fs'), shell = require('shelljs'), util= require('../src/cordova/util'), +node_util = require('util'), prepare = require('../src/cordova/prepare'), registry= require('../src/plugman/registry/registry'), PlatformApi = require('../src/platforms/PlatformApiPoly'), @@ -126,12 +127,16 @@ describe('(save flag)', function () { revertInstallPluginsForNewPlatform(); }); +function gitClone(repo, dir, ref, cb) { +var gitTemplate = 'git clone --branch %s --depth=1 %s %s'; +var gitCommand = node_util.format(gitTemplate, ref, repo, dir); +shell.exec(gitCommand, { silent: true }, cb); +} + describe('preparing fixtures', function () { it('cloning "old" platform', function (done) { shell.rm('-rf', platformLocalPathOld); -shell.exec('git clone ' + platformGitUrl + ' ' + platformLocalPathOld + -' && cd ' + platformLocalPathOld + -' && git reset --hard ' + platformVersionOld, { silent: true }, function (err) { +gitClone(platformGitUrl, platformLocalPathOld, platformVersionOld, function (err) { expect(err).toBe(0); done(); }); @@ -139,9 +144,7 @@ describe('(save flag)', function () { it('cloning "new" platform', function (done) { shell.rm('-rf', platformLocalPathNew); -shell.exec('git clone ' + platformGitUrl + ' ' + platformLocalPathNew + -' && cd ' + platformLocalPathNew + -' && git reset --hard ' + platformVersionNew, { silent: true }, function (err) { +gitClone(platformGitUrl, platformLocalPathNew, platformVersionNew, function (err) { expect(err).toBe(0); done(); }); @@ -149,9 +152,7 @@ describe('(save flag)', function () { it('cloning "newer" platform', function (done) { shell.rm('-rf', platformLocalPathNewer); -shell.exec('git clone ' + platformGitUrl + ' ' + platformLocalPathNewer + -' && cd ' + platformLocalPathNewer + -' && git reset --hard ' + platformVersionNewer, { silent: true }, function (err) { +gitClone(platformGitUrl, platformLocalPathNewer, platformVersionNewer, function (err) { expect(err).toBe(0); done(); }); - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[2/2] cordova-lib git commit: Incremented package version to -dev
Incremented package version to -dev Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/bc2d9423 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/bc2d9423 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/bc2d9423 Branch: refs/heads/master Commit: bc2d9423544c8d4508c3ffaa32c19e482d1a1d55 Parents: 46051b8 Author: Steve Gill Authored: Tue Aug 9 16:17:35 2016 -0700 Committer: Steve Gill Committed: Tue Aug 9 16:17:35 2016 -0700 -- cordova-common/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/bc2d9423/cordova-common/package.json -- diff --git a/cordova-common/package.json b/cordova-common/package.json index 341d0d5..68c5756 100644 --- a/cordova-common/package.json +++ b/cordova-common/package.json @@ -3,7 +3,7 @@ "name": "cordova-common", "description": "Apache Cordova tools and platforms shared routines", "license": "Apache-2.0", - "version": "1.4.1", + "version": "1.4.2-dev", "repository": { "type": "git", "url": "git://git-wip-us.apache.org/repos/asf/cordova-common.git" - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[1/2] cordova-lib git commit: Updated version and RELEASENOTES.md for release cordova-common@1.4.1
Repository: cordova-lib Updated Branches: refs/heads/master 780439cd1 -> bc2d94235 Updated version and RELEASENOTES.md for release cordova-common@1.4.1 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/46051b80 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/46051b80 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/46051b80 Branch: refs/heads/master Commit: 46051b800b2fa286d656356e11e38d302c937e86 Parents: 780439c Author: Steve Gill Authored: Tue Aug 9 15:27:19 2016 -0700 Committer: Steve Gill Committed: Tue Aug 9 15:27:33 2016 -0700 -- cordova-common/RELEASENOTES.md | 7 +++ cordova-common/package.json| 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/46051b80/cordova-common/RELEASENOTES.md -- diff --git a/cordova-common/RELEASENOTES.md b/cordova-common/RELEASENOTES.md index 7a99cc9..01037d4 100644 --- a/cordova-common/RELEASENOTES.md +++ b/cordova-common/RELEASENOTES.md @@ -20,6 +20,13 @@ --> # Cordova-common Release Notes +### 1.4.1 (Aug 09, 2016) +* Add general purpose `ConfigParser.getAttribute` API +* [CB-11653](https://issues.apache.org/jira/browse/CB-11653) moved `findProjectRoot` from `cordova-lib` to `cordova-common` +* [CB-11636](https://issues.apache.org/jira/browse/CB-11636) Handle attributes with quotes correctly +* [CB-11645](https://issues.apache.org/jira/browse/CB-11645) added check to see if `getEditConfig` exists before trying to use it +* [CB-9825](https://issues.apache.org/jira/browse/CB-9825) framework tag spec parsing + ### 1.3.0 (May 12, 2016) * [CB-11259](https://issues.apache.org/jira/browse/CB-11259): Improving prepare and build logging * [CB-11194](https://issues.apache.org/jira/browse/CB-11194) Improve cordova load time http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/46051b80/cordova-common/package.json -- diff --git a/cordova-common/package.json b/cordova-common/package.json index 61c16e4..341d0d5 100644 --- a/cordova-common/package.json +++ b/cordova-common/package.json @@ -3,7 +3,7 @@ "name": "cordova-common", "description": "Apache Cordova tools and platforms shared routines", "license": "Apache-2.0", - "version": "1.4.1-dev", + "version": "1.4.1", "repository": { "type": "git", "url": "git://git-wip-us.apache.org/repos/asf/cordova-common.git" - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[15/19] cordova-lib git commit: CB-11685 Increment package version to -dev
CB-11685 Increment package version to -dev Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/d1c63d68 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/d1c63d68 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/d1c63d68 Branch: refs/heads/common-1.4.x Commit: d1c63d68a115bf16bb369107d7b4a459c873d86b Parents: ced64c4 Author: Vladimir Kotikov Authored: Tue Aug 9 10:46:27 2016 +0300 Committer: Vladimir Kotikov Committed: Tue Aug 9 10:46:27 2016 +0300 -- cordova-lib/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/d1c63d68/cordova-lib/package.json -- diff --git a/cordova-lib/package.json b/cordova-lib/package.json index 9010e48..ab1a898 100644 --- a/cordova-lib/package.json +++ b/cordova-lib/package.json @@ -2,7 +2,7 @@ "author": "Apache Software Foundation", "name": "cordova-lib", "description": "Apache Cordova tools core lib and API", - "version": "6.3.1-dev", + "version": "6.4.0-dev", "repository": { "type": "git", "url": "git://git-wip-us.apache.org/repos/asf/cordova-lib.git" - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[04/19] cordova-lib git commit: CB-11205 Respect saved variables when installing plugin
CB-11205 Respect saved variables when installing plugin This closes #471 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/acb7b0a0 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/acb7b0a0 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/acb7b0a0 Branch: refs/heads/common-1.4.x Commit: acb7b0a0e68499f589cf585830bfb6461d0e9f39 Parents: 29382ca Author: Nikita Matrosov Authored: Fri Jul 29 14:47:44 2016 +0300 Committer: Vladimir Kotikov Committed: Fri Jul 29 17:06:55 2016 +0300 -- cordova-lib/spec-cordova/save.spec.js | 27 +++ cordova-lib/src/cordova/plugin.js | 6 ++ 2 files changed, 33 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/acb7b0a0/cordova-lib/spec-cordova/save.spec.js -- diff --git a/cordova-lib/spec-cordova/save.spec.js b/cordova-lib/spec-cordova/save.spec.js index e2be5a5..b5ece83 100644 --- a/cordova-lib/spec-cordova/save.spec.js +++ b/cordova-lib/spec-cordova/save.spec.js @@ -412,6 +412,33 @@ describe('(save flag)', function () { }); }, TIMEOUT); +it('spec.14.1 should restore plugin with variables', function (done) { +platform('add', platformLocalPathNewer) +.then(function () { +return cordova.raw.plugin('add', variablePluginUrl, { +'save': true, +'cli_variables': { +'APP_ID':'123456789', +'APP_NAME':'myApplication' +} +}); +}).then(function () { +expect(helpers.getPluginVariable(appPath, variablePluginName, 'APP_ID')).toBe('123456789'); +expect(helpers.getPluginVariable(appPath, variablePluginName, 'APP_NAME')).toBe('myApplication'); +return cordova.raw.plugin('rm', variablePluginName); +}).then(function() { +expect(path.join(appPath, 'plugins', variablePluginName)).not.toExist(); +return cordova.raw.plugin('add', variablePluginName); +}).then(function() { +expect(path.join(appPath, 'plugins', variablePluginName)).toExist(); +done(); +}).catch(function (err) { +console.log(err.message); +expect(true).toBe(false); +done(); +}); +}, TIMEOUT); + it('spec.15 save git url as spec', function (done) { platform('add', platformLocalPathNewer) .then(function () { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/acb7b0a0/cordova-lib/src/cordova/plugin.js -- diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js index e8d6acb..d803425 100644 --- a/cordova-lib/src/cordova/plugin.js +++ b/cordova-lib/src/cordova/plugin.js @@ -155,6 +155,12 @@ module.exports = function plugin(command, targets, opts) { .then(function(pluginInfo) { // Validate top-level required variables var pluginVariables = pluginInfo.getPreferences(); +opts.cli_variables = opts.cli_variables || {}; +var pluginEntry = cfg.getPlugin(pluginInfo.id); +var pluginEntryVariables = pluginEntry ? pluginEntry.variables : {}; + Object.keys(pluginVariables).forEach(function(varName) { +opts.cli_variables[varName] = opts.cli_variables[varName] || pluginEntryVariables[varName]; +}); var missingVariables = Object.keys(pluginVariables) .filter(function (variableName) { // discard variables with default value - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[13/19] cordova-lib git commit: CB-11653 copied findProjectRoot from cordova-lib
CB-11653 copied findProjectRoot from cordova-lib This closes #474 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/a429358e Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/a429358e Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/a429358e Branch: refs/heads/common-1.4.x Commit: a429358eb76fef6597c35d4fdf69df7db79af31c Parents: 3e1a5cd Author: carynbear Authored: Wed Jul 20 16:16:49 2016 -0700 Committer: Steve Gill Committed: Wed Aug 3 09:55:36 2016 -0700 -- cordova-common/cordova-common.js | 1 + cordova-common/spec/CordovaCheck.spec.js | 104 ++ cordova-common/src/CordovaCheck.js | 76 +++ 3 files changed, 181 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a429358e/cordova-common/cordova-common.js -- diff --git a/cordova-common/cordova-common.js b/cordova-common/cordova-common.js index dcaf7a4..801d510 100644 --- a/cordova-common/cordova-common.js +++ b/cordova-common/cordova-common.js @@ -27,6 +27,7 @@ addProperty(module, 'superspawn', './src/superspawn'); addProperty(module, 'ActionStack', './src/ActionStack'); addProperty(module, 'CordovaError', './src/CordovaError/CordovaError'); addProperty(module, 'CordovaLogger', './src/CordovaLogger'); +addProperty(module, 'CordovaCheck', './src/CordovaCheck'); addProperty(module, 'CordovaExternalToolErrorContext', './src/CordovaError/CordovaExternalToolErrorContext'); addProperty(module, 'PlatformJson', './src/PlatformJson'); addProperty(module, 'ConfigParser', './src/ConfigParser/ConfigParser'); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a429358e/cordova-common/spec/CordovaCheck.spec.js -- diff --git a/cordova-common/spec/CordovaCheck.spec.js b/cordova-common/spec/CordovaCheck.spec.js new file mode 100644 index 000..a1f37fa --- /dev/null +++ b/cordova-common/spec/CordovaCheck.spec.js @@ -0,0 +1,104 @@ +/** +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 shell = require('shelljs'), +path = require('path'), +CordovaCheck = require('../src/CordovaCheck'); + +var cwd = process.cwd(); +var home = process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME']; +var origPWD = process.env.PWD; + +describe('findProjectRoot method', function() { +afterEach(function() { +process.env.PWD = origPWD; +process.chdir(cwd); +}); +it('should return false if it hits the home directory', function() { +var somedir = path.join(home, 'somedir'); +this.after(function() { +shell.rm('-rf', somedir); +}); +shell.mkdir(somedir); +expect(CordovaCheck.findProjectRoot(somedir)).toEqual(false); +}); +it('should return false if it cannot find a .cordova directory up the directory tree', function() { +var somedir = path.join(home, '..'); +expect(CordovaCheck.findProjectRoot(somedir)).toEqual(false); +}); +it('should return the first directory it finds with a .cordova folder in it', function() { +var somedir = path.join(home,'somedir'); +var anotherdir = path.join(somedir, 'anotherdir'); +this.after(function() { +shell.rm('-rf', somedir); +}); +shell.mkdir('-p', anotherdir); +shell.mkdir('-p', path.join(somedir, 'www', 'config.xml')); +expect(CordovaCheck.findProjectRoot(somedir)).toEqual(somedir); +}); +it('should ignore PWD when its undefined', function() { +delete process.env.PWD; +var somedir = path.join(home,'somedir'); +var anotherdir = path.join(somedir, 'anotherdir'); +this.after(function() { +shell.rm('-rf', somedir); +}); +shell.mkdir('-p', anotherdir); +shell.mkdir('-p', path.join(somedir, 'www')); +shell.mkdir('-p', path.join(somedir, 'config.xml'
[01/19] cordova-lib git commit: CB-11569 Incremented package versions to -dev
Repository: cordova-lib Updated Branches: refs/heads/common-1.4.x 09ab5bbc7 -> 3e57e4c33 refs/heads/master bc2d94235 -> 2a178662a CB-11569 Incremented package versions to -dev Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/1228fdc5 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/1228fdc5 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/1228fdc5 Branch: refs/heads/common-1.4.x Commit: 1228fdc589095ef1682b11c81273fe040d5b5251 Parents: 7d367dc Author: Vladimir Kotikov Authored: Tue Jul 12 18:53:02 2016 +0300 Committer: Vladimir Kotikov Committed: Wed Jul 13 17:00:03 2016 +0300 -- cordova-common/package.json | 2 +- cordova-fetch/package.json | 2 +- cordova-lib/package.json| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1228fdc5/cordova-common/package.json -- diff --git a/cordova-common/package.json b/cordova-common/package.json index c0c7dc8..61c16e4 100644 --- a/cordova-common/package.json +++ b/cordova-common/package.json @@ -3,7 +3,7 @@ "name": "cordova-common", "description": "Apache Cordova tools and platforms shared routines", "license": "Apache-2.0", - "version": "1.3.1-dev", + "version": "1.4.1-dev", "repository": { "type": "git", "url": "git://git-wip-us.apache.org/repos/asf/cordova-common.git" http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1228fdc5/cordova-fetch/package.json -- diff --git a/cordova-fetch/package.json b/cordova-fetch/package.json index 18ba93d..ab232b1 100644 --- a/cordova-fetch/package.json +++ b/cordova-fetch/package.json @@ -1,6 +1,6 @@ { "name": "cordova-fetch", - "version": "1.0.1-dev", + "version": "1.0.2-dev", "description": "Apache Cordova fetch module. Fetches from git and npm.", "main": "index.js", "repository": { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1228fdc5/cordova-lib/package.json -- diff --git a/cordova-lib/package.json b/cordova-lib/package.json index 93e20e2..ddad29a 100644 --- a/cordova-lib/package.json +++ b/cordova-lib/package.json @@ -2,7 +2,7 @@ "author": "Apache Software Foundation", "name": "cordova-lib", "description": "Apache Cordova tools core lib and API", - "version": "6.2.1-dev", + "version": "6.3.1-dev", "repository": { "type": "git", "url": "git://git-wip-us.apache.org/repos/asf/cordova-lib.git" - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[03/19] cordova-lib git commit: CB-9825 framework tag spec parsing
CB-9825 framework tag spec parsing This closes #461 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/29382ca2 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/29382ca2 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/29382ca2 Branch: refs/heads/common-1.4.x Commit: 29382ca2bf67e17337845feb4360980df99fe3d2 Parents: f05874a Author: juliascript Authored: Fri Jul 1 11:42:45 2016 -0700 Committer: Steve Gill Committed: Wed Jul 20 15:50:04 2016 -0700 -- cordova-common/src/PluginInfo/PluginInfo.js | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/29382ca2/cordova-common/src/PluginInfo/PluginInfo.js -- diff --git a/cordova-common/src/PluginInfo/PluginInfo.js b/cordova-common/src/PluginInfo/PluginInfo.js index bf1f75b..0be0c41 100644 --- a/cordova-common/src/PluginInfo/PluginInfo.js +++ b/cordova-common/src/PluginInfo/PluginInfo.js @@ -318,6 +318,7 @@ function PluginInfo(dirname) { parent: el.attrib.parent, custom: isStrTrue(el.attrib.custom), src: el.attrib.src, +spec: el.attrib.spec, weak: isStrTrue(el.attrib.weak), versions: el.attrib.versions, targetDir: el.attrib['target-dir'], - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[08/19] cordova-lib git commit: CB-11645 added check to see if getEditConfig exists before trying to use it
CB-11645 added check to see if getEditConfig exists before trying to use it Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/185a2424 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/185a2424 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/185a2424 Branch: refs/heads/common-1.4.x Commit: 185a2424eb31a088c8cbc06e3231893e0a85a3e7 Parents: 3ad0b50 Author: Steve Gill Authored: Fri Jul 29 17:16:02 2016 -0700 Committer: Steve Gill Committed: Mon Aug 1 17:14:54 2016 -0700 -- cordova-common/src/ConfigChanges/ConfigChanges.js | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/185a2424/cordova-common/src/ConfigChanges/ConfigChanges.js -- diff --git a/cordova-common/src/ConfigChanges/ConfigChanges.js b/cordova-common/src/ConfigChanges/ConfigChanges.js index a395c6d..e5b09a7 100644 --- a/cordova-common/src/ConfigChanges/ConfigChanges.js +++ b/cordova-common/src/ConfigChanges/ConfigChanges.js @@ -97,7 +97,10 @@ function remove_plugin_changes(pluginInfo, is_top_level) { var plugin_vars = is_top_level ? platform_config.installed_plugins[pluginInfo.id] : platform_config.dependent_plugins[pluginInfo.id]; -var edit_config_changes = pluginInfo.getEditConfigs(self.platform); +var edit_config_changes = null; +if(pluginInfo.getEditConfigs) { +edit_config_changes = pluginInfo.getEditConfigs(self.platform); +} // get config munge, aka how did this plugin change various config files var config_munge = self.generate_plugin_config_munge(pluginInfo, plugin_vars, edit_config_changes); @@ -131,7 +134,12 @@ PlatformMunger.prototype.add_plugin_changes = add_plugin_changes; function add_plugin_changes(pluginInfo, plugin_vars, is_top_level, should_increment, plugin_force) { var self = this; var platform_config = self.platformJson.root; -var edit_config_changes = pluginInfo.getEditConfigs(self.platform); + +var edit_config_changes = null; +if(pluginInfo.getEditConfigs) { +edit_config_changes = pluginInfo.getEditConfigs(self.platform); +} + var config_munge; if (!edit_config_changes || edit_config_changes.length === 0) { - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[17/19] cordova-lib git commit: Updated version and RELEASENOTES.md for release cordova-common@1.4.1
Updated version and RELEASENOTES.md for release cordova-common@1.4.1 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/46051b80 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/46051b80 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/46051b80 Branch: refs/heads/common-1.4.x Commit: 46051b800b2fa286d656356e11e38d302c937e86 Parents: 780439c Author: Steve Gill Authored: Tue Aug 9 15:27:19 2016 -0700 Committer: Steve Gill Committed: Tue Aug 9 15:27:33 2016 -0700 -- cordova-common/RELEASENOTES.md | 7 +++ cordova-common/package.json| 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/46051b80/cordova-common/RELEASENOTES.md -- diff --git a/cordova-common/RELEASENOTES.md b/cordova-common/RELEASENOTES.md index 7a99cc9..01037d4 100644 --- a/cordova-common/RELEASENOTES.md +++ b/cordova-common/RELEASENOTES.md @@ -20,6 +20,13 @@ --> # Cordova-common Release Notes +### 1.4.1 (Aug 09, 2016) +* Add general purpose `ConfigParser.getAttribute` API +* [CB-11653](https://issues.apache.org/jira/browse/CB-11653) moved `findProjectRoot` from `cordova-lib` to `cordova-common` +* [CB-11636](https://issues.apache.org/jira/browse/CB-11636) Handle attributes with quotes correctly +* [CB-11645](https://issues.apache.org/jira/browse/CB-11645) added check to see if `getEditConfig` exists before trying to use it +* [CB-9825](https://issues.apache.org/jira/browse/CB-9825) framework tag spec parsing + ### 1.3.0 (May 12, 2016) * [CB-11259](https://issues.apache.org/jira/browse/CB-11259): Improving prepare and build logging * [CB-11194](https://issues.apache.org/jira/browse/CB-11194) Improve cordova load time http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/46051b80/cordova-common/package.json -- diff --git a/cordova-common/package.json b/cordova-common/package.json index 61c16e4..341d0d5 100644 --- a/cordova-common/package.json +++ b/cordova-common/package.json @@ -3,7 +3,7 @@ "name": "cordova-common", "description": "Apache Cordova tools and platforms shared routines", "license": "Apache-2.0", - "version": "1.4.1-dev", + "version": "1.4.1", "repository": { "type": "git", "url": "git://git-wip-us.apache.org/repos/asf/cordova-common.git" - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[18/19] cordova-lib git commit: fixed merge conflict
fixed merge conflict Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/3e57e4c3 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/3e57e4c3 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/3e57e4c3 Branch: refs/heads/common-1.4.x Commit: 3e57e4c33bc7d644b8c2de0928d60e196da21d55 Parents: 09ab5bb 46051b8 Author: Steve Gill Authored: Tue Aug 9 16:25:43 2016 -0700 Committer: Steve Gill Committed: Tue Aug 9 16:25:43 2016 -0700 -- cordova-common/RELEASENOTES.md | 7 ++ cordova-common/cordova-common.js| 1 + cordova-common/package.json | 2 +- cordova-common/spec/CordovaCheck.spec.js| 104 +++ cordova-common/spec/util/xml-helpers.spec.js| 10 ++ .../src/ConfigChanges/ConfigChanges.js | 12 ++- cordova-common/src/ConfigParser/ConfigParser.js | 20 ++-- cordova-common/src/CordovaCheck.js | 76 ++ cordova-common/src/PluginInfo/PluginInfo.js | 1 + cordova-common/src/util/xml-helpers.js | 84 +++ cordova-fetch/package.json | 2 +- cordova-lib/package.json| 2 +- cordova-lib/spec-cordova/emulate.spec.js| 24 + cordova-lib/spec-cordova/run.spec.js| 25 + cordova-lib/spec-cordova/save.spec.js | 46 ++-- cordova-lib/src/cordova/emulate.js | 35 --- cordova-lib/src/cordova/platform.js | 24 +++-- cordova-lib/src/cordova/plugin.js | 6 ++ cordova-lib/src/cordova/prepare.js | 2 +- cordova-lib/src/cordova/run.js | 29 +++--- cordova-lib/src/cordova/util.js | 15 ++- 21 files changed, 421 insertions(+), 106 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3e57e4c3/cordova-common/RELEASENOTES.md -- diff --cc cordova-common/RELEASENOTES.md index 71ad1ea,01037d4..d09d42e --- a/cordova-common/RELEASENOTES.md +++ b/cordova-common/RELEASENOTES.md @@@ -20,9 -20,13 +20,16 @@@ --> # Cordova-common Release Notes + ### 1.4.1 (Aug 09, 2016) + * Add general purpose `ConfigParser.getAttribute` API + * [CB-11653](https://issues.apache.org/jira/browse/CB-11653) moved `findProjectRoot` from `cordova-lib` to `cordova-common` + * [CB-11636](https://issues.apache.org/jira/browse/CB-11636) Handle attributes with quotes correctly + * [CB-11645](https://issues.apache.org/jira/browse/CB-11645) added check to see if `getEditConfig` exists before trying to use it + * [CB-9825](https://issues.apache.org/jira/browse/CB-9825) framework tag spec parsing + +### 1.4.0 (Jul 12, 2016) +* [CB-11023](https://issues.apache.org/jira/browse/CB-11023) Add edit-config functionality + ### 1.3.0 (May 12, 2016) * [CB-11259](https://issues.apache.org/jira/browse/CB-11259): Improving prepare and build logging * [CB-11194](https://issues.apache.org/jira/browse/CB-11194) Improve cordova load time - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[05/19] cordova-lib git commit: updated cordova-common dep for cordova-fetch to 1.4.0
updated cordova-common dep for cordova-fetch to 1.4.0 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/06b79d7b Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/06b79d7b Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/06b79d7b Branch: refs/heads/common-1.4.x Commit: 06b79d7bfb29617a738b7f486792b6a491f25e3f Parents: acb7b0a Author: Steve Gill Authored: Fri Jul 29 11:21:17 2016 -0700 Committer: Steve Gill Committed: Fri Jul 29 11:21:17 2016 -0700 -- cordova-fetch/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/06b79d7b/cordova-fetch/package.json -- diff --git a/cordova-fetch/package.json b/cordova-fetch/package.json index ab232b1..397bb9c 100644 --- a/cordova-fetch/package.json +++ b/cordova-fetch/package.json @@ -21,7 +21,7 @@ "email": "d...@cordova.apache.org" }, "dependencies": { -"cordova-common": "^1.3.0", +"cordova-common": "^1.4.0", "dependency-ls": "^1.0.0", "is-url": "^1.2.1", "q": "^1.4.1", - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[16/19] cordova-lib git commit: CB-11679 Speed up save/restore tests
CB-11679 Speed up save/restore tests clone platform repos with --depth 1 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/780439cd Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/780439cd Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/780439cd Branch: refs/heads/common-1.4.x Commit: 780439cd116716641cd2831236d2c416564e Parents: d1c63d6 Author: Vladimir Kotikov Authored: Tue Apr 19 16:27:32 2016 +0300 Committer: Vladimir Kotikov Committed: Tue Aug 9 12:58:18 2016 +0300 -- cordova-lib/spec-cordova/save.spec.js | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/780439cd/cordova-lib/spec-cordova/save.spec.js -- diff --git a/cordova-lib/spec-cordova/save.spec.js b/cordova-lib/spec-cordova/save.spec.js index b5ece83..31f7e96 100644 --- a/cordova-lib/spec-cordova/save.spec.js +++ b/cordova-lib/spec-cordova/save.spec.js @@ -26,6 +26,7 @@ describe('(save flag)', function () { fs = require('fs'), shell = require('shelljs'), util= require('../src/cordova/util'), +node_util = require('util'), prepare = require('../src/cordova/prepare'), registry= require('../src/plugman/registry/registry'), PlatformApi = require('../src/platforms/PlatformApiPoly'), @@ -126,12 +127,16 @@ describe('(save flag)', function () { revertInstallPluginsForNewPlatform(); }); +function gitClone(repo, dir, ref, cb) { +var gitTemplate = 'git clone --branch %s --depth=1 %s %s'; +var gitCommand = node_util.format(gitTemplate, ref, repo, dir); +shell.exec(gitCommand, { silent: true }, cb); +} + describe('preparing fixtures', function () { it('cloning "old" platform', function (done) { shell.rm('-rf', platformLocalPathOld); -shell.exec('git clone ' + platformGitUrl + ' ' + platformLocalPathOld + -' && cd ' + platformLocalPathOld + -' && git reset --hard ' + platformVersionOld, { silent: true }, function (err) { +gitClone(platformGitUrl, platformLocalPathOld, platformVersionOld, function (err) { expect(err).toBe(0); done(); }); @@ -139,9 +144,7 @@ describe('(save flag)', function () { it('cloning "new" platform', function (done) { shell.rm('-rf', platformLocalPathNew); -shell.exec('git clone ' + platformGitUrl + ' ' + platformLocalPathNew + -' && cd ' + platformLocalPathNew + -' && git reset --hard ' + platformVersionNew, { silent: true }, function (err) { +gitClone(platformGitUrl, platformLocalPathNew, platformVersionNew, function (err) { expect(err).toBe(0); done(); }); @@ -149,9 +152,7 @@ describe('(save flag)', function () { it('cloning "newer" platform', function (done) { shell.rm('-rf', platformLocalPathNewer); -shell.exec('git clone ' + platformGitUrl + ' ' + platformLocalPathNewer + -' && cd ' + platformLocalPathNewer + -' && git reset --hard ' + platformVersionNewer, { silent: true }, function (err) { +gitClone(platformGitUrl, platformLocalPathNewer, platformVersionNewer, function (err) { expect(err).toBe(0); done(); }); - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[02/19] cordova-lib git commit: CB-11589: Fix missing plugin files after restore
CB-11589: Fix missing plugin files after restore This closes #464 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/f05874a5 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/f05874a5 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/f05874a5 Branch: refs/heads/common-1.4.x Commit: f05874a5420ea5fcf5b96290cb1a7fe18fe3e6d6 Parents: 1228fdc Author: Darryl Pogue Authored: Fri Jul 15 11:23:27 2016 -0700 Committer: Vladimir Kotikov Committed: Tue Jul 19 09:17:20 2016 +0300 -- cordova-lib/src/cordova/platform.js | 24 ++-- cordova-lib/src/cordova/prepare.js | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/f05874a5/cordova-lib/src/cordova/platform.js -- diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js index 95f1af5..680fb3b 100644 --- a/cordova-lib/src/cordova/platform.js +++ b/cordova-lib/src/cordova/platform.js @@ -193,22 +193,26 @@ function addHelper(cmd, hooksRunner, projectRoot, targets, opts) { return promise() .then(function () { -return prepare.preparePlatforms([platform], projectRoot, { searchpath: opts.searchpath }); +if (!opts.restoring) { +return prepare.preparePlatforms([platform], projectRoot, { searchpath: opts.searchpath }); +} }) .then(function() { -if (cmd == 'add') { +if (cmd == 'add' && !opts.restoring) { return installPluginsForNewPlatform(platform, projectRoot, opts); } }) .then(function () { -// Call prepare for the current platform. -var prepOpts = { -platforms :[platform], -searchpath :opts.searchpath, -fetch: opts.fetch || false, -save: opts.save || false -}; -return require('./cordova').raw.prepare(prepOpts); +if (!opts.restoring) { +// Call prepare for the current platform if we're not restoring from config.xml +var prepOpts = { +platforms :[platform], +searchpath :opts.searchpath, +fetch: opts.fetch || false, +save: opts.save || false +}; +return require('./cordova').raw.prepare(prepOpts); +} }) .then(function() { var saveVersion = !spec || semver.validRange(spec, true); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/f05874a5/cordova-lib/src/cordova/prepare.js -- diff --git a/cordova-lib/src/cordova/prepare.js b/cordova-lib/src/cordova/prepare.js index ff4f119..00d50ad 100644 --- a/cordova-lib/src/cordova/prepare.js +++ b/cordova-lib/src/cordova/prepare.js @@ -43,7 +43,7 @@ function prepare(options) { var hooksRunner = new HooksRunner(projectRoot); return hooksRunner.fire('before_prepare', options) .then(function(){ -return restore.installPlatformsFromConfigXML(options.platforms, { searchpath : options.searchpath, fetch : options.fetch, save : options.save }); +return restore.installPlatformsFromConfigXML(options.platforms, { searchpath : options.searchpath, fetch : options.fetch, restoring : true }); }) .then(function(){ options = cordova_util.preProcessOptions(options); - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[10/19] cordova-lib git commit: CB-11493: Add cordova emulate option to skip prepare
CB-11493: Add cordova emulate option to skip prepare This closes #459 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/a0d8e283 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/a0d8e283 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/a0d8e283 Branch: refs/heads/common-1.4.x Commit: a0d8e283348f3e99b80ede16220dca845d62d4ae Parents: a15b24d Author: gruppjo Authored: Mon Jun 27 16:50:02 2016 +0200 Committer: Vladimir Kotikov Committed: Tue Aug 2 10:10:15 2016 +0300 -- cordova-lib/src/cordova/emulate.js | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a0d8e283/cordova-lib/src/cordova/emulate.js -- diff --git a/cordova-lib/src/cordova/emulate.js b/cordova-lib/src/cordova/emulate.js index b0b61aa..642e55c 100644 --- a/cordova-lib/src/cordova/emulate.js +++ b/cordova-lib/src/cordova/emulate.js @@ -35,8 +35,10 @@ module.exports = function emulate(options) { var hooksRunner = new HooksRunner(projectRoot); return hooksRunner.fire('before_emulate', options) .then(function() { -// Run a prepare first! -return require('./cordova').raw.prepare(options); +if (!options.options.noprepare) { +// Run a prepare first! +return require('./cordova').raw.prepare(options); +} }).then(function() { // Deploy in parallel (output gets intermixed though...) return Q.all(options.platforms.map(function(platform) { - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[09/19] cordova-lib git commit: CB-11636 Handle attributes with quotes correctly
CB-11636 Handle attributes with quotes correctly Avoid using complex queries in et.findall to prevent issues w/ quoted values. Previous approach w/ crafting complex query from attributes names and values was faulty when any of the attributes had double quotes or " This closes #470 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/a15b24da Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/a15b24da Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/a15b24da Branch: refs/heads/common-1.4.x Commit: a15b24da0fc32cfc6bb09fa30ea09452e95ee680 Parents: 185a242 Author: Vladimir Kotikov Authored: Thu Jul 28 12:44:59 2016 +0300 Committer: Steve Gill Committed: Mon Aug 1 17:25:08 2016 -0700 -- cordova-common/spec/util/xml-helpers.spec.js | 10 +++ cordova-common/src/util/xml-helpers.js | 84 --- 2 files changed, 53 insertions(+), 41 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a15b24da/cordova-common/spec/util/xml-helpers.spec.js -- diff --git a/cordova-common/spec/util/xml-helpers.spec.js b/cordova-common/spec/util/xml-helpers.spec.js index 24c6553..0becf72 100644 --- a/cordova-common/spec/util/xml-helpers.spec.js +++ b/cordova-common/spec/util/xml-helpers.spec.js @@ -294,6 +294,7 @@ describe('xml-helpers', function(){ beforeEach(function() { dstXml = et.XML(TEST_XML); }); + it('should merge attributes and text of the root element without clobbering', function () { var testXml = et.XML('TEXT'); xml_helpers.mergeXml(testXml, dstXml); @@ -310,6 +311,15 @@ describe('xml-helpers', function(){ expect(dstXml.text).toEqual('TEXT'); }); +it('should handle attributes values with quotes correctly', function () { +var testXml = et.XML(''); +xml_helpers.mergeXml(testXml, dstXml); +expect(dstXml.find('quote')).toBeDefined(); +expect(dstXml.find('quote').attrib.foo).toEqual('some \'quoted\' string'); +expect(dstXml.find('quote').attrib.bar).toEqual('another "quoted" string'); +expect(dstXml.find('quote').attrib.baz).toEqual('"mixed" \'quotes\''); +}); + it('should not merge platform tags with the wrong platform', function () { var testXml = et.XML('testTEXT'), origCfg = et.tostring(dstXml); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/a15b24da/cordova-common/src/util/xml-helpers.js -- diff --git a/cordova-common/src/util/xml-helpers.js b/cordova-common/src/util/xml-helpers.js index f16eaaf..4b630fa 100644 --- a/cordova-common/src/util/xml-helpers.js +++ b/cordova-common/src/util/xml-helpers.js @@ -44,23 +44,9 @@ module.exports = { return false; } -var oneAttribKeys = Object.keys(one.attrib), -twoAttribKeys = Object.keys(two.attrib), -i = 0, attribName; +if (!attribMatch(one, two)) return false; -if (oneAttribKeys.length != twoAttribKeys.length) { -return false; -} - -for (i; i < oneAttribKeys.length; i++) { -attribName = oneAttribKeys[i]; - -if (one.attrib[attribName] != two.attrib[attribName]) { -return false; -} -} - -for (i; i < one._children.length; i++) { +for (var i = 0; i < one._children.length; i++) { if (!module.exports.equalNodes(one._children[i], two._children[i])) { return false; } @@ -287,33 +273,30 @@ function mergeXml(src, dest, platform, clobber) { query = srcTag + '', shouldMerge = true; -if (BLACKLIST.indexOf(srcTag) === -1) { -if (SINGLETONS.indexOf(srcTag) !== -1) { -foundChild = dest.find(query); -if (foundChild) { -destChild = foundChild; -dest.remove(destChild); -} -} else { -//Check for an exact match and if you find one don't add -Object.getOwnPropertyNames(srcChild.attrib).forEach(function (attribute) { -query += '[@' + attribute + '="' + srcChild.attrib[attribute] + '"]'; -}); -var foundChildren = dest.findall(query); -for(var i = 0; i < foundChildren.length; i++) { -foundChild = foundChildren[i]; -if (foundChild && textMatch(srcChild, foundChild) && (Object.keys(srcChild.attrib).length==Object.keys(foundChild.attrib).length)) { -
[11/19] cordova-lib git commit: CB-11194 Defer creating of libDir folder until something actually requests it
CB-11194 Defer creating of libDir folder until something actually requests it This closes #462 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/68af465c Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/68af465c Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/68af465c Branch: refs/heads/common-1.4.x Commit: 68af465ca7906c47bebfa9428124e83855dda6f6 Parents: a0d8e28 Author: Jesse MacFadyen Authored: Fri Jul 1 16:35:53 2016 -0700 Committer: Vladimir Kotikov Committed: Wed Aug 3 12:53:29 2016 +0300 -- cordova-lib/src/cordova/util.js | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/68af465c/cordova-lib/src/cordova/util.js -- diff --git a/cordova-lib/src/cordova/util.js b/cordova-lib/src/cordova/util.js index 1bc227e..e617e08 100644 --- a/cordova-lib/src/cordova/util.js +++ b/cordova-lib/src/cordova/util.js @@ -38,11 +38,22 @@ if (!global_config_path) { var origCwd = null; var lib_path = path.join(global_config_path, 'lib'); -shell.mkdir('-p', lib_path); + exports.binname = 'cordova'; exports.globalConfig = global_config_path; -exports.libDirectory = lib_path; + +// defer defining libDirectory on exports so we don't create it if +// someone simply requires this module +Object.defineProperty(exports,'libDirectory', { +configurable: true, +get: function () { +shell.mkdir('-p', lib_path); +exports.libDirectory = lib_path; +return lib_path; +} +}); + addModuleProperty(module, 'plugin_parser', './plugin_parser'); exports.isCordova = isCordova; - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[14/19] cordova-lib git commit: Add general purpose ConfigParser.getAttribute API
Add general purpose ConfigParser.getAttribute API This closes #466 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/ced64c43 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/ced64c43 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/ced64c43 Branch: refs/heads/common-1.4.x Commit: ced64c43462ed70ec789308440d31fb8cad08610 Parents: a429358 Author: Darryl Pogue Authored: Thu Jul 21 20:03:33 2016 -0700 Committer: Steve Gill Committed: Mon Aug 8 17:37:43 2016 -0700 -- cordova-common/src/ConfigParser/ConfigParser.js | 20 1 file changed, 12 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/ced64c43/cordova-common/src/ConfigParser/ConfigParser.js -- diff --git a/cordova-common/src/ConfigParser/ConfigParser.js b/cordova-common/src/ConfigParser/ConfigParser.js index aae59db..195164a 100644 --- a/cordova-common/src/ConfigParser/ConfigParser.js +++ b/cordova-common/src/ConfigParser/ConfigParser.js @@ -90,20 +90,24 @@ function findElementAttributeValue(attributeName, elems) { } ConfigParser.prototype = { +getAttribute: function(attr) { +return this.doc.getroot().attrib[attr]; +}, + packageName: function(id) { -return this.doc.getroot().attrib['id']; +return this.getAttribute('id'); }, setPackageName: function(id) { this.doc.getroot().attrib['id'] = id; }, android_packageName: function() { -return this.doc.getroot().attrib['android-packageName']; +return this.getAttribute('android-packageName'); }, android_activityName: function() { - return this.doc.getroot().attrib['android-activityName']; +return this.getAttribute('android-activityName'); }, ios_CFBundleIdentifier: function() { -return this.doc.getroot().attrib['ios-CFBundleIdentifier']; +return this.getAttribute('ios-CFBundleIdentifier'); }, name: function() { return getNodeTextSafe(this.doc.find('name')); @@ -120,16 +124,16 @@ ConfigParser.prototype = { el.text = text; }, version: function() { -return this.doc.getroot().attrib['version']; +return this.getAttribute('version'); }, windows_packageVersion: function() { -return this.doc.getroot().attrib('windows-packageVersion'); +return this.getAttribute('windows-packageVersion'); }, android_versionCode: function() { -return this.doc.getroot().attrib['android-versionCode']; +return this.getAttribute('android-versionCode'); }, ios_CFBundleVersion: function() { -return this.doc.getroot().attrib['ios-CFBundleVersion']; +return this.getAttribute('ios-CFBundleVersion'); }, setVersion: function(value) { this.doc.getroot().attrib['version'] = value; - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[cordova-lib] Git Push Summary
Repository: cordova-lib Updated Tags: refs/tags/common-1.4.1 [created] 46051b800 - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[06/19] cordova-lib git commit: updated cordova-common and cordova-fetch deps on master
updated cordova-common and cordova-fetch deps on master Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/64e67ecf Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/64e67ecf Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/64e67ecf Branch: refs/heads/common-1.4.x Commit: 64e67ecf74e6d730b488f13fa0c638a673623738 Parents: 06b79d7 Author: Steve Gill Authored: Fri Jul 29 14:21:34 2016 -0700 Committer: Steve Gill Committed: Fri Jul 29 14:21:34 2016 -0700 -- cordova-lib/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/64e67ecf/cordova-lib/package.json -- diff --git a/cordova-lib/package.json b/cordova-lib/package.json index ddad29a..9010e48 100644 --- a/cordova-lib/package.json +++ b/cordova-lib/package.json @@ -19,8 +19,8 @@ "dependencies": { "aliasify": "^1.7.2", "cordova-app-hello-world": "3.10.0", -"cordova-common": "1.3.x", -"cordova-fetch": "1.0.0", +"cordova-common": "1.4.x", +"cordova-fetch": "1.0.x", "cordova-js": "4.1.4", "cordova-registry-mapper": "1.x", "cordova-serve": "^1.0.0", - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[19/19] cordova-lib git commit: added missing 1.4.0 release notes for cordova-common
added missing 1.4.0 release notes for cordova-common Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/2a178662 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/2a178662 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/2a178662 Branch: refs/heads/master Commit: 2a178662acfad9c779114fddd815e484fc1b6f1d Parents: bc2d942 Author: Steve Gill Authored: Tue Aug 9 16:27:15 2016 -0700 Committer: Steve Gill Committed: Tue Aug 9 16:27:15 2016 -0700 -- cordova-common/RELEASENOTES.md | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/2a178662/cordova-common/RELEASENOTES.md -- diff --git a/cordova-common/RELEASENOTES.md b/cordova-common/RELEASENOTES.md index 01037d4..d09d42e 100644 --- a/cordova-common/RELEASENOTES.md +++ b/cordova-common/RELEASENOTES.md @@ -27,6 +27,9 @@ * [CB-11645](https://issues.apache.org/jira/browse/CB-11645) added check to see if `getEditConfig` exists before trying to use it * [CB-9825](https://issues.apache.org/jira/browse/CB-9825) framework tag spec parsing +### 1.4.0 (Jul 12, 2016) +* [CB-11023](https://issues.apache.org/jira/browse/CB-11023) Add edit-config functionality + ### 1.3.0 (May 12, 2016) * [CB-11259](https://issues.apache.org/jira/browse/CB-11259): Improving prepare and build logging * [CB-11194](https://issues.apache.org/jira/browse/CB-11194) Improve cordova load time - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[12/19] cordova-lib git commit: CB-11652 Update run and emulate to skip build
CB-11652 Update run and emulate to skip build We need to add this conditional logic to cordova's `run` and `emulate` methods to skip build when `--nobuild` option is specified. CLI previously has delegated this logic to platform's `run` method but since introducing `before_deploy` hook we call platform's `build` and `run` separately and so we need to handle this option in CLI Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/3e1a5cdb Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/3e1a5cdb Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/3e1a5cdb Branch: refs/heads/common-1.4.x Commit: 3e1a5cdb3eb4331de81342aae47131d5a4ddc061 Parents: 68af465 Author: Vladimir Kotikov Authored: Tue Aug 2 15:08:24 2016 +0300 Committer: Vladimir Kotikov Committed: Wed Aug 3 12:55:17 2016 +0300 -- cordova-lib/spec-cordova/emulate.spec.js | 24 ++ cordova-lib/spec-cordova/run.spec.js | 25 +++ cordova-lib/src/cordova/emulate.js | 29 ++- cordova-lib/src/cordova/run.js | 29 ++- 4 files changed, 79 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3e1a5cdb/cordova-lib/spec-cordova/emulate.spec.js -- diff --git a/cordova-lib/spec-cordova/emulate.spec.js b/cordova-lib/spec-cordova/emulate.spec.js index c04c16d..94b2ab9 100644 --- a/cordova-lib/spec-cordova/emulate.spec.js +++ b/cordova-lib/spec-cordova/emulate.spec.js @@ -131,6 +131,30 @@ describe('emulate command', function() { }).fin(done); }); }); + +it('should call platform\'s build method', function (done) { +cordova.raw.emulate({platforms: ['blackberry10']}) +.then(function() { +expect(prepare_spy).toHaveBeenCalled(); +expect(platformApi.build).toHaveBeenCalledWith({device: false, emulator: true}); + expect(platformApi.run).toHaveBeenCalledWith(jasmine.objectContaining({nobuild: true})); +}, function(err) { +expect(err).toBeUndefined(); +}) +.fin(done); +}); + +it('should not call build if --nobuild option is passed', function (done) { +cordova.raw.emulate({platforms: ['blackberry10'], options: { nobuild: true }}) +.then(function() { +expect(prepare_spy).toHaveBeenCalled(); +expect(platformApi.build).not.toHaveBeenCalled(); + expect(platformApi.run).toHaveBeenCalledWith(jasmine.objectContaining({nobuild: true})); +}, function(err) { +expect(err).toBeUndefined(); +}) +.fin(done); +}); }); describe('hooks', function() { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3e1a5cdb/cordova-lib/spec-cordova/run.spec.js -- diff --git a/cordova-lib/spec-cordova/run.spec.js b/cordova-lib/spec-cordova/run.spec.js index b1dedd3..2b09e04 100644 --- a/cordova-lib/spec-cordova/run.spec.js +++ b/cordova-lib/spec-cordova/run.spec.js @@ -107,6 +107,31 @@ describe('run command', function() { done(); }); }); + +it('should call platform\'s build method', function (done) { +cordova.raw.run({platforms: ['blackberry10']}) +.then(function() { +expect(prepare_spy).toHaveBeenCalled(); +expect(platformApi.build).toHaveBeenCalledWith({}); + expect(platformApi.run).toHaveBeenCalledWith(jasmine.objectContaining({nobuild: true})); +}, function(err) { +expect(err).toBeUndefined(); +}) +.fin(done); +}); + +it('should not call build if --nobuild option is passed', function (done) { +cordova.raw.run({platforms: ['blackberry10'], options: { nobuild: true }}) +.then(function() { +expect(prepare_spy).toHaveBeenCalled(); +expect(platformApi.build).not.toHaveBeenCalled(); + expect(platformApi.run).toHaveBeenCalledWith(jasmine.objectContaining({nobuild: true})); +}, function(err) { +expect(err).toBeUndefined(); +}) +.fin(done); +}); + describe('run parameters should not be altered by intermediate build command', function() { var originalBuildSpy; beforeEach(function() { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3e1a5cdb/cordova-lib/src/cordova/emulate.js -
[07/19] cordova-lib git commit: CB-11569 Bump pinned platforms' versions
CB-11569 Bump pinned platforms' versions Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/3ad0b502 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/3ad0b502 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/3ad0b502 Branch: refs/heads/common-1.4.x Commit: 3ad0b5029205171fbac4571d9272f4be9b7617cf Parents: 64e67ec Author: Vladimir Kotikov Authored: Tue Jul 12 18:57:49 2016 +0300 Committer: Vladimir Kotikov Committed: Mon Aug 1 13:44:11 2016 +0300 -- cordova-lib/src/platforms/platformsConfig.json | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3ad0b502/cordova-lib/src/platforms/platformsConfig.json -- diff --git a/cordova-lib/src/platforms/platformsConfig.json b/cordova-lib/src/platforms/platformsConfig.json index f411f8b..b4bf23b 100644 --- a/cordova-lib/src/platforms/platformsConfig.json +++ b/cordova-lib/src/platforms/platformsConfig.json @@ -4,7 +4,7 @@ "parser_file": "../cordova/metadata/ios_parser", "handler_file": "../plugman/platforms/ios", "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-ios.git";, -"version": "~4.1.0", +"version": "~4.2.0", "apiCompatibleSince": "4.0.0", "deprecated": false }, @@ -21,7 +21,7 @@ "parser_file": "../cordova/metadata/android_parser", "handler_file": "../plugman/platforms/android", "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-android.git";, -"version": "~5.1.1", +"version": "~5.2.0", "apiCompatibleSince": "5.0.0", "deprecated": false }, @@ -30,7 +30,7 @@ "parser_file": "../cordova/metadata/ubuntu_parser", "handler_file": "../plugman/platforms/ubuntu", "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-ubuntu.git";, -"version": "~4.3.3", +"version": "~4.3.4", "deprecated": false }, "amazon-fireos": { @@ -75,7 +75,7 @@ "parser_file": "../cordova/metadata/windows_parser", "handler_file": "../plugman/platforms/windows", "url": "https://git-wip-us.apache.org/repos/asf?p=cordova-windows.git";, -"version": "~4.3.1", +"version": "~4.4.0", "apiCompatibleSince": "4.3.0", "deprecated": false }, - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
svn commit: r14730 - in /dev/cordova/CB-11690: ./ cordova-common-1.4.1.tgz cordova-common-1.4.1.tgz.asc cordova-common-1.4.1.tgz.md5 cordova-common-1.4.1.tgz.sha
Author: steven Date: Tue Aug 9 23:31:02 2016 New Revision: 14730 Log: CB-11690 Uploading release candidates for common@1.4.1 release Added: dev/cordova/CB-11690/ dev/cordova/CB-11690/cordova-common-1.4.1.tgz (with props) dev/cordova/CB-11690/cordova-common-1.4.1.tgz.asc dev/cordova/CB-11690/cordova-common-1.4.1.tgz.md5 dev/cordova/CB-11690/cordova-common-1.4.1.tgz.sha Added: dev/cordova/CB-11690/cordova-common-1.4.1.tgz == Binary file - no diff available. Propchange: dev/cordova/CB-11690/cordova-common-1.4.1.tgz -- svn:mime-type = application/octet-stream Added: dev/cordova/CB-11690/cordova-common-1.4.1.tgz.asc == --- dev/cordova/CB-11690/cordova-common-1.4.1.tgz.asc (added) +++ dev/cordova/CB-11690/cordova-common-1.4.1.tgz.asc Tue Aug 9 23:31:02 2016 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQEcBAABAgAGBQJXqmerAAoJEDhDuPn/ymi+66IIAMg8YO2iqAjOhOnvPMRnuR95 +Xq7dr/xu6mcOGaF74yVXyIqWvM4XuCPoTkS9BfdYMCYIZSX31qLtTATr6HV22iPK +0yZNDtSsEjQZNAyM8f5uhAbU9NcqNUtZ6efH6IHXtv3sm8A5Ku6j1dhkpsbDDewA +zXs3nZt70DLEz4Z7h2m+adMDXUxmuGLr6edoUtZY9AcgSbpDfbctPF4A7ptR2P4B +AqeYPl6TMTSiCdjM1cIYycCXFLU04XOC28DhbAIejL/tBTNCfjIPWz3UZ+9S+pDP +W75HsDOajk+PGToDjlvGaL0lcVOS8mByEto0ME4rkU4cAVj2yehDvyfgEmAY/EE= +=K+bF +-END PGP SIGNATURE- Added: dev/cordova/CB-11690/cordova-common-1.4.1.tgz.md5 == --- dev/cordova/CB-11690/cordova-common-1.4.1.tgz.md5 (added) +++ dev/cordova/CB-11690/cordova-common-1.4.1.tgz.md5 Tue Aug 9 23:31:02 2016 @@ -0,0 +1 @@ +27160e3786105f5d3cd0c2af90ae96ef Added: dev/cordova/CB-11690/cordova-common-1.4.1.tgz.sha == --- dev/cordova/CB-11690/cordova-common-1.4.1.tgz.sha (added) +++ dev/cordova/CB-11690/cordova-common-1.4.1.tgz.sha Tue Aug 9 23:31:02 2016 @@ -0,0 +1 @@ +2904f97626235585dd3370350226adfaaec007d4209a06a340991fa44cd481eccf18925174578f845cdf903d22dad0438df0352fc0f3554c18db6d3bf197c0a7 - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
cordova-create git commit: updated readme and package.json
Repository: cordova-create Updated Branches: refs/heads/master 79cace59b -> 14d644a75 updated readme and package.json Project: http://git-wip-us.apache.org/repos/asf/cordova-create/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-create/commit/14d644a7 Tree: http://git-wip-us.apache.org/repos/asf/cordova-create/tree/14d644a7 Diff: http://git-wip-us.apache.org/repos/asf/cordova-create/diff/14d644a7 Branch: refs/heads/master Commit: 14d644a753d6ff90b9e6242a25b9ebbe805f09a4 Parents: 79cace5 Author: Steve Gill Authored: Tue Aug 9 17:24:01 2016 -0700 Committer: Steve Gill Committed: Tue Aug 9 17:24:01 2016 -0700 -- README.md| 4 ++-- package.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-create/blob/14d644a7/README.md -- diff --git a/README.md b/README.md index 3429c63..da3f084 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,8 @@ # --> -[![Build status](https://ci.appveyor.com/api/projects/status/pejqbhscb3mlnt74)](https://ci.appveyor.com/project/stevengill/cordova-create) -[![Build Status](https://travis-ci.org/stevengill/cordova-create.svg?branch=master)](https://travis-ci.org/stevengill/cordova-create) +[![Build status]()](https://ci.appveyor.com/project/Humbedooh/cordova-create) +[![Build Status](https://travis-ci.org/apache/cordova-create.svg?branch=master)](https://travis-ci.org/apache/cordova-create) # cordova-create http://git-wip-us.apache.org/repos/asf/cordova-create/blob/14d644a7/package.json -- diff --git a/package.json b/package.json index e068374..5d08493 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.js", "repository": { "type": "git", -"url": "https://github.com/carynbear/cordova-create.git"; +"url": "https://github.com/apache/cordova-create.git"; }, "keywords": [ "cordova", @@ -26,8 +26,8 @@ "engineStrict": true, "dependencies": { "cordova-app-hello-world": "3.10.0", -"cordova-common": "1.3.x", -"cordova-fetch": "1.0.0", +"cordova-common": "^1.4.0", +"cordova-fetch": "^1.0.0", "q": "1.0.1", "shelljs": "0.3.0", "valid-identifier": "0.0.1" - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org