Permalink
Browse files

Config is now optional

  • Loading branch information...
1 parent 48be26f commit d1ae87bfa33f9017de9e13f67d373573ba56e9c1 @wdavidw wdavidw committed Feb 19, 2012
View
@@ -1,4 +1,5 @@
.*
+/conf/test.coffee
/conf/dump.rdb
/node_modules/*
!.travis.yml
View
@@ -1,6 +1,6 @@
daemonize no
pidfile ./conf/redis.pid
-port 4501
+port 6379
timeout 300
loglevel verbose
logfile stdout
File renamed without changes.
View
@@ -12,7 +12,7 @@ module.exports = class Client
if @options.redis
@redis = @options.redis
else
- @redis = redis.createClient options.redis_port, options.redis_host
+ @redis = redis.createClient options.redis_port ? 6379, options.redis_host ? '127.0.0.1'
@redis.auth options.redis_password if options.redis_password?
@redis.select options.redis_database if options.redis_database?
View
@@ -1,7 +1,7 @@
should = require 'should'
-config = require '../conf/test'
+try config = require '../conf/test' catch e
Ron = require '../index'
describe 'client', ->
View
@@ -1,7 +1,7 @@
should = require 'should'
-config = require '../conf/test'
+try config = require '../conf/test' catch e
Ron = require '../index'
describe 'all', ->
View
@@ -1,7 +1,7 @@
should = require 'should'
-config = require '../conf/test'
+try config = require '../conf/test' catch e
Ron = require '../index'
describe 'count', ->
View
@@ -1,7 +1,7 @@
should = require 'should'
-config = require '../conf/test'
+try config = require '../conf/test' catch e
Ron = require '../index'
describe 'create', ->
@@ -1,7 +1,7 @@
should = require 'should'
-config = require '../conf/test'
+try config = require '../conf/test' catch e
Ron = require '../index'
describe 'create_validation', ->
View
@@ -1,7 +1,7 @@
should = require 'should'
-config = require '../conf/test'
+try config = require '../conf/test' catch e
ron = require '..'
describe 'define', ->
View
@@ -1,7 +1,7 @@
should = require 'should'
-config = require '../conf/test'
+try config = require '../conf/test' catch e
Ron = require '../index'
describe 'exists', ->
View
@@ -1,7 +1,7 @@
should = require 'should'
-config = require '../conf/test'
+try config = require '../conf/test' catch e
Ron = require '../index'
describe 'get', ->
View
@@ -1,7 +1,7 @@
should = require 'should'
-config = require '../conf/test'
+try config = require '../conf/test' catch e
Ron = require '../index'
describe 'id', ->
View
@@ -1,7 +1,7 @@
should = require 'should'
-config = require '../conf/test'
+try config = require '../conf/test' catch e
Ron = require '../index'
describe 'list', ->
View
@@ -1,7 +1,7 @@
should = require 'should'
-config = require '../conf/test'
+try config = require '../conf/test' catch e
Ron = require '../index'
describe 'remove', ->
View
@@ -1,7 +1,7 @@
should = require 'should'
-config = require '../conf/test'
+try config = require '../conf/test' catch e
Ron = require '../index'
describe 'update', ->

0 comments on commit d1ae87b

Please sign in to comment.