Merge 9a92d1f into 9b62cde

lib/index.coffee

@@ -13,6 +13,7 @@ module.exports = (opts) ->
     setup: ->
       W(opts).with(@)
         .then (opts) ->
+          opts.outdir ?= ''
           @opts = _.defaults(opts, {redirects: {}, rewrites: {}, headers: {}})
         .then ->
           W.all([write_headers.call(@), write_redirects.call(@)])
@@ -23,7 +24,7 @@ module.exports = (opts) ->
         str += "  #{k}: #{v}\n" for k, v of conf
         return str
       , ''
-      @util.write '_headers', res
+      @util.write path.join(@opts.outdir, '_headers'), res
 
     write_redirects = ->
       redirects = _.pick(@opts.redirects, codes)
@@ -37,4 +38,4 @@ module.exports = (opts) ->
           str += "#{k} #{v} #{code}\n"
         return str
       , ''
-      @util.write '_redirects', res
+      @util.write path.join(@opts.outdir, '_redirects'), res

package.json

@@ -13,11 +13,11 @@
   },
   "devDependencies": {
     "coffee-script": "1.7.x",
-    "mocha": "*",
-    "should": "*",
-    "roots": "3.0.0-rc.10",
     "coveralls": "2.x",
-    "istanbul": "0.3.x"
+    "istanbul": "0.3.x",
+    "mocha": "*",
+    "roots": "^3.1.0",
+    "should": "*"
   },
   "scripts": {
     "test": "mocha",

test/fixtures/outdir/app.coffee

@@ -0,0 +1,25 @@
+netlify = require '../../..'
+
+module.exports =
+  ignores: ["**/.DS_Store"]
+  extensions: [
+    netlify
+      outdir: 'customdir'
+      redirects:
+        '/news': '/blog'
+        '/news/:year/:month:/:date/:slug': '/blog/:year/:month/:date/:story_id'
+        '/news/*': '/blog/:splat'
+        '302':
+          '/temp_redirect': '/'
+        '404':
+          '/ecommerce': '/closed'
+      rewrites:
+        '/*': '/index.html'
+      headers:
+        '/protected/path':
+          'Cache-Control': 'max-age: 3000'
+          'Basic-Auth': 'username:password'
+        '/*':
+          'X-Frame-Options': 'DENY'
+          'X-XSS-Protection': '1; mode=block'
+  ]

test/fixtures/outdir/expected/_headers

@@ -0,0 +1,6 @@
+/protected/path
+  Cache-Control: max-age: 3000
+  Basic-Auth: username:password
+/*
+  X-Frame-Options: DENY
+  X-XSS-Protection: 1; mode=block

test/fixtures/outdir/expected/_redirects

@@ -0,0 +1,6 @@
+/* /index.html 200
+/news /blog 301
+/news/:year/:month:/:date/:slug /blog/:year/:month/:date/:story_id 301
+/news/* /blog/:splat 301
+/temp_redirect / 302
+/ecommerce /closed 404

test/fixtures/outdir/index.jade

@@ -0,0 +1 @@
+p hello world

test/fixtures/outdir/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "test",
+  "dependencies": {
+    "jade": "*"
+  }
+}

test/test.coffee

@@ -50,3 +50,11 @@ describe 'promises support', ->
     compiled = path.join(@public, '_redirects')
     expected = path.join(@public, 'expected', '_redirects')
     h.file.matches_file(compiled, expected).should.be.true
+
+describe 'custom output directory', ->
+
+  before (done) -> compile_fixture.call(@, 'outdir', -> done())
+
+  it 'compiles basic project to custom directory', ->
+    p = path.join(@public, '/customdir/index.html')
+    h.file.exists(p).should.be.ok