Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm
Precedence: bulk
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: purplecabbage@apache.org
To: commits@cordova.apache.org
Date: Thu, 07 Jan 2016 07:42:46 -0000
Message-Id: <db5296d0e0c84f61be3e743ceb1b90c2@git.apache.org>
Subject: [1/5] cordova-lib git commit: Add recursive install check and tests
 to prove it.

Repository: cordova-lib
Updated Branches:
  refs/heads/master 5eb351e08 -> 0d2c2ec17


Add recursive install check and tests to prove 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/9b767b5b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/9b767b5b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/9b767b5b

Branch: refs/heads/master
Commit: 9b767b5b1b94823114f1bcb6b2e943b1aeb56a5b
Parents: 0b0dee5
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Wed Jul 22 17:08:48 2015 -0700
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Wed Jul 22 17:08:48 2015 -0700

----------------------------------------------------------------------
 cordova-lib/spec-plugman/fetch.spec.js          | 16 +++++++++++
 .../plugins/recursivePlug/asset.txt             |  1 +
 .../plugins/recursivePlug/plugin.xml            | 30 ++++++++++++++++++++
 cordova-lib/src/plugman/fetch.js                |  5 ++++
 4 files changed, 52 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9b767b5b/cordova-lib/spec-plugman/fetch.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/fetch.spec.js b/cordova-lib/spec-plugman/fetch.spec.js
index cfc3104..97c6189 100644
--- a/cordova-lib/spec-plugman/fetch.spec.js
+++ b/cordova-lib/spec-plugman/fetch.spec.js
@@ -239,6 +239,22 @@ describe('fetch', function() {
         });
     });
 
+    describe('fetch recursive error CB-8809', function(){
+
+        var srcDir = path.join(__dirname, 'plugins/recursivePlug');
+        var appDir = path.join(__dirname, 'plugins/recursivePlug/demo');
+
+        it('should skip copy to avoid recursive error', function(done) {
+
+            var cp = spyOn(shell, 'cp').andCallFake(function(){});
+
+            wrapper(fetch(srcDir, appDir),done, function() {
+                expect(cp).not.toHaveBeenCalled();
+            });
+        });
+
+    });
+
     describe('registry plugins', function() {
         var pluginId = 'dummyplugin', sFetch;
         var rm, sym, save_metadata;

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9b767b5b/cordova-lib/spec-plugman/plugins/recursivePlug/asset.txt
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/plugins/recursivePlug/asset.txt b/cordova-lib/spec-plugman/plugins/recursivePlug/asset.txt
new file mode 100644
index 0000000..3ba44e4
--- /dev/null
+++ b/cordova-lib/spec-plugman/plugins/recursivePlug/asset.txt
@@ -0,0 +1 @@
+//asset file
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9b767b5b/cordova-lib/spec-plugman/plugins/recursivePlug/plugin.xml
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/plugins/recursivePlug/plugin.xml b/cordova-lib/spec-plugman/plugins/recursivePlug/plugin.xml
new file mode 100644
index 0000000..ea130e5
--- /dev/null
+++ b/cordova-lib/spec-plugman/plugins/recursivePlug/plugin.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2013 Anis Kadri
+
+ Licensed 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.
+
+-->
+
+<plugin xmlns="http://cordova.apache.org/ns/plugins/1.0"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    id="test-recursive"
+    version="1.0.0">
+
+    <name>test recursive</name>
+
+    <asset src="asset.txt" target="asset.txt" />
+
+</plugin>

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9b767b5b/cordova-lib/src/plugman/fetch.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/fetch.js b/cordova-lib/src/plugman/fetch.js
index 5003611..f1c734b 100644
--- a/cordova-lib/src/plugman/fetch.js
+++ b/cordova-lib/src/plugman/fetch.js
@@ -272,6 +272,11 @@ function copyPlugin(pinfo, plugins_dir, link) {
         return altDest;
     }
 
+    if(!link && dest.indexOf(path.resolve(plugin_dir)) == 0) {
+        events.emit('verbose', 'Copy plugin destination is child of src. Forcing --link mode.');
+        link = true;
+    }
+
     shell.rm('-rf', dest);
     if (link) {
         var isRelativePath = plugin_dir.charAt(1) != ':' && plugin_dir.charAt(0) != path.sep;


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