Merge pull request #65 from RallyApps/parent_dir_files

Add support for files in parent directories

bin/run.coffee

@@ -5,6 +5,7 @@ RallyAppBuilder = require("../lib/")
 
 errorHandler = (error) ->
   if error
+    console.error '\r\n' + (error[0] || error)
     console.error '\r\nBuild aborted due to error.'
   else
     console.log 'Success'

lib/config.coffee

@@ -1,16 +1,15 @@
 _ = require('lodash')
 fs = require('fs')
-{join} = require('path')
+pathUtils = require('path')
 
 configFileName = "config.json"
 
-
 _updateConfig = (config)->
   config.server = config.server || "https://rally1.rallydev.com"
   config
 
 saveConfig = ({path, config}, callback)->
-  configPath = join(path, configFileName)
+  configPath = pathUtils.join(path, configFileName)
   fs.writeFile(configPath, JSON.stringify(config, null, '    '), callback)
 
 getConfig = (path, callback) ->
@@ -23,13 +22,22 @@ getConfig = (path, callback) ->
     else
       callback(error)
 
-  configPath = join(path, configFileName)
+  configPath = pathUtils.join(path, configFileName)
   if !fs.existsSync(configPath)
     throw new Error("#{configFileName} not found at path #{path}")
   else
     fs.readFile(configPath, "utf-8", convertToJson)
 
-
-
-module.exports = {_updateConfig,getConfig,saveConfig}
+getAppSourceRoot = (path, callback) ->
+  getConfig path, (err, config) ->
+    root = pathUtils.resolve path
+    localFiles = _.filter config.javascript, (jsFile) -> !jsFile.match /^.*\/\//
+    dirNames = localFiles.map (appFilePath) ->
+      pathUtils.dirname pathUtils.resolve pathUtils.join root, appFilePath
+    common = root
+    while(!_.every(dirNames, (dir) -> dir.indexOf(common) == 0))
+      common = pathUtils.resolve common, '..'
+    callback null, common
+
+module.exports = {_updateConfig,getConfig,saveConfig,getAppSourceRoot}
 _.defaults module.exports, {configFileName}

lib/run.coffee

@@ -4,11 +4,17 @@ _ = require 'lodash'
 app = express()
 path = require 'path'
 
+configModule = require('./config')
+
 module.exports = (args) ->
-  args = _.defaults args,
-    port: 1337
-  app.use express.static process.cwd()
-  app.listen args.port
-  url = "http://localhost:#{args.port}/App-debug.html"
-  console.log "Launching #{url}..."
-  open(url)
+  appPath = args.path || process.cwd()
+  configModule.getAppSourceRoot appPath, (error, srcRoot) ->
+    pathToApp = path.relative srcRoot, appPath
+    pathToApp = '/' + pathToApp if pathToApp
+    args = _.defaults args,
+      port: 1337
+    app.use express.static srcRoot
+    app.listen args.port
+    url = "http://localhost:#{args.port}#{pathToApp}/App-debug.html"
+    console.log "Launching #{url}..."
+    open(url)

lib/watch.coffee

@@ -2,6 +2,7 @@ chokidar = require('chokidar')
 build = require './build'
 watcher = null
 test = require './test'
+config = require './config'
 
 onChange = (args) ->
   console.log('Rebuilding...\n');
@@ -15,9 +16,11 @@ onChange = (args) ->
 watch = (args) ->
   {templates, ci} = args
   console.log('\nWatching for changes...')
-  watcher = chokidar.watch process.cwd(), { ignored: '**/*.html', usePolling: true, interval: 500 }
-  watcher.on 'change', (path) ->
-    console.log('\nChange detected:', path);
-    onChange {templates, ci}
+  appPath = args.path || process.cwd()
+  config.getAppSourceRoot appPath, (error, srcRoot) ->
+    watcher = chokidar.watch srcRoot, { ignored: '**/*.html', usePolling: true, interval: 500 }
+    watcher.on 'change', (path) ->
+      console.log('\nChange detected:', path);
+      onChange {templates, ci}
 
 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.3.5",
+  "version": "1.4.1",
   "homepage": "https://github.com/rallyapps/rally-app-builder",
   "repository": {
     "type": "git",

test/config.test.coffee

@@ -1,7 +1,8 @@
 assert = require 'assert'
 config = require '../lib/config'
+path = require 'path'
 
-describe('Config', ()->
+describe 'Config', ()->
   describe('Updates Config', ()->
     testConfig = {
       "name": "CardboardCustomCard",
@@ -27,4 +28,16 @@ describe('Config', ()->
       assert(updatedConfig.server == "https://rally1.rallydev.com")
   )
 
-)
+  describe '#getAppSourceRoot', () ->
+
+    it 'handles basic case', (done) ->
+      sdk2TestDirectory = path.join(__dirname, 'fixtures', 'sdk2')
+      config.getAppSourceRoot sdk2TestDirectory, (err, srcRoot) ->
+        assert srcRoot == sdk2TestDirectory
+        done()
+
+    it 'handles complicated case', (done) ->
+      sd2WithParentFiles = path.join(__dirname, 'fixtures', 'sdk2WithParentPaths', 'b', 'c')
+      config.getAppSourceRoot sd2WithParentFiles, (err, srcRoot) ->
+        assert srcRoot == path.resolve path.join __dirname, 'fixtures', 'sdk2WithParentPaths'
+        done()

test/fixtures/sdk2/config.json

@@ -15,4 +15,4 @@
         "ferentchak/teamboard",
         "rallyapps/ninjas"
     ]
-}
+}

test/fixtures/sdk2WithParentPaths/a/File1.js

@@ -0,0 +1,2 @@
+Ext.define('File1', {});
+

test/fixtures/sdk2WithParentPaths/b/File2.js

@@ -0,0 +1,2 @@
+Ext.define('File2', {});
+

test/fixtures/sdk2WithParentPaths/b/c/App.js

@@ -0,0 +1,9 @@
+Ext.define('CustomApp', {
+    extend: 'Rally.app.App',
+    componentCls: 'app',
+    launch: function() {
+        //Write app code here
+
+        //API Docs: https://help.rallydev.com/apps/2.1/doc/
+    }
+});

test/fixtures/sdk2WithParentPaths/b/c/app.css

@@ -0,0 +1,3 @@
+.app {
+     /* Add app styles here */
+}

test/fixtures/sdk2WithParentPaths/b/c/config.json

@@ -0,0 +1,15 @@
+{
+    "name": "Test",
+    "className": "CustomApp",
+    "server": "https://rally1.rallydev.com",
+    "sdk": "2.1",
+    "javascript": [
+        "App.js",
+        "../File2.js",
+        "../../a/File1.js",
+        "https://code.jquery.com/jquery-3.1.1.min.js"
+    ],
+    "css": [
+        "app.css"
+    ]
+}