From e4c9bebe34005a9246c8688c63d4079485c4115e Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Mon, 23 Mar 2015 15:23:30 -0700 Subject: [PATCH] CB-8735: Fixing the regex so that it's more compliant with Java package rules --- bin/lib/create.js | 2 +- spec/create.spec.js | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/lib/create.js b/bin/lib/create.js index 1d78d911..739c3982 100755 --- a/bin/lib/create.js +++ b/bin/lib/create.js @@ -149,7 +149,7 @@ function copyScripts(projectPath) { function validatePackageName(package_name) { //Make the package conform to Java package types //Enforce underscore limitation - if (!/^[a-zA-Z]+(\.[a-zA-Z0-9][a-zA-Z0-9_]*)+$/.test(package_name)) { + if (!/^[a-zA-Z][a-zA-Z0-9_]+(\.[a-zA-Z][a-zA-Z0-9_]*)+$/.test(package_name)) { return Q.reject('Package name must look like: com.company.Name'); } diff --git a/spec/create.spec.js b/spec/create.spec.js index 8e08793f..8385fc29 100644 --- a/spec/create.spec.js +++ b/spec/create.spec.js @@ -27,7 +27,8 @@ describe("create", function () { var valid = [ "org.apache.mobilespec" , "com.example" - , "com.42floors.package" + , "com.floors42.package", + , "ball8.ball8.ball8ball", ]; var invalid = [ "" @@ -40,6 +41,10 @@ describe("create", function () { , "_underscore.anything" , "underscore._something" , "_underscore._all._the._things" + , "8.ball", + , "8ball.ball", + , "ball8.8ball", + , "ball8.com.8ball" ]; valid.forEach(function(package_name) {