github/cordova-android
github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-03-17 09:21:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-5971: Fix package / project validation

Browse Source
This commit is contained in:
Ian Clelland 2014-06-24 14:05:03 -04:00
parent bb141a70e8
commit 4352456129
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/lib/create.js
View File

@ -113,18 +113,13 @@ function copyScripts(projectPath) {
*/ */
function validatePackageName(package_name) { function validatePackageName(package_name) {
//Make the package conform to Java package types //Make the package conform to Java package types
if (!/[a-zA-Z0-9_]+\.[a-zA-Z0-9_](.[a-zA-Z0-9_])*/.test(package_name)) { //Enforce underscore limitation
if (!/^[a-zA-Z]+(\.[a-zA-Z0-9][a-zA-Z0-9_]*)+$/.test(package_name)) {
return Q.reject('Package name must look like: com.company.Name'); return Q.reject('Package name must look like: com.company.Name');
} }
//Enforce underscore limitation
if (/[_]+[a-zA-Z0-9_]*/.test(package_name)) {
return Q.reject("Package name can't begin with an underscore");
}
//Class is a reserved word //Class is a reserved word
if(/[C|c]+lass+[\s|\.]/.test(package_name) && !/[a-zA-Z0-9_]+[C|c]+lass/.test(package_name)) if(/\b[Cc]lass\b/.test(package_name)) {
{
return Q.reject('class is a reserved word'); return Q.reject('class is a reserved word');
} }
@ -137,6 +132,11 @@ function validatePackageName(package_name) {
* otherwise. * otherwise.
*/ */
function validateProjectName(project_name) { function validateProjectName(project_name) {
//Make sure there's something there
if (project_name === '') {
return Q.reject('Project name cannot be empty');
}
//Enforce stupid name error //Enforce stupid name error
if (project_name === 'CordovaActivity') { if (project_name === 'CordovaActivity') {
return Q.reject('Project name cannot be CordovaActivity'); return Q.reject('Project name cannot be CordovaActivity');