ruby-redis 0.0.1 → 0.0.2

data/lib/redis/config.rb

@@ -1,38 +1,43 @@
-require File.expand_path '../redis', File.dirname(__FILE__)
-
-class Redis
-  
+module Redis
   class Config < Hash
     
     INTEGERS = [:port, :timeout, :databases]
     BOOLEANS = [:daemonize]
     
-    def initialize argf
-      super()
+    def initialize argf_or_hash
 
       # defaults
       self[:dir] = '.'
       self[:logfile] = 'stdout'
+      self[:loglevel] = 'verbose'
       self[:daemonize] = false
+      self[:pidfile] = '/var/run/redis.pid'
+      self[:bind] = '127.0.0.1'
       self[:port] = 6379
-      self[:pidfile] = "/var/run/redis.pid"
+      self[:timeout] = 300
       self[:databases] = 16
 
-      # load from ARGF or IO compatible interface
-      argf.each do |line|
-        key, val = line.split ' ', 2
-        self[key.downcase.gsub(/-/,'_').to_sym] = val.chomp "\n"
+      this = super()
+      if Hash === argf_or_hash
+        super argf_or_hash
+      else
+        super()
+        # load from ARGF or IO compatible interface
+        argf_or_hash.each do |line|
+          key, val = line.split ' ', 2
+          self[key.downcase.gsub(/-/,'_').to_sym] = val.chomp "\n"
+        end
       end
 
       # convert
       INTEGERS.each do |key|
-        self[key] = self[key].to_i
+        this[key] = this[key].to_i
       end
 
       # convert
       BOOLEANS.each do |key|
-        next unless String===self[key]
-        self[key] = case self[key].downcase
+        next unless String===this[key]
+        this[key] = case this[key].downcase
         when 'yes' then true
         when 'no' then false
         else nil
@@ -40,7 +45,5 @@ class Redis
       end
       
     end
-    
   end
-    
 end

data/lib/redis/config.rbc

@@ -1,6 +1,6 @@
 !RBIX
-6235178746665710376
-x
+8948944263761558646
+18
 M
 1
 n
@@ -9,57 +9,32 @@ x
 10
 __script__
 i
-54
-5
-45
-0
-1
-7
-2
-64
-45
-0
-3
-65
-49
-4
-0
-49
-5
-1
-49
-6
-2
-47
-49
-7
-1
-15
+29
 99
 7
-8
+0
 1
 65
 49
-9
+1
 3
 13
 99
 12
 7
-10
+2
 12
 7
-11
+3
 12
 65
 12
 49
-12
+4
 4
 15
 49
-10
+2
 0
 15
 2
@@ -72,29 +47,11 @@ I
 0
 I
 0
+I
+0
 n
 p
-13
-x
-4
-File
-n
-s
-8
-../redis
-n
-x
-11
-active_path
-x
-7
-dirname
-x
-11
-expand_path
-x
-7
-require
+5
 x
 5
 Redis
@@ -152,6 +109,8 @@ I
 0
 I
 0
+I
+0
 n
 p
 7
@@ -227,6 +186,8 @@ I
 0
 I
 0
+I
+0
 n
 p
 11
@@ -262,87 +223,126 @@ x
 10
 initialize
 i
-117
-54
-52
-0
-0
-15
+185
 5
 7
-1
+0
 7
-2
+1
 64
 13
 18
 3
 47
 49
-3
+2
 2
 15
 15
 5
 7
-4
+3
 7
-5
+4
 64
 13
 18
 3
 47
 49
-3
+2
 2
 15
 15
 5
 7
+5
+7
 6
-3
+64
 13
 18
 3
 47
 49
-3
+2
 2
 15
 15
 5
 7
 7
-7
-8
+3
 13
 18
 3
 47
 49
-3
+2
 2
 15
 15
 5
 7
+8
+7
 9
+64
+13
+18
+3
+47
+49
+2
+2
+15
+15
+5
 7
 10
+7
+11
 64
 13
 18
 3
 47
 49
+2
+2
+15
+15
+5
+7
+12
+7
+13
+13
+18
 3
+47
+49
+2
 2
 15
 15
 5
 7
-11
+14
+7
+15
+13
+18
+3
+47
+49
+2
+2
+15
+15
+5
+7
+16
 4
 16
 13
@@ -350,50 +350,78 @@ i
 3
 47
 49
-3
 2
+2
+15
 15
+54
+52
+17
+0
+19
+1
+15
+45
+18
+19
+20
+0
+86
+20
+9
+154
+20
+0
+54
+52
+17
+1
+8
+166
+54
+52
+17
+0
 15
 20
 0
 56
-12
+21
 50
-13
+22
 0
 15
 45
-14
-15
+23
+24
 56
-16
+25
 50
-13
+22
 0
 15
 45
-17
-18
+26
+27
 56
-19
+28
 50
-13
+22
 0
 11
 I
-5
+6
 I
-1
+2
 I
 1
 I
+0
+I
 1
 n
 p
-20
-x
-10
-initialize
+29
 x
 3
 dir
@@ -410,22 +438,49 @@ s
 6
 stdout
 x
+8
+loglevel
+s
+7
+verbose
+x
 9
 daemonize
 x
+7
+pidfile
+s
+18
+/var/run/redis.pid
+x
+4
+bind
+s
+9
+127.0.0.1
+x
 4
 port
 I
 18eb
 x
 7
-pidfile
-s
-18
-/var/run/redis.pid
+timeout
+I
+12c
 x
 9
 databases
+x
+10
+initialize
+x
+4
+Hash
+n
+x
+3
+===
 M
 1
 p
@@ -522,6 +577,8 @@ I
 I
 1
 I
+0
+I
 1
 n
 p
@@ -569,19 +626,19 @@ p
 I
 0
 I
-16
+1a
 I
 4
 I
-17
+1b
 I
 19
 I
-2e
+31
 I
 1a
 I
-18
+1c
 I
 4b
 x
@@ -618,18 +675,21 @@ x
 10
 initialize
 i
-26
+28
 57
 19
 0
 15
-5
+21
+1
+1
 20
 0
-5
+21
+1
+1
 20
 0
-47
 49
 0
 1
@@ -639,7 +699,6 @@ i
 13
 18
 3
-47
 49
 2
 2
@@ -652,6 +711,8 @@ I
 I
 1
 I
+0
+I
 1
 n
 p
@@ -666,21 +727,17 @@ x
 3
 []=
 p
-7
+5
 I
 0
 I
-1c
+21
 I
 4
 I
-2e
-I
-5
-I
-1d
+22
 I
-1a
+1c
 x
 52
 /Users/dturnbull/ruby/ruby-redis/lib/redis/config.rb
@@ -706,7 +763,7 @@ x
 10
 initialize
 i
-76
+79
 57
 19
 0
@@ -714,30 +771,34 @@ i
 45
 0
 1
-5
+21
+1
+1
 20
 0
-47
 49
 2
 1
 86
 3
 9
-21
+22
 1
 8
-23
+24
 1
 11
 15
-5
+21
+1
+1
 20
 0
-5
+21
+1
+1
 20
 0
-47
 49
 2
 1
@@ -753,11 +814,11 @@ i
 3
 1
 9
-51
+55
 15
 2
 8
-67
+71
 13
 7
 6
@@ -767,17 +828,16 @@ i
 3
 1
 9
-65
+69
 15
 3
 8
-67
+71
 15
 1
 13
 18
 3
-47
 49
 7
 2
@@ -790,6 +850,8 @@ I
 I
 1
 I
+0
+I
 1
 n
 p
@@ -817,45 +879,41 @@ x
 3
 []=
 p
-19
+17
 I
 0
 I
-21
+26
 I
 4
 I
-22
-I
-17
-I
-0
+27
 I
 18
 I
-2e
+0
 I
 19
 I
-23
+28
 I
-25
+29
 I
-24
+29
 I
-33
+37
 I
-25
+2a
 I
-42
+46
 I
-26
+2b
 I
-43
+47
 I
 0
 I
-4c
+4f
 x
 52
 /Users/dturnbull/ruby/ruby-redis/lib/redis/config.rb
@@ -865,85 +923,128 @@ x
 3
 key
 p
-35
+55
 I
 -1
 I
-a
+7
 I
 0
 I
+31
+I
+1
+I
+a
+I
+f
+I
+31
+I
+10
+I
 b
 I
-5
+1e
+I
+31
+I
+1f
+I
+c
+I
+2d
+I
+31
 I
 2e
 I
-6
+d
+I
+3a
+I
+31
+I
+3b
 I
 e
 I
-14
+49
 I
-2e
+31
 I
-15
+4a
 I
 f
 I
-23
+58
 I
-2e
+31
 I
-24
+59
 I
 10
 I
-30
-I
-2e
+66
 I
 31
 I
+67
+I
 11
 I
-3e
+74
 I
-2e
+31
 I
-3f
+75
 I
 12
 I
-4d
+82
 I
-2e
+14
 I
-4e
+89
 I
-13
+15
 I
-5b
+92
 I
 16
 I
-63
+9a
 I
-1c
+18
+I
+9f
+I
+1a
+I
+a6
+I
+0
 I
-6c
+a7
 I
 21
 I
-75
+b0
+I
+26
+I
+b9
 x
 52
 /Users/dturnbull/ruby/ruby-redis/lib/redis/config.rb
 p
-1
+2
+x
+12
+argf_or_hash
 x
 4
-argf
+this
 x
 17
 method_visibility
@@ -955,15 +1056,15 @@ p
 I
 2
 I
-7
+4
 I
 11
 I
-8
+5
 I
 1c
 I
-a
+7
 I
 2a
 x
@@ -979,7 +1080,7 @@ p
 I
 2
 I
-5
+2
 I
 1f
 x
@@ -991,17 +1092,13 @@ x
 13
 attach_method
 p
-5
+3
 I
 0
 I
 1
 I
-19
-I
-3
-I
-36
+1d
 x
 52
 /Users/dturnbull/ruby/ruby-redis/lib/redis/config.rb