@leverege/build-tools 1.10.4 → 1.10.6

package/lib/server/getfbcfg

@@ -8,14 +8,14 @@ let stdbuf = []
 process.stdin
   .on( 'data', ( d ) => { stdbuf.push( d ) } )
   .on( 'end', () => {
-    const rawCfg = stdbuf.join( '' ).replace( /[":\n\r]/g, '' )
+    const rawCfg = stdbuf.join( '' ).replace( /["\n\r]/g, '' )
     const keyVals = rawCfg.match(/\{(.*)\}/)[1].split(',')
 
     const lastLine = keyVals.length - 1
     console.log( "{" )
     for( let i = 0; i <= lastLine; i++ ) {
       const kv = keyVals[i].trim().split( ' ' )
-      console.log( `  "${kv[0]}": "${kv[1]}"${(i < lastLine ? ',' : '')}` )
+      console.log( `  "${kv[0].replace( /:/, '')}": "${kv[1]}"${(i < lastLine ? ',' : '')}` )
     }
     console.log( "}" )
 

package/lib/server/helmup

@@ -7,6 +7,7 @@
 # to be turned into a cronjob to avoid having it run as soon as it gets
 # deployed.
 #
+# printf "\nRUNNING LOCALLY\n" && sleep 2
 PLATFORM=(
   api-server
   emailer
@@ -236,13 +237,14 @@ function doInstall() {
           MUSEUM=$(<${OVERRIDE})
           printf "\n$YELO_WARN Local chartmuseum name override from ${SERVICE} to ${MUSEUM}\n"
         fi
-        helm upgrade --install $SERVICE chartmuseum/$MUSEUM -f $SERVICE/values.yaml 2> /dev/null
+        helm upgrade --install $SERVICE chartmuseum/$MUSEUM -f $SERVICE/values.yaml
         if [ $? -ne 0 ];
         then
           cat<<NOTRUNNING
 
-$RED_ERROR The $SERVICE chart failed to upgrade or install. Is chartmuseum up 
-           and running on the proper port? Try firing it up with:
+$RED_ERROR The $SERVICE chart failed to upgrade or install. There may be an
+           issue with the service's helm charts, or chartmuseum may not be
+           up and running? If the latter, try firing it up with:
 
 chartmuseum \\
   --port="8080" \\

package/lib/server/overwhelm

@@ -285,7 +285,8 @@ ahoy.forEach( ( dir ) => {
   if ( matchedCtx ) {
     console.log( `
 
-  Your current context matches. Do you want to update credentials anyway?
+  Current context ${chalk.bold.green(currentCtx)} matches the desired
+  context. Do you want to update credentials anyway?
 
   ` )
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "1.10.4",
+  "version": "1.10.6",
   "description": "A package for development build tools.",
   "main": "index.js",
   "scripts": {

package/src/getfbcfg

@@ -8,14 +8,14 @@ let stdbuf = []
 process.stdin
   .on( 'data', ( d ) => { stdbuf.push( d ) } )
   .on( 'end', () => {
-    const rawCfg = stdbuf.join( '' ).replace( /[":\n\r]/g, '' )
+    const rawCfg = stdbuf.join( '' ).replace( /["\n\r]/g, '' )
     const keyVals = rawCfg.match(/\{(.*)\}/)[1].split(',')
 
     const lastLine = keyVals.length - 1
     console.log( "{" )
     for( let i = 0; i <= lastLine; i++ ) {
       const kv = keyVals[i].trim().split( ' ' )
-      console.log( `  "${kv[0]}": "${kv[1]}"${(i < lastLine ? ',' : '')}` )
+      console.log( `  "${kv[0].replace( /:/, '')}": "${kv[1]}"${(i < lastLine ? ',' : '')}` )
     }
     console.log( "}" )
 

package/src/helmup

@@ -7,6 +7,7 @@
 # to be turned into a cronjob to avoid having it run as soon as it gets
 # deployed.
 #
+# printf "\nRUNNING LOCALLY\n" && sleep 2
 PLATFORM=(
   api-server
   emailer
@@ -236,13 +237,14 @@ function doInstall() {
           MUSEUM=$(<${OVERRIDE})
           printf "\n$YELO_WARN Local chartmuseum name override from ${SERVICE} to ${MUSEUM}\n"
         fi
-        helm upgrade --install $SERVICE chartmuseum/$MUSEUM -f $SERVICE/values.yaml 2> /dev/null
+        helm upgrade --install $SERVICE chartmuseum/$MUSEUM -f $SERVICE/values.yaml
         if [ $? -ne 0 ];
         then
           cat<<NOTRUNNING
 
-$RED_ERROR The $SERVICE chart failed to upgrade or install. Is chartmuseum up 
-           and running on the proper port? Try firing it up with:
+$RED_ERROR The $SERVICE chart failed to upgrade or install. There may be an
+           issue with the service's helm charts, or chartmuseum may not be
+           up and running? If the latter, try firing it up with:
 
 chartmuseum \\
   --port="8080" \\

package/src/overwhelm

@@ -285,7 +285,8 @@ ahoy.forEach( ( dir ) => {
   if ( matchedCtx ) {
     console.log( `
 
-  Your current context matches. Do you want to update credentials anyway?
+  Current context ${chalk.bold.green(currentCtx)} matches the desired
+  context. Do you want to update credentials anyway?
 
   ` )
   }