8
0
Просмотр исходного кода

Moved exec.js contents to tasks.js.

Maksymilian Barnaś 9 лет назад
Родитель
Сommit
18810f2240
2 измененных файлов с 48 добавлено и 57 удалено
  1. 48 1
      dev/tasks/exec/tasks.js
  2. 0 56
      dev/tasks/exec/tasks/exec.js

+ 48 - 1
dev/tasks/exec/tasks.js

@@ -8,9 +8,12 @@
 const gulp = require( 'gulp' );
 const gutil = require( 'gulp-util' );
 const minimist = require( 'minimist' );
+const path = require( 'path' );
+const merge = require( 'merge-stream' );
 
-const exec = require( './tasks/exec' );
 const log = require( '../../lib/log' );
+const tools = require( '../../lib/tools' );
+const git = require( '../../lib/git' );
 
 module.exports = ( config ) => {
 	const ckeditor5Path = process.cwd();
@@ -51,3 +54,47 @@ module.exports = ( config ) => {
 
 	return tasks;
 };
+
+/**
+ * @param {Function} execTask Task to use on each dependency.
+ * @param {String} ckeditor5Path Path to main CKEditor5 repository.
+ * @param {Object} packageJSON Parsed package.json file from CKEditor5 repository.
+ * @param {String} workspaceRoot Relative path to workspace root.
+ * @param {Boolean} dryRun
+ */
+function exec( execTask, ckeditor5Path, packageJSON, workspaceRoot, params ) {
+	const workspaceAbsolutePath = path.join( ckeditor5Path, workspaceRoot );
+
+	// Get all CKEditor dependencies from package.json.
+	const dependencies = tools.getCKEditorDependencies( packageJSON.dependencies );
+	const streams = merge();
+
+	if ( dependencies ) {
+		const directories = tools.getCKE5Directories( workspaceAbsolutePath );
+
+		if ( directories.length ) {
+			for ( let dependency in dependencies ) {
+				const repositoryURL = dependencies[ dependency ];
+				const urlInfo = git.parseRepositoryUrl( repositoryURL );
+				const repositoryAbsolutePath = path.join( ckeditor5Path, 'node_modules', dependency );
+
+				// Check if repository's directory already exists.
+				if ( directories.indexOf( urlInfo.name ) > -1 ) {
+					try {
+						log.out( `Executing task on ${ repositoryURL }...` );
+
+						streams.add( execTask( repositoryAbsolutePath, params ) );
+					} catch ( error ) {
+						log.err( error );
+					}
+				}
+			}
+		} else {
+			log.out( 'No CKEditor5 plugins in development mode.' );
+		}
+	} else {
+		log.out( 'No CKEditor5 dependencies found in package.json file.' );
+	}
+
+	return streams;
+}

+ 0 - 56
dev/tasks/exec/tasks/exec.js

@@ -1,56 +0,0 @@
-/**
- * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md.
- */
-
-'use strict';
-
-const tools = require( '../../../lib/tools' );
-const git = require( '../../../lib/git' );
-const path = require( 'path' );
-const log = require( '../../../lib/log' );
-const merge = require( 'merge-stream' );
-
-/**
- * @param {Function} execTask Task to use on each dependency.
- * @param {String} ckeditor5Path Path to main CKEditor5 repository.
- * @param {Object} packageJSON Parsed package.json file from CKEditor5 repository.
- * @param {String} workspaceRoot Relative path to workspace root.
- * @param {Boolean} dryRun
- */
-module.exports = ( execTask, ckeditor5Path, packageJSON, workspaceRoot, params ) => {
-	const workspaceAbsolutePath = path.join( ckeditor5Path, workspaceRoot );
-
-	// Get all CKEditor dependencies from package.json.
-	const dependencies = tools.getCKEditorDependencies( packageJSON.dependencies );
-	const streams = merge();
-
-	if ( dependencies ) {
-		const directories = tools.getCKE5Directories( workspaceAbsolutePath );
-
-		if ( directories.length ) {
-			for ( let dependency in dependencies ) {
-				const repositoryURL = dependencies[ dependency ];
-				const urlInfo = git.parseRepositoryUrl( repositoryURL );
-				const repositoryAbsolutePath = path.join( ckeditor5Path, 'node_modules', dependency );
-
-				// Check if repository's directory already exists.
-				if ( directories.indexOf( urlInfo.name ) > -1 ) {
-					try {
-						log.out( `Executing task on ${ repositoryURL }...` );
-
-						streams.add( execTask( repositoryAbsolutePath, params ) );
-					} catch ( error ) {
-						log.err( error );
-					}
-				}
-			}
-		} else {
-			log.out( 'No CKEditor5 plugins in development mode.' );
-		}
-	} else {
-		log.out( 'No CKEditor5 dependencies found in package.json file.' );
-	}
-
-	return streams;
-};