Extract package.js

Author: bdukes

gulpfile.js

@@ -1,91 +1,57 @@
 'use strict';
 
-const path = require('path');
 const gulp = require('gulp');
 const log = require('fancy-log');
-const glob = require('glob');
 const ejs = require('gulp-ejs');
 const zip = require('gulp-zip');
 const mergeStream = require('merge-stream');
 const {
 	formatVersionFolder,
 	compareStrings,
 	formatPackageUpgrades,
+	getLibraries,
+	getUpgradeVersions,
 } = require('./utility');
 
-const { dependencies } = require('./package.json');
-
-const libraries = glob
-	.sync('*/dnn-library.json')
-	.map(manifestPath => ({
-		path: path.dirname(manifestPath),
-		manifest: require(path.resolve(manifestPath)),
-	}))
-	.map(library =>
-		Object.assign(library, { name: path.basename(library.path) })
-	)
-	.map(library =>
-		Object.assign(library, { version: dependencies[library.name] })
-	);
+const libraries = getLibraries();
 
 libraries.forEach(library =>
-	gulp.task(library.path, () =>
-		mergeStream(
-			gulp.src(library.manifest.files),
-			gulp
-				.src(library.manifest.resources || [])
-				.pipe(zip('Resources.zip')),
-			gulp
-				.src(['LICENSE.htm', 'CHANGES.htm', '*.dnn'], {
-					cwd: library.path,
-				})
-				.pipe(
-					ejs(
-						{
-							version: library.version,
-							versionFolder: formatVersionFolder(library.version),
-						},
-						{ delimiter: '~' }
-					)
-				)
+	gulp.task(library.path, () => {
+		const mainFileStream = gulp.src(library.manifest.files);
+		const resourceZipStream = gulp
+			.src(library.manifest.resources || [])
+			.pipe(zip('Resources.zip'));
+
+		const templateData = {
+			version: library.version,
+			versionFolder: formatVersionFolder(library.version),
+		};
+		const packageFilesStream = gulp
+			.src(['LICENSE.htm', 'CHANGES.htm', '*.dnn'], {
+				cwd: library.path,
+			})
+			.pipe(ejs(templateData, { delimiter: '~' }));
+
+		return mergeStream(
+			mainFileStream,
+			resourceZipStream,
+			packageFilesStream
 		)
 			.pipe(zip(`${library.name}_${library.version}.zip`))
-			.pipe(gulp.dest('./_InstallPackages/'))
-	)
+			.pipe(gulp.dest('./_InstallPackages/'));
+	})
 );
 
-const libraryTaskNames = libraries.map(l => l.path);
+const libraryTaskNames = libraries.map(library => library.path);
 
 gulp.task('default', libraryTaskNames);
 
 gulp.task('outdated', () => {
-	const packageJson = require('package-json');
-	const semver = require('semver');
-
-	const allUpgradesPromises = Object.keys(dependencies).map(name => {
-		const currentVersion = dependencies[name];
-
-		const packageUpgrades = packageJson(name, { allVersions: true }).then(
-			({ versions }) =>
-				Object.keys(versions)
-					.filter(version => semver.gt(version, currentVersion))
-					.sort(semver.compare)
-					.reduce(
-						(upgrades, version) =>
-							upgrades.set(
-								semver.diff(version, currentVersion),
-								version
-							),
-						new Map()
-					)
-		);
-
-		return packageUpgrades.then(upgrades => ({
-			name,
-			version: currentVersion,
-			upgrades,
-		}));
-	});
+	const allUpgradesPromises = libraries.map(library =>
+		getUpgradeVersions(library).then(upgrades =>
+			Object.assign(library, { upgrades })
+		)
+	);
 
 	return Promise.all(allUpgradesPromises).then(allUpgrades => {
 		const validUpgrades = allUpgrades

utility/index.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { formatPackageUpgrades } = require('./ui');
+const { getLibraries, getUpgradeVersions } = require('./packages');
 
 /**
  * Format a version number in the format used by DNN JS library folders
@@ -42,4 +43,6 @@ module.exports = {
 	formatVersionFolder,
 	compareStrings,
 	formatPackageUpgrades,
+	getLibraries,
+	getUpgradeVersions,
 };

utility/packages.js

@@ -0,0 +1,56 @@
+'use strict';
+
+const path = require('path');
+const glob = require('glob');
+const semver = require('semver');
+const packageJson = require('package-json');
+const { dependencies } = require('../package.json');
+
+/**
+ * Gets the current list of DNN JS libraries in this repo
+ *
+ * @returns {object[]} An array of objects with path, manifest, name, and version
+ */
+function getLibraries() {
+	return glob
+		.sync('*/dnn-library.json')
+		.map(manifestPath => ({
+			path: path.dirname(manifestPath),
+			manifest: require(path.resolve(manifestPath)),
+		}))
+		.map(library =>
+			Object.assign(library, { name: path.basename(library.path) })
+		)
+		.map(library =>
+			Object.assign(library, { version: dependencies[library.name] })
+		);
+}
+
+/**
+ * Gets the available upgrade versions for a library
+ *
+ * @param {object} library - A library object
+ * @returns {Promise} A Promise which returns a Map with available version upgrades
+ */
+function getUpgradeVersions(library) {
+	return packageJson(library.name, {
+		allVersions: true,
+	}).then(({ versions }) =>
+		Object.keys(versions)
+			.filter(version => semver.gt(version, library.version))
+			.sort(semver.compare)
+			.reduce(
+				(upgrades, version) =>
+					upgrades.set(
+						semver.diff(version, library.version),
+						version
+					),
+				new Map()
+			)
+	);
+}
+
+module.exports = {
+	getLibraries,
+	getUpgradeVersions,
+};