Bug Fixes: Added support for multiple labels

Multiple labels with comma separated value Signed-Off-By: Progyan Bhatatcharya <[email protected]>
BytesClub · May 16, 2017 · 18d251b · 18d251b
1 parent 3bdb0c5
commit 18d251b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,6 +20,5 @@ branches:
 install:
   - npm install --ignore-scripts
   - npm link
-  - export NODEJS_ENV=development
 script:
   - npm test
diff --git a/app.js b/app.js
@@ -33,9 +33,9 @@ const  argv    = process.argv,
        GHT     = require('./lib/ght.js'),
        ver     = require('./package.json').version,
 
-       DIR     = process.env.NODEJS_ENV == 'development' ? __dirname : '~',
+       DIR     = process.env.NODEJS_ENV == 'development' ? __dirname : (process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE),
        CONFIG  = path.resolve(DIR, '.ghb'),
-       FILE    = curDir.replace(/[|&:;$%@"<>()+,\/\\\s]/g, '-'),
+       FILE    = curDir.replace(/[|&:;$%@"<>()+,\/\\\s]+/g, '-'),
 
        helpStr =
 `Usage: ghb [options] [parameter]

diff --git a/lib/fetchissue.js b/lib/fetchissue.js
@@ -16,8 +16,10 @@ var fetchIssue = (config, flag, callback) => {
 		fg = '?state=' + flag.value
 	else if (flag.key === 'id' && typeof flag.value == 'number')
 		fg = '/' + flag.value.toString()
-	else if (flag.key === 'label' && typeof flag.value === 'string')
-		fg = '?labels=' + flag.value.replace(/[\s]/, '+')
+	else if (flag.key === 'label' && typeof flag.value === 'string'){
+		let temp = flag.value.replace(/([,])[\s]/, ',')
+		fg = '?labels=' + temp.replace(/[\s]/, '+')
+	}
 	else {
 		let err = `Invalid argument specified for fetch issue.`
 		throw err;

diff --git a/lib/fetchpulls.js b/lib/fetchpulls.js
@@ -16,8 +16,10 @@ var fetchPulls = (config, flag, callback) => {
 		fg = '?state=' + flag.value
 	else if (flag.key === 'id' && typeof flag.value == 'number')
 		fg = '/' + flag.value.toString()
-	else if (flag.key === 'label' && typeof flag.value === 'string')
-		fg = '?labels=' + flag.value.replace(/[\s]/, '+')
+	else if (flag.key === 'label' && typeof flag.value === 'string'){
+		let temp = flag.value.replace(/([,])[\s]/, ',')
+		fg = '?labels=' + temp.replace(/[\s]/, '+')
+	}
 	else {
 		let err = `Invalid argument specified for fetch pulls.`
 		throw err;