You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2013/07/18 02:23:02 UTC
[1/3] git commit: 0.9.7
Updated Branches:
refs/heads/plugman-registry 73f5ef2a9 -> 9dab68089
0.9.7
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/16a865e3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/16a865e3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/16a865e3
Branch: refs/heads/plugman-registry
Commit: 16a865e3601d43892a850f178832652114102f03
Parents: 9c0d637
Author: Fil Maj <ma...@gmail.com>
Authored: Tue Jul 16 16:00:31 2013 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Tue Jul 16 16:00:31 2013 -0700
----------------------------------------------------------------------
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/16a865e3/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 5e114fc..4834e58 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"author": "Andrew Lunny <al...@gmail.com>",
"name": "plugman",
"description": "install/uninstall Cordova plugins",
- "version": "0.9.6",
+ "version": "0.9.7",
"repository": {
"type": "git",
"url": "git://git-wip-us.apache.org/repos/asf/cordova-plugman.git"
[2/3] git commit: 0.9.8. cordova versions that have "rc" in it will
be munged slightly to add a dash in between the version and the rc number,
to play nice with semver.
Posted by an...@apache.org.
0.9.8. cordova versions that have "rc" in it will be munged slightly to add a dash in between the version and the rc number, to play nice with semver.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/58be145d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/58be145d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/58be145d
Branch: refs/heads/plugman-registry
Commit: 58be145da875d1cdae64c7b7270ff7a9ad473fa1
Parents: 16a865e
Author: Fil Maj <ma...@gmail.com>
Authored: Wed Jul 17 09:44:16 2013 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Wed Jul 17 09:44:16 2013 -0700
----------------------------------------------------------------------
package.json | 2 +-
spec/install.spec.js | 6 ++++++
src/install.js | 4 ++++
3 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/58be145d/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 4834e58..1896486 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"author": "Andrew Lunny <al...@gmail.com>",
"name": "plugman",
"description": "install/uninstall Cordova plugins",
- "version": "0.9.7",
+ "version": "0.9.8",
"repository": {
"type": "git",
"url": "git://git-wip-us.apache.org/repos/asf/cordova-plugman.git"
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/58be145d/spec/install.spec.js
----------------------------------------------------------------------
diff --git a/spec/install.spec.js b/spec/install.spec.js
index 2895667..33bfcc8 100644
--- a/spec/install.spec.js
+++ b/spec/install.spec.js
@@ -67,6 +67,12 @@ describe('install', function() {
install('android', temp, 'engineplugin', plugins_dir, {});
expect(spy).toHaveBeenCalledWith('2.5.0','>=2.3.0');
});
+ it('should check version and munge it a little if it has "rc" in it so it plays nice with semver (introduce a dash in it)', function() {
+ var spy = spyOn(semver, 'satisfies').andReturn(true);
+ exec.andReturn({code:0,output:"3.0.0rc1"});
+ install('android', temp, 'engineplugin', plugins_dir, {});
+ expect(spy).toHaveBeenCalledWith('3.0.0-rc1','>=2.3.0');
+ });
it('should queue up actions as appropriate for that plugin and call process on the action stack', function() {
install('android', temp, dummyplugin, plugins_dir, {});
expect(actions_push.calls.length).toEqual(3);
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/58be145d/src/install.js
----------------------------------------------------------------------
diff --git a/src/install.js b/src/install.js
index 17343c8..c1b5d17 100644
--- a/src/install.js
+++ b/src/install.js
@@ -103,6 +103,10 @@ function runInstall(actions, platform, project_dir, plugin_dir, plugins_dir, opt
// Only check cordova version if the version script was successful.
if (versionScript.code === 0) {
var current_version = versionScript.output.trim();
+ var rc_index = current_version.indexOf('rc');
+ if (rc_index > -1) {
+ current_version = current_version.substr(0, rc_index) + '-' + current_version.substr(rc_index);
+ }
var engines = plugin_et.findall('engines/engine');
engines.forEach(function(engine){
if(engine.attrib["name"].toLowerCase() === "cordova"){
[3/3] git commit: Merge branch 'master' into plugman-registry
Posted by an...@apache.org.
Merge branch 'master' into plugman-registry
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/9dab6808
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/9dab6808
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/9dab6808
Branch: refs/heads/plugman-registry
Commit: 9dab6808961aa6e6d7f145b6065f6560055ecd70
Parents: 73f5ef2 58be145
Author: Anis Kadri <an...@apache.org>
Authored: Wed Jul 17 17:22:57 2013 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Jul 17 17:22:57 2013 -0700
----------------------------------------------------------------------
package.json | 2 +-
spec/install.spec.js | 6 ++++++
src/install.js | 4 ++++
3 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/9dab6808/package.json
----------------------------------------------------------------------