Merge lp:~tveronezi/juju-gui/make-build into lp:juju-gui/experimental

[Thiago Veronezi]

Makefile does not support static file deployment

Full description here: https://bugs.launchpad.net/juju-gui/+bug/1078898

This branch does not support CSS minification. It only combines the third-party css files. The minification of the YUI and our custom CSS files is covered by another branch;

The "make debug" command starts the node.js server with the debug version of our application;

The "make server" command starts a python SimpleHTTPServer service with the production version of our application. Note that it is not possible to use REST with this version. It will be covered by another card;

https://codereview.appspot.com/6844061/

[Thiago Veronezi (tveronezi)]

Reviewers: mp+134706_code.launchpad.net,

Message:
Please take a look.

Description:
Makefile does not support static file deployment

Full description here: https://bugs.launchpad.net/juju-gui/+bug/1078898

This branch does not support CSS minification. It only combines the
third-party css files. The minification of the YUI and our custom CSS
files is covered by another branch;

The "make debug" command starts the node.js server with the debug
version of our application;

The "make server" command starts a python SimpleHTTPServer service with
the production version of our application. Note that it is not possible
to use REST with this version. It will be covered by another card;

https://code.launchpad.net/~tveronezi/juju-gui/make-build/+merge/134706

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/6844061/

Affected files:
   M .bzrignore
   M Makefile
   A [revision details]
   M app/index.html
   M bin/merge-files
   M grunt.js
   M lib/server.js
   M lib/templates.js

[lp:~tveronezi/juju-gui/make-build]

252. By Thiago Veronezi on 2012-11-16

personal code review

[Thiago Veronezi (tveronezi)]

https://codereview.appspot.com/6844061/diff/1/bin/merge-files
File bin/merge-files (right):

https://codereview.appspot.com/6844061/diff/1/bin/merge-files#newcode63
bin/merge-files:63: filesToLoad.js.push.apply(filesToLoad.js, [
'./app/assets/javascripts/d3.v2.min.js',
Please, ignore this long line. Its is already fixed.

https://codereview.appspot.com/6844061/

[Brad Crittenden (bac)]

Thiago I think the work you've done here is good. I'm a bit unclear how
much still needs to be done to finish off this refactoring of the build
structure.

Thanks for tackling it. The branch looks good to land after you make
the changes suggested and weigh the other ones.

https://codereview.appspot.com/6844061/diff/1/Makefile
File Makefile (right):

https://codereview.appspot.com/6844061/diff/1/Makefile#newcode18
Makefile:18: PRODUCTION_FILES=build/juju-ui/assets/modules.js \
I'd be tempted to make a symbol for 'build/juju-ui/assets' since it is
repeated so often.

https://codereview.appspot.com/6844061/diff/1/Makefile#newcode89
Makefile:89: @cd build && python -m SimpleHTTPServer 8888
I'm unhappy that the magic port 8888 is found four times in our code and
twice in documentation. I wish it were possible to define it once,
somewhere but am at a loss for how to do it.

https://codereview.appspot.com/6844061/diff/1/Makefile#newcode94
Makefile:94: @rm -Rf build/
Yay, the clean target is much simplified.

https://codereview.appspot.com/6844061/diff/1/Makefile#newcode100
Makefile:100:
I'm concerned about separate build and install targets and having
template.js in a separate rule from the others. Seems complicated and
twisty.

https://codereview.appspot.com/6844061/diff/1/app/index.html
File app/index.html (right):

https://codereview.appspot.com/6844061/diff/1/app/index.html#newcode14
app/index.html:14: <link rel="stylesheet"
href="http://yui.yahooapis.com/combo?3.8.0pr1/build/slider-base/assets/skins/sam/slider-base.css">
Is this safe? The URL with an embedded version number looks fragile.

https://codereview.appspot.com/6844061/diff/1/app/index.html#newcode15
app/index.html:15: <link>
What is the second <link> for?

https://codereview.appspot.com/6844061/diff/1/grunt.js
File grunt.js (right):

https://codereview.appspot.com/6844061/diff/1/grunt.js#newcode8
grunt.js:8: outputImage: 'stylesheets/sprite.png',
I guess putting sprites in 'stylesheets' is a lie we can live with.

https://codereview.appspot.com/6844061/

[lp:~tveronezi/juju-gui/make-build]

253. By Thiago Veronezi on 2012-11-19

code review

[Thiago Veronezi (tveronezi)]

Thanks for your review Brad!

https://codereview.appspot.com/6844061/diff/1/Makefile
File Makefile (right):

https://codereview.appspot.com/6844061/diff/1/Makefile#newcode18
Makefile:18: PRODUCTION_FILES=build/juju-ui/assets/modules.js \
On 2012/11/19 18:18:58, bac wrote:
> I'd be tempted to make a symbol for 'build/juju-ui/assets' since it is
repeated
> so often.

Done.

https://codereview.appspot.com/6844061/diff/1/Makefile#newcode89
Makefile:89: @cd build && python -m SimpleHTTPServer 8888
On 2012/11/19 18:18:58, bac wrote:
> I'm unhappy that the magic port 8888 is found four times in our code
and twice
> in documentation. I wish it were possible to define it once,
somewhere but am
> at a loss for how to do it.

I agree. I would like to create another card under the "Needs
specification" group for it, so we can discuss this issue later. Is that
ok?

https://codereview.appspot.com/6844061/diff/1/Makefile#newcode94
Makefile:94: @rm -Rf build/
On 2012/11/19 18:18:58, bac wrote:
> Yay, the clean target is much simplified.

:O)

https://codereview.appspot.com/6844061/diff/1/Makefile#newcode100
Makefile:100:
On 2012/11/19 18:18:58, bac wrote:
> I'm concerned about separate build and install targets and having
template.js in
> a separate rule from the others. Seems complicated and twisty.

True. "install" does not mean "install". IMO "install" should be renamed
to "generate-files", or something like that. wdyt?

template.js should be in a separated rule, so we can determine when we
should execute it, right? The same applies to the sprites.

https://codereview.appspot.com/6844061/diff/1/app/index.html
File app/index.html (right):

https://codereview.appspot.com/6844061/diff/1/app/index.html#newcode14
app/index.html:14: <link rel="stylesheet"
href="http://yui.yahooapis.com/combo?3.8.0pr1/build/slider-base/assets/skins/sam/slider-base.css">
On 2012/11/19 18:18:58, bac wrote:
> Is this safe? The URL with an embedded version number looks fragile.

True. I've investigated it a little bit further, and it works if I add
the 'slider-base' requirement to the environment.js file. Tkx Brad!

https://codereview.appspot.com/6844061/diff/1/app/index.html#newcode15
app/index.html:15: <link>
On 2012/11/19 18:18:58, bac wrote:
> What is the second <link> for?
for nothing :)
Removed tkx.

https://codereview.appspot.com/6844061/diff/1/grunt.js
File grunt.js (right):

https://codereview.appspot.com/6844061/diff/1/grunt.js#newcode8
grunt.js:8: outputImage: 'stylesheets/sprite.png',
On 2012/11/19 18:18:58, bac wrote:
> I guess putting sprites in 'stylesheets' is a lie we can live with.

I agree.

https://codereview.appspot.com/6844061/

[Gary Poster (gary)]

Thanks Thiago. This is a nice improvement. Once we have the CSS
changes, and we no longer have the slow initial combo CSS load from YUI,
this will be really nice to use. I have some small suggestions for the
Makefile, in line with Brad's comments.

https://codereview.appspot.com/6844061/diff/1/.bzrignore
File .bzrignore (right):

https://codereview.appspot.com/6844061/diff/1/.bzrignore#newcode16
.bzrignore:16: build
Nice simplification and clean-up.

https://codereview.appspot.com/6844061/diff/1/Makefile
File Makefile (right):

https://codereview.appspot.com/6844061/diff/1/Makefile#newcode100
Makefile:100:
On 2012/11/19 18:18:58, bac wrote:
> I'm concerned about separate build and install targets and having
template.js in
> a separate rule from the others. Seems complicated and twisty.

Having "build" depend on "install" also seems odd, conceptually.

Does the "install" target bring any value? That is, is there any use
case for running it alone? If not, I suggest combining it and "build"
into the "build" target (and deleting the "install" target). What do
you two think of that?

https://codereview.appspot.com/6844061/diff/1/lib/server.js
File lib/server.js (right):

https://codereview.appspot.com/6844061/diff/1/lib/server.js#newcode57
lib/server.js:57: res.sendfile('build/juju-ui/assets/' + fileName);
Interesting. I wanted the development server code to be even simpler
than this, but I can see why what you did is compelling. I would be
tempted to experiment with converting the js files to symlinks in a
later branch and simplifying this code. This is an improvement anyway,
though, and maybe my hunch won't work out.

https://codereview.appspot.com/6844061/

[lp:~tveronezi/juju-gui/make-build]

254. By Thiago Veronezi on 2012-11-19

code review

255. By Thiago Veronezi on 2012-11-19

trunk merge

256. By Thiago Veronezi on 2012-11-19

code review

257. By Thiago Veronezi on 2012-11-19

code review

[Thiago Veronezi (tveronezi)]

Thanks Gary for your review!

https://codereview.appspot.com/6844061/diff/1/.bzrignore
File .bzrignore (right):

https://codereview.appspot.com/6844061/diff/1/.bzrignore#newcode16
.bzrignore:16: build
On 2012/11/19 19:00:33, gary.poster wrote:
> Nice simplification and clean-up.

Ohhh yeah. :O)

https://codereview.appspot.com/6844061/diff/1/Makefile
File Makefile (right):

https://codereview.appspot.com/6844061/diff/1/Makefile#newcode100
Makefile:100:
On 2012/11/19 19:00:33, gary.poster wrote:
> On 2012/11/19 18:18:58, bac wrote:
> > I'm concerned about separate build and install targets and having
template.js
> in
> > a separate rule from the others. Seems complicated and twisty.

> Having "build" depend on "install" also seems odd, conceptually.

> Does the "install" target bring any value? That is, is there any use
case for
> running it alone? If not, I suggest combining it and "build" into the
"build"
> target (and deleting the "install" target). What do you two think of
that?

Ah... I see! I will delete the "install" target and change the "build"
target from...

build: install

... to...

build: appcache $(NODE_TARGETS) build/juju-ui/templates.js yuidoc
spritegen combinejs

Is that ok?

https://codereview.appspot.com/6844061/diff/1/lib/server.js
File lib/server.js (right):

https://codereview.appspot.com/6844061/diff/1/lib/server.js#newcode57
lib/server.js:57: res.sendfile('build/juju-ui/assets/' + fileName);
On 2012/11/19 19:00:33, gary.poster wrote:
> Interesting. I wanted the development server code to be even simpler
than this,
> but I can see why what you did is compelling. I would be tempted to
experiment
> with converting the js files to symlinks in a later branch and
simplifying this
> code. This is an improvement anyway, though, and maybe my hunch won't
work out.

I needed to change the "test-server.js" file too. The tests were broken
due to the new notification stuff. I've tried to use the symbolic link
approach in order to avoid it, but with no success.

I will use the "new branch" option to do it. Thanks.

https://codereview.appspot.com/6844061/

[Thiago Veronezi (tveronezi)]

Please take a look.

https://codereview.appspot.com/6844061/

[Gary Poster (gary)]

Good, Thiago, thank you. The slow CSS loading is the only downside for
putting this branch in staging, and if you can follow it quickly with
the CSS branch then I think it will be great.

+1!

Gary

https://codereview.appspot.com/6844061/diff/1/Makefile
File Makefile (right):

https://codereview.appspot.com/6844061/diff/1/Makefile#newcode89
Makefile:89: @cd build && python -m SimpleHTTPServer 8888
On 2012/11/19 18:50:59, thiago wrote:
> On 2012/11/19 18:18:58, bac wrote:
> > I'm unhappy that the magic port 8888 is found four times in our code
and twice
> > in documentation. I wish it were possible to define it once,
somewhere but am
> > at a loss for how to do it.

> I agree. I would like to create another card under the "Needs
specification"
> group for it, so we can discuss this issue later. Is that ok?

If you have any ideas on what we can do, +1. Otherwise, eh, don't
bother IMO.

https://codereview.appspot.com/6844061/diff/1/lib/server.js
File lib/server.js (right):

https://codereview.appspot.com/6844061/diff/1/lib/server.js#newcode57
lib/server.js:57: res.sendfile('build/juju-ui/assets/' + fileName);
On 2012/11/19 20:23:19, thiago wrote:
> On 2012/11/19 19:00:33, gary.poster wrote:
> > Interesting. I wanted the development server code to be even
simpler than
> this,
> > but I can see why what you did is compelling. I would be tempted to
> experiment
> > with converting the js files to symlinks in a later branch and
simplifying
> this
> > code. This is an improvement anyway, though, and maybe my hunch
won't work
> out.

> I needed to change the "test-server.js" file too. The tests were
broken due to
> the new notification stuff. I've tried to use the symbolic link
approach in
> order to avoid it, but with no success.

> I will use the "new branch" option to do it. Thanks.

Cool. I'm not sure it is that worth it to mess with it, given that you
have already experimented with it. That said, bug 1078910 will lead to
a natural opportunity to investigate.

https://codereview.appspot.com/6844061/diff/6002/Makefile
File Makefile (right):

https://codereview.appspot.com/6844061/diff/6002/Makefile#newcode16
Makefile:16: BUILD_ASSETS_DIR=build/juju-ui/assets
This ends up saving two characters per reference. :-) I guess it is
still an advantage to prevent typos though. Well...not even much there,
since bash doesn't have errors for unknown names. I dunno, I'm
certainly fine with this, but it didn't end up helping much IMO. Maybe
bac has a different suggestion for a name?

https://codereview.appspot.com/6844061/diff/6002/Makefile#newcode95
Makefile:95: build: appcache $(NODE_TARGETS) build/juju-ui/templates.js
yuidoc spritegen combinejs
I think "build" is the right name logically. benji might not like the
fact that we are breaking backwards compatibility for the dev
experience, but since the "all" target is equivalent and still works, I
think it is fine.

https://codereview.appspot.com/6844061/

[Thiago Veronezi (tveronezi)]

*** Submitted:

Makefile does not support static file deployment

Full description here: https://bugs.launchpad.net/juju-gui/+bug/1078898

This branch does not support CSS minification. It only combines the
third-party css files. The minification of the YUI and our custom CSS
files is covered by another branch;

The "make debug" command starts the node.js server with the debug
version of our application;

The "make server" command starts a python SimpleHTTPServer service with
the production version of our application. Note that it is not possible
to use REST with this version. It will be covered by another card;

R=bac, gary.poster
CC=
https://codereview.appspot.com/6844061

https://codereview.appspot.com/6844061/

=== modified file '.bzrignore'
--- .bzrignore	2012-11-13 15:04:19 +0000
+++ .bzrignore	2012-11-19 20:22:19 +0000
@@ -3,22 +3,14 @@
 gui.sublime-project
 .emacs.desktop.lock
 gui.sublime-workspace
-app/templates.js
-app/assets/stylesheets/juju-gui.css
 app/assets/javascripts/d3.v2.js
 app/assets/javascripts/d3.v2.min.js
 app/assets/javascripts/yui
-app/templates.js
-app/assets/stylesheets/juju-gui.css
 docs/_build/doctrees
 docs/_build/html
 *~
-app/assets/stylesheets/juju-gui.css
 tags
 Session.vim
 virtualenv
 yuidoc
-app/assets/manifest.appcache
-app/assets/sprite
-app/assets/javascripts/generated/
-app/assets/stylesheets/all-static.css
+build

=== modified file 'Makefile'
--- Makefile	2012-11-15 13:07:29 +0000
+++ Makefile	2012-11-19 20:22:19 +0000
@@ -13,18 +13,20 @@
 	node_modules/node-minify
 TEMPLATE_TARGETS=$(shell bzr ls -k file app/templates)
 SPRITE_SOURCE_FILES=$(shell bzr ls -R -k file app/assets/images)
-SPRITE_GENERATED_FILES=app/assets/sprite/sprite.css app/assets/sprite/sprite.png
-COMPRESSED_FILES=app/assets/javascripts/generated/all-app-debug.js \
-	app/assets/javascripts/generated/all-app.js \
-	app/assets/javascripts/generated/all-third.js \
-	app/assets/javascripts/generated/all-yui.js \
-	app/assets/stylesheets/all-static.css
+BUILD_ASSETS_DIR=build/juju-ui/assets
+SPRITE_GENERATED_FILES=$(BUILD_ASSETS_DIR)/stylesheets/sprite.css \
+	$(BUILD_ASSETS_DIR)/stylesheets/sprite.png
+PRODUCTION_FILES=$(BUILD_ASSETS_DIR)/modules.js \
+	$(BUILD_ASSETS_DIR)/config.js \
+	$(BUILD_ASSETS_DIR)/app.js \
+	$(BUILD_ASSETS_DIR)/stylesheets/all-static.css
 DATE=$(shell date -u)
-APPCACHE=app/assets/manifest.appcache
-
-all: install
-
-app/templates.js: $(TEMPLATE_TARGETS) bin/generateTemplates
+APPCACHE=$(BUILD_ASSETS_DIR)/manifest.appcache
+
+all: build
+
+build/juju-ui/templates.js: $(TEMPLATE_TARGETS) bin/generateTemplates
+	@test -d "$(BUILD_ASSETS_DIR)/stylesheets" || mkdir -p "$(BUILD_ASSETS_DIR)/stylesheets"
 	@./bin/generateTemplates
 
 yuidoc/index.html: node_modules/yuidocjs $(JSFILES)
@@ -34,8 +36,6 @@
 
 $(SPRITE_GENERATED_FILES): node_modules/grunt node_modules/node-spritesheet $(SPRITE_SOURCE_FILES)
 	@node_modules/grunt/bin/grunt spritegen
-	@rm -Rf app/assets/sprite/
-	@mv bin/sprite app/assets
 
 $(NODE_TARGETS): package.json
 	@npm install
@@ -43,8 +43,6 @@
 	@ln -sf `pwd`/node_modules/yui ./app/assets/javascripts/
 	@ln -sf `pwd`/node_modules/d3/d3.v2* ./app/assets/javascripts/
 
-install: appcache $(NODE_TARGETS) app/templates.js yuidoc spritegen combinejs
-
 gjslint: virtualenv/bin/gjslint
 	@virtualenv/bin/gjslint --strict --nojsdoc --jslint_error=all \
 	    --custom_jsdoc_tags module,main,class,method,event,property,attribute,submodule,namespace,extends,config,constructor,static,final,readOnly,writeOnce,optional,required,param,return,for,type,private,protected,requires,default,uses,example,chainable,deprecated,since,async,beta,bubbles,extension,extensionfor,extension_for \
@@ -67,36 +65,40 @@
 
 spritegen: $(SPRITE_GENERATED_FILES)
 
-$(COMPRESSED_FILES): node_modules/yui node_modules/d3/d3.v2.min.js $(JSFILES) ./bin/merge-files
-	@rm -f app/assets/stylesheets/all-static.css
-	@rm -Rf app/assets/javascripts/generated/
-	@mkdir app/assets/javascripts/generated/
+$(PRODUCTION_FILES): node_modules/yui node_modules/d3/d3.v2.min.js $(JSFILES) ./bin/merge-files
+	@rm -f $(PRODUCTION_FILES)
+	@test -d "$(BUILD_ASSETS_DIR)/stylesheets" || mkdir -p "$(BUILD_ASSETS_DIR)/stylesheets"
 	@./bin/merge-files
+	@cp app/modules.js $(BUILD_ASSETS_DIR)/modules.js
+	@cp app/config.js $(BUILD_ASSETS_DIR)/config.js
 
-combinejs: $(COMPRESSED_FILES)
+combinejs: $(PRODUCTION_FILES)
 
 prep: beautify lint
 
-test: install
+test: build
 	@./test-server.sh
 
-debug: install
-	@echo "Customize config.js to modify server settings"
-	@node server.js debug
-
-server: install
+debug: build
 	@echo "Customize config.js to modify server settings"
 	@node server.js
 
+server: build
+	@echo "Runnning the application from a SimpleHTTPServer"
+	@cd build && python -m SimpleHTTPServer 8888
+
 clean:
 	@rm -rf node_modules virtualenv
 	@make -C docs clean
-	@rm -Rf bin/sprite/
-	@rm -Rf app/assets/sprite/
-	@rm -Rf app/assets/javascripts/generated/
-	@rm -f app/assets/stylesheets/all-static.css
+	@rm -Rf build/
+
+build: appcache $(NODE_TARGETS) build/juju-ui/templates.js yuidoc spritegen combinejs
+	@cp -f app/index.html build/
+	@cp -rf app/assets/images $(BUILD_ASSETS_DIR)/images
+	@cp -rf app/assets/svgs $(BUILD_ASSETS_DIR)/svgs
 
 $(APPCACHE): manifest.appcache.in
+	@test -d "build/juju-ui/assets" || mkdir -p "build/juju-ui/assets"
 	@cp manifest.appcache.in $(APPCACHE)
 	@sed -re 's/^\# TIMESTAMP .+$$/\# TIMESTAMP $(DATE)/' -i $(APPCACHE)
 
@@ -110,6 +112,6 @@
 # appcache, and this provides the correct order.
 appcache-force: appcache-touch appcache
 
-.PHONY: test lint beautify server install clean prep jshint gjslint \
+.PHONY: test lint beautify server build clean prep jshint gjslint \
 	appcache appcache-touch appcache-force yuidoc spritegen yuidoc-lint \
 	combinejs

=== modified file 'app/index.html'
--- app/index.html	2012-11-15 15:44:00 +0000
+++ app/index.html	2012-11-19 20:22:19 +0000
@@ -9,7 +9,7 @@
     <link href='http://fonts.googleapis.com/css?family=Ubuntu:400,400italic&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="/juju-ui/assets/stylesheets/all-static.css">
     <link rel="stylesheet" href="/juju-ui/assets/stylesheets/juju-gui.css">
-    <link rel="stylesheet" href="/juju-ui/assets/sprite/sprite.css">
+    <link rel="stylesheet" href="/juju-ui/assets/stylesheets/sprite.css">
     <!--[if lt IE 9]>
     <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
@@ -68,9 +68,9 @@
         <div id="vp-right-border"></div>
     </div>
     <!-- javascript away -->
-    <script src="/juju-ui/assets/yui.js"></script>
-    <script src="/juju-ui/assets/all-third.js"></script>
+    <script src="/juju-ui/assets/app.js"></script>
     <script src="/juju-ui/assets/modules.js"></script>
+    <script src="/juju-ui/assets/config.js"></script>
     <script>
       YUI(GlobalConfig).use(["juju-gui"], function(Y) {
         app = new Y.juju.App(juju_config);

=== modified file 'app/views/environment.js'
--- app/views/environment.js	2012-11-19 16:20:21 +0000
+++ app/views/environment.js	2012-11-19 20:22:19 +0000
@@ -1814,5 +1814,6 @@
     'svg-layouts',
     'event-resize',
     'slider',
+    'slider-base',
     'view']
 });

=== modified file 'bin/merge-files'
--- bin/merge-files	2012-11-15 13:07:29 +0000
+++ bin/merge-files	2012-11-19 20:22:19 +0000
@@ -30,8 +30,7 @@
       syspath = require('path'),
       paths,
       reqs,
-      filesToLoad,
-      thirdPartyCSS;
+      filesToLoad;
 
   // First we find all of the paths to our custom Javascript in the app
   // directory.  We need to tell the function to ignore the "assets" directory
@@ -42,6 +41,9 @@
     [syspath.join(process.cwd(), './app/assets'),
      syspath.join(process.cwd(), './app/modules-debug.js')]);
 
+  // templates.js is a generated file. It is not part of the app directory.
+  paths.push(syspath.join(process.cwd(), './build/juju-ui/templates.js'));
+
   // Get the name of all the YUI modules that our custom js files use directly.
   reqs = merge.loadRequires(paths);
 
@@ -56,41 +58,23 @@
 
   // Get all of the YUI files and their dependencies
   filesToLoad = merge.getYUIFiles(reqs);
-  thirdPartyCSS = filesToLoad.css;
-  thirdPartyCSS.push('./app/assets/stylesheets/bootstrap-2.0.4.css');
-  thirdPartyCSS.push('./app/assets/stylesheets/bootstrap-responsive-2.0.4.css');
-  console.log('CSS: ' + thirdPartyCSS);
-
-  // Combine YUI js files
+
+  // Merge third-party files to the filesToLoad list
+  filesToLoad.js.push.apply(filesToLoad.js, [
+      './app/assets/javascripts/d3.v2.min.js',
+      './app/assets/javascripts/d3-components.js',
+      './app/assets/javascripts/reconnecting-websocket.js',
+      './app/assets/javascripts/svg-layouts.js' ]);
+  
+  // Merge our list of custom js files to the filesToLoad list
+  filesToLoad.js.push.apply(filesToLoad.js, paths);
+
+  // Combine YUI and our js files
   merge.combine(filesToLoad.js,
-      './app/assets/javascripts/generated/all-yui.js', 'uglifyjs');
+      './build/juju-ui/assets/app.js', 'uglifyjs');
 
   // Combine third party css files
-  merge.combine(thirdPartyCSS,
-      './app/assets/stylesheets/all-static.css', 'yui-css');
-
-  // Combine third party js libraries
-  merge.combine([ './app/assets/javascripts/d3.v2.min.js',
-      './app/assets/javascripts/d3-components.js',
-      './app/assets/javascripts/reconnecting-websocket.js',
-      './app/assets/javascripts/svg-layouts.js' ],
-      './app/assets/javascripts/generated/all-third-min.js', 'uglifyjs');
-
-  // It has only one file but eventually it will have more.
-  merge.combine([ './app/assets/javascripts/d3.v2.js' ],
-      './app/assets/javascripts/generated/all-third.js', 'uglifyjs');
-
-  // Now we only need to generate the file that is used to tell YUI where all
-  // the dependencies are.  We either use a debug version or the production
-  // version.  The debug version is simply pointers to the individual files.
-  // The production version aggregates all of the files together.
-
-  // Creating the combined file for the modules-debug.js and config.js files
-  merge.combine(['./app/modules-debug.js', './app/config.js'],
-      './app/assets/javascripts/generated/all-app-debug.js');
-
-  // Creating the combined file for all our files.  Note that this includes
-  // app/modules.js in the rollup, which is why that file still needs exist.
-  merge.combine(paths, './app/assets/javascripts/generated/all-app.js',
-      'uglifyjs');
+  merge.combine([ './app/assets/stylesheets/bootstrap-2.0.4.css',
+      './app/assets/stylesheets/bootstrap-responsive-2.0.4.css' ],
+      './build/juju-ui/assets/stylesheets/all-static.css', 'yui-css');
 });

=== modified file 'grunt.js'
--- grunt.js	2012-11-06 12:28:51 +0000
+++ grunt.js	2012-11-19 20:22:19 +0000
@@ -5,13 +5,13 @@
     spritesheet: {
       compile: {
         options: {
-          outputImage: 'sprite/sprite.png',
-          outputCss: 'sprite/sprite.css',
+          outputImage: 'stylesheets/sprite.png',
+          outputCss: 'stylesheets/sprite.css',
           selector: '.sprite'
 
         },
         files: {
-          'bin': 'app/assets/images/*'
+          'build/juju-ui/assets': 'app/assets/images/*'
         }
       }
     }

=== modified file 'lib/server.js'
--- lib/server.js	2012-11-15 13:07:29 +0000
+++ lib/server.js	2012-11-19 20:22:19 +0000
@@ -5,35 +5,10 @@
     fs = require('fs'),
     path = require('path'),
     config = require('../config').config.server,
-    debugMode = (String(process.argv[2]).toLowerCase() === 'debug'),
     public_dir = config.public_dir,
     Templates = require('./templates.js'),
     view = require('./view.js');
 
-
-/**
- * It finds a file under the given path. The first match wins.
- * @param {string} path starting point.
- * @param {string} fileName name of the file to be found.
- * @return {string} the file path.
- */
-function findFile(path, fileName) {
-  var file, files = fs.readdirSync(path);
-  for (var i = 0; i < files.length; i = i + 1) {
-    if (files[i] === fileName) {
-      return path + '/' + files[i];
-    }
-    file = fs.statSync(path + '/' + files[i]);
-    if (file.isDirectory()) {
-      file = findFile(path + '/' + files[i], fileName);
-      if (file) {
-        return file;
-      }
-    }
-  }
-  return null;
-}
-
 server.configure(function() {
   server.set('views', __dirname + './lib/views/');
   server.set('view engine', 'handlebars');
@@ -70,47 +45,27 @@
   });
 });
 
-server.get('/juju-ui/assets/all-third.js', function(req, res) {
-  if (debugMode) {
-    res.sendfile('app/assets/javascripts/generated/all-third.js');
-  } else {
-    res.sendfile('app/assets/javascripts/generated/all-third-min.js');
-  }
-});
-
-server.get('/juju-ui/assets/modules.js', function(req, res) {
-  if (debugMode) {
-    res.sendfile('app/assets/javascripts/generated/all-app-debug.js');
-  } else {
-    res.sendfile('app/assets/javascripts/generated/all-app.js');
-  }
-});
-
-server.get('/juju-ui/assets/yui.js', function(req, res) {
-  if (debugMode) {
+server.get('/juju-ui/assets/:file', function(req, res) {
+  var fileName = req.params.file;
+  if ('app.js' === fileName) {
     res.sendfile('app/assets/javascripts/yui/yui/yui-debug.js');
+  } else if ('modules.js' === fileName) {
+    res.sendfile('app/modules-debug.js');
+  } else if ('config.js' === fileName) {
+    res.sendfile('app/config.js');
   } else {
-    res.sendfile('app/assets/javascripts/generated/all-yui.js');
+    res.sendfile('build/juju-ui/assets/' + fileName);
   }
 });
 
+server.get('/juju-ui/:file', function(req, res) {
+  var fileName = req.params.file;
+  res.sendfile('build/juju-ui/' + fileName);
+});
+
 server.get('/juju-ui/assets/stylesheets/:file', function(req, res) {
-  var file, fileName = req.params.file;
-  if (path.extname(fileName).toLowerCase() === '.css') {
-    res.sendfile('app/assets/stylesheets/' + fileName);
-  } else {
-    // We've merged all the yui and third party files into a single css file.
-    // YUI expects to load its images from the same path as its css files, so
-    // we need to mock this position. When the system tries to load a resource
-    // from "app/assets/stylesheets/", it tries to find this resource under the
-    // "./app/assets" directory. The first match wins. Another solution would
-    // be to manually copy all the images we need to the
-    // "./app/assets/stylesheets" directory.
-    // This is an example of image...
-    // ./yui/datatable-sort/assets/skins/sam/sort-arrow-sprite-ie.png
-    file = findFile('./app/assets', fileName);
-    res.sendfile(file);
-  }
+  var fileName = req.params.file;
+  res.sendfile('build/juju-ui/assets/stylesheets/' + fileName);
 });
 
 server.get('*', function(req, res) {

=== modified file 'lib/templates.js'
--- lib/templates.js	2012-09-26 23:31:13 +0000
+++ lib/templates.js	2012-11-19 20:22:19 +0000
@@ -122,7 +122,7 @@
 
 var templateSpecs = {
   templates: {
-    output: __dirname + '/../app/templates.js',
+    output: __dirname + '/../build/juju-ui/templates.js',
     callback: function(strategy, name) {
       cache = {};
       getPrecompiled();
@@ -138,7 +138,7 @@
   },
 
   stylesheet: {
-    output: __dirname + '/../app/assets/stylesheets/juju-gui.css',
+    output: __dirname + '/../build/juju-ui/assets/stylesheets/juju-gui.css',
     callback: function(strategy, name) {
       var parser = new less.Parser({
         paths: [config.server.view_dir],

=== modified file 'test-server.js'
--- test-server.js	2012-10-31 10:57:16 +0000
+++ test-server.js	2012-11-19 20:22:19 +0000
@@ -17,7 +17,10 @@
   server.use(express.methodOverride());
 });
 
-
+server.get('/juju-ui/:file', function(req, res) {
+  var fileName = req.params.file;
+  res.sendfile('build/juju-ui/' + fileName);
+});
 
 var port = 8084;
 

=== modified file 'test/index.html'
--- test/index.html	2012-11-15 15:30:59 +0000
+++ test/index.html	2012-11-19 20:22:19 +0000
@@ -48,7 +48,7 @@
               continue
             }
             resource.fullpath = resource.fullpath.replace(
-              '/juju-ui/', '../app/', 1);
+              '/juju-ui/', '../juju-ui/', 1);
          }
      }
      // Load before test runner