Merge pull request #56 from krmorse/master

Fix watch from crashing when there are app build errors

lib/build/get-script.coffee

@@ -18,7 +18,7 @@ module.exports =
   getFiles: ({configJson, appPath}, callback)->
     localFiles =  _.filter(configJson.javascript, isScriptLocal)
     localCssFiles =  _.filter(configJson.css, isScriptLocal)
-    async.parallel
+    async.series
       javascript_files: (jsCallback)=>
         @getJavaScripts {appPath, scripts: localFiles, compress:true}, jsCallback
       uncompressed_javascript_files: (jsCallback)=>
@@ -46,7 +46,14 @@ module.exports =
         for key,code of results
           fileName = scripts[key]
           @hintJavaScriptFile(code, fileName)
-          results[key] = if compress then @compressJavaScript(code) else code
+          if compress
+            try
+              results[key] = @compressJavaScript code
+            catch e
+              callback new Error()
+              return
+          else
+            results[key] = code
         callback(null, results)
 
   getStylesheets: ({appPath, scripts, compress}, callback)->
@@ -66,9 +73,8 @@ module.exports =
   compressJavaScript: (code)->
     ast = uglify.parse(code)
     ast.figure_out_scope()
-    compressor = uglify.Compressor(
+    compressor = uglify.Compressor
       unused: false
-    )
     ast = ast.transform(compressor)
     return ast.print_to_string()
 

lib/watch.coffee

@@ -3,7 +3,7 @@ build = require './build'
 watcher = null
 
 onChange = (args) ->
-  console.log "\nRebuilding...\n"
+  console.log('Rebuilding...\n');
   path = process.cwd()
   {templates} = args
   watcher.close()
@@ -13,6 +13,8 @@ watch = (args) ->
   {templates} = args
   console.log('\nWatching for changes...')
   watcher = chokidar.watch process.cwd(), { usePolling: true, interval: 500 }
-  watcher.on 'change', () -> onChange {templates}
+  watcher.on 'change', (path) ->
+    console.log('\nChange detected:', path);
+    onChange {templates}
 
 module.exports = watch

package.json

@@ -2,7 +2,7 @@
   "author": "Kyle Morse <[email protected]>",
   "name": "rally-app-builder",
   "description": "A node module that assists in the building of Rally Apps",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "homepage": "https://github.com/rallyapps/rally-app-builder",
   "repository": {
     "type": "git",