Merge branch 'master' of https://github.com/benjamine/hubot-scripts into benjamine-master

Conflicts:
	src/scripts/redis-brain.coffee

Author: tombell

src/scripts/redis-brain.coffee

@@ -2,10 +2,10 @@
 #   None
 #
 # Dependencies:
-#   "redis": "0.7.2"
+#   "redis": "0.8.4"
 #
 # Configuration:
-#   REDISTOGO_URL
+#   REDISTOGO_URL or BOXEN_REDIS_URL
 #
 # Commands:
 #   None
@@ -16,39 +16,41 @@
 Url   = require "url"
 Redis = require "redis"
 
-# sets up hooks to persist the brain into redis.
 module.exports = (robot) ->
-  info   = Url.parse process.env.REDISTOGO_URL || process.env.BOXEN_REDIS_URL || 'redis://localhost:6379'
+  info   = Url.parse process.env.REDISTOGO_URL or process.env.BOXEN_REDIS_URL or 'redis://localhost:6379'
   client = Redis.createClient(info.port, info.hostname)
 
-  if info.auth
-    client.auth info.auth.split(":")[1]
-
-  client.on "error", (err) ->
-    robot.logger.error err
-
-  client.on "connect", ->
-    robot.logger.debug "Successfully connected to Redis"
+  robot.brain.setAutoSave false
 
+  getData = ->
     client.get "hubot:storage", (err, reply) ->
       if err
         throw err
       else if reply
-        robot.logger.info "Brain data retrieved from redis-brain storage"
+        robot.logger.info "Data for brain retrieved from Redis"
         robot.brain.mergeData JSON.parse(reply.toString())
       else
-        robot.logger.info "Initializing new redis-brain storage"
+        robot.logger.info "Initializing new data for brain"
         robot.brain.mergeData {}
 
-      robot.logger.info "Enabling brain auto-saving"
       robot.brain.setAutoSave true
 
-  # Prevent autosaves until connect has occured
-  robot.logger.info "Disabling brain auto-saving"
-  robot.brain.setAutoSave false
+  if info.auth
+    client.auth info.auth.split(":")[1], (err) ->
+      if err
+        robot.logger.error "Failed to authenticate to Redis"
+      else
+        robot.logger.info "Successfully authenticated to Redis"
+        getData()
+
+  client.on "error", (err) ->
+    robot.logger.error err
+
+  client.on "connect", ->
+    robot.logger.debug "Successfully connected to Redis"
+    getData() if not info.auth
 
   robot.brain.on 'save', (data = {}) ->
-    robot.logger.debug "Saving brain data"
     client.set 'hubot:storage', JSON.stringify data
 
   robot.brain.on 'close', ->