From b1417307517190c6136b1917195c1e4785f93e46 Mon Sep 17 00:00:00 2001
From: Kyle MacDonald <kyle@carrotcreative.com>
Date: Thu, 20 Mar 2014 15:45:33 -0400
Subject: [PATCH 01/10] clean api and make tests pass

---
 bin/sprout          | 10 +++++++---
 lib/api/add.coffee  | 22 ++++++++++------------
 lib/api/init.coffee | 12 ++++++------
 test/test.coffee    | 21 +++++++++------------
 4 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/bin/sprout b/bin/sprout
index d30aad6..9f7b165 100755
--- a/bin/sprout
+++ b/bin/sprout
@@ -22,13 +22,17 @@ if (cmd.sync) {
   var p;
   switch (name) {
     case 'add':
-      p = cmd({ name: argv._[0], url: argv._[1], options: opts_only(argv) }); break;
+      // sprout add <name> <template>
+      p = cmd({ name: argv._[0], template: argv._[1] }); break;
     case 'remove':
+      // sprout remove <name>
       p = cmd(argv._[0]); break;
     case 'list':
-      p = cmd({ pretty: true }); break;
+      // sprout list <options>
+      p = cmd({ pretty: true, options: opts_only(argv) }); break;
     case 'init':
-      p = cmd({ template: argv._[0], path: argv._[1], options: opts_only(argv) }); break;
+      // sprout init <name> <path> <options>
+      p = cmd({ name: argv._[0], path: argv._[1], options: opts_only(argv) }); break;
   }
 
   p.done(function(r){ console.log(r.green) }, function(err){
diff --git a/lib/api/add.coffee b/lib/api/add.coffee
index 28220bf..20d9ac0 100644
--- a/lib/api/add.coffee
+++ b/lib/api/add.coffee
@@ -15,34 +15,32 @@ class Add extends Base
       .yield("template '#{@name}' added")
 
   # @api private
-  
+
   configure_options = (opts) ->
     if not opts then return W.reject('your template needs a name!')
     @name = opts.name
-    @url = opts.url
+    @template = opts.template
     @options = opts.options || {}
 
     if not @name then return W.reject('your template needs a name!')
     if not which.sync('git') then return W.reject('you need to have git installed')
 
-    if @name and not @url
-      @url = @name
-      @name = @url.split('/')[@url.split('/').length-1]
+    if @name and not @template
+      @template = @name
+      @name = @template.split('/')[@template.split('/').length-1]
 
     @branch = null
     branch_matcher = /#(.*)$/
-    if @url.match(branch_matcher)
-      @branch = "#{@url.match(branch_matcher)[1]}"
-      @url = @url.replace(branch_matcher, '')
+    if @template.match(branch_matcher)
+      @branch = "#{@template.match(branch_matcher)[1]}"
+      @template = @template.replace(branch_matcher, '')
 
     W.resolve()
 
 
   link_project = ->
-    if not @options.local
-      nodefn.call(exec, "git clone #{@url} #{@path(@name)}")
-    else
-      nodefn.call(exec, "rm -rf #{@path(@name)}; ln -s #{@url} #{@path(@name)}")
+    nodefn.call(exec, "git clone #{@template} #{@path(@name)}")
+    # nodefn.call(exec, "rm -rf #{@path(@name)}; ln -s #{@template} #{@path(@name)}")
 
 
 module.exports = (opts) ->
diff --git a/lib/api/init.coffee b/lib/api/init.coffee
index 2bc2b62..6045ec9 100644
--- a/lib/api/init.coffee
+++ b/lib/api/init.coffee
@@ -35,16 +35,16 @@ class Init extends Base
   #
 
   configure_options = (opts) ->
-    if not opts then return W.reject('please provide a template name')
-    @template = opts.template
+    if not opts then return W.reject('you must provide options for your template')
+    @name = opts.name
     @target = opts.path
     @options = opts.options
 
-    if not @template then return W.reject('please provide a template name')
-    if not @target then @target = path.join(process.cwd(), @template)
+    if not @name then return W.reject('please provide a template name')
+    if not @target then @target = path.join(process.cwd(), @name)
 
-    @sprout_path = @path(@template)
-    if not fs.existsSync(@sprout_path) then return W.reject("template #{@template} does not exist")
+    @sprout_path = @path(@name)
+    if not fs.existsSync(@sprout_path) then return W.reject("template #{@name} does not exist")
 
     W.resolve()
 
diff --git a/test/test.coffee b/test/test.coffee
index 20e8d9d..baa7455 100644
--- a/test/test.coffee
+++ b/test/test.coffee
@@ -21,16 +21,16 @@ describe 'js api', ->
       .catch((err) -> should.exist(err); done())
 
   it '[add] saves/removes the template when passed a valid url', (done) ->
-    sprout.add(name: 'foobar', url: test_template_url)
+    sprout.add(name: 'foobar', template: test_template_url)
       .tap(-> fs.existsSync(sprout.path('foobar')).should.be.ok)
       .then(-> sprout.remove('foobar'))
       .tap(-> fs.existsSync(sprout.path('foobar')).should.not.be.ok)
       .done((-> done()), done)
 
   it '[list] lists available templates', (done) ->
-    sprout.list().length.should.eql(0)
-    sprout.add(name: 'foobar', url: 'https://github.com/carrot/sprout')
-      .tap(-> sprout.list().length.should.eql(1))
+    start = sprout.list().length
+    sprout.add(name: 'foobar', template: test_template_url)
+      .tap(-> sprout.list().length.should.eql(start + 1))
       .then(-> sprout.remove('foobar'))
       .done((-> done()), done)
 
@@ -46,8 +46,8 @@ describe 'js api', ->
     basic_path = path.join(__dirname, 'fixtures/basic')
     test_path = path.join(__dirname, 'testproj')
 
-    sprout.add(name: 'foobar', url: test_template_url)
-      .then(-> sprout.init(template: 'foobar', path: test_path, options: { foo: 'bar' }))
+    sprout.add(name: 'foobar', template: test_template_url)
+      .then(-> sprout.init(name: 'foobar', path: test_path, options: { foo: 'bar' }))
       .tap(->
         fs.existsSync(path.join(test_path, 'index.html')).should.be.ok
         contents = fs.readFileSync(path.join(test_path, 'index.html'), 'utf8')
@@ -60,8 +60,8 @@ describe 'js api', ->
     basic_path = path.join(__dirname, 'fixtures/basic')
     test_path = path.join(__dirname, 'testproj')
 
-    sprout.add(name: 'foobar', url: "#{test_template_url}#alt")
-      .then(-> sprout.init(template: 'foobar', path: test_path, options: { foo: 'bar' }))
+    sprout.add(name: 'foobar', template: "#{test_template_url}#alt")
+      .then(-> sprout.init(name: 'foobar', path: test_path, options: { foo: 'bar' }))
       .tap(->
         contents = fs.readFileSync(path.join(test_path, 'index.html'), 'utf8')
         contents.should.match /alternate/
@@ -90,8 +90,6 @@ describe 'cli', ->
   it '[list] lists available templates', ->
     cmd = @exec("#{@$} list")
     cmd.code.should.eql(0)
-    cmd.output.should.match /Templates/
-    cmd.output.should.match /no templates present/
     cmd = @exec("#{@$} add foobar #{test_template_url}")
     cmd.code.should.eql(0)
     cmd = @exec("#{@$} list")
@@ -108,9 +106,8 @@ describe 'cli', ->
     cmd = @exec("#{@$} init foobar")
     cmd.code.should.be.above(0)
 
-  it '[init] creates a project template correctly', ->
+  it '[init] creates a project template correctly target', ->
     test_path = path.join(__dirname, 'testproj')
-
     cmd = @exec("#{@$} add foobar #{test_template_url}")
     cmd.code.should.eql(0)
     cmd = @exec("#{@$} init foobar #{test_path} --foo bar")

From 3b0317c2eb6f1f3bce0b58e1c500484ca138c86f Mon Sep 17 00:00:00 2001
From: Kyle MacDonald <kyle@carrotcreative.com>
Date: Thu, 20 Mar 2014 17:05:03 -0400
Subject: [PATCH 02/10] update to whenjs 3.0 & bind context down the chain

---
 lib/api/add.coffee  |  4 ++--
 lib/api/init.coffee | 16 ++++++++--------
 package.json        |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/api/add.coffee b/lib/api/add.coffee
index 20d9ac0..7eb3f8d 100644
--- a/lib/api/add.coffee
+++ b/lib/api/add.coffee
@@ -9,8 +9,8 @@ class Add extends Base
   constructor: -> super
 
   execute: (opts) ->
-    configure_options.call(@, opts)
-      .then(link_project.bind(@))
+    configure_options.call(@, opts).with(@)
+      .then(link_project)
       .then(=> if @branch then nodefn.call(exec, "cd #{@path(@name)}; git checkout #{@branch}"))
       .yield("template '#{@name}' added")
 
diff --git a/lib/api/init.coffee b/lib/api/init.coffee
index 6045ec9..c4a72e1 100644
--- a/lib/api/init.coffee
+++ b/lib/api/init.coffee
@@ -15,14 +15,14 @@ class Init extends Base
 
   execute: (opts) ->
 
-    configure_options.call(@, opts)
-      .then(get_user_config.bind(@))
-      .then(user_before_fn.bind(@))
-      .then(prompt_for_info.bind(@))
-      .then(update_template.bind(@))
-      .then(copy_template.bind(@))
-      .then(replace_ejs.bind(@))
-      .then(user_after_fn.bind(@))
+    configure_options.call(@, opts).with(@)
+      .then(get_user_config)
+      .then(user_before_fn)
+      .then(prompt_for_info)
+      .then(update_template)
+      .then(copy_template)
+      .then(replace_ejs)
+      .then(user_after_fn)
       .yield("project created at ./#{@target}!")
 
   # intended for use in the after function, quick way to remove
diff --git a/package.json b/package.json
index 0c174a5..e1d8762 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "ejs": "0.8.x",
     "prompt": "0.2.x",
     "readdirp": "0.3.x",
-    "when": "2.x",
+    "when": "3.x",
     "mkdirp": "0.3.x",
     "which": "1.0.x"
   },

From 29c9eea7aa876de01f693e732c2142bb2a95a5e7 Mon Sep 17 00:00:00 2001
From: Kyle MacDonald <kyle@carrotcreative.com>
Date: Fri, 21 Mar 2014 12:43:07 -0400
Subject: [PATCH 03/10] improvements to sprout 'add' logic - allow for local
 templates - assure local template exists on add - break out logic that sets a
 template's branch

---
 lib/api/add.coffee           | 33 +++++++++++++++++++++++++++++----
 test/fixtures/basic/.gitkeep |  0
 test/test.coffee             | 30 +++++++++++++++++++++++++-----
 3 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 test/fixtures/basic/.gitkeep

diff --git a/lib/api/add.coffee b/lib/api/add.coffee
index 7eb3f8d..5ba9708 100644
--- a/lib/api/add.coffee
+++ b/lib/api/add.coffee
@@ -3,6 +3,9 @@ W = require 'when'
 nodefn = require 'when/node/function'
 exec = require('child_process').exec
 Base = require '../base'
+fs = require 'fs'
+path = require 'path'
+url = require 'url'
 
 class Add extends Base
 
@@ -10,6 +13,9 @@ class Add extends Base
 
   execute: (opts) ->
     configure_options.call(@, opts).with(@)
+      .then(determine_if_local)
+      .then(assure_local_template_exists)
+      .then(set_branch)
       .then(link_project)
       .then(=> if @branch then nodefn.call(exec, "cd #{@path(@name)}; git checkout #{@branch}"))
       .yield("template '#{@name}' added")
@@ -21,6 +27,7 @@ class Add extends Base
     @name = opts.name
     @template = opts.template
     @options = opts.options || {}
+    @local = false
 
     if not @name then return W.reject('your template needs a name!')
     if not which.sync('git') then return W.reject('you need to have git installed')
@@ -28,19 +35,37 @@ class Add extends Base
     if @name and not @template
       @template = @name
       @name = @template.split('/')[@template.split('/').length-1]
+    W.resolve()
+
+  determine_if_local = ->
+    # set @local to true if @template isn't an http or git url
+    url  = url.parse(@template)
+    test = url.pathname.split('.')[url.pathname.split('.').length-1] == 'git'
+    if not test
+      @local = true
+    W.resolve()
+
+  assure_local_template_exists = ->
+    if not @local then return W.resolve()
 
+    test = fs.existsSync(path.normalize(@template))
+    if not test then return W.reject("there is no sprout template located at '#{@template}'")
+    W.resolve()
+
+  set_branch = ->
+    if @local then return W.resolve()
     @branch = null
     branch_matcher = /#(.*)$/
     if @template.match(branch_matcher)
       @branch = "#{@template.match(branch_matcher)[1]}"
       @template = @template.replace(branch_matcher, '')
-
     W.resolve()
 
-
   link_project = ->
-    nodefn.call(exec, "git clone #{@template} #{@path(@name)}")
-    # nodefn.call(exec, "rm -rf #{@path(@name)}; ln -s #{@template} #{@path(@name)}")
+    if @local
+      nodefn.call(exec, "rm -rf #{@path(@name)}; ln -s #{@template} #{@path(@name)}")
+    else
+      nodefn.call(exec, "git clone #{@template} #{@path(@name)}")
 
 
 module.exports = (opts) ->
diff --git a/test/fixtures/basic/.gitkeep b/test/fixtures/basic/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/test/test.coffee b/test/test.coffee
index baa7455..77923ac 100644
--- a/test/test.coffee
+++ b/test/test.coffee
@@ -2,9 +2,15 @@ require 'shelljs/global'
 path = require 'path'
 fs = require 'fs'
 should = require 'should'
+_path  = path.join(__dirname, 'fixtures')
 sprout = require '..'
 
-test_template_url = 'https://github.com/jenius/sprout-test-template.git'
+# remote templates
+test_template_url  = 'https://github.com/jenius/sprout-test-template.git'
+test_template_git  = 'git@github.com:jenius/sprout-test-template.git'
+
+# local template
+test_template_path = path.join(_path, 'basic')
 
 before ->
   @exec = (cmd) -> exec(cmd, {silent: true})
@@ -20,13 +26,27 @@ describe 'js api', ->
     sprout.add(name: 'foobar')
       .catch((err) -> should.exist(err); done())
 
-  it '[add] saves/removes the template when passed a valid url', (done) ->
+  it '[add] saves/removes the template when passed a valid http url', (done) ->
     sprout.add(name: 'foobar', template: test_template_url)
       .tap(-> fs.existsSync(sprout.path('foobar')).should.be.ok)
       .then(-> sprout.remove('foobar'))
       .tap(-> fs.existsSync(sprout.path('foobar')).should.not.be.ok)
       .done((-> done()), done)
 
+  it '[add] saves/removes the template when passed a valid git url', (done) ->
+   sprout.add(name: 'foobar', template: test_template_git)
+     .tap(-> fs.existsSync(sprout.path('foobar')).should.be.ok)
+     .then(-> sprout.remove('foobar'))
+     .tap(-> fs.existsSync(sprout.path('foobar')).should.not.be.ok)
+     .done((-> done()), done)
+
+  it '[add] saves/removes the template when passed a local path', (done) ->
+    sprout.add(name: 'foobar', template: test_template_path)
+      .tap(-> fs.existsSync(sprout.path('foobar')).should.be.ok)
+      .then(-> sprout.remove('foobar'))
+      .tap(-> fs.existsSync(sprout.path('foobar')).should.not.be.ok)
+      .done((-> done()), done)
+
   it '[list] lists available templates', (done) ->
     start = sprout.list().length
     sprout.add(name: 'foobar', template: test_template_url)
@@ -56,11 +76,11 @@ describe 'js api', ->
       ).then(-> sprout.remove('foobar'))
       .done((-> done()), done)
 
-  it '[init] creates a project template from a branch', (done) ->
+  it '[init] creates a project template from a branch target', (done) ->
     basic_path = path.join(__dirname, 'fixtures/basic')
     test_path = path.join(__dirname, 'testproj')
 
-    sprout.add(name: 'foobar', template: "#{test_template_url}#alt")
+    sprout.add(name: 'foobar', template: "#{test_template_git}#alt")
       .then(-> sprout.init(name: 'foobar', path: test_path, options: { foo: 'bar' }))
       .tap(->
         contents = fs.readFileSync(path.join(test_path, 'index.html'), 'utf8')
@@ -106,7 +126,7 @@ describe 'cli', ->
     cmd = @exec("#{@$} init foobar")
     cmd.code.should.be.above(0)
 
-  it '[init] creates a project template correctly target', ->
+  it '[init] creates a project template correctly', ->
     test_path = path.join(__dirname, 'testproj')
     cmd = @exec("#{@$} add foobar #{test_template_url}")
     cmd.code.should.eql(0)

From d52c0aaf0f4ce9f45b99a1968e1ee87cd4e1df2a Mon Sep 17 00:00:00 2001
From: Kyle MacDonald <kyle@carrotcreative.com>
Date: Fri, 21 Mar 2014 17:54:55 -0400
Subject: [PATCH 04/10] convert prompting to inquirer.js

---
 .gitignore                                    |  1 +
 lib/api/add.coffee                            | 35 ++++---
 lib/api/init.coffee                           | 94 +++++++++++--------
 package.json                                  | 15 ++-
 readme.md                                     | 74 +++++++++------
 test/fixtures/after/init.coffee               |  7 ++
 test/fixtures/after/root/index.html           |  1 +
 test/fixtures/bad-init/init.coffee            |  6 ++
 test/fixtures/bad-init/root/index.html        |  1 +
 test/fixtures/basic/init.coffee               |  7 ++
 test/fixtures/basic/root/index.html           |  1 +
 test/fixtures/before/init.coffee              |  7 ++
 test/fixtures/before/root/index.html          |  1 +
 test/fixtures/missing-key/init.coffee         |  7 ++
 test/fixtures/missing-key/root/index.html     |  2 +
 test/fixtures/no-init/root/index.html         |  1 +
 test/fixtures/override/init.coffee            | 25 +++++
 test/fixtures/override/root/index.html        | 15 +++
 .../{basic/.gitkeep => pizza/init.coffee}     |  0
 test/fixtures/pizza/root/index.html           |  0
 test/fixtures/rootless/init.coffee            |  7 ++
 test/fixtures/validate/init.coffee            |  9 ++
 test/fixtures/validate/root/index.html        |  1 +
 test/test.coffee                              | 60 ++++++++----
 24 files changed, 275 insertions(+), 102 deletions(-)
 create mode 100644 test/fixtures/after/init.coffee
 create mode 100644 test/fixtures/after/root/index.html
 create mode 100644 test/fixtures/bad-init/init.coffee
 create mode 100644 test/fixtures/bad-init/root/index.html
 create mode 100644 test/fixtures/basic/init.coffee
 create mode 100644 test/fixtures/basic/root/index.html
 create mode 100644 test/fixtures/before/init.coffee
 create mode 100644 test/fixtures/before/root/index.html
 create mode 100644 test/fixtures/missing-key/init.coffee
 create mode 100644 test/fixtures/missing-key/root/index.html
 create mode 100644 test/fixtures/no-init/root/index.html
 create mode 100644 test/fixtures/override/init.coffee
 create mode 100644 test/fixtures/override/root/index.html
 rename test/fixtures/{basic/.gitkeep => pizza/init.coffee} (100%)
 create mode 100644 test/fixtures/pizza/root/index.html
 create mode 100644 test/fixtures/rootless/init.coffee
 create mode 100644 test/fixtures/validate/init.coffee
 create mode 100644 test/fixtures/validate/root/index.html

diff --git a/.gitignore b/.gitignore
index 9daa824..a58c6c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 node_modules
+test/testproj
diff --git a/lib/api/add.coffee b/lib/api/add.coffee
index 5ba9708..562f6e7 100644
--- a/lib/api/add.coffee
+++ b/lib/api/add.coffee
@@ -17,39 +17,42 @@ class Add extends Base
       .then(assure_local_template_exists)
       .then(set_branch)
       .then(link_project)
-      .then(=> if @branch then nodefn.call(exec, "cd #{@path(@name)}; git checkout #{@branch}"))
+      .then(handle_branch_checkout)
       .yield("template '#{@name}' added")
 
   # @api private
 
   configure_options = (opts) ->
-    if not opts then return W.reject('your template needs a name!')
-    @name = opts.name
-    @template = opts.template
-    @options = opts.options || {}
-    @local = false
+    if not opts or not opts.name
+      return W.reject('your template needs a name!')
 
-    if not @name then return W.reject('your template needs a name!')
-    if not which.sync('git') then return W.reject('you need to have git installed')
+    @name     = opts.name
+    @template = opts.template
+    @options  = opts.options || {}
+    @local    = false
 
     if @name and not @template
       @template = @name
       @name = @template.split('/')[@template.split('/').length-1]
+
     W.resolve()
 
   determine_if_local = ->
     # set @local to true if @template isn't an http or git url
     url  = url.parse(@template)
-    test = url.pathname.split('.')[url.pathname.split('.').length-1] == 'git'
-    if not test
+    remote = url.pathname.split('.')[url.pathname.split('.').length-1] == 'git'
+    if not remote
       @local = true
     W.resolve()
 
   assure_local_template_exists = ->
     if not @local then return W.resolve()
+    if not which.sync('git')
+      return W.reject('you need to have git installed')
 
     test = fs.existsSync(path.normalize(@template))
-    if not test then return W.reject("there is no sprout template located at '#{@template}'")
+    if not test
+      return W.reject("there is no sprout template located at '#{@template}'")
     W.resolve()
 
   set_branch = ->
@@ -62,11 +65,13 @@ class Add extends Base
     W.resolve()
 
   link_project = ->
-    if @local
-      nodefn.call(exec, "rm -rf #{@path(@name)}; ln -s #{@template} #{@path(@name)}")
-    else
-      nodefn.call(exec, "git clone #{@template} #{@path(@name)}")
+    cmd = "git clone #{@template} #{@path(@name)}"
+    cmd = "rm -rf #{@path(@name)}; ln -s #{@template} #{@path(@name)}" if @local
+    nodefn.call(exec, cmd)
 
+  handle_branch_checkout = ->
+    if not @branch then return W.resolve()
+    nodefn.call(exec, "cd #{@path(@name)}; git checkout #{@branch}")
 
 module.exports = (opts) ->
   (new Add()).execute(opts)
diff --git a/lib/api/init.coffee b/lib/api/init.coffee
index c4a72e1..786eb0b 100644
--- a/lib/api/init.coffee
+++ b/lib/api/init.coffee
@@ -2,12 +2,15 @@ path = require 'path'
 fs = require 'fs'
 W = require 'when'
 nodefn = require 'when/node/function'
+nodecb = require 'when/callbacks'
 readdirp = require 'readdirp'
 ncp = require('ncp').ncp
 exec = require('child_process').exec
 ejs = require 'ejs'
 prompt = require 'prompt'
+inquirer = require 'inquirer'
 Base = require '../base'
+_ = require 'lodash'
 
 class Init extends Base
 
@@ -16,14 +19,16 @@ class Init extends Base
   execute: (opts) ->
 
     configure_options.call(@, opts).with(@)
-      .then(get_user_config)
-      .then(user_before_fn)
-      .then(prompt_for_info)
-      .then(update_template)
+      .then(get_user_init_file)
+      .then(run_user_before_function)
+      .then(remove_overrides_from_prompt)
+      .then(prompt_user_for_answers)
+      .then(merge_config_values_with_overrides)
+      .then(assure_template_is_updated)
       .then(copy_template)
       .then(replace_ejs)
-      .then(user_after_fn)
-      .yield("project created at ./#{@target}!")
+      .then(run_user_after_function)
+      .yield("project created at '#{@target}'!")
 
   # intended for use in the after function, quick way to remove
   # files/folders that users wanted to nix after the prompts.
@@ -35,50 +40,57 @@ class Init extends Base
   #
 
   configure_options = (opts) ->
-    if not opts then return W.reject('you must provide options for your template')
-    @name = opts.name
-    @target = opts.path
-    @options = opts.options
-
-    if not @name then return W.reject('please provide a template name')
-    if not @target then @target = path.join(process.cwd(), @name)
+    if not opts or not opts.name
+      return W.reject('your template needs a name!')
 
+    @name        = opts.name
+    @target      = opts.path
+    @options     = opts.options
     @sprout_path = @path(@name)
-    if not fs.existsSync(@sprout_path) then return W.reject("template #{@name} does not exist")
+
+    if not fs.existsSync(@sprout_path)
+      return W.reject("template '#{@name}' does not exist")
+
+    if not @target then @target = path.join(process.cwd(), @name)
 
     W.resolve()
 
-  get_user_config = ->
+  get_user_init_file = ->
     init_file = path.join(@sprout_path, 'init.coffee')
     if not fs.existsSync(init_file) then return @config = {}
     @config = require(init_file)
 
-  user_before_fn = ->
+  run_user_before_function = ->
     if not @config.before then return W.resolve()
     nodefn.call(@config.before, @)
 
-  prompt_for_info = ->
-    if not @config.configure
-      @config_values = @options
-      return W.resolve()
-
-    prompt.override = @options
-    prompt.message = ''
-    prompt.delimiter = ''
-
-    if not prompt.override then console.log '\nplease enter the following information:'.yellow
-
-    prompt.start()
-    nodefn.call(prompt.get, @config.configure).tap (res) =>
-      @config_values = res
-      if not prompt.override then console.log('')
-
-  user_after_fn = ->
-    if not @config.after then return W.resolve()
-    nodefn.call(@config.after, @)
-
-  update_template = ->
+  remove_overrides_from_prompt = ->
+    keys = _.keys(@options)
+    @questions = _.reject(@config.configure, (v) -> _.contains(keys, v.name) )
+
+  prompt_user_for_answers = ->
+    @answers = {}
+    if not @questions.length then return W.resolve()
+    nodecb.call(inquirer.prompt, @questions)
+      .then((o) => @answers = o)
+
+  merge_config_values_with_overrides = ->
+    response = {}
+    _.each @answers, (k,i) ->
+      if k.hasOwnProperty('input')
+        response[k.name] = k.input
+      else if k.hasOwnProperty('confirm')
+        response[k.name] = k.confirm
+      else if k.hasOwnProperty('rawlist')
+        response[k.name] = k.rawlist
+      else if k.hasOwnProperty('list')
+        response[k.name] = k.list
+
+    @config_values = _.assign(response, @options)
+
+  assure_template_is_updated = ->
     nodefn.call(exec, "cd #{@sprout_path} && git pull")
+      .catch(-> return W.resolve())
 
   copy_template = ->
     nodefn.call(ncp, path.join(@sprout_path, 'root'), @target)
@@ -87,8 +99,12 @@ class Init extends Base
     nodefn.call(readdirp, { root: @target })
       .tap (res) =>
         res.files.map (f) =>
-          processed = ejs.render(fs.readFileSync(f.fullPath, 'utf8'), @config_values)
-          fs.writeFileSync(f.fullPath, processed)
+          out = ejs.render(fs.readFileSync(f.fullPath, 'utf8'), @config_values)
+          fs.writeFileSync(f.fullPath, out)
+
+  run_user_after_function = ->
+    if not @config.after then return W.resolve()
+    nodefn.call(@config.after, @)
 
 module.exports = (opts) ->
   (new Init()).execute(opts)
diff --git a/package.json b/package.json
index e1d8762..f8abd82 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,9 @@
   "name": "sprout",
   "version": "0.0.8",
   "author": "Carrot Creative <dev@carrotcreative.com>",
-  "contibutors": ["Jeff Escalante <hello@jenius.me>"],
+  "contibutors": [
+    "Jeff Escalante <hello@jenius.me>"
+  ],
   "description": "Simple project templating",
   "main": "index.js",
   "license": "MIT",
@@ -10,7 +12,12 @@
     "type": "git",
     "url": "https://github.com/carrot/sprout"
   },
-  "keywords": ["new", "project", "templating", "configuration"],
+  "keywords": [
+    "new",
+    "project",
+    "templating",
+    "configuration"
+  ],
   "bugs": "https://github.com/carrot/sprout/issues",
   "bin": {
     "sprout": "bin/sprout"
@@ -29,7 +36,9 @@
     "readdirp": "0.3.x",
     "when": "3.x",
     "mkdirp": "0.3.x",
-    "which": "1.0.x"
+    "which": "1.0.x",
+    "inquirer": "0.4.x",
+    "lodash": "2.4.x"
   },
   "devDependencies": {
     "mocha": "*",
diff --git a/readme.md b/readme.md
index e844d8d..014b322 100644
--- a/readme.md
+++ b/readme.md
@@ -26,37 +26,43 @@ Sprout can be used directly through the command line to intitialize projects. On
 
 Command params in `[brackets]` are optional, and in `<angle_brackets>` are required.
 
-##### Add Template
+#### Add Template
+**Command**:  
+`sprout add [name] <clone_url_or_path>`
 
-* * *
+**Description**: Adds a template to your repertoire. Name represents how you would like the template to be named within sprout. You are required to add a _template_ which can be either a clone url or a path to a local template. If no name is provided, sprout will use the last piece of the template as the name.
 
-_Command Syntax_: `sprout add [name] <clone_url> [options]`     
-_Description_: Adds a template to your repertoire. Name represents how you would like the template to be named within sprout, and clone url is a url that `git clone` could be run with and it would be successful. If no name is provided, sprout will use the last piece of the clone url as the name.  
-_Options:_  `--local` allows you to symlink a local project for active development. use a `path` instead of a `clone_url`
+---
 
+#### Remove Template
+**Command**:  
+`sprout remove <name>`  
 
-##### Remove Template
+**Description**: Removes the template with the specified name from sprout.
 
-* * *
+---
 
-_Command Syntax_: `sprout remove <name>`    
-_Description_: Removes the template with the specified name from sprout.
+#### List Templates
+**Command**:  
+`sprout list`
 
-##### List Templates
+_Description_: Lists all templates that you have added to sprout.
 
-* * *
+---
 
-_Command Syntax_: `sprout list`    
-_Description_: Lists all templates that you have added to sprout.
+#### Initialize Template
+**Command**:  
+`sprout init <name> [path] [options]`  
+
+**Description**: Initializes the template with the given name at the given path. If no path is provided it will create a new folder with the same name as the template in the current working directory. If there already is one, it will throw an error.
 
-##### Initialize Template
+Sprout also comes with a [man page](man) and will display a help menu as a refresher on these commands if you type something wrong.  
 
-* * *
+**Options**: You can pass override arguments like `--foo bar --fun true` as options which will override the prompts set in your templates.
 
-_Command Syntax_: `sprout init <name> [path]`    
-_Description_: Initializes the template with the given name at the given path. If no path is provided it will create a new folder with the same name as the template in the current working directory. If there already is one, it will throw an error.
+> **Note**: Options overrides set from the command line will only be passed to your ejs templates as either a string or a boolean. This means that when overriding there are many powerful features from inquirer.js (like validation) that you won't be able to take advantage of.
 
-Sprout also comes with a [man page](man) and will display a help menu as a refresher on these commands if you type something wrong.
+---
 
 ### Javascript API
 
@@ -68,7 +74,7 @@ sprout = require 'sprout'
 
 # Adding a template
 # -----------------
-sprout.add({ name: 'node', url: 'https://github.com/carrot/sprout-node', options: {local: false} })
+sprout.add({ name: 'node', template: 'https://github.com/carrot/sprout-node', options: {local: false} })
   .catch(console.error.bind(console))
   .done(-> console.log('template added!'))
 
@@ -92,7 +98,7 @@ console.log sprout.list(pretty: true)
 # -----------------------
 
 sprout.init({
-  template: 'node',
+  name: 'node',
   path: path.join(process.cwd(), 'new_project'),
   options: { foo: 'bar' } # optional, will prompt if not provided
 }).catch(console.error.bind(console))
@@ -140,15 +146,25 @@ exports.before = (sprout, done) ->
 # allows you to configure a slightly more customizable prompt.
 
 # The 'prompt' option in an object has a couple of preset values you
-# conforms to the configuration used by flatiron/prompt, found here:
-# https://github.com/flatiron/prompt#valid-property-settings
+# conforms to the configuration used by SBoudrias/Inquirer.js, found here:
+# https://github.com/SBoudrias/Inquirer.js#question
 exports.configure = [
-  'name',
-  'github_url',
-  { name: 'travis'
-    message: 'use travis-ci? (y/n)'
-    validator: /y|n/
-    default: 'y' }
+  {
+    type: 'input',
+    name: 'foo',
+    message: 'What is foo?'
+  },
+  {
+    type: 'input',
+    name: 'github_handle',
+    message: 'What is your github handle?'
+  },
+  {
+    type: "confirm",
+    name: "travis",
+    message: "Do you want to utilize Travis CI?",
+    default: false
+  },
 ]
 
 # This function is executed after the configuration info is collected.
@@ -156,7 +172,7 @@ exports.configure = [
 # extra files etc. You have the full power of node at your fingertips here.
 exports.after = (sprout, done) ->
   console.log sprout.config_values # all the config values you collected
-  if not sprout.config_values.travis == 'y' then sprout.remove('.travis.yml')
+  if not sprout.config_values.travis == true then sprout.remove('.travis.yml')
   done()
 
 ```
diff --git a/test/fixtures/after/init.coffee b/test/fixtures/after/init.coffee
new file mode 100644
index 0000000..367b8eb
--- /dev/null
+++ b/test/fixtures/after/init.coffee
@@ -0,0 +1,7 @@
+exports.configure = [
+  {
+    type: 'input',
+    name: 'foo',
+    message: 'What is foo?'
+  }
+]
diff --git a/test/fixtures/after/root/index.html b/test/fixtures/after/root/index.html
new file mode 100644
index 0000000..afc452a
--- /dev/null
+++ b/test/fixtures/after/root/index.html
@@ -0,0 +1 @@
+<p>foo != <%= foo %></p>
diff --git a/test/fixtures/bad-init/init.coffee b/test/fixtures/bad-init/init.coffee
new file mode 100644
index 0000000..2ef253a
--- /dev/null
+++ b/test/fixtures/bad-init/init.coffee
@@ -0,0 +1,6 @@
+exports.configure = [
+  {
+    type: 'input',
+    name: 'foo'
+  }
+]
diff --git a/test/fixtures/bad-init/root/index.html b/test/fixtures/bad-init/root/index.html
new file mode 100644
index 0000000..bdcbad2
--- /dev/null
+++ b/test/fixtures/bad-init/root/index.html
@@ -0,0 +1 @@
+<p>bad init template: <%= foo %></p>
diff --git a/test/fixtures/basic/init.coffee b/test/fixtures/basic/init.coffee
new file mode 100644
index 0000000..367b8eb
--- /dev/null
+++ b/test/fixtures/basic/init.coffee
@@ -0,0 +1,7 @@
+exports.configure = [
+  {
+    type: 'input',
+    name: 'foo',
+    message: 'What is foo?'
+  }
+]
diff --git a/test/fixtures/basic/root/index.html b/test/fixtures/basic/root/index.html
new file mode 100644
index 0000000..a58c610
--- /dev/null
+++ b/test/fixtures/basic/root/index.html
@@ -0,0 +1 @@
+<p>basic template: <%= foo %></p>
diff --git a/test/fixtures/before/init.coffee b/test/fixtures/before/init.coffee
new file mode 100644
index 0000000..367b8eb
--- /dev/null
+++ b/test/fixtures/before/init.coffee
@@ -0,0 +1,7 @@
+exports.configure = [
+  {
+    type: 'input',
+    name: 'foo',
+    message: 'What is foo?'
+  }
+]
diff --git a/test/fixtures/before/root/index.html b/test/fixtures/before/root/index.html
new file mode 100644
index 0000000..6d63a07
--- /dev/null
+++ b/test/fixtures/before/root/index.html
@@ -0,0 +1 @@
+<p>foo === <%= foo %></p>
diff --git a/test/fixtures/missing-key/init.coffee b/test/fixtures/missing-key/init.coffee
new file mode 100644
index 0000000..367b8eb
--- /dev/null
+++ b/test/fixtures/missing-key/init.coffee
@@ -0,0 +1,7 @@
+exports.configure = [
+  {
+    type: 'input',
+    name: 'foo',
+    message: 'What is foo?'
+  }
+]
diff --git a/test/fixtures/missing-key/root/index.html b/test/fixtures/missing-key/root/index.html
new file mode 100644
index 0000000..9c6d8a1
--- /dev/null
+++ b/test/fixtures/missing-key/root/index.html
@@ -0,0 +1,2 @@
+<p>this key exists: <%= foo %></p>
+<p>this key doesn't: <%= bar %></p>
diff --git a/test/fixtures/no-init/root/index.html b/test/fixtures/no-init/root/index.html
new file mode 100644
index 0000000..95fd4a5
--- /dev/null
+++ b/test/fixtures/no-init/root/index.html
@@ -0,0 +1 @@
+<p>no init file: <%= foo %></p>
diff --git a/test/fixtures/override/init.coffee b/test/fixtures/override/init.coffee
new file mode 100644
index 0000000..fc78925
--- /dev/null
+++ b/test/fixtures/override/init.coffee
@@ -0,0 +1,25 @@
+exports.configure = [
+  {
+    type: 'input',
+    name: 'foo',
+    message: 'What is foo?'
+  },
+  {
+    type: 'confirm',
+    name: 'snow',
+    message: 'Does Jon Snow know nothing?',
+    default: false
+  },
+  {
+    type: 'list',
+    name: 'size',
+    message: 'What size do you need',
+    choices: [ 'Large', 'Medium', 'Small' ]
+  },
+  {
+    type: "rawlist",
+    name: "liquid",
+    message: "You also get a free 2L liquid",
+    choices: [ "Pepsi", "7up", "Coke" ]
+  }
+]
diff --git a/test/fixtures/override/root/index.html b/test/fixtures/override/root/index.html
new file mode 100644
index 0000000..2aee805
--- /dev/null
+++ b/test/fixtures/override/root/index.html
@@ -0,0 +1,15 @@
+<!-- inquirer.js type = 'input' -->
+<p>foo = <%= foo %></p>
+
+<!-- inquirer.js type = 'confirm' -->
+<% if (snow) { %>
+<p>you know nothing jon snow</p>
+<% } else { %>
+<p>i guess you know some stuff, jon snow</p>
+<% } %>
+
+<!-- inquirer.js type = 'list' -->
+<p>size = <%= size %></p>
+
+<!-- inquirer.js type = 'rawlist' -->
+<p>choice of drink = <%= liquid %></p>
diff --git a/test/fixtures/basic/.gitkeep b/test/fixtures/pizza/init.coffee
similarity index 100%
rename from test/fixtures/basic/.gitkeep
rename to test/fixtures/pizza/init.coffee
diff --git a/test/fixtures/pizza/root/index.html b/test/fixtures/pizza/root/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/test/fixtures/rootless/init.coffee b/test/fixtures/rootless/init.coffee
new file mode 100644
index 0000000..367b8eb
--- /dev/null
+++ b/test/fixtures/rootless/init.coffee
@@ -0,0 +1,7 @@
+exports.configure = [
+  {
+    type: 'input',
+    name: 'foo',
+    message: 'What is foo?'
+  }
+]
diff --git a/test/fixtures/validate/init.coffee b/test/fixtures/validate/init.coffee
new file mode 100644
index 0000000..b381688
--- /dev/null
+++ b/test/fixtures/validate/init.coffee
@@ -0,0 +1,9 @@
+exports.configure = [
+  {
+    type: 'input',
+    name: 'foo',
+    message: 'What is foo?',
+    validate: (msg) ->
+      msg.toUpperCase()
+  }
+]
diff --git a/test/fixtures/validate/root/index.html b/test/fixtures/validate/root/index.html
new file mode 100644
index 0000000..8717368
--- /dev/null
+++ b/test/fixtures/validate/root/index.html
@@ -0,0 +1 @@
+<p>the following should be uppercase: <%= foo %></p>
diff --git a/test/test.coffee b/test/test.coffee
index 77923ac..cdfab8b 100644
--- a/test/test.coffee
+++ b/test/test.coffee
@@ -5,12 +5,11 @@ should = require 'should'
 _path  = path.join(__dirname, 'fixtures')
 sprout = require '..'
 
-# remote templates
-test_template_url  = 'https://github.com/jenius/sprout-test-template.git'
-test_template_git  = 'git@github.com:jenius/sprout-test-template.git'
+# remote template
+test_template_url  = 'https://github.com/carrot/sprout-test-template.git'
 
 # local template
-test_template_path = path.join(_path, 'basic')
+test_template_path     = path.join(_path, 'basic')
 
 before ->
   @exec = (cmd) -> exec(cmd, {silent: true})
@@ -33,13 +32,6 @@ describe 'js api', ->
       .tap(-> fs.existsSync(sprout.path('foobar')).should.not.be.ok)
       .done((-> done()), done)
 
-  it '[add] saves/removes the template when passed a valid git url', (done) ->
-   sprout.add(name: 'foobar', template: test_template_git)
-     .tap(-> fs.existsSync(sprout.path('foobar')).should.be.ok)
-     .then(-> sprout.remove('foobar'))
-     .tap(-> fs.existsSync(sprout.path('foobar')).should.not.be.ok)
-     .done((-> done()), done)
-
   it '[add] saves/removes the template when passed a local path', (done) ->
     sprout.add(name: 'foobar', template: test_template_path)
       .tap(-> fs.existsSync(sprout.path('foobar')).should.be.ok)
@@ -66,21 +58,22 @@ describe 'js api', ->
     basic_path = path.join(__dirname, 'fixtures/basic')
     test_path = path.join(__dirname, 'testproj')
 
-    sprout.add(name: 'foobar', template: test_template_url)
-      .then(-> sprout.init(name: 'foobar', path: test_path, options: { foo: 'bar' }))
+    sprout.add(name: 'foobar', template: test_template_path)
+      .then(-> sprout.init(name: 'foobar', path: test_path, options: { foo: 'bar'}))
       .tap(->
         fs.existsSync(path.join(test_path, 'index.html')).should.be.ok
         contents = fs.readFileSync(path.join(test_path, 'index.html'), 'utf8')
         contents.should.match /bar/
         rm('-rf', test_path)
-      ).then(-> sprout.remove('foobar'))
+      )
+      .then(-> sprout.remove('foobar'))
       .done((-> done()), done)
 
-  it '[init] creates a project template from a branch target', (done) ->
+  it '[init] creates a project template from a branch', (done) ->
     basic_path = path.join(__dirname, 'fixtures/basic')
     test_path = path.join(__dirname, 'testproj')
 
-    sprout.add(name: 'foobar', template: "#{test_template_git}#alt")
+    sprout.add(name: 'foobar', template: "#{test_template_url}#alt")
       .then(-> sprout.init(name: 'foobar', path: test_path, options: { foo: 'bar' }))
       .tap(->
         contents = fs.readFileSync(path.join(test_path, 'index.html'), 'utf8')
@@ -89,6 +82,27 @@ describe 'js api', ->
       ).then(-> sprout.remove('foobar'))
       .done((-> done()), done)
 
+  it "[init] creates a project by overriding inquirer's question types", (done) ->
+    basic_path = path.join(__dirname, 'fixtures/override')
+    test_path  = path.join(__dirname, 'testproj')
+    opts =
+      foo: "bar"
+      snow: true
+      size: "Medium"
+      liquid: '7up'
+
+    sprout.add(name: 'foobar', template: basic_path)
+      .then(-> sprout.init(name: 'foobar', path: test_path, options: opts))
+      .tap(->
+        contents = fs.readFileSync(path.join(test_path, 'index.html'), 'utf8')
+        contents.should.match /foo/
+        contents.should.match /you know nothing jon snow/
+        contents.should.match /Medium/
+        contents.should.match /7up/
+        rm('-rf', test_path)
+      ).then(-> sprout.remove('foobar'))
+      .done((-> done()), done)
+
 describe 'cli', ->
 
   it '[add] errors when no args provided', ->
@@ -131,9 +145,23 @@ describe 'cli', ->
     cmd = @exec("#{@$} add foobar #{test_template_url}")
     cmd.code.should.eql(0)
     cmd = @exec("#{@$} init foobar #{test_path} --foo bar")
+
     cmd.code.should.eql(0)
     fs.existsSync(path.join(test_path, 'index.html')).should.be.ok
     contents = fs.readFileSync(path.join(test_path, 'index.html'), 'utf8')
     contents.should.match /bar/
     rm('-rf', test_path)
     rmcmd = @exec("#{@$} remove foobar")
+
+  it '[init] creates a project with multiple inquirer inputs'
+  it '[init] errors when prompt entry doesn\'t pass validation'
+  it '[init] executes before function'
+  it '[init] executes after function'
+  it '[init] includes String.js in ejs compilation'
+  it '[init] errors when template does not have `root` directory'
+  it '[init] errors when template does not have and `init.coffee` in root dir'
+  it '[init] errors when template has malformed `init.coffee`'
+  it '[init] errors when template does not have and `init.coffee` in root dir'
+  it '[init] does not error when ejs has a key not present in @config_values'
+  it '[new] runs sprout.init when `sprout new` is attempted'
+  it '[add] replaces existing template on add'

From 11886ca20cf92679f88c3db5509af94189f9ba53 Mon Sep 17 00:00:00 2001
From: Kyle MacDonald <kyle@carrotcreative.com>
Date: Sat, 22 Mar 2014 17:17:43 -0400
Subject: [PATCH 05/10] alias sprout.new to sprout.init. for funsies

---
 bin/sprout       |  8 +++++---
 test/test.coffee | 16 ++++++++++++++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/bin/sprout b/bin/sprout
index 9f7b165..2a3b9d2 100755
--- a/bin/sprout
+++ b/bin/sprout
@@ -6,14 +6,15 @@ require('colors');
 var argv = require('optimist').argv,
     commands = require('../lib/api');
 
-// get command
+// add sprout.new alias
+commands['new'] = function() { return undefined; };
 
+// get command
 var name = argv._.splice(0,1)[0];
 var cmd = commands[name];
 if (!cmd) return commands.help()
 
 // execute command
-
 if (cmd.sync) {
   res = cmd({ pretty: true });
   if (res.error) return console.error("ERROR: ".red + res.error)
@@ -30,9 +31,10 @@ if (cmd.sync) {
     case 'list':
       // sprout list <options>
       p = cmd({ pretty: true, options: opts_only(argv) }); break;
+    case 'new':
     case 'init':
       // sprout init <name> <path> <options>
-      p = cmd({ name: argv._[0], path: argv._[1], options: opts_only(argv) }); break;
+      p = commands['init']({ name: argv._[0], path: argv._[1], options: opts_only(argv) }); break;
   }
 
   p.done(function(r){ console.log(r.green) }, function(err){
diff --git a/test/test.coffee b/test/test.coffee
index cdfab8b..835f963 100644
--- a/test/test.coffee
+++ b/test/test.coffee
@@ -153,15 +153,27 @@ describe 'cli', ->
     rm('-rf', test_path)
     rmcmd = @exec("#{@$} remove foobar")
 
+  it '[new] runs sprout.init when `sprout new` is attempted', ->
+    test_path = path.join(__dirname, 'testproj')
+    cmd = @exec("#{@$} add foobar #{test_template_url}")
+    cmd.code.should.eql(0)
+    cmd = @exec("#{@$} new foobar #{test_path} --foo bar")
+
+    cmd.code.should.eql(0)
+    fs.existsSync(path.join(test_path, 'index.html')).should.be.ok
+    contents = fs.readFileSync(path.join(test_path, 'index.html'), 'utf8')
+    contents.should.match /bar/
+    rm('-rf', test_path)
+    rmcmd = @exec("#{@$} remove foobar")
+
   it '[init] creates a project with multiple inquirer inputs'
   it '[init] errors when prompt entry doesn\'t pass validation'
   it '[init] executes before function'
   it '[init] executes after function'
   it '[init] includes String.js in ejs compilation'
   it '[init] errors when template does not have `root` directory'
-  it '[init] errors when template does not have and `init.coffee` in root dir'
+  it '[init] errors when template does not have `init.coffee` in root dir'
   it '[init] errors when template has malformed `init.coffee`'
   it '[init] errors when template does not have and `init.coffee` in root dir'
   it '[init] does not error when ejs has a key not present in @config_values'
-  it '[new] runs sprout.init when `sprout new` is attempted'
   it '[add] replaces existing template on add'

From 73c2adf1c4bf42afe11fd0ae4754730d60b73be3 Mon Sep 17 00:00:00 2001
From: Kyle MacDonald <kyle@carrotcreative.com>
Date: Sat, 22 Mar 2014 17:26:31 -0400
Subject: [PATCH 06/10] allow sprout.add to override existing template

---
 lib/api/add.coffee                   |   4 +
 lib/api/init.coffee                  |   2 +
 test/fixtures/after/init.coffee      |  10 +++
 test/fixtures/basic/init.coffee      |   2 +-
 test/fixtures/before/init.coffee     |   7 --
 test/fixtures/before/root/index.html |   1 -
 test/test.coffee                     | 105 ++++++++++++++++++---------
 7 files changed, 88 insertions(+), 43 deletions(-)
 delete mode 100644 test/fixtures/before/init.coffee
 delete mode 100644 test/fixtures/before/root/index.html

diff --git a/lib/api/add.coffee b/lib/api/add.coffee
index 562f6e7..1d0ded1 100644
--- a/lib/api/add.coffee
+++ b/lib/api/add.coffee
@@ -16,6 +16,7 @@ class Add extends Base
       .then(determine_if_local)
       .then(assure_local_template_exists)
       .then(set_branch)
+      .then(remove_existing_template)
       .then(link_project)
       .then(handle_branch_checkout)
       .yield("template '#{@name}' added")
@@ -64,6 +65,9 @@ class Add extends Base
       @template = @template.replace(branch_matcher, '')
     W.resolve()
 
+  remove_existing_template = ->
+    nodefn.call(exec, "rm -rf #{@path(@name)}")
+
   link_project = ->
     cmd = "git clone #{@template} #{@path(@name)}"
     cmd = "rm -rf #{@path(@name)}; ln -s #{@template} #{@path(@name)}" if @local
diff --git a/lib/api/init.coffee b/lib/api/init.coffee
index 786eb0b..2dbfd5d 100644
--- a/lib/api/init.coffee
+++ b/lib/api/init.coffee
@@ -104,7 +104,9 @@ class Init extends Base
 
   run_user_after_function = ->
     if not @config.after then return W.resolve()
+    console.log "this has an after hook"
     nodefn.call(@config.after, @)
+      .done(-> W.resolve())
 
 module.exports = (opts) ->
   (new Init()).execute(opts)
diff --git a/test/fixtures/after/init.coffee b/test/fixtures/after/init.coffee
index 367b8eb..f00e7a0 100644
--- a/test/fixtures/after/init.coffee
+++ b/test/fixtures/after/init.coffee
@@ -1,3 +1,7 @@
+fs = require 'fs'
+path = require 'path'
+nodefn = require 'when/node/function'
+
 exports.configure = [
   {
     type: 'input',
@@ -5,3 +9,9 @@ exports.configure = [
     message: 'What is foo?'
   }
 ]
+
+exports.after = (sprout, done) ->
+  original = path.join(sprout.target, 'index.html')
+  target   = path.join(sprout.target, 'findex.html')
+  nodefn.call(fs.rename, original, target)
+    .then((-> console.log "foo"; done()), done)
diff --git a/test/fixtures/basic/init.coffee b/test/fixtures/basic/init.coffee
index 367b8eb..29fac44 100644
--- a/test/fixtures/basic/init.coffee
+++ b/test/fixtures/basic/init.coffee
@@ -2,6 +2,6 @@ exports.configure = [
   {
     type: 'input',
     name: 'foo',
-    message: 'What is foo?'
+    message: 'What is basic foo?'
   }
 ]
diff --git a/test/fixtures/before/init.coffee b/test/fixtures/before/init.coffee
deleted file mode 100644
index 367b8eb..0000000
--- a/test/fixtures/before/init.coffee
+++ /dev/null
@@ -1,7 +0,0 @@
-exports.configure = [
-  {
-    type: 'input',
-    name: 'foo',
-    message: 'What is foo?'
-  }
-]
diff --git a/test/fixtures/before/root/index.html b/test/fixtures/before/root/index.html
deleted file mode 100644
index 6d63a07..0000000
--- a/test/fixtures/before/root/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>foo === <%= foo %></p>
diff --git a/test/test.coffee b/test/test.coffee
index 835f963..dc17512 100644
--- a/test/test.coffee
+++ b/test/test.coffee
@@ -5,11 +5,9 @@ should = require 'should'
 _path  = path.join(__dirname, 'fixtures')
 sprout = require '..'
 
-# remote template
 test_template_url  = 'https://github.com/carrot/sprout-test-template.git'
-
-# local template
-test_template_path     = path.join(_path, 'basic')
+test_template_path = path.join(_path, 'basic')
+test_path          = path.join(__dirname, 'testproj')
 
 before ->
   @exec = (cmd) -> exec(cmd, {silent: true})
@@ -39,9 +37,25 @@ describe 'js api', ->
       .tap(-> fs.existsSync(sprout.path('foobar')).should.not.be.ok)
       .done((-> done()), done)
 
+  it '[add] replaces existing template on add', (done) ->
+    sprout.add(name: 'foobar', template: test_template_path)
+      .tap(->
+        fs.existsSync(sprout.path('foobar')).should.be.ok
+        contents = fs.readFileSync(path.join(sprout.path('foobar'), 'init.coffee'), 'utf8')
+        contents.should.match /basic foo/
+      )
+      .then(-> sprout.add(name: 'foobar', template: test_template_url))
+      .tap(->
+        fs.existsSync(sprout.path('foobar')).should.be.ok
+        contents = fs.readFileSync(path.join(sprout.path('foobar'), 'init.coffee'), 'utf8')
+        contents.should.match /is foo/
+      )
+      .then(-> sprout.remove('foobar'))
+      .done((-> done()), done)
+
   it '[list] lists available templates', (done) ->
     start = sprout.list().length
-    sprout.add(name: 'foobar', template: test_template_url)
+    sprout.add(name: 'foobar', template: test_template_path, options: {foo: 'bar'})
       .tap(-> sprout.list().length.should.eql(start + 1))
       .then(-> sprout.remove('foobar'))
       .done((-> done()), done)
@@ -55,10 +69,9 @@ describe 'js api', ->
       .catch((err) -> should.exist(err); done())
 
   it '[init] creates a project template correctly', (done) ->
-    basic_path = path.join(__dirname, 'fixtures/basic')
-    test_path = path.join(__dirname, 'testproj')
+    test_template = path.join(_path, 'basic')
 
-    sprout.add(name: 'foobar', template: test_template_path)
+    sprout.add(name: 'foobar', template: test_template)
       .then(-> sprout.init(name: 'foobar', path: test_path, options: { foo: 'bar'}))
       .tap(->
         fs.existsSync(path.join(test_path, 'index.html')).should.be.ok
@@ -70,9 +83,6 @@ describe 'js api', ->
       .done((-> done()), done)
 
   it '[init] creates a project template from a branch', (done) ->
-    basic_path = path.join(__dirname, 'fixtures/basic')
-    test_path = path.join(__dirname, 'testproj')
-
     sprout.add(name: 'foobar', template: "#{test_template_url}#alt")
       .then(-> sprout.init(name: 'foobar', path: test_path, options: { foo: 'bar' }))
       .tap(->
@@ -82,27 +92,58 @@ describe 'js api', ->
       ).then(-> sprout.remove('foobar'))
       .done((-> done()), done)
 
-  it "[init] creates a project by overriding inquirer's question types", (done) ->
-    basic_path = path.join(__dirname, 'fixtures/override')
-    test_path  = path.join(__dirname, 'testproj')
-    opts =
-      foo: "bar"
-      snow: true
-      size: "Medium"
-      liquid: '7up'
-
-    sprout.add(name: 'foobar', template: basic_path)
-      .then(-> sprout.init(name: 'foobar', path: test_path, options: opts))
+  # it "[init] creates a project by overriding inquirer's question types", (done) ->
+  #   test_template = path.join(_path, 'override')
+  #
+  #   opts =
+  #     foo: "bar"
+  #     snow: true
+  #     size: "Medium"
+  #     liquid: '7up'
+  #
+  #   sprout.add(name: 'foobar', template: test_template)
+  #     .then(-> sprout.init(name: 'foobar', path: test_path, options: opts))
+  #     .tap(->
+  #       contents = fs.readFileSync(path.join(test_path, 'index.html'), 'utf8')
+  #       contents.should.match /foo/
+  #       contents.should.match /you know nothing jon snow/
+  #       contents.should.match /Medium/
+  #       contents.should.match /7up/
+  #       rm('-rf', test_path)
+  #     ).then(-> sprout.remove('foobar'))
+  #     .done((-> done()), done)
+
+  it '[init] executes before function', (done) ->
+    test_template = path.join(_path, 'before')
+    new_path      = path.join(__dirname, 'newproj')
+
+    sprout.add(name: 'foobar', template: test_template)
+      .then(-> sprout.init(name: 'foobar', path: test_path, options: {foo: 'bar'}))
       .tap(->
-        contents = fs.readFileSync(path.join(test_path, 'index.html'), 'utf8')
-        contents.should.match /foo/
-        contents.should.match /you know nothing jon snow/
-        contents.should.match /Medium/
-        contents.should.match /7up/
-        rm('-rf', test_path)
-      ).then(-> sprout.remove('foobar'))
+        p = path.join(new_path, 'index.html')
+        exists = fs.existsSync(p).should.be.ok
+        contents = fs.readFileSync(path.join(new_path, 'index.html'), 'utf8')
+        contents.should.match /bar/
+        rm('-rf', new_path)
+      )
+      .then(-> sprout.remove('foobar'))
       .done((-> done()), done)
 
+  # it '[init] executes after function', (done) ->
+  #   test_template = path.join(_path, 'after')
+  #
+  #   sprout.add(name: 'foobar', template: test_template)
+  #     .then(-> sprout.init(name: 'foobar', path: test_path, options: {foo: 'bar'}))
+  #     .tap(->
+  #       fs.existsSync(path.join(test_path, 'findex.html')).should.be.ok
+  #       contents = fs.readFileSync(path.join(test_path, 'findex.html'), 'utf8')
+  #       contents.should.match /bar/
+  #       rm('-rf', test_path)
+  #     )
+  #     .then(-> sprout.remove('foobar'))
+  #     # .catch((err) -> console.log "after error:", err)
+  #     .done((-> done()), done)
+
 describe 'cli', ->
 
   it '[add] errors when no args provided', ->
@@ -141,7 +182,6 @@ describe 'cli', ->
     cmd.code.should.be.above(0)
 
   it '[init] creates a project template correctly', ->
-    test_path = path.join(__dirname, 'testproj')
     cmd = @exec("#{@$} add foobar #{test_template_url}")
     cmd.code.should.eql(0)
     cmd = @exec("#{@$} init foobar #{test_path} --foo bar")
@@ -154,7 +194,6 @@ describe 'cli', ->
     rmcmd = @exec("#{@$} remove foobar")
 
   it '[new] runs sprout.init when `sprout new` is attempted', ->
-    test_path = path.join(__dirname, 'testproj')
     cmd = @exec("#{@$} add foobar #{test_template_url}")
     cmd.code.should.eql(0)
     cmd = @exec("#{@$} new foobar #{test_path} --foo bar")
@@ -168,12 +207,10 @@ describe 'cli', ->
 
   it '[init] creates a project with multiple inquirer inputs'
   it '[init] errors when prompt entry doesn\'t pass validation'
-  it '[init] executes before function'
-  it '[init] executes after function'
+
   it '[init] includes String.js in ejs compilation'
   it '[init] errors when template does not have `root` directory'
   it '[init] errors when template does not have `init.coffee` in root dir'
   it '[init] errors when template has malformed `init.coffee`'
   it '[init] errors when template does not have and `init.coffee` in root dir'
   it '[init] does not error when ejs has a key not present in @config_values'
-  it '[add] replaces existing template on add'

From a3b7db8d60ceecc1da696c023c1dcb9704851dde Mon Sep 17 00:00:00 2001
From: Kyle MacDonald <kyle@carrotcreative.com>
Date: Mon, 24 Mar 2014 20:56:56 -0400
Subject: [PATCH 07/10] before/after hook tests

---
 lib/api/add.coffee                   | 14 +++--
 lib/api/init.coffee                  | 21 ++------
 readme.md                            |  2 +-
 test/fixtures/after/init.coffee      |  4 +-
 test/fixtures/basic/init.coffee      |  2 +-
 test/fixtures/before/init.coffee     | 15 ++++++
 test/fixtures/before/root/index.html |  1 +
 test/test.coffee                     | 81 ++++++++++++++--------------
 8 files changed, 70 insertions(+), 70 deletions(-)
 create mode 100644 test/fixtures/before/init.coffee
 create mode 100644 test/fixtures/before/root/index.html

diff --git a/lib/api/add.coffee b/lib/api/add.coffee
index 1d0ded1..c3bf201 100644
--- a/lib/api/add.coffee
+++ b/lib/api/add.coffee
@@ -14,7 +14,7 @@ class Add extends Base
   execute: (opts) ->
     configure_options.call(@, opts).with(@)
       .then(determine_if_local)
-      .then(assure_local_template_exists)
+      .then(ensure_local_template_exists)
       .then(set_branch)
       .then(remove_existing_template)
       .then(link_project)
@@ -46,15 +46,13 @@ class Add extends Base
       @local = true
     W.resolve()
 
-  assure_local_template_exists = ->
+  ensure_local_template_exists = ->
     if not @local then return W.resolve()
     if not which.sync('git')
-      return W.reject('you need to have git installed')
+      throw W.reject('you need to have git installed')
 
-    test = fs.existsSync(path.normalize(@template))
-    if not test
-      return W.reject("there is no sprout template located at '#{@template}'")
-    W.resolve()
+    if not fs.existsSync(path.normalize(@template))
+      throw W.reject("there is no sprout template located at '#{@template}'")
 
   set_branch = ->
     if @local then return W.resolve()
@@ -70,7 +68,7 @@ class Add extends Base
 
   link_project = ->
     cmd = "git clone #{@template} #{@path(@name)}"
-    cmd = "rm -rf #{@path(@name)}; ln -s #{@template} #{@path(@name)}" if @local
+    if @local then cmd = "rm -rf #{@path(@name)} && ln -s #{@template} #{@path(@name)}"
     nodefn.call(exec, cmd)
 
   handle_branch_checkout = ->
diff --git a/lib/api/init.coffee b/lib/api/init.coffee
index 2dbfd5d..4b27d49 100644
--- a/lib/api/init.coffee
+++ b/lib/api/init.coffee
@@ -24,7 +24,7 @@ class Init extends Base
       .then(remove_overrides_from_prompt)
       .then(prompt_user_for_answers)
       .then(merge_config_values_with_overrides)
-      .then(assure_template_is_updated)
+      .then(ensure_template_is_updated)
       .then(copy_template)
       .then(replace_ejs)
       .then(run_user_after_function)
@@ -75,20 +75,9 @@ class Init extends Base
       .then((o) => @answers = o)
 
   merge_config_values_with_overrides = ->
-    response = {}
-    _.each @answers, (k,i) ->
-      if k.hasOwnProperty('input')
-        response[k.name] = k.input
-      else if k.hasOwnProperty('confirm')
-        response[k.name] = k.confirm
-      else if k.hasOwnProperty('rawlist')
-        response[k.name] = k.rawlist
-      else if k.hasOwnProperty('list')
-        response[k.name] = k.list
-
-    @config_values = _.assign(response, @options)
-
-  assure_template_is_updated = ->
+    @config_values = _.assign(@answers, @options)
+
+  ensure_template_is_updated = ->
     nodefn.call(exec, "cd #{@sprout_path} && git pull")
       .catch(-> return W.resolve())
 
@@ -104,9 +93,7 @@ class Init extends Base
 
   run_user_after_function = ->
     if not @config.after then return W.resolve()
-    console.log "this has an after hook"
     nodefn.call(@config.after, @)
-      .done(-> W.resolve())
 
 module.exports = (opts) ->
   (new Init()).execute(opts)
diff --git a/readme.md b/readme.md
index 014b322..f53db7b 100644
--- a/readme.md
+++ b/readme.md
@@ -172,7 +172,7 @@ exports.configure = [
 # extra files etc. You have the full power of node at your fingertips here.
 exports.after = (sprout, done) ->
   console.log sprout.config_values # all the config values you collected
-  if not sprout.config_values.travis == true then sprout.remove('.travis.yml')
+  if not sprout.config_values.travis then sprout.remove('.travis.yml')
   done()
 
 ```
diff --git a/test/fixtures/after/init.coffee b/test/fixtures/after/init.coffee
index f00e7a0..12a88e2 100644
--- a/test/fixtures/after/init.coffee
+++ b/test/fixtures/after/init.coffee
@@ -2,7 +2,7 @@ fs = require 'fs'
 path = require 'path'
 nodefn = require 'when/node/function'
 
-exports.configure = [
+exports.refigure = [
   {
     type: 'input',
     name: 'foo',
@@ -14,4 +14,4 @@ exports.after = (sprout, done) ->
   original = path.join(sprout.target, 'index.html')
   target   = path.join(sprout.target, 'findex.html')
   nodefn.call(fs.rename, original, target)
-    .then((-> console.log "foo"; done()), done)
+    .done((-> done()), done)
diff --git a/test/fixtures/basic/init.coffee b/test/fixtures/basic/init.coffee
index 29fac44..241a9e9 100644
--- a/test/fixtures/basic/init.coffee
+++ b/test/fixtures/basic/init.coffee
@@ -2,6 +2,6 @@ exports.configure = [
   {
     type: 'input',
     name: 'foo',
-    message: 'What is basic foo?'
+    message: 'What is basic foo from basic/init.coffee?'
   }
 ]
diff --git a/test/fixtures/before/init.coffee b/test/fixtures/before/init.coffee
new file mode 100644
index 0000000..9de1de9
--- /dev/null
+++ b/test/fixtures/before/init.coffee
@@ -0,0 +1,15 @@
+fs = require 'fs'
+path = require 'path'
+
+exports.before = (sprout, done) ->
+  sprout.target = sprout.target.replace('testproj', 'newproj')
+  done()
+
+
+exports.configure = [
+  {
+    type: 'input',
+    name: 'foo',
+    message: 'What is foo?'
+  }
+]
diff --git a/test/fixtures/before/root/index.html b/test/fixtures/before/root/index.html
new file mode 100644
index 0000000..5473ef2
--- /dev/null
+++ b/test/fixtures/before/root/index.html
@@ -0,0 +1 @@
+<p>foo = <%= foo %></p>
diff --git a/test/test.coffee b/test/test.coffee
index dc17512..7a05cd1 100644
--- a/test/test.coffee
+++ b/test/test.coffee
@@ -83,42 +83,42 @@ describe 'js api', ->
       .done((-> done()), done)
 
   it '[init] creates a project template from a branch', (done) ->
-    sprout.add(name: 'foobar', template: "#{test_template_url}#alt")
-      .then(-> sprout.init(name: 'foobar', path: test_path, options: { foo: 'bar' }))
+    sprout.add(name: 'foobar-2', template: "#{test_template_url}#alt")
+      .then(-> sprout.init(name: 'foobar-2', path: test_path, options: { foo: 'bar' }))
       .tap(->
         contents = fs.readFileSync(path.join(test_path, 'index.html'), 'utf8')
         contents.should.match /alternate/
         rm('-rf', test_path)
-      ).then(-> sprout.remove('foobar'))
+      ).then(-> sprout.remove('foobar-2'))
       .done((-> done()), done)
 
-  # it "[init] creates a project by overriding inquirer's question types", (done) ->
-  #   test_template = path.join(_path, 'override')
-  #
-  #   opts =
-  #     foo: "bar"
-  #     snow: true
-  #     size: "Medium"
-  #     liquid: '7up'
-  #
-  #   sprout.add(name: 'foobar', template: test_template)
-  #     .then(-> sprout.init(name: 'foobar', path: test_path, options: opts))
-  #     .tap(->
-  #       contents = fs.readFileSync(path.join(test_path, 'index.html'), 'utf8')
-  #       contents.should.match /foo/
-  #       contents.should.match /you know nothing jon snow/
-  #       contents.should.match /Medium/
-  #       contents.should.match /7up/
-  #       rm('-rf', test_path)
-  #     ).then(-> sprout.remove('foobar'))
-  #     .done((-> done()), done)
+  it "[init] creates a project by overriding inquirer's question types", (done) ->
+    test_template = path.join(_path, 'override')
+
+    opts =
+      foo: "bar"
+      snow: true
+      size: "Medium"
+      liquid: '7up'
+
+    sprout.add(name: 'foobar', template: test_template)
+      .then(-> sprout.init(name: 'foobar', path: test_path, options: opts))
+      .tap(->
+        contents = fs.readFileSync(path.join(test_path, 'index.html'), 'utf8')
+        contents.should.match /foo/
+        contents.should.match /you know nothing jon snow/
+        contents.should.match /Medium/
+        contents.should.match /7up/
+        rm('-rf', test_path)
+      ).then(-> sprout.remove('foobar'))
+      .done((-> done()), done)
 
   it '[init] executes before function', (done) ->
     test_template = path.join(_path, 'before')
     new_path      = path.join(__dirname, 'newproj')
 
-    sprout.add(name: 'foobar', template: test_template)
-      .then(-> sprout.init(name: 'foobar', path: test_path, options: {foo: 'bar'}))
+    sprout.add(name: 'foobar-3', template: test_template)
+      .then(-> sprout.init(name: 'foobar-3', path: test_path, options: {foo: 'bar'}))
       .tap(->
         p = path.join(new_path, 'index.html')
         exists = fs.existsSync(p).should.be.ok
@@ -126,23 +126,22 @@ describe 'js api', ->
         contents.should.match /bar/
         rm('-rf', new_path)
       )
-      .then(-> sprout.remove('foobar'))
+      .then(-> sprout.remove('foobar-3'))
       .done((-> done()), done)
 
-  # it '[init] executes after function', (done) ->
-  #   test_template = path.join(_path, 'after')
-  #
-  #   sprout.add(name: 'foobar', template: test_template)
-  #     .then(-> sprout.init(name: 'foobar', path: test_path, options: {foo: 'bar'}))
-  #     .tap(->
-  #       fs.existsSync(path.join(test_path, 'findex.html')).should.be.ok
-  #       contents = fs.readFileSync(path.join(test_path, 'findex.html'), 'utf8')
-  #       contents.should.match /bar/
-  #       rm('-rf', test_path)
-  #     )
-  #     .then(-> sprout.remove('foobar'))
-  #     # .catch((err) -> console.log "after error:", err)
-  #     .done((-> done()), done)
+  it '[init] executes after function', (done) ->
+    test_template = path.join(_path, 'after')
+
+    sprout.add(name: 'foobar-4', template: test_template)
+      .then(-> sprout.init(name: 'foobar-4', path: test_path, options: {foo: 'bar'}))
+      .tap(->
+        fs.existsSync(path.join(test_path, 'findex.html')).should.be.ok
+        contents = fs.readFileSync(path.join(test_path, 'findex.html'), 'utf8')
+        contents.should.match /bar/
+        rm('-rf', test_path)
+      )
+      .then(-> sprout.remove('foobar-4'))
+      .done((-> done()), done)
 
 describe 'cli', ->
 
@@ -207,10 +206,10 @@ describe 'cli', ->
 
   it '[init] creates a project with multiple inquirer inputs'
   it '[init] errors when prompt entry doesn\'t pass validation'
-
   it '[init] includes String.js in ejs compilation'
   it '[init] errors when template does not have `root` directory'
   it '[init] errors when template does not have `init.coffee` in root dir'
   it '[init] errors when template has malformed `init.coffee`'
   it '[init] errors when template does not have and `init.coffee` in root dir'
   it '[init] does not error when ejs has a key not present in @config_values'
+  it '[add] errors when a local template is added but doesn\'t actually exist'

From b68cebac0131e03ebced5eb231fa50d820f5e388 Mon Sep 17 00:00:00 2001
From: Kyle MacDonald <kyle@carrotcreative.com>
Date: Tue, 25 Mar 2014 12:17:39 -0400
Subject: [PATCH 08/10] inject string.js to ejs templates

---
 lib/api/init.coffee                 |  5 +++--
 package.json                        |  4 ++--
 readme.md                           |  8 ++++++++
 test/fixtures/stringjs/init.coffee  |  7 +++++++
 test/fixtures/stringjs/root/user.rb |  3 +++
 test/test.coffee                    | 15 ++++++++++++++-
 6 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 test/fixtures/stringjs/init.coffee
 create mode 100644 test/fixtures/stringjs/root/user.rb

diff --git a/lib/api/init.coffee b/lib/api/init.coffee
index 4b27d49..fec52d1 100644
--- a/lib/api/init.coffee
+++ b/lib/api/init.coffee
@@ -7,9 +7,9 @@ readdirp = require 'readdirp'
 ncp = require('ncp').ncp
 exec = require('child_process').exec
 ejs = require 'ejs'
-prompt = require 'prompt'
 inquirer = require 'inquirer'
 Base = require '../base'
+S = require 'string'
 _ = require 'lodash'
 
 class Init extends Base
@@ -87,8 +87,9 @@ class Init extends Base
   replace_ejs = ->
     nodefn.call(readdirp, { root: @target })
       .tap (res) =>
+        ejs_options = _.extend(@config_values, {S: S})
         res.files.map (f) =>
-          out = ejs.render(fs.readFileSync(f.fullPath, 'utf8'), @config_values)
+          out = ejs.render(fs.readFileSync(f.fullPath, 'utf8'), ejs_options)
           fs.writeFileSync(f.fullPath, out)
 
   run_user_after_function = ->
diff --git a/package.json b/package.json
index f8abd82..8ef1d07 100644
--- a/package.json
+++ b/package.json
@@ -32,13 +32,13 @@
     "rimraf": "2.x",
     "ncp": "0.5.x",
     "ejs": "0.8.x",
-    "prompt": "0.2.x",
     "readdirp": "0.3.x",
     "when": "3.x",
     "mkdirp": "0.3.x",
     "which": "1.0.x",
     "inquirer": "0.4.x",
-    "lodash": "2.4.x"
+    "lodash": "2.4.x",
+    "string": "1.8.x"
   },
   "devDependencies": {
     "mocha": "*",
diff --git a/readme.md b/readme.md
index f53db7b..59b7847 100644
--- a/readme.md
+++ b/readme.md
@@ -131,6 +131,7 @@ license.md
 
 So a folder called `root` where the actual template goes, an `init.coffee` where we'll set up the config and stuff, and then any other files you need like a readme and license, which will *not* be included with the template. If you don't want any config options, you don't even need the `init.coffee`, just the `root` folder with the files in it and that's it. But let's assume you are after some additional configuration and jump into `init.coffee`.
 
+
 ```coffee
 
 # This function is executed before any of the configuration happens.
@@ -177,4 +178,11 @@ exports.after = (sprout, done) ->
 
 ```
 
+We also provide you the power of [String.js](http://stringjs.com/) in all of your ejs templates. This means you can run powerful string operations on your user input like:
+
+```js
+class <%= S('user_model').capialize().s; %> // given 'user_model' is prompted by your init.coffee
+```
+
+
 So between this config file and the root folder, you should be able to make anything happen fairly easily. If not, please open up and issue and we'll try to make it happening-er and/or easier for you : )
diff --git a/test/fixtures/stringjs/init.coffee b/test/fixtures/stringjs/init.coffee
new file mode 100644
index 0000000..a4d670c
--- /dev/null
+++ b/test/fixtures/stringjs/init.coffee
@@ -0,0 +1,7 @@
+exports.configure = [
+  {
+    type: 'input',
+    name: 'user_model',
+    message: 'What is the name of your user model?'
+  }
+]
diff --git a/test/fixtures/stringjs/root/user.rb b/test/fixtures/stringjs/root/user.rb
new file mode 100644
index 0000000..09d5a7d
--- /dev/null
+++ b/test/fixtures/stringjs/root/user.rb
@@ -0,0 +1,3 @@
+class <%= S(user_model).capitalize().s %>
+  attr_accessor :name
+end
diff --git a/test/test.coffee b/test/test.coffee
index 7a05cd1..daf50f1 100644
--- a/test/test.coffee
+++ b/test/test.coffee
@@ -143,6 +143,20 @@ describe 'js api', ->
       .then(-> sprout.remove('foobar-4'))
       .done((-> done()), done)
 
+  it '[init] includes String.js in ejs compilation', (done) ->
+    test_template = path.join(_path, 'stringjs')
+
+    sprout.add(name: 'foobar-5', template: test_template)
+      .then(-> sprout.init(name: 'foobar-5', path: test_path, options: {user_model: 'user'}))
+      .tap(->
+        fs.existsSync(path.join(test_path, 'user.rb')).should.be.ok
+        contents = fs.readFileSync(path.join(test_path, 'user.rb'), 'utf8')
+        contents.should.match /class User/
+        rm('-rf', test_path)
+      )
+      .then(-> sprout.remove('foobar-5'))
+      .done((-> done()), done)
+
 describe 'cli', ->
 
   it '[add] errors when no args provided', ->
@@ -206,7 +220,6 @@ describe 'cli', ->
 
   it '[init] creates a project with multiple inquirer inputs'
   it '[init] errors when prompt entry doesn\'t pass validation'
-  it '[init] includes String.js in ejs compilation'
   it '[init] errors when template does not have `root` directory'
   it '[init] errors when template does not have `init.coffee` in root dir'
   it '[init] errors when template has malformed `init.coffee`'

From 96a38b29b2bbbe01cefb9df56bb1b875437e0d3c Mon Sep 17 00:00:00 2001
From: Kyle MacDonald <kyle@carrotcreative.com>
Date: Tue, 25 Mar 2014 15:36:55 -0400
Subject: [PATCH 09/10] feedback clean up commit

---
 bin/sprout          |  2 +-
 lib/api/add.coffee  | 13 +++++++------
 lib/api/init.coffee |  4 ++--
 readme.md           |  1 -
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/sprout b/bin/sprout
index 2a3b9d2..db16b84 100755
--- a/bin/sprout
+++ b/bin/sprout
@@ -7,7 +7,7 @@ var argv = require('optimist').argv,
     commands = require('../lib/api');
 
 // add sprout.new alias
-commands['new'] = function() { return undefined; };
+commands['new'] = function(){};
 
 // get command
 var name = argv._.splice(0,1)[0];
diff --git a/lib/api/add.coffee b/lib/api/add.coffee
index c3bf201..5039474 100644
--- a/lib/api/add.coffee
+++ b/lib/api/add.coffee
@@ -5,6 +5,7 @@ exec = require('child_process').exec
 Base = require '../base'
 fs = require 'fs'
 path = require 'path'
+rimraf = require 'rimraf'
 url = require 'url'
 
 class Add extends Base
@@ -18,7 +19,7 @@ class Add extends Base
       .then(set_branch)
       .then(remove_existing_template)
       .then(link_project)
-      .then(handle_branch_checkout)
+      .then(checkout_branch)
       .yield("template '#{@name}' added")
 
   # @api private
@@ -49,10 +50,10 @@ class Add extends Base
   ensure_local_template_exists = ->
     if not @local then return W.resolve()
     if not which.sync('git')
-      throw W.reject('you need to have git installed')
+      return W.reject('you need to have git installed')
 
     if not fs.existsSync(path.normalize(@template))
-      throw W.reject("there is no sprout template located at '#{@template}'")
+      return W.reject("there is no sprout template located at '#{@template}'")
 
   set_branch = ->
     if @local then return W.resolve()
@@ -64,16 +65,16 @@ class Add extends Base
     W.resolve()
 
   remove_existing_template = ->
-    nodefn.call(exec, "rm -rf #{@path(@name)}")
+    nodefn.call(rimraf, @path(@name))
 
   link_project = ->
     cmd = "git clone #{@template} #{@path(@name)}"
     if @local then cmd = "rm -rf #{@path(@name)} && ln -s #{@template} #{@path(@name)}"
     nodefn.call(exec, cmd)
 
-  handle_branch_checkout = ->
+  checkout_branch = ->
     if not @branch then return W.resolve()
-    nodefn.call(exec, "cd #{@path(@name)}; git checkout #{@branch}")
+    nodefn.call(exec, "git checkout #{@branch}", {cwd: @path(@name)})
 
 module.exports = (opts) ->
   (new Add()).execute(opts)
diff --git a/lib/api/init.coffee b/lib/api/init.coffee
index fec52d1..3180798 100644
--- a/lib/api/init.coffee
+++ b/lib/api/init.coffee
@@ -1,7 +1,7 @@
 path = require 'path'
 fs = require 'fs'
 W = require 'when'
-nodefn = require 'when/node/function'
+nodefn = require 'when/node'
 nodecb = require 'when/callbacks'
 readdirp = require 'readdirp'
 ncp = require('ncp').ncp
@@ -47,6 +47,7 @@ class Init extends Base
     @target      = opts.path
     @options     = opts.options
     @sprout_path = @path(@name)
+    @answers     = {}
 
     if not fs.existsSync(@sprout_path)
       return W.reject("template '#{@name}' does not exist")
@@ -69,7 +70,6 @@ class Init extends Base
     @questions = _.reject(@config.configure, (v) -> _.contains(keys, v.name) )
 
   prompt_user_for_answers = ->
-    @answers = {}
     if not @questions.length then return W.resolve()
     nodecb.call(inquirer.prompt, @questions)
       .then((o) => @answers = o)
diff --git a/readme.md b/readme.md
index 59b7847..9116205 100644
--- a/readme.md
+++ b/readme.md
@@ -184,5 +184,4 @@ We also provide you the power of [String.js](http://stringjs.com/) in all of you
 class <%= S('user_model').capialize().s; %> // given 'user_model' is prompted by your init.coffee
 ```
 
-
 So between this config file and the root folder, you should be able to make anything happen fairly easily. If not, please open up and issue and we'll try to make it happening-er and/or easier for you : )

From f4c8bdad2746c2187fce51a8f59e5bd875fc12b4 Mon Sep 17 00:00:00 2001
From: Kyle MacDonald <kyle@carrotcreative.com>
Date: Wed, 26 Mar 2014 16:03:45 -0400
Subject: [PATCH 10/10] add additional test coverage

---
 lib/api/init.coffee                   |  5 ++++-
 test/fixtures/no-init/root/index.html |  1 -
 test/fixtures/no-root/.gitkeep        |  0
 test/mocha.opts                       |  2 +-
 test/test.coffee                      | 24 ++++++++++++++++++------
 5 files changed, 23 insertions(+), 9 deletions(-)
 delete mode 100644 test/fixtures/no-init/root/index.html
 create mode 100644 test/fixtures/no-root/.gitkeep

diff --git a/lib/api/init.coffee b/lib/api/init.coffee
index 3180798..b54c599 100644
--- a/lib/api/init.coffee
+++ b/lib/api/init.coffee
@@ -82,7 +82,10 @@ class Init extends Base
       .catch(-> return W.resolve())
 
   copy_template = ->
-    nodefn.call(ncp, path.join(@sprout_path, 'root'), @target)
+    root_path = path.join(@sprout_path, 'root')
+    if not fs.existsSync(root_path)
+      return W.reject('template does not contain root directory')
+    nodefn.call(ncp, root_path, @target)
 
   replace_ejs = ->
     nodefn.call(readdirp, { root: @target })
diff --git a/test/fixtures/no-init/root/index.html b/test/fixtures/no-init/root/index.html
deleted file mode 100644
index 95fd4a5..0000000
--- a/test/fixtures/no-init/root/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>no init file: <%= foo %></p>
diff --git a/test/fixtures/no-root/.gitkeep b/test/fixtures/no-root/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/test/mocha.opts b/test/mocha.opts
index d2e47df..8d6105c 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,3 +1,3 @@
 --reporter spec
 --compilers coffee:coffee-script/register
---timeout 5000
+--timeout 10000
diff --git a/test/test.coffee b/test/test.coffee
index daf50f1..87611e5 100644
--- a/test/test.coffee
+++ b/test/test.coffee
@@ -53,6 +53,13 @@ describe 'js api', ->
       .then(-> sprout.remove('foobar'))
       .done((-> done()), done)
 
+  it '[add] errors when a local template is added but doesn\'t actually exist', (done) ->
+    sprout.add(name: 'foobar', template: path.join(_path, 'not-there'))
+      .catch((err) ->
+        should.exist(err)
+        err.should.match /there is no sprout template located at/
+      ).done((-> done()), done)
+
   it '[list] lists available templates', (done) ->
     start = sprout.list().length
     sprout.add(name: 'foobar', template: test_template_path, options: {foo: 'bar'})
@@ -157,6 +164,15 @@ describe 'js api', ->
       .then(-> sprout.remove('foobar-5'))
       .done((-> done()), done)
 
+  it '[init] errors when template does not have `root` directory', (done) ->
+    test_template = path.join(_path, 'no-root')
+    sprout.add(name: 'foobar-6', template: test_template)
+      .then(-> sprout.init(name: 'foobar-6', path: test_path))
+      .catch((err) ->
+        should.exist(err)
+        err.should.match /template does not contain root directory/
+      ).done((-> done()), done)
+
 describe 'cli', ->
 
   it '[add] errors when no args provided', ->
@@ -218,11 +234,7 @@ describe 'cli', ->
     rm('-rf', test_path)
     rmcmd = @exec("#{@$} remove foobar")
 
+  # these tests require a better way of responding to the command-line
+  # prompts. they will remain stubbed for ref until a new solution is found
   it '[init] creates a project with multiple inquirer inputs'
   it '[init] errors when prompt entry doesn\'t pass validation'
-  it '[init] errors when template does not have `root` directory'
-  it '[init] errors when template does not have `init.coffee` in root dir'
-  it '[init] errors when template has malformed `init.coffee`'
-  it '[init] errors when template does not have and `init.coffee` in root dir'
-  it '[init] does not error when ejs has a key not present in @config_values'
-  it '[add] errors when a local template is added but doesn\'t actually exist'