0.6

.dir-locals.el

@@ -1,2 +1,3 @@
-((scheme-mode . ((flymake-chicken-command-args . ("-X" "r7rs" "-R" "r7rs"))
+((org-mode . ((geiser-scheme-implementation . chicken)))
-                 (geiser-scheme . 'chicken))))
+ (scheme-mode . ((flymake-chicken-command-args . ("-X" "r7rs" "-R" "r7rs"))
+                 (geiser-scheme-implementation . chicken))))

.envrc

@@ -0,0 +1 @@
+use guix chicken chicken-test chicken-r7rs chicken-srfi-34 chicken-srfi-35 chicken-srfi-69 chicken-srfi-99 chicken-srfi-113 chicken-srfi-128 chicken-srfi-133 chicken-srfi-152 chicken-srfi-158 redis

redis-impl.scm

@@ -2,6 +2,7 @@
 (import r7rs
         (chicken base)
         (chicken port)
+        (chicken string)
         (chicken io)
         (chicken tcp)
         (srfi 34)	;; Exception Handling
@@ -28,15 +29,17 @@
 ;; Connection Management
 ;; This egg currently uses a simple TCP connection without any "bells and whistles". The two ports are kept in a record of type =redis-connection= in the fields ~input~ and ~output~.
 
-;; ~(redis-connect host port)~
+;; ~(redis-connect host port #!optional (protocol-version 1))~
-;; Connects to a (hopefully) Redis server at =host:port=.
+;; Connects to a (hopefully) Redis server at =host:port=, using the given protocol version. Defaults, like Redis itself, to version 1.
 
 
 ;; [[file:redis.org::*Connection Management][Connection Management:1]]
 (define-record-type redis-connection #t #t input output)
-(define (redis-connect host port)
+(define (redis-connect host port #!optional (protocol-version 1))
   (let-values (((i o) (tcp-connect host port)))
-    (make-redis-connection i o)))
+    (values (make-redis-connection i o)
+            (and (write-line (string-append "HELLO " (->string protocol-version)) o)
+                (redis-read-reply i)))))
 ;; Connection Management:1 ends here
 
 
@@ -80,7 +83,7 @@
 
 ;; Supported Data Types
 
-;; This Redis client supports all data types up to and including as specified in [[https://github.com/antirez/RESP3/blob/master/spec.md][RESP3]]. Setting the protocol version with the =HELLO= command, however, is the user's responsibility.
+;; This Redis client supports all data types up to and including as specified in [[https://github.com/antirez/RESP3/blob/master/spec.md][RESP3]].
 
 ;; #+name: redis-read-reply
 

redis.egg

@@ -7,7 +7,7 @@
  (synopsis "A Redis client library for Chicken Scheme")
  (category db)
  (license "BSD")
- (version "0.5")
+ (version "0.6")
  (dependencies r7rs srfi-34 srfi-35 srfi-69 srfi-99 srfi-113 srfi-128 srfi-133 srfi-152 srfi-158)
  (test-dependencies test)
 

redis.org

@@ -79,9 +79,10 @@
 #+end_src
 
 #+begin_src scheme :noweb yes :tangle redis-impl.scm :exports none
-(import r7rs
+  (import r7rs
           (chicken base)
           (chicken port)
+          (chicken string)
           (chicken io)
           (chicken tcp)
           (srfi 34)	;; Exception Handling
@@ -103,7 +104,7 @@
 ** Exceptions
 This library defines an SRFI-35 exception type ~&redis-error~ that gets raised when Redis returns an error. The exception type has a single field called ~redis-error-message~ containing the error message returned by Redis.
 #+begin_src scheme :tangle redis-impl.scm
-(define-condition-type &redis-error &error
+  (define-condition-type &redis-error &error
     redis-error?
     (redis-error-message redis-error-message))
 #+end_src
@@ -111,20 +112,22 @@ This library defines an SRFI-35 exception type ~&redis-error~ that gets raised w
 ** Connection Management
 This egg currently uses a simple TCP connection without any "bells and whistles". The two ports are kept in a record of type =redis-connection= in the fields ~input~ and ~output~.
 
-~(redis-connect host port)~
+~(redis-connect host port #!optional (protocol-version 1))~
-Connects to a (hopefully) Redis server at =host:port=.
+Connects to a (hopefully) Redis server at =host:port=, using the given protocol version. Defaults, like Redis itself, to version 1.
 
 #+begin_src scheme :tangle redis-impl.scm :exports none
-(define-record-type redis-connection #t #t input output)
+  (define-record-type redis-connection #t #t input output)
-(define (redis-connect host port)
+  (define (redis-connect host port #!optional (protocol-version 1))
     (let-values (((i o) (tcp-connect host port)))
-    (make-redis-connection i o)))
+      (values (make-redis-connection i o)
+              (and (write-line (string-append "HELLO " (->string protocol-version)) o)
+                  (redis-read-reply i)))))
 #+end_src
 
 ~(redis-disconnect rconn)~
 Disconnects from =rconn= which must be a =redis-connection=.
 #+begin_src scheme :tangle redis-impl.scm :exports none
-(define (redis-disconnect rconn)
+  (define (redis-disconnect rconn)
     (tcp-abandon-port (redis-connection-input rconn))
     (tcp-abandon-port (redis-connection-output rconn)))
 #+end_src
@@ -134,7 +137,7 @@ Disconnects from =rconn= which must be a =redis-connection=.
 ~(redis-run rconn command . args)~
 Uses connection =rconn= to run =command= with =args=. The args will be appended to the command, space-separated. Returns the parsed reply.
 #+begin_src scheme :tangle redis-impl.scm :exports none
-(define (redis-run rconn command . args)
+  (define (redis-run rconn command . args)
     (let ((in (redis-connection-input rconn))
           (out (redis-connection-output rconn))
           (comm (string-join (cons command args))))
@@ -145,7 +148,7 @@ Uses connection =rconn= to run =command= with =args=. The args will be appended
 ~(redis-run-proc rconn proc . args)~
 Calls =proc= with the output port of the =rconn= as current output port, optionally with =args=. Returns the parsed reply.
 #+begin_src scheme :tangle redis-impl.scm :exports none
-(define (redis-run-proc rconn proc . args)
+  (define (redis-run-proc rconn proc . args)
     (let ((in (redis-connection-input rconn))
           (out (redis-connection-output rconn)))
       (with-output-to-port out
@@ -156,11 +159,11 @@ Calls =proc= with the output port of the =rconn= as current output port, optiona
 
 ** Supported Data Types
 
-This Redis client supports all data types up to and including as specified in [[https://github.com/antirez/RESP3/blob/master/spec.md][RESP3]]. Setting the protocol version with the =HELLO= command, however, is the user's responsibility.
+This Redis client supports all data types up to and including as specified in [[https://github.com/antirez/RESP3/blob/master/spec.md][RESP3]].
 
 #+name: redis-read-reply
 #+begin_src scheme :tangle redis-impl.scm :exports none
-(define (redis-read-reply #!optional port)
+  (define (redis-read-reply #!optional port)
     (let* ((port (or port (current-input-port)))
            (sigil (read-char port)))
       (case sigil
@@ -190,7 +193,7 @@ Simple strings start with ~+~ and are single-line.
 
 #+name: read-redis-simple-string
 #+begin_src scheme :tangle redis-impl.scm :exports none :results silent
-(define (read-redis-simple-string #!optional port)
+  (define (read-redis-simple-string #!optional port)
     (let ((port (or port (current-input-port))))
       (read-line port)))
 #+end_src
@@ -229,7 +232,7 @@ chicken
 
 #+name: read-redis-blob-string
 #+begin_src scheme :tangle redis-impl.scm :exports none
-(define (read-redis-blob-string #!optional port)
+  (define (read-redis-blob-string #!optional port)
     (let* ((port (or port (current-input-port)))
            (charcount (string->number (read-line port)))
            (str (list->string
@@ -282,7 +285,7 @@ Integers are sent to the client prefixed with ~:~.
 
 #+name: read-redis-number
 #+begin_src scheme :tangle redis-impl.scm :exports none
-(define (read-redis-number #!optional port)
+  (define (read-redis-number #!optional port)
     (let* ((port (or port (current-input-port)))
            (elem (read-line port)))
       (if (string=? elem "inf")
@@ -339,7 +342,7 @@ True and false values are represented as ~#t~ and ~#f~, just like in Scheme.
 
 #+name: read-redis-bool
 #+begin_src scheme :tangle redis-impl.scm :exports none
-(define (read-redis-bool #!optional port)
+  (define (read-redis-bool #!optional port)
     (let ((port (or port (current-input-port))))
       (string=? (read-line port) "t")))
 #+end_src
@@ -367,7 +370,7 @@ The null type is encoded simply as ~_~, and results in ~'()~.
 
 #+name: read-redis-null
 #+begin_src scheme :tangle redis-impl.scm :exports none
-(define (read-redis-null #!optional port)
+  (define (read-redis-null #!optional port)
     (let ((port (or port (current-input-port))))
       (read-line port) '()))
 #+end_src
@@ -399,7 +402,7 @@ Arrays are marked with ~*~ followed by the number of entries, and get returned a
 
 #+name: read-redis-array
 #+begin_src scheme :tangle redis-impl.scm :exports none
-(define (read-redis-array #!optional port)
+  (define (read-redis-array #!optional port)
     (let* ((port (or port (current-input-port)))
            (elems (string->number (read-line port)))
            (vec (make-vector elems '())))
@@ -440,7 +443,7 @@ Maps are represented exactly as arrays, but instead of using the ~*~ byte, the e
 
 #+name: read-redis-map
 #+begin_src scheme :tangle redis-impl.scm :exports none
-(define (read-redis-map #!optional port)
+  (define (read-redis-map #!optional port)
     (let* ((port (or port (current-input-port)))
            (elems (string->number (read-line port)))
            (ht (make-hash-table)))
@@ -485,14 +488,14 @@ Additionally, there is a parameter defined, =redis-set-comparator=, that specifi
 
 #+name: read-redis-set
 #+begin_src scheme :tangle redis-impl.scm :exports none
-(define redis-set-comparator
+  (define redis-set-comparator
     (make-parameter (make-default-comparator)
                     (lambda (newcomp)
                       (or (and (comparator? newcomp)
                                newcomp)
                           '()))))
 
-(define (read-redis-set #!optional port)
+  (define (read-redis-set #!optional port)
     (let* ((port (or port (current-input-port)))
            (elems (string->number (read-line port)))
            (s (set (redis-set-comparator))))
@@ -529,7 +532,7 @@ This library returns two values in this case, the first value being the actual d
 
 #+name: read-redis-with-attributes
 #+begin_src scheme :tangle redis-impl.scm :exports none
-(define (read-redis-with-attributes #!optional port)
+  (define (read-redis-with-attributes #!optional port)
     (let* ((port (or port (current-input-port)))
            (attributes (read-redis-map port)))
       (values (redis-read-reply port) attributes)))
@@ -567,6 +570,7 @@ Daniel Ziltener
 ** Version History
 
 #+name: version-history
+| 0.6 | Easier Protocol Version Setting |
 | 0.5 | Initial Release                 |
 
 #+name: gen-releases

redis.release-info

@@ -2,5 +2,6 @@
 ;; -*- Scheme -*-
 (repo git "https://gitea.lyrion.ch/Chicken/redis.git")
 (uri targz "https://gitea.lyrion.ch/Chicken/redis/archive/{egg-release}.tar.gz")
+(release "0.6") ;; Easier Protocol Version Setting
 (release "0.5") ;; Initial Release
 ;; Version History:3 ends here