Merge pull request #3 from stevematney/add-basedir

Pre-building the proper files so the build doesn't early-exit.
FubuMvcArchive · Jul 7, 2014 · 12f8493 · 12f8493
2 parents 1f4abdf + 73fc119
commit 12f8493
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 24 deletions.
diff --git a/lib/config.js b/lib/config.js
diff --git a/lib/fubu-import.js b/lib/fubu-import.js
diff --git a/lib/index.js b/lib/index.js
diff --git a/lib/scaffolding.js b/lib/scaffolding.js
diff --git a/lib/util.js b/lib/util.js
diff --git a/src/config.coffee b/src/config.coffee
@@ -2,6 +2,7 @@
 
 _ = require "lodash"
 path = require 'path'
+fs = require 'fs'
 
 exports.defaults = ->
   fubumvc:
@@ -40,7 +41,7 @@ exports.validate = (config, validators) ->
 
   {excludePaths, conventions, usePolling, interval, binaryInterval, baseDir} = fubumvc
 
-  unless !baseDir? or (baseDir? and path.existsSync baseDir)
+  unless !baseDir? or (baseDir? and fs.existsSync baseDir)
     errors.push "fubumvc.baseDir"
     return errors
 

diff --git a/src/fubu-import.coffee b/src/fubu-import.coffee
@@ -244,11 +244,12 @@ cleanAssets = (mimosaConfig, options, next) ->
     mimosaConfig.fubumvc
   extensions = buildExtensions mimosaConfig
   options = {sourceDir, conventions, baseDir}
+  setWorkingDir baseDir
 
   filesFor = (target) ->
     log "debug", "finding files for: #{target} with extensions: #{extensions} and excludePaths: #{excludePaths}"
-    files  = findSourceFiles target, extensions, excludePaths
-    outputFiles = _.map files, (f) -> transformPath f, target, options, mimosaConfig
+    files  = findSourceFiles target, extensions, excludePaths, baseDir
+    outputFiles = _.map files, (f) -> transformPath f, target, options
     [target, files, outputFiles]
 
   targets = getTargets workingDir

diff --git a/src/index.coffee b/src/index.coffee
@@ -5,7 +5,10 @@ fubuImport = require './fubu-import'
 scaffolding = require './scaffolding'
 
 registration = (mimosaConfig, register) ->
-  register ['preBuild'], 'init', fubuImport.importAssets
+  mimosaConfig.log["info"] "setting up fubumvc"
+  scaffolding.setupFileSystemWithConfig mimosaConfig
+  register ['preBuild'], 'init', (mimosaConfig, options, next) ->
+    fubuImport.importAssets mimosaConfig, options, next
   register ['postClean'], 'init', fubuImport.cleanAssets
 
 registerCommand = (program, retrieveConfig) ->

diff --git a/src/scaffolding.coffee b/src/scaffolding.coffee
@@ -13,10 +13,13 @@ cwd = process.cwd()
 
 setupFileSystem = (args, retrieveConfig) ->
   retrieveConfig(false, (config) ->
-    baseDir = if config.fubumvc then config.fubumvc.baseDir else cwd
-    makeFolders(baseDir)
-    initFiles(args, baseDir)
+    setupFileSystemWithConfig config, args
   )
+
+setupFileSystemWithConfig = (config, args) ->
+  baseDir = if config.fubumvc then config.fubumvc.baseDir else cwd
+  makeFolders(baseDir)
+  initFiles(args, baseDir)
 
 resetFileSystem = (args, retrieveConfig) ->
   retrieveConfig(false, (config) ->
@@ -82,4 +85,4 @@ copyContents = ([fileName, contents]) ->
     log "info", "creating #{fileName}"
     fs.writeFileSync fileName, contents
 
-module.exports = {setupFileSystem, resetFileSystem}
+module.exports = {setupFileSystem, resetFileSystem, setupFileSystemWithConfig}