cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject [8/8] git commit: updated bb10 pull with latest dependency changes.
Date Thu, 16 May 2013 19:39:49 GMT
updated bb10 pull with latest dependency changes.


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

Branch: refs/heads/bb10
Commit: 15eafa95642fc40802a03e19f5dd124f853624d6
Parents: 38b16cf
Author: Fil Maj <maj.fil@gmail.com>
Authored: Thu May 16 12:39:36 2013 -0700
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Thu May 16 12:39:36 2013 -0700

----------------------------------------------------------------------
 spec/platforms/blackberry10.spec.js |   93 ++++++++++-------------------
 src/install.js                      |    2 +-
 src/platforms/blackberry10.js       |    7 +--
 src/uninstall.js                    |    2 +-
 4 files changed, 36 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/15eafa95/spec/platforms/blackberry10.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/blackberry10.spec.js b/spec/platforms/blackberry10.spec.js
index d0973e2..7c66ec2 100644
--- a/spec/platforms/blackberry10.spec.js
+++ b/spec/platforms/blackberry10.spec.js
@@ -38,14 +38,16 @@ function parsePlugin (pluginPath) {
 
 
 describe('blackberry10 project handler', function() {
-    it('should have an install function', function() {
-        expect(typeof blackberry10.install).toEqual('function');
-    });
-    it('should have an uninstall function', function() {
-        expect(typeof blackberry10.uninstall).toEqual('function');
+    describe('www_dir method', function() {
+        it('should return cordova-blackberry10 project www location using www_dir', function()
{
+            expect(blackberry10.www_dir('/')).toEqual('/www');
+        });
     });
-    it('should return cordova-blackberry10 project www location using www_dir', function()
{
-        expect(blackberry10.www_dir('/')).toEqual('/www');
+
+    describe('package_name method', function() {
+        it('should return a blackberry10 project\'s proper package name', function() {
+            expect(blackberry10.package_name(path.join(blackberry10_project, '..'))).toEqual('cordovaExample');
+        });
     });
 
     describe('installation', function() {
@@ -59,12 +61,11 @@ describe('blackberry10 project handler', function() {
         describe('of <lib-file> elements', function() {
             it("should copy so files to native/target/plugins", function () {
                 var plugin = plugins.echo,
-                    source = copyArray(plugin.libFiles),
+                    libs = copyArray(plugin.libFiles),
                     s = spyOn(common, 'copyFile');
 
-                blackberry10.install(source, plugin.id, temp, plugin.path, {});
+                blackberry10['lib-file'].install(libs[0], plugin.path, temp);
                 expect(s).toHaveBeenCalledWith(plugin.path, 'src/blackberry10/native/device/echoJnext.so',
temp, 'native/device/plugins/jnext/echoJnext.so');
-                expect(s).toHaveBeenCalledWith(plugin.path, 'src/blackberry10/native/simulator/echoJnext.so',
temp, 'native/simulator/plugins/jnext/echoJnext.so');
             });
         });
         describe('of <source-file> elements', function() {
@@ -73,21 +74,21 @@ describe('blackberry10 project handler', function() {
                     source = copyArray(plugin.srcFiles);
                     s = spyOn(common, 'copyFile');
 
-                blackberry10.install(source, plugin.id, temp, plugin.path, {});
+                blackberry10['source-file'].install(source[0], plugin.path, temp, plugin.id);
                 expect(s).toHaveBeenCalledWith(plugin.path, 'src/blackberry10/index.js',
temp, 'native/device/chrome/plugin/cordova.echo/index.js');
                 expect(s).toHaveBeenCalledWith(plugin.path, 'src/blackberry10/index.js',
temp, 'native/simulator/chrome/plugin/cordova.echo/index.js');
             });
             it('defaults to plugin id when dest is not present', function() {
                 var source = copyArray(plugins.dummy.srcFiles);
                 var s = spyOn(common, 'copyFile');
-                blackberry10.install(source, plugins.dummy.id, temp, plugins.dummy.path,
{});
+                blackberry10['source-file'].install(source[0], plugins.dummy.path, temp,
plugins.dummy.id);
                 expect(s).toHaveBeenCalledWith(plugins.dummy.path, 'src/blackberry10/index.js',
temp, 'native/device/chrome/plugin/' + plugins.dummy.id + '/index.js');
                 expect(s).toHaveBeenCalledWith(plugins.dummy.path, 'src/blackberry10/index.js',
temp, 'native/simulator/chrome/plugin/' + plugins.dummy.id + '/index.js');
             });
             it('should throw if source file cannot be found', function() {
                 var source = copyArray(plugins.faulty.srcFiles);
                 expect(function() {
-                    blackberry10.install(source, plugins.faulty.id, temp, plugins.faulty.path,
{});
+                    blackberry10['source-file'].install(source[0], plugins.faulty.path, temp,
plugins.faulty.id);
                 }).toThrow('"' + path.resolve(plugins.faulty.path, 'src/blackberry10/index.js')
+ '" not found!');
             });
             it('should throw if target file already exists', function() {
@@ -99,7 +100,7 @@ describe('blackberry10 project handler', function() {
 
                 var source = copyArray(plugins.dummy.srcFiles);
                 expect(function() {
-                    blackberry10.install(source, plugins.dummy.id, temp, plugins.dummy.path,
{});
+                    blackberry10['source-file'].install(source[0], plugins.dummy.path, temp,
plugins.dummy.id);
                 }).toThrow('"' + target + '" already exists!');
             });
         });
@@ -114,63 +115,33 @@ describe('blackberry10 project handler', function() {
             shell.rm('-rf', temp);
         });
         describe('of <source-file> elements', function() {
-            it('should remove stuff by calling common.removeFile', function(done) {
+            it('should remove stuff by calling common.removeFile', function() {
                 var s = spyOn(common, 'removeFile'),
                     plugin = plugins.echo;
-                install('blackberry10', temp, plugin.path, plugins_dir, {}, "", function()
{
-                    var source = copyArray(plugin.srcFiles);
-                    blackberry10.uninstall(source, plugin.id, temp, plugin.path);
-                    expect(s).toHaveBeenCalledWith(temp, 'native/device/chrome/plugin/cordova.echo/index.js');
-                    expect(s).toHaveBeenCalledWith(temp, 'native/simulator/chrome/plugin/cordova.echo/index.js');
-                    done();
-                });
+                var source = copyArray(plugin.srcFiles);
+                blackberry10['source-file'].install(source[0], plugin.path, temp, plugin.id);
+                blackberry10['source-file'].uninstall(source[0], temp, plugin.id);
+                expect(s).toHaveBeenCalledWith(temp, 'native/device/chrome/plugin/cordova.echo/index.js');
+                expect(s).toHaveBeenCalledWith(temp, 'native/simulator/chrome/plugin/cordova.echo/index.js');
             });
-            it('should remove stuff by calling common.removeFile', function(done) {
+            it('should remove stuff by calling common.removeFile', function() {
                 var s = spyOn(common, 'removeFile'),
                     plugin = plugins.dummy;
-                install('blackberry10', temp, plugin.path, plugins_dir, {}, "", function()
{
-                    var source = copyArray(plugin.srcFiles);
-                    blackberry10.uninstall(source, plugin.id, temp, plugin.path);
-                    expect(s).toHaveBeenCalledWith(temp, 'native/device/chrome/plugin/' +
plugin.id + '/index.js');
-                    expect(s).toHaveBeenCalledWith(temp, 'native/simulator/chrome/plugin/'
+ plugin.id + '/index.js');
-                    done();
-                });
+                var source = copyArray(plugin.srcFiles);
+                blackberry10['source-file'].install(source[0], plugin.path, temp, plugin.id);
+                blackberry10['source-file'].uninstall(source[0], temp, plugin.id);
+                expect(s).toHaveBeenCalledWith(temp, 'native/device/chrome/plugin/' + plugin.id
+ '/index.js');
+                expect(s).toHaveBeenCalledWith(temp, 'native/simulator/chrome/plugin/' +
plugin.id + '/index.js');
             });
         });
         describe('of <lib-file> elements', function(done) {
-            it("should remove so files from www/plugins", function (done) {
+            it("should remove so files from www/plugins", function () {
                 var s = spyOn(common, 'removeFile'),
                     plugin = plugins.echo;
-                install('blackberry10', temp, plugin.path, plugins_dir, {}, "", function()
{
-                    var source = copyArray(plugin.libFiles);
-                    blackberry10.uninstall(source, plugin.id, temp, plugin.path);
-                    expect(s).toHaveBeenCalledWith(temp, 'native/device/plugins/jnext/echoJnext.so');
-                    expect(s).toHaveBeenCalledWith(temp, 'native/simulator/plugins/jnext/echoJnext.so');
-                    done();
-                });
-            });
-        });
-        describe('of <asset> elements', function() {
-            it('should remove www\'s plugins/<plugin-id> directory', function(done)
{
-                var plugin = plugins.dummy,
-                    as = copyArray(plugin.assets);
-                install('blackberry10', temp, plugin.path, plugins_dir, {}, "", function()
{
-                    var s = spyOn(shell, 'rm');
-                    blackberry10.uninstall(as, plugin.id, temp, plugin.path);
-                    expect(s).toHaveBeenCalledWith('-Rf', path.join(temp, 'www', 'plugins',
plugin.id));
-                    done();
-                });
-            });
-            it('should remove stuff specified by the element', function(done) {
-                var plugin = plugins.dummy,
-                    as = copyArray(plugin.assets);
-                install('blackberry10', temp, plugin.path, plugins_dir, {}, "", function()
{
-                    var s = spyOn(shell, 'rm');
-                    blackberry10.uninstall(as, plugin.id, temp, plugin.path);
-                    expect(s).toHaveBeenCalledWith('-Rf', path.join(temp, 'www', 'dummyplugin.js'));
-                    expect(s).toHaveBeenCalledWith('-Rf', path.join(temp, 'www', 'dummyplugin'));
-                    done();
-                });
+                var source = copyArray(plugin.libFiles);
+                blackberry10['lib-file'].install(source[0], plugin.path, temp, plugin.id);
+                blackberry10['lib-file'].uninstall(source[0], temp, plugin.id);
+                expect(s).toHaveBeenCalledWith(temp, 'native/device/plugins/jnext/echoJnext.so');
             });
         });
     });

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/15eafa95/src/install.js
----------------------------------------------------------------------
diff --git a/src/install.js b/src/install.js
index 4e67f74..49d2189 100644
--- a/src/install.js
+++ b/src/install.js
@@ -128,7 +128,7 @@ function handleInstall(actions, plugin_id, plugin_et, platform, project_dir,
plu
 
         // queue up native stuff
         sourceFiles && sourceFiles.forEach(function(source) {
-            actions.push(actions.createAction(handler["source-file"].install, [source, plugin_dir,
project_dir], handler["source-file"].uninstall, [source, project_dir]));
+            actions.push(actions.createAction(handler["source-file"].install, [source, plugin_dir,
project_dir, plugin_id], handler["source-file"].uninstall, [source, project_dir, plugin_id]));
         });
 
         headerFiles && headerFiles.forEach(function(header) {

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/15eafa95/src/platforms/blackberry10.js
----------------------------------------------------------------------
diff --git a/src/platforms/blackberry10.js b/src/platforms/blackberry10.js
index 5e868e4..c3d1ce9 100644
--- a/src/platforms/blackberry10.js
+++ b/src/platforms/blackberry10.js
@@ -34,9 +34,7 @@ module.exports = {
         return widget_doc._root.attrib['id'];
     },
     "source-file":{
-        install:function(source_el, plugin_dir, project_dir) {
-            // TODO: possibly move below into action-stack.process so we dont parse the xml
file per source-file element in plugin.xml
-            var plugin_id = xml_helpers.parseElementtreeSync(path.join(plugin_dir, 'plugin.xml'))._root.attrib['id'];
+        install:function(source_el, plugin_dir, project_dir, plugin_id) {
             var src = source_el.attrib['src'];
             var target = source_el.attrib['target-dir'] || plugin_id;
             TARGETS.forEach(function(arch) {
@@ -44,8 +42,7 @@ module.exports = {
                 common.copyFile(plugin_dir, src, project_dir, dest);
             });
         },
-        uninstall:function(source_el, project_dir) {
-            var plugin_id = xml_helpers.parseElementtreeSync(path.join(plugin_dir, 'plugin.xml'))._root.attrib['id'];
+        uninstall:function(source_el, project_dir, plugin_id) {
             var src = source_el.attrib['src'];
             var target = source_el.attrib['target-dir'] || plugin_id;
             TARGETS.forEach(function(arch) {

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/15eafa95/src/uninstall.js
----------------------------------------------------------------------
diff --git a/src/uninstall.js b/src/uninstall.js
index 7528876..dd991d0 100644
--- a/src/uninstall.js
+++ b/src/uninstall.js
@@ -90,7 +90,7 @@ function handleUninstall(actions, platform, plugin_id, plugin_et, project_dir,
w
 
         // queue up native stuff
         sourceFiles && sourceFiles.forEach(function(source) {
-            actions.push(actions.createAction(handler["source-file"].uninstall, [source,
project_dir], handler["source-file"].install, [source, plugin_dir, project_dir]));
+            actions.push(actions.createAction(handler["source-file"].uninstall, [source,
project_dir, plugin_id], handler["source-file"].install, [source, plugin_dir, project_dir,
plugin_id]));
         });
 
         headerFiles && headerFiles.forEach(function(header) {


Mime
View raw message