whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: board agenda server side rendering
Date Thu, 25 Aug 2016 20:40:32 GMT
This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git

The following commit(s) were added to refs/heads/master by this push:
       new  681aeb2   board agenda server side rendering
681aeb2 is described below

commit 681aeb20c920e02fb905a9150430b2125a101263
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Thu Aug 25 16:40:16 2016 -0400

    board agenda server side rendering
---
 MACOSX.md                  | 29 +++++++++++++++++++++++++----
 config/board-agenda.md     |  1 +
 www/board/agenda/config.ru |  4 ++--
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/MACOSX.md b/MACOSX.md
index b2c0631..9a9c83f 100644
--- a/MACOSX.md
+++ b/MACOSX.md
@@ -40,21 +40,42 @@ If you don't see 2.3.1, run `hash -r` and try again.  If you previously
 installed ruby via brew, you may need to run `brew upgrade ruby` instead.
 
 
+Upgrade Node.js
+---------------
+
+Install:
+
+```
+$ brew install node
+$ npm install -g npm
+```
+
+Verify:
+
+```
+$ node -v
+v6.4.0
+$ npm -v
+3.10.6
+```
+
+If you don't see v6 or higher, run `hash -r` and try again.  If you previously
+installed node via brew, you may need to run `brew upgrade node` instead.
+
+
 Install dependencies
 ------------
 
 Install:
 
 ```
-$ gem install whimsy-asf bundler mail
+$ gem install whimsy-asf bundler mail listen
 ```
 
 Verify:
 
 ```
-$ ruby -r whimsy/asf -e 'p ASF.constants'
-[:Config, :Base, :Committee, :LDAP, :ETCLDAP, :LazyHash, :Person, :Group, :Service, :Mail,
:SVN, :Git, :ICLA, :Authorization, :Member, :Site, :Podling, :Podlings]
-
+$ gem list
 $ bundler -v
 Bundler version 1.12.5
 ```
diff --git a/config/board-agenda.md b/config/board-agenda.md
index 7b6ed0c..92f6f09 100644
--- a/config/board-agenda.md
+++ b/config/board-agenda.md
@@ -9,6 +9,7 @@ Run:
 
 ```
 $ bundle install
+$ npm install
 ```
 
 Look for a line that says either `Bundle complete!` or `Bundle updated!`.
diff --git a/www/board/agenda/config.ru b/www/board/agenda/config.ru
index fc425c4..6bfac98 100644
--- a/www/board/agenda/config.ru
+++ b/www/board/agenda/config.ru
@@ -1,7 +1,7 @@
-require File.expand_path('../main.rb', __FILE__)
-
 require 'whimsy/asf/rack'
 
+require File.expand_path('../main.rb', __FILE__)
+
 # https://svn.apache.org/repos/infra/infrastructure/trunk/projects/whimsy/asf/rack.rb
 use ASF::Auth::MembersAndOfficers do |env|
   # additionally authorize all invited guests

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message