Merge pull request #596 from jenius/deploy-polish

deploy using production settings if present

lib/api/deploy.coffee

@@ -1,14 +1,28 @@
-W    = require 'when'
-Ship = require 'ship'
+W      = require 'when'
+fs     = require 'fs'
+path   = require 'path'
+Ship   = require 'ship'
+Config = require '../config'
 
 class Deploy
   constructor: (@project) ->
 
   exec: (opts = {}) ->
     __track('api', { name: 'deploy', deployer: opts.to })
 
-    @project.compile()
-    .then => new Ship(root: @project.root, deployer: opts.to)
+    @project.clean()
+    .then =>
+      # So in reality, compile should take an env parameter. It does not at the
+      # moment though probably for performance reasons, so we can hack around
+      # this to get a compile in a different env. This should be refactored.
+      if fs.existsSync(path.join(@project.root, 'app.production.coffee'))
+        @project.config = new Config(@project, { env: 'production' })
+    .then => @project.compile()
+    .then =>
+      if fs.existsSync(path.join(@project.root, 'ship.production.conf'))
+        new Ship(root: @project.root, deployer: opts.to, env: 'production')
+      else
+        new Ship(root: @project.root, deployer: opts.to)
     .tap (ship) ->
       if not ship.is_configured()
         ship.config_prompt()

test/deploy.coffee

@@ -17,3 +17,33 @@ describe 'deploy', ->
     project = new Roots(p)
 
     project.deploy(to: 'nowhere').should.be.fulfilled
+
+  it 'compiles before deploy', ->
+    p = path.join(base_path, 'deploy/compile')
+    project = new Roots(p)
+
+    project.deploy(to: 'nowhere')
+    .then -> path.join(p, 'public').should.be.a.directory()
+    .then -> path.join(p, 'public/index.html').should.be.a.file()
+    .should.be.fulfilled
+
+  it 'removes previous output folder before compiling', ->
+    p = path.join(base_path, 'deploy/remove_prev')
+    project = new Roots(p)
+
+    fs.mkdirSync(path.join(p, 'public'))
+    fs.writeFileSync(path.join(p, 'public/foo.html'), 'foo bar')
+
+    project.deploy(to: 'nowhere')
+    .tap -> path.join(p, 'public/foo.html').should.not.be.a.path()
+    .tap -> path.join(p, 'public/index.html').should.be.a.file()
+    .should.be.fulfilled
+
+  it 'compiles with app.production.coffee if available', ->
+    p = path.join(base_path, 'deploy/production')
+    project = new Roots(p)
+
+    project.deploy(to: 'nowhere')
+    .then -> path.join(p, 'public/index.html').should.have.content('production')
+    .catch(console.log)
+    .should.be.fulfilled

test/fixtures/deploy/compile/index.html

@@ -0,0 +1 @@
+<p>this should be compiled to itself</p>

test/fixtures/deploy/compile/ship.conf

@@ -0,0 +1,2 @@
+nowhere:
+  nothing: wow

test/fixtures/deploy/production/app.coffee

@@ -0,0 +1,2 @@
+locals:
+  env: 'development'

test/fixtures/deploy/production/app.production.coffee

@@ -0,0 +1,2 @@
+locals:
+  env: 'production'

test/fixtures/deploy/production/index.jade

@@ -0,0 +1 @@
+= env

test/fixtures/deploy/production/package.json

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

test/fixtures/deploy/production/ship.conf

@@ -0,0 +1,2 @@
+nowhere:
+  nothing: wow

test/fixtures/deploy/remove_prev/index.html

@@ -0,0 +1 @@
+<p>here!</p>

test/fixtures/deploy/remove_prev/ship.conf

@@ -0,0 +1,2 @@
+nowhere:
+  nothing: wow