You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ra...@apache.org on 2018/09/26 08:05:08 UTC

[cordova-lib] branch cross-spawn-test updated (abd060b -> cd1cc0c)

This is an automated email from the ASF dual-hosted git repository.

raphinesse pushed a change to branch cross-spawn-test
in repository https://gitbox.apache.org/repos/asf/cordova-lib.git.


 discard abd060b  TEMP revert to default jasmine reporter
 discard e5695cc  CB-14166: (cli) Fixed issue when install plugins on windows
     add 24c4af4  Increase plugman install test timeout (#698)
     add 63b26e6  Increase timeout for cordova.platform e2e tests (#699)
     add 3079853  Dereference possible symlinks when copying plugin (#705)
     new 19622de  CB-14166: (cli) Fixed issue when install plugins on windows
     new cd1cc0c  TEMP revert to default jasmine reporter

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (abd060b)
            \
             N -- N -- N   refs/heads/cross-spawn-test (cd1cc0c)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 integration-tests/platform.spec.js      | 2 +-
 integration-tests/plugman_fetch.spec.js | 6 +++---
 spec/plugman/install.spec.js            | 2 +-
 src/plugman/fetch.js                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)


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


[cordova-lib] 02/02: TEMP revert to default jasmine reporter

Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

raphinesse pushed a commit to branch cross-spawn-test
in repository https://gitbox.apache.org/repos/asf/cordova-lib.git

commit cd1cc0c31bbaaf8ab6088707879fcab907cfb1ca
Author: Raphael von der GrĂ¼n <ra...@gmail.com>
AuthorDate: Sun Sep 16 17:38:37 2018 +0200

    TEMP revert to default jasmine reporter
---
 spec/helper.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/spec/helper.js b/spec/helper.js
index f1a1782..351e6e4 100644
--- a/spec/helper.js
+++ b/spec/helper.js
@@ -17,17 +17,3 @@
     under the License.
 */
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
-
-const SpecReporter = require('jasmine-spec-reporter').SpecReporter;
-
-jasmine.getEnv().clearReporters();
-jasmine.getEnv().addReporter(new SpecReporter({
-    spec: {
-        displayPending: true,
-        displayDuration: true
-    },
-    summary: {
-        displayDuration: true,
-        displayStacktrace: true
-    }
-}));


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


[cordova-lib] 01/02: CB-14166: (cli) Fixed issue when install plugins on windows

Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

raphinesse pushed a commit to branch cross-spawn-test
in repository https://gitbox.apache.org/repos/asf/cordova-lib.git

commit 19622dedfac0078b8f5f997c96996d505c35de71
Author: Almir Kadric <gi...@almirkadric.com>
AuthorDate: Tue Jul 17 03:23:57 2018 +0900

    CB-14166: (cli) Fixed issue when install plugins on windows
    
        The npm package name is already wrapped in quotes to prevent special
        characters from being execute. However the additional win32 code was
        further injecting quotes around the version causing npm to return a
        EINVALIDTAGNAME error. The win32 code is redundant and seems to not
        be required.
---
 src/plugman/fetch.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/plugman/fetch.js b/src/plugman/fetch.js
index 86d3ea3..58a642d 100644
--- a/src/plugman/fetch.js
+++ b/src/plugman/fetch.js
@@ -120,7 +120,6 @@ function fetchPlugin (plugin_src, plugins_dir, options) {
             var parsedSpec = pluginSpec.parse(plugin_src);
             var P;
             var skipCopyingPlugin;
-            var specContainsSpecialCharacters = false;
             plugin_dir = path.join(plugins_dir, parsedSpec.id);
             // if the plugin has already been fetched, use it.
             if (fs.existsSync(plugin_dir)) {
@@ -135,16 +134,7 @@ function fetchPlugin (plugin_src, plugins_dir, options) {
                     projectRoot = options.projectRoot;
                 }
 
-                if (process.platform === 'win32' && parsedSpec.version) {
-                    var windowsShellSpecialCharacters = ['&', '\\', '<', '>', '^', '|'];
-                    specContainsSpecialCharacters = windowsShellSpecialCharacters.some(function (character) {
-                        return parsedSpec.version.indexOf(character);
-                    });
-                }
-
-                var fetchPluginSrc = specContainsSpecialCharacters ?
-                    parsedSpec.package + '@"' + parsedSpec.version + '"' : plugin_src;
-                P = fetch(fetchPluginSrc, projectRoot, options);
+                P = fetch(plugin_src, projectRoot, options);
                 skipCopyingPlugin = false;
             }
             return P


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