Openshift-enabling redis connection

.gitignore

@@ -2,3 +2,4 @@
 /public/stylesheets/*.css
 .DS_Store
 tags
+npm-debug.log

README.md

@@ -30,7 +30,7 @@ are as follows:
 * Coffee pots
   - name: 'pot:%id%'
   - type: hash
-  - attributes: id, name, color
+  - attributes: id, name, color, lastBrew, readyAt, currentLevel, removed
 * Brews set
   - name: 'brews'
   - type: sorted set by time of brew
@@ -72,6 +72,12 @@ about. This is the same as the contents of the '#brews' div.
 This event is sent automatically when a client connects to make sure they have
 the most recent list of brews.
 
+#### updatePot
+
+This is broadcast to all currently connected clients.  It sends the JSON object
+representing all of the pots currently in the system, including how full they
+are, whether they are in the caddy, etc.
+
 ### Emitted by client
 
 #### recentBrews

app.js

@@ -1,12 +1,20 @@
+
+var openshift_app_dir = "./"
+if (process.env.OPENSHIFT_NODEJS_IP){
+    openshift_app_dir = process.env.OPENSHIFT_REPO_DIR + "coffee-monitor/";
+}
+
+
+
 var express = require('express'),
-    routes = require('./routes'),
+    routes = require(openshift_app_dir + 'routes'),
     http = require('http'),
     passport = require('passport'),
     path = require('path'),
-    brewHelper = require('./helpers/brews'),
-    redisHelper = require('./helpers/redis'),
-    signals = require('./helpers/signals'),
-    userHelper = require('./helpers/users');
+    brewHelper = require(openshift_app_dir + 'helpers/brews'),
+    redisHelper = require(openshift_app_dir + 'helpers/redis'),
+    signals = require(openshift_app_dir + 'helpers/signals'),
+    userHelper = require(openshift_app_dir + 'helpers/users');
 
 var db = redisHelper.getConnection();
 var manager = new brewHelper.BrewManager(db);
@@ -53,13 +61,14 @@ function ensureAuthenticatedOrKnownIp(req, res, next) {
 var app = express();
 app.locals.moment = require('moment');
 app.configure(function() {
-  app.set('port', process.env.PORT || 3000);
-  app.set('views', __dirname + '/views');
+  app.set('port', process.env.OPENSHIFT_NODEJS_PORT || process.env.PORT || 3000);
+  app.set('ip', process.env.OPENSHIFT_NODEJS_IP || process.env.IP || '127.0.0.1');
+  app.set('views', openshift_app_dir  + 'views/');
   app.set('view engine', 'jade');
   app.set('trust proxy', true);
-  app.use(express.favicon(__dirname + '/public/favicon.ico',
+  app.use(express.favicon(openshift_app_dir + 'public/favicon.ico',
           { maxAge: 365 * 24 * 60 * 60 * 1000 }));
-  app.use(express.logger('dev'));
+//  app.use(express.logger('dev'));
   app.use(express.compress({ filter: compressFilter }));
   app.use(express.bodyParser());
   app.use(require('express-validator'));
@@ -74,8 +83,8 @@ app.configure(function() {
   app.use(attachBrewManager);
   app.use(attachPassport);
   app.use(app.router);
-  app.use(require('stylus').middleware(__dirname + '/public'));
-  app.use(express.static(path.join(__dirname, 'public')));
+  app.use(require('stylus').middleware(openshift_app_dir + 'public'));
+  app.use(express.static(path.join(openshift_app_dir, 'public')));
 });
 
 app.configure('development', function() {
@@ -93,6 +102,7 @@ app.get('/makers', onlineTracker, routes.makers);
 
 app.get('/pots/add', userHelper.ensureAuthenticated, routes.potAdd);
 app.post('/pots/add', userHelper.ensureAuthenticated, routes.potAddSubmit);
+app.post('/pots/update', ensureAuthenticatedOrKnownIp, routes.potUpdate);
 app.get('/pots/:id', onlineTracker, routes.potDetail);
 app.delete('/pots/:id', userHelper.ensureAuthenticated, routes.potDelete);
 app.get('/pots', onlineTracker, routes.pots);
@@ -104,6 +114,7 @@ app.get('/brews/:id', onlineTracker, routes.brewDetail);
 app.delete('/brews/:id', userHelper.ensureAuthenticated, routes.brewDelete);
 app.get('/brews', onlineTracker, routes.brews);
 
+
 app.get('/tea', onlineTracker, routes.teapot);
 app.get('/qr', onlineTracker, routes.qr);
 
@@ -113,10 +124,13 @@ app.post('/login', routes.loginSubmit);
 app.get('/logout', routes.logout);
 
 var server = http.createServer(app);
-server.listen(app.get('port'), function() {
-  console.log("Express server listening on port " + app.get('port'));
+server.listen(app.get('port'), app.get('ip'), function() {
+  console.log("Express server listening on port " + app.get('port') + " and ip " + app.get('ip'));
 });
 
+//var websocketserver = http.createServer();
+//websocketserver.listen(8000, app.get('ip'));
+
 var io = require('socket.io').listen(server);
 io.configure(function() {
   io.set('log level', 1);
@@ -147,6 +161,8 @@ ioSub.on('message', function(chan, msg) {
     signals.updateBrew(app, io, manager, msg);
   } else if (chan === 'deleteBrew') {
     signals.deleteBrew(io, msg);
+  } else if (chan === 'updatePot') {
+    signals.updatePot(app, io, manager, msg);
   }
 });
-ioSub.subscribe('updateBrew', 'deleteBrew');
+ioSub.subscribe('updateBrew', 'deleteBrew', 'updatePot');

helpers/brews.js

@@ -17,6 +17,7 @@ BrewManager.prototype.getRecentBrews = function(next) {
   });
 };
 
+
 function storePartTwo(err, db, obj, type, next) {
   // coerce any non-string keys to strings
   Object.keys(obj).forEach(function(key) { obj[key] = "" + obj[key]; });
@@ -80,6 +81,10 @@ BrewManager.prototype.getPots = function(next) {
   });
 };
 
+BrewManager.prototype.getPot = function(id, next) {
+  this.db.hgetall('pot:' + id, next);
+};
+
 BrewManager.prototype.addPot = function(pot, next) {
   var self = this;
   async.waterfall([
@@ -101,6 +106,40 @@ BrewManager.prototype.deletePot = function(id, next) {
     .exec(next);
 };
 
+BrewManager.prototype.updatePot = function(update, next){
+  var self = this;
+  async.waterfall([
+      function(next) {
+        self.db.multi()
+          .hmset('pot:' + update.pot, 
+              'currentLevel', update.currentLevel,
+              'removed', update.removed
+           )
+          .hgetall('pot:' + update.pot)
+          .publish('updatePot', update.pot)
+          .exec(next);
+        },
+        function(potresult, next) {
+          var pot = potresult[1];
+          //Vaguely valid data
+          if (update.lastBrew != 0 && update.lastBrew != "0" && update.lastBrew != undefined){
+            if (int10(update.lastBrew) * 1000 > pot.readyAt){
+              console.log ("lastBrew was updated");
+              var brew = {
+                creationIp: '127.0.0.1',
+                readyAt: int10(update.lastBrew) * 1000,
+                makerId: 1,
+                potId: update.pot,
+              };
+              self.addBrew(brew, next);
+            }
+          }
+      }
+ ], function(err, results) {
+    next(err, update);
+  });
+}
+
 BrewManager.prototype.getBrew = function(id, next) {
   this.db.hgetall('brew:' + id, next);
 };
@@ -118,7 +157,7 @@ BrewManager.prototype.addBrew = function(brew, next) {
           .hmget('pot:' + brew.potId, 'name', 'color', 'readyAt')
           .exec(next);
       },
-      function(results, next) {
+      function(results, next) { 
         // check preconditions first: we must be > readyAt time for this brew
         // to even make sense, otherwise someone is spoofing us
         var now = Date.now();
@@ -139,7 +178,7 @@ BrewManager.prototype.addBrew = function(brew, next) {
           if (!brew.readyAt) {
             brew.createdAt = now;
           } else {
-            brew.createdAt = brew.readyAt - (1000 * int10(brew.brewTime));
+            brew.createdAt = int10(brew.readyAt) - (1000 * int10(brew.brewTime));
           }
         }
         if (!brew.readyAt) {

helpers/redis.js

@@ -11,10 +11,10 @@ function logError(err) {
 }
 
 function getConnection() {
-  var port = process.env.REDIS_PORT || 6379,
-      host = process.env.REDIS_HOST || '127.0.0.1',
-      password = process.env.REDIS_PASS,
-      dbNumber = process.env.REDIS_DB;
+  var port = process.env.OPENSHIFT_REDIS_PORT || process.env.REDIS_PORT || 16379,
+      host = process.env.OPENSHIFT_REDIS_HOST || process.env.REDIS_HOST || process.env.IP || '127.0.0.1',
+      password = process.env.REDIS_PASSWORD   || process.env.REDIS_PASS,
+      dbNumber = process.env.REDIS_DB         || 0;
   var db = redis.createClient(port, host);
   db.on('error', logError);
 

helpers/signals.js

@@ -33,6 +33,19 @@ exports.updateBrew = function(app, io, manager, brewId) {
   });
 };
 
+
+exports.updatePot = function(app, io, manager, potId) {
+//Just copying from above
+  manager.getPot(potId, function(error, pot) {
+    async.parallel([
+      function(next) {
+          io.sockets.emit('updatePot', pot);
+          next(null);
+        }
+    ]);
+  });
+};
+
 exports.deleteBrew = function(io, brewId) {
   io.sockets.emit('deleteBrew', brewId);
 };

package.json

@@ -1,9 +1,16 @@
 {
-  "name": "coffee-monitor",
-  "description": "Monitor when coffee pots were brewed",
-  "version": "0.1.8",
-  "author": "Dan McGee <[email protected]>",
-  "private": true,
+  "name": "OpenShift-Backstop-Coffee-monitor",
+  "version": "1.0.0",
+  "description": "Monitor when coffee gets brewed on openshift",
+  "keywords": [
+    "OpenShift",
+    "Node.js",
+    "application",
+    "openshift"
+  ],
+  "author": {
+    "name": "Backstop"
+  },
   "bugs": {
     "web": "https://github.com/toofishes/coffee-monitor/issues"
   },
@@ -20,15 +27,18 @@
     }
   ],
   "homepage": "https://github.com/toofishes/coffee-monitor",
-  "scripts": {
-    "start": "node app.js"
+  "repository": {
+    "type": "git",
+    "url": "https://gitub.com/openshift/origin-server"
+  },
+
+  "engines": {
+    "node": ">= 0.6.0",
+    "npm": ">= 1.0.0"
   },
-  "keywords": [
-    "coffee"
-  ],
   "dependencies": {
     "async": "0.2.x",
-    "bcrypt": "0.7.x",
+    "bcrypt": "0.5.x",
     "campfire": "0.1.x",
     "connect-redis": "1.4.x",
     "express": "3.1.x",
@@ -47,8 +57,6 @@
     "jitsu": "*",
     "jshint": "*"
   },
-  "engines": {
-    "node": ">=0.8"
-  },
-  "subdomain": "coffee-monitor"
+  "private": true,
+  "main": "server.js"
 }