From b6648cb9e23f5dea3aed90cf34b7dee0b457557e Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Sat, 20 Nov 2010 18:32:40 +0100
Subject: [PATCH] Handle jammit by precaching in script/server.

This introduces some jammit warnings in 'rake spec'. These seem
to be just warnings. To get rid of them, take steps as described in
https://github.com/diaspora/diaspora/wiki/Installing-and-Running-Diaspora
in the "Read-only Installation" (sic!) chapter.
---
 config/assets.yml          |  5 +++--
 script/server              | 10 ++++++++++
 script/websocket_server.rb | 12 ------------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/config/assets.yml b/config/assets.yml
index f127c9cb4..00225e26b 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -1,3 +1,4 @@
+package: always
 javascripts:
   flash_socket:
     - public/javascripts/vendor/FABridge.js
@@ -19,14 +20,14 @@ javascripts:
     - public/javascripts/vendor/mailchimp/jquery.form.js
     - public/javascripts/vendor/mailchimp/jquery.validate.js
     - public/javascripts/vendor/mailchimp/jquery126.min.js
-    
+
   photo:
     - public/javascripts/photo.js
     - public/javascripts/image-picker.js
   aspects:
     - public/javascripts/vendor/jquery-ui-1.8.6.custom.min.js
     - public/javascripts/aspect-edit.js
-  
+
 stylesheets:
   default:
     - public/stylesheets/application.css
diff --git a/script/server b/script/server
index d3948e7df..2256b410c 100755
--- a/script/server
+++ b/script/server
@@ -48,6 +48,16 @@ if [ ! -e public/source.tar.gz ]; then
     exit 65
 fi
 
+# Precache jammit assets
+if [ -w public ]; then
+    bundle exec jammit
+fi
+if [ ! -e 'public/assets/main.js.gz' ]; then
+    echo 'Jammit precache error (now or at install)' >&2
+    exit 66
+fi
+
+
 mkdir -p -v log/thin/
 bundle exec ruby ./script/websocket_server.rb&
 bundle exec magent start --log-path=log/ &
diff --git a/script/websocket_server.rb b/script/websocket_server.rb
index 82f3b57a2..b3df18e10 100644
--- a/script/websocket_server.rb
+++ b/script/websocket_server.rb
@@ -41,20 +41,8 @@ def process_message
   end
 end
 
-def package_js
-  require 'jammit'
-
-  begin
-    Jammit.package!
-  rescue => e
-    puts "Error minifying assets, but server will continue starting normally."
-    puts e.inspect
-  end
-end
-
 begin
   EM.run {
-    package_js
     Diaspora::WebSocket.initialize_channels
 
     socket_params = { :host => APP_CONFIG[:socket_host],