From 794ac1429c24e0a76e4a1a1dd697c85fba5de06d Mon Sep 17 00:00:00 2001
From: Christopher Rogers <chrissrogers@gmail.com>
Date: Tue, 17 Mar 2015 12:07:11 -0700
Subject: [PATCH] Reworks build

- Changes build target to ./build/
- Adds `make watch`
- Adds duo.json to clean list

Signed-off-by: Christopher Rogers <chrissrogers@gmail.com>
---
 .gitignore             |  5 ++---
 Makefile               | 22 ++++++++++++++--------
 package.json           |  3 ++-
 test/server/index.jade |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7d37cd69d..4e552d118 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,8 @@ npm-debug.log
 
 components/duo.json
 
+build
+
 test/build.js
 test/components
 test/server/pid.txt
-
-/recurly.js
-/recurly.min.js
diff --git a/Makefile b/Makefile
index 6e237c104..faab1a7f3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,28 @@
 BIN = node_modules/.bin
 DUO = $(BIN)/duo
 MINIFY = $(BIN)/uglifyjs
+WATCH = $(BIN)/wr
 DELEGATE = test test-browser test-sauce test-coverage
 
-recurly.js: node_modules
-	@$(DUO) --global recurly --stdout index.js > recurly.js
-	@$(MINIFY) recurly.js --output recurly.min.js
+BUILD = ./build
+WATCH_FILES = lib index.js component.json Makefile
+
+build: node_modules
+	@mkdir -p $(BUILD)
+	@$(DUO) --quiet --stdout --global recurly index.js > $(BUILD)/recurly.js
+	@$(MINIFY) $(BUILD)/recurly.js --output $(BUILD)/recurly.min.js
+
+watch: node_modules
+	@$(WATCH) make $(WATCH_FILES)
 
 node_modules: package.json
 	@npm install --silent
 
-$(DELEGATE): recurly.js
+$(DELEGATE): build
 	@cd test && make $@
 
 clean:
-	@rm -rf node_modules recurly.js recurly.min.js
+	@rm -rf node_modules components/duo.json $(BUILD)
 	@cd test && make $@
 
-.PHONY: recurly.js
-.PHONY: clean test test-browser
-.PHONY: test-sauce test-coverage
+.PHONY: clean build test test-browser test-sauce test-coverage
diff --git a/package.json b/package.json
index cc090ef2f..3d56daeaa 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "jade": "1.x",
     "mocha-phantomjs": "3.5.2",
     "gravy": "0.x",
-    "debug": "0.x"
+    "debug": "0.x",
+    "wr": "*"
   }
 }
diff --git a/test/server/index.jade b/test/server/index.jade
index 4c4a81c07..eeb15fd6e 100644
--- a/test/server/index.jade
+++ b/test/server/index.jade
@@ -3,7 +3,7 @@ html
   head
     title recurly.js tests
     link(rel='stylesheet', href='/test/server/mocha.css')
-    script(src='/recurly.js')
+    script(src='/build/recurly.js')
     script(src='/test/server/sinon.js')
     script(src='/test/server/mocha.js')
     script.