From 2781749fb74479f76796fdaf96e8dc8a98c2dae4 Mon Sep 17 00:00:00 2001 From: "Froufe Moreno, Cristobal" Date: Mon, 30 May 2016 15:33:11 +0200 Subject: [PATCH 1/2] Added compatibility with repository TFS --- bower.conf.json | 3 ++- lib/service/packageManager.js | 27 +++++++++++++++++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/bower.conf.json b/bower.conf.json index df0d1f7..a51389b 100644 --- a/bower.conf.json +++ b/bower.conf.json @@ -50,5 +50,6 @@ "log4js" : { "enabled": false, "configPath" : "log4js.conf.json" - } + }, + "repositoryTFS" : false } \ No newline at end of file diff --git a/lib/service/packageManager.js b/lib/service/packageManager.js index e5e8ce3..d33010e 100644 --- a/lib/service/packageManager.js +++ b/lib/service/packageManager.js @@ -16,22 +16,30 @@ module.exports = function PackageManager() { for(var packageName in privatePackageStore.packages) { if(privatePackageStore.packages.hasOwnProperty(packageName)) { var item = privatePackageStore.packages[packageName]; - + var url = item.url; + if (config.repositoryTFS) { + url = urlRepoTFS(item.url); + } packages.push({ name: item.name, - url: item.url, + url: url, hits: item.hits }); } } - + return packages; } - + function _registerPackages(packages) { + if (config.repositoryTFS) { + for (i = 0; i < packages.length; i++) { + packages[i].url = urlRepoTFS(packages[i].url); + } + } privatePackageStore.registerPackages(packages); } - + function _removePackages(packages) { privatePackageStore.removePackages(packages); @@ -75,10 +83,13 @@ module.exports = function PackageManager() { }); } } - + function _getPackageDetails(packageName) { return _getPackageForInstall(packageName) .then(function(packageDescription) { + if (config.repositoryTFS) { + packageDescription.url = urlRepoTFS(packageDescription.url); + } return packageDetailsProvider.getPackageDetails(packageDescription.url) }); } @@ -198,6 +209,10 @@ module.exports = function PackageManager() { return repoCacheHandler.getLatestForRepos(); } + function urlRepoTFS(url) { + return url.replace('git+http://', 'http://'); + } + return { refresh: _refresh, removePackages: _removePackages, From 7230962ed5c31cf35660155f91db8c7783d86f8e Mon Sep 17 00:00:00 2001 From: Froufe Date: Tue, 31 May 2016 08:55:01 +0200 Subject: [PATCH 2/2] Fix registerPackages function When the parameter "repositoryTFS" repository is true, the registerPackages add the prefix "+git" --- lib/service/packageManager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/service/packageManager.js b/lib/service/packageManager.js index d33010e..0dbd570 100644 --- a/lib/service/packageManager.js +++ b/lib/service/packageManager.js @@ -34,7 +34,7 @@ module.exports = function PackageManager() { function _registerPackages(packages) { if (config.repositoryTFS) { for (i = 0; i < packages.length; i++) { - packages[i].url = urlRepoTFS(packages[i].url); + packages[i].url = "git+" + packages[i].url; } } privatePackageStore.registerPackages(packages); @@ -222,4 +222,4 @@ module.exports = function PackageManager() { getPackageDetails: _getPackageDetails, getPackageForInstall: _getPackageForInstall }; -}(); \ No newline at end of file +}();