Merge pull request #157 from Financial-Times/specify-npm-registry

Support custom npm registries
Financial-Times · Dec 12, 2014 · 77a6d62 · 77a6d62
2 parents 6f203b1 + c7aff79
commit 77a6d62
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/lib/origami-build-tools-cli.js b/lib/origami-build-tools-cli.js
@@ -49,6 +49,7 @@ function printUsage(commands) {
 	console.log('   [--scssLintPath=<path>]      Custom scss-lint configuration');
 	console.log('   [--jsHintPath=<path>]        Custom JS Hint configuration');
 	console.log('   [--editorconfigPath=<path>]  Custom .editorconfig');
+	console.log('   [--npmRegistry=<url>]        Custom npm registry');
 
 	console.log('');
 	console.log('Full documentation: http://git.io/bBjMNw');

diff --git a/lib/tasks/install.js b/lib/tasks/install.js
@@ -91,15 +91,20 @@ function cliFailed(output) {
 	log.primaryError(output.stderr);
 }
 
-module.exports = function() {
+module.exports = function(gulp, config) {
 	module.exports.installSass();
 	module.exports.installScssLint();
 	module.exports.installBower()
 		.then(function() {
 			module.exports.runBowerInstall();
 		});
 	module.exports.installJshint();
-	module.exports.runNpmInstall();
+
+	var npmConfig = {};
+	if (config.npmRegistry) {
+		npmConfig.registry = config.npmRegistry;
+	}
+	module.exports.runNpmInstall(npmConfig);
 };
 
 module.exports.installSass = function() {
@@ -212,13 +217,17 @@ module.exports.installJshint = function() {
 		});
 };
 
-module.exports.runNpmInstall = function() {
+module.exports.runNpmInstall = function(config) {
 	function outputInstalling() {
 		log.primary('npm install...');
 	}
+	var args = ['install'];
+	if (config.registry) {
+		args.push(['--registry '+config.registry]);
+	}
 
 	if (files.packageJsonExists()) {
-		commandLine.run('npm', ['install'], { stderr: 'pipe', stdout: 'pipe' })
+		commandLine.run('npm', args, { stderr: 'pipe', stdout: 'pipe' })
 			.then(function() {
 				outputInstalling();
 				cliSuccess();

diff --git a/lib/tasks/version.js b/lib/tasks/version.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function() {
 	console.log("v"+require(__dirname + '/../../package.json').version);
 };