From 1afe13e0921484b2a0ff03f36bf57359d68cc496 Mon Sep 17 00:00:00 2001 From: hongweiyi Date: Wed, 27 Jan 2016 13:29:50 +0800 Subject: [PATCH 1/2] packageDependencies support raw url --- lib/index.js | 11 ++++++++++- lib/utils.js | 4 ++++ package.json | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/index.js b/lib/index.js index b56496c..b471baa 100644 --- a/lib/index.js +++ b/lib/index.js @@ -104,7 +104,16 @@ Pkgm.prototype.loadAll = function(folder) { Pkgm.prototype.uriInfos = function(uri) { var parts = uri.split("#"); var version = parts[1]; - uri = url.resolve('https://github.com', parts[0]); + var gitPrefix = "git@"; + var httpsPrefix = "https://"; + var httpPrefix = "http://"; + if ( util.startsWith(parts[0], gitPrefix) || + util.startsWith(parts[0], httpsPrefix) || + util.startsWith(parts[0], httpPrefix) ) { + uri = parts[0]; + } else { + uri = url.resolve('https://github.com', parts[0]); + } return { uri: uri, diff --git a/lib/utils.js b/lib/utils.js index 7ad3de7..d3490b7 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -2,6 +2,10 @@ var Q = require('q'); var _ = require('lodash'); var cp = require('child_process'); +// Is string has prefix +function startsWith(string, prefix) { + return string.slice(0, prefix.length) == prefix; +} // Generate callbacks for exec functions function _execHandler(command, deffered) { diff --git a/package.json b/package.json index b832dc7..ac858c1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "pkgm", "main": "lib/index.js", "description": "Make it easy to build a package manager for client/node large applications", - "version": "3.3.0", + "version": "3.3.1", "author": "Samy Pesse ", "repository": { "type": "git", @@ -28,4 +28,4 @@ "scripts": { "test": "export TESTING=true; mocha --reporter list" } -} \ No newline at end of file +} From ce5623d7d02d00ca4afe9bf0370dc25725c38b43 Mon Sep 17 00:00:00 2001 From: hongweiyi Date: Wed, 27 Jan 2016 13:58:26 +0800 Subject: [PATCH 2/2] Fix some stupid mistakes. --- lib/index.js | 6 +++--- lib/utils.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/index.js b/lib/index.js index b471baa..5ea56f5 100644 --- a/lib/index.js +++ b/lib/index.js @@ -107,9 +107,9 @@ Pkgm.prototype.uriInfos = function(uri) { var gitPrefix = "git@"; var httpsPrefix = "https://"; var httpPrefix = "http://"; - if ( util.startsWith(parts[0], gitPrefix) || - util.startsWith(parts[0], httpsPrefix) || - util.startsWith(parts[0], httpPrefix) ) { + if ( utils.startsWith(parts[0], gitPrefix) || + utils.startsWith(parts[0], httpsPrefix) || + utils.startsWith(parts[0], httpPrefix) ) { uri = parts[0]; } else { uri = url.resolve('https://github.com', parts[0]); diff --git a/lib/utils.js b/lib/utils.js index d3490b7..9bfac6a 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -70,5 +70,6 @@ var execFile = simpleExecBuilder(cp.execFile); module.exports = { exec: exec, execFile: execFile, - deepkeys: deepkeys + deepkeys: deepkeys, + startsWith: startsWith };