pluginstall - npm Package Compare versions

Comparing version 0.3.6 to 0.3.7

package.json

@@ -5,3 +5,3 @@ {
   "description": "install Cordova plugins",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "repository": {
@@ -20,3 +20,3 @@ "type": "git",
      "mkdirp":"0.2.2",
-     "xcode":"0.3.5",
+     "xcode":"0.4.0",
      "plist":"git+https://github.com/joshfire/node-plist.git",
@@ -23,0 +23,0 @@ "glob":"3.0.1"

platforms/android.js

@@ -7,2 +7,3 @@ var fs = require('fs'),
     asyncCopy = require('../util/asyncCopy'),
+    getConfigChanges = require('../util/config-changes'),
     assetsDir = 'assets/www', // relative path to project's web assets
@@ -18,9 +19,20 @@ sourceDir = 'src',
         libFiles = platformTag.findall('./library-file'),
-        pluginsChanges = platformTag.findall('./config-file[@target="res/xml/plugins.xml"]'),
-        manifestChanges = platformTag.findall('./config-file[@target="AndroidManifest.xml"]'),
 
-        callbackCount = assets.length + sourceFiles.length + pluginsChanges.length
-            + libFiles.length + manifestChanges.length,
-        endCallback = nCallbacks(callbackCount, callback)
+        configChanges = getConfigChanges(platformTag),
 
+        callbackCount = assets.length + sourceFiles.length + libFiles.length,
+        endCallback;
+
+    // find which config-files we're interested in
+    Object.keys(configChanges).forEach(function (configFile) {
+        if (fs.existsSync(path.resolve(config.projectPath, configFile))) {
+            // if so, add length to callbackCount
+            callbackCount += configChanges[configFile].length
+        } else {
+            delete configChanges[configFile];
+        }
+    });
+    
+    endCallback = nCallbacks(callbackCount, callback)
+
     // move asset files
@@ -70,37 +82,20 @@ assets.forEach(function (asset) {
 
-    // edit plugins.xml
-    pluginsChanges.forEach(function (configNode) {
-        var pluginsPath = path.resolve(config.projectPath, 'res/xml/plugins.xml'),
-            pluginsDoc = readAsETSync(pluginsPath),
-            selector = configNode.attrib["parent"],
-            child = configNode.find('*');
+    Object.keys(configChanges).forEach(function (filename) {
+        configChanges[filename].forEach(function (configNode) {
+            var filepath = path.resolve(config.projectPath, filename),
+                xmlDoc = readAsETSync(filepath),
+                selector = configNode.attrib["parent"],
+                child = configNode.find('*');
 
-        if (addToDoc(pluginsDoc, child, selector)) {
-            fs.writeFile(pluginsPath, pluginsDoc.write(), function (err) {
-                if (err) endCallback(err);
+            if (addToDoc(xmlDoc, child, selector)) {
+                fs.writeFile(filepath, xmlDoc.write(), function (err) {
+                    if (err) endCallback(err);
 
-                endCallback();
-            });
-        } else {
-            endCallback('failed to add node to plugins.xml');
-        }
+                    endCallback();
+                });
+            } else {
+                endCallback('failed to add node to ' + filename);
+            }
+        });
     });
-
-    // edit AndroidManifest.xml
-    manifestChanges.forEach(function (configNode) {
-        var manifestPath = path.resolve(config.projectPath, 'AndroidManifest.xml'),
-            manifestDoc  = readAsETSync(manifestPath),
-            selector = configNode.attrib["parent"],
-            child = configNode.find('*');
-
-        if (addToDoc(manifestDoc, child, selector)) {
-            fs.writeFile(manifestPath, manifestDoc.write(), function (err) {
-                if (err) endCallback(err);
-
-                endCallback();
-            });
-        } else {
-            endCallback('failed to add node to AndroidManifest.xml')
-        }
-    })
 }
@@ -107,0 +102,0 @@

test/ios-install.js

@@ -11,5 +11,9 @@ var fs = require('fs'),
 
+    // helpers
+    helpers = require('../util/test-helpers'),
+    moveProjFile = helpers.moveProjFile,
+
     config = {
         platform: 'ios',
-        projectPath: fs.realpathSync('test/project'),
+        projectPath: fs.realpathSync('test/project/ios'),
         pluginPath: fs.realpathSync('test/plugin')
@@ -22,11 +26,2 @@ },
 
-function moveProjFile(origFile, callback) {
-    var src = path.resolve(config.projectPath, origFile),
-        dest = src.replace('.orig', '')
-
-    fs.createReadStream(src)
-        .pipe(fs.createWriteStream(dest))
-        .on('close', callback);
-}
-
 function unlinkIfThere(filepath, cb) {
@@ -62,4 +57,4 @@ fs.stat(filepath, function (err, stat) {
 
-    moveProjFile('SampleApp/PhoneGap.orig.plist', end);
-    moveProjFile('SampleApp.xcodeproj/project.orig.pbxproj', end);
+    moveProjFile('SampleApp/PhoneGap.orig.plist', config.projectPath, end);
+    moveProjFile('SampleApp.xcodeproj/project.orig.pbxproj', config.projectPath, end);
 }
@@ -66,0 +61,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Non-existent author

Supply chain risk

The package was published by an npm account that no longer exists.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

147740

increased by10.23%

Number of package files

53

increased by17.78%

Lines of code

754

increased by23.81%

Worsened metrics

Number of high supply chain risk alerts

2

increased by100%

Number of low supply chain risk alerts

9

increased by50%

Dependency changes

• + Addedxcode@0.4.0(transitive)

• - Removedxcode@0.3.5(transitive)

• Updatedxcode@0.4.0