Massively cleaned up

.gitignore

@@ -1,8 +1,8 @@
 *.swp
 angel
-reconfig
-unpacker
-*.hi
-*.o
+deploy
 testapp1.yesod
 testapp1/testapp1
+/dist/
+testapp1/*.hi
+testapp1/*.o

LICENSE

@@ -0,0 +1,30 @@
+Copyright (c)2012, Michael Snoyman
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Michael Snoyman nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Setup.hs

@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain

build.sh

@@ -1,10 +1,9 @@
 #!/bin/bash -xe
 
-sudo rm -rf /yesod-deploy
-sudo stop yesod-deploy-angel || true
-sudo rm -f /etc/init/yesod-deploy-angel.conf
-sudo rm -f /etc/nginx/sites-enabled/yesod-deploy.conf
-sudo /etc/init.d/nginx reload
+sudo ./clean.sh
+
+cabal build
+cp dist/build/deploy/deploy .
+strip deploy
 
-ghc -Wall -Werror --make deploy.hs && strip deploy
 sudo ./setup.sh

clean.sh

@@ -0,0 +1,7 @@
+#!/bin/bash -ex
+
+rm -rf /yesod-deploy
+stop yesod-deploy-angel || true
+rm -f /etc/init/yesod-deploy-angel.conf
+rm -f /etc/nginx/sites-enabled/yesod-deploy.conf
+/etc/init.d/nginx reload

package.sh

@@ -0,0 +1,15 @@
+#!/bin/bash -ex
+
+cabal clean
+cabal configure
+cabal build
+
+rm -rf yesod-deploy
+mkdir yesod-deploy
+
+cp dist/build/deploy/deploy `which angel` yesod-deploy
+strip yesod-deploy/*
+cp setup.sh yesod-deploy
+
+tar czfv yesod-deploy.tar.gz yesod-deploy
+rm -rf yesod-deploy

src/Angel.hs

@@ -0,0 +1,38 @@
+{-# LANGUAGE OverloadedStrings #-}
+-- | Generate an Angel config file.
+module Angel
+    ( angelFile
+    ) where
+
+import Prelude hiding (FilePath)
+import Data.Monoid (Monoid, mappend, mconcat)
+import Data.Text.Lazy.Builder (Builder, fromText, fromString)
+import Data.Text.Lazy.Builder.Int (decimal)
+import Filesystem.Path.CurrentOS (encodeString)
+import Config
+import Paths
+
+infixr 5 <>
+(<>) :: Monoid m => m -> m -> m
+(<>) = mappend
+
+-- | A block in an angel file for an individual webapp.
+angelBlock :: WebappPort -> Builder
+angelBlock (WebappPort w d p) =
+    fromText (deployName d) <> "-" <> fromText (webappHost w) <> " {\n" <>
+    "    exec = \"env PORT=" <> decimal p <> " " <> fromString (encodeString $ webappExec w) <> "\"\n" <>
+    "    directory = \"" <> fromString (encodeString $ deployDirectory d) <> "\"\n" <>
+    "}\n\n"
+
+-- | Generate the deploy block, for monitoring this program.
+deployBlock :: RootDir -> Builder
+deployBlock rootDir =
+    "deploy {\n" <>
+    "    exec = \"" <> rootDir' <> "bin/deploy " <> rootDir' <> "\"\n" <>
+    "}\n\n"
+  where
+    rootDir' = fromString $ encodeString rootDir
+
+-- | The full text of the angel config file.
+angelFile :: RootDir -> Deploys -> Builder
+angelFile rootDir ds = deployBlock rootDir <> mconcat (map angelBlock $ webappPorts ds)