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

Changed variable name (gitHubUrl => gitHubPath).

Kamil Piechaczek 9 лет назад
Родитель
Сommit
4118febec3

+ 7 - 7
dev/tasks/dev/tasks/create-package.js

@@ -14,7 +14,7 @@ const log = require( '../utils/log' );
 /**
  * 1. Ask for new package name.
  * 2. Ask for initial version.
- * 3. Ask for GitHub URL.
+ * 3. Ask for GitHub path.
  * 4. Initialize repository.
  * 5. Add remote.
  * 6. Copy files to new repository.
@@ -59,7 +59,7 @@ module.exports = ( ckeditor5Path, workspaceRoot ) => {
 	let packageFullName;
 	let repositoryPath;
 	let packageVersion;
-	let gitHubUrl;
+	let gitHubPath;
 	let packageDescription;
 
 	return inquiries.getPackageName()
@@ -77,10 +77,10 @@ module.exports = ( ckeditor5Path, workspaceRoot ) => {
 		.then( result => {
 			packageVersion = result;
 
-			return inquiries.getPackageGitHubUrl( packageName );
+			return inquiries.getPackageGitHubPath( packageName );
 		} )
 		.then( result => {
-			gitHubUrl = result;
+			gitHubPath = result;
 
 			return inquiries.getPackageDescription();
 		} )
@@ -91,14 +91,14 @@ module.exports = ( ckeditor5Path, workspaceRoot ) => {
 			git.initializeRepository( repositoryPath );
 
 			log.out( `Adding remote ${ repositoryPath }...` );
-			git.addRemote( repositoryPath, gitHubUrl );
+			git.addRemote( repositoryPath, gitHubPath );
 
 			log.out( `Copying files into ${ repositoryPath }...` );
 
 			for ( let destination in fileStructure ) {
 				tools.copyTemplateFiles( fileStructure[ destination ], path.join( repositoryPath, destination ), {
 					'{{AppName}}': packageFullName,
-					'{{GitHubRepositoryPath}}': gitHubUrl,
+					'{{GitHubRepositoryPath}}': gitHubPath,
 					'{{ProjectDescription}}': packageDescription
 				} );
 			}
@@ -116,7 +116,7 @@ module.exports = ( ckeditor5Path, workspaceRoot ) => {
 				if ( !json.dependencies ) {
 					json.dependencies = {};
 				}
-				json.dependencies[ packageName ] = gitHubUrl;
+				json.dependencies[ packageName ] = gitHubPath;
 				json.dependencies = tools.sortObject( json.dependencies );
 
 				return json;

+ 7 - 7
dev/tasks/dev/utils/inquiries.js

@@ -9,7 +9,7 @@ const inquirer = require( 'inquirer' );
 const sanitize = require( './sanitize' );
 const DEFAULT_PLUGIN_NAME_PREFIX = 'ckeditor5-';
 const DEFAULT_PLUGIN_VERSION = '0.0.1';
-const DEFAULT_GITHUB_URL_PREFIX = 'ckeditor/';
+const DEFAULT_GITHUB_PATH_PREFIX = 'ckeditor/';
 
 module.exports = {
 	getPackageName() {
@@ -51,16 +51,16 @@ module.exports = {
 		} );
 	},
 
-	getPackageGitHubUrl( packageName ) {
-		const defaultGitHubUrl = DEFAULT_GITHUB_URL_PREFIX + packageName;
+	getPackageGitHubPath( packageName ) {
+		const defaultGitHubPath = DEFAULT_GITHUB_PATH_PREFIX + packageName;
 
 		return new Promise( ( resolve ) => {
 			inquirer.prompt( [ {
-				name: 'gitHubUrl',
-				message: 'Enter package\'s GitHub URL:',
-				default: defaultGitHubUrl
+				name: 'gitHubPath',
+				message: 'Enter package\'s GitHub path:',
+				default: defaultGitHubPath
 			} ], ( answers ) => {
-				resolve( answers.gitHubUrl );
+				resolve( answers.gitHubPath );
 			} );
 		} );
 	},

+ 5 - 5
dev/tests/dev/create-package.js

@@ -24,7 +24,7 @@ describe( 'dev-create-package', () => {
 	const packageName = 'package-name';
 	const applicationName = 'Full application name';
 	const packageVersion = '0.0.1';
-	const gitHubUrl = 'ckeditor5/package-name';
+	const gitHubPath = 'ckeditor5/package-name';
 	const packageDescription = 'Package description.';
 
 	beforeEach( () => createSpies() );
@@ -37,7 +37,7 @@ describe( 'dev-create-package', () => {
 			getPackageName: sinon.stub( inquiries, 'getPackageName' ).returns( new Promise( ( r ) => r( packageName ) ) ),
 			getApplicationName: sinon.stub( inquiries, 'getApplicationName' ).returns( new Promise( ( r ) => r( applicationName ) ) ),
 			getPackageVersion: sinon.stub( inquiries, 'getPackageVersion' ).returns( new Promise( ( r ) => r( packageVersion ) ) ),
-			getPackageGitHubUrl: sinon.stub( inquiries, 'getPackageGitHubUrl' ).returns( new Promise( ( r ) => r( gitHubUrl ) ) ),
+			getPackageGitHubPath: sinon.stub( inquiries, 'getPackageGitHubPath' ).returns( new Promise( ( r ) => r( gitHubPath ) ) ),
 			getPackageDescription: sinon.stub( inquiries, 'getPackageDescription' ).returns( new Promise( ( r ) => r( packageDescription ) ) ),
 			initializeRepository: sinon.stub( git, 'initializeRepository' ),
 			updateJSONFile: sinon.stub( tools, 'updateJSONFile' ),
@@ -63,13 +63,13 @@ describe( 'dev-create-package', () => {
 			expect( spies.getPackageName.calledOnce ).to.equal( true );
 			expect( spies.getApplicationName.calledOnce ).to.equal( true );
 			expect( spies.getPackageVersion.calledOnce ).to.equal( true );
-			expect( spies.getPackageGitHubUrl.calledOnce ).to.equal( true );
+			expect( spies.getPackageGitHubPath.calledOnce ).to.equal( true );
 			expect( spies.getPackageDescription.calledOnce ).to.equal( true );
 			expect( spies.initializeRepository.calledOnce ).to.equal( true );
 			expect( spies.initializeRepository.firstCall.args[ 0 ] ).to.equal( repositoryPath );
 			expect( spies.addRemote.calledOnce ).to.equal( true );
 			expect( spies.addRemote.firstCall.args[ 0 ] ).to.equal( repositoryPath );
-			expect( spies.addRemote.firstCall.args[ 1 ] ).to.equal( gitHubUrl );
+			expect( spies.addRemote.firstCall.args[ 1 ] ).to.equal( gitHubPath );
 			expect( spies.copy.called ).to.equal( true );
 			expect( spies.updateJSONFile.calledTwice ).to.equal( true );
 			expect( spies.updateJSONFile.firstCall.args[ 0 ] ).to.equal( path.join( repositoryPath, 'package.json' ) );
@@ -81,7 +81,7 @@ describe( 'dev-create-package', () => {
 			updateFn = spies.updateJSONFile.secondCall.args[ 1 ];
 			json = updateFn( {} );
 			expect( json.dependencies ).to.be.an( 'object' );
-			expect( json.dependencies[ packageName ] ).to.equal( gitHubUrl );
+			expect( json.dependencies[ packageName ] ).to.equal( gitHubPath );
 			expect( spies.initialCommit.calledOnce ).to.equal( true );
 			expect( spies.initialCommit.firstCall.args[ 0 ] ).to.equal( packageName );
 			expect( spies.initialCommit.firstCall.args[ 1 ] ).to.equal( repositoryPath );