Merge pull request mrnumber#7 from aluuu/remove-batteries

Remove Batteries

Author: aluuu

.travis-ci.sh

@@ -1,4 +1,4 @@
-OPAM_DEPENDS="batteries uuidm lwt ounit"
+OPAM_DEPENDS="re uuidm lwt ounit"
 
 case "$OCAML_VERSION,$OPAM_VERSION" in
 4.00.1,1.0.0) ppa=avsm/ocaml40+opam10 ;;

README.md

@@ -4,7 +4,6 @@ Ocaml bindings for [Redis](http://redis.io/)
 
 ## Dependencies
 
-* [Batteries](https://github.com/ocaml-batteries-team/batteries-included.git)
 * [Lwt](http://ocsigen.org/lwt/install) (optional)
 
 ## Quick start

_oasis

@@ -13,7 +13,7 @@ Library redis
   Pack: true
   Modules: Redis_sync
   InternalModules: Client, Cache, Mutex, Make
-  BuildDepends: batteries, uuidm
+  BuildDepends: re.str, uuidm
 
 Flag lwt
   Description: Build the Lwt client
@@ -41,13 +41,13 @@ Executable redis_examples
   BuildDepends: threads, core, redis, redis_lwt, lwt.unix, lwt
 
 Executable test
-  Path:		test
-  BuildTools:	ocamlbuild
-  MainIs:	test.ml
-  BuildDepends:	lwt, lwt.unix, oUnit, redis
-  Install:	false
-  Build$:	flag(tests)
+  Path:                 test
+  BuildTools:   ocamlbuild
+  MainIs:       test.ml
+  BuildDepends:         lwt, lwt.unix, oUnit, redis
+  Install:      false
+  Build$:       flag(tests)
 
 Test main
-  Run$:		flag(tests)
-  Command:	$test
+  Run$:                 flag(tests)
+  Command:      $test

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: e7c0f94fa6df599a02800c8237d35a94)
+# DO NOT EDIT (digest: a879416111424ed1672bec0da78d5ff1)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -23,39 +23,39 @@ true: annot, bin_annot
 "src/make.cmx": for-pack(Redis)
 # Library redis_lwt
 "src/redis_lwt.cmxs": use_redis_lwt
-<src/*.ml{,i,y}>: pkg_batteries
 <src/*.ml{,i,y}>: pkg_lwt
 <src/*.ml{,i,y}>: pkg_lwt.unix
+<src/*.ml{,i,y}>: pkg_re.str
 <src/*.ml{,i,y}>: pkg_uuidm
 <src/*.ml{,i,y}>: use_redis
 # Executable redis_examples
-<examples/examples.{native,byte}>: pkg_batteries
 <examples/examples.{native,byte}>: pkg_core
 <examples/examples.{native,byte}>: pkg_lwt
 <examples/examples.{native,byte}>: pkg_lwt.unix
+<examples/examples.{native,byte}>: pkg_re.str
 <examples/examples.{native,byte}>: pkg_redis_lwt
 <examples/examples.{native,byte}>: pkg_threads
 <examples/examples.{native,byte}>: pkg_uuidm
 <examples/examples.{native,byte}>: use_redis
-<examples/*.ml{,i,y}>: pkg_batteries
 <examples/*.ml{,i,y}>: pkg_core
 <examples/*.ml{,i,y}>: pkg_lwt
 <examples/*.ml{,i,y}>: pkg_lwt.unix
+<examples/*.ml{,i,y}>: pkg_re.str
 <examples/*.ml{,i,y}>: pkg_redis_lwt
 <examples/*.ml{,i,y}>: pkg_threads
 <examples/*.ml{,i,y}>: pkg_uuidm
 <examples/*.ml{,i,y}>: use_redis
 # Executable test
-"test/test.byte": pkg_batteries
 "test/test.byte": pkg_lwt
 "test/test.byte": pkg_lwt.unix
 "test/test.byte": pkg_oUnit
+"test/test.byte": pkg_re.str
 "test/test.byte": pkg_uuidm
 "test/test.byte": use_redis
-<test/*.ml{,i,y}>: pkg_batteries
 <test/*.ml{,i,y}>: pkg_lwt
 <test/*.ml{,i,y}>: pkg_lwt.unix
 <test/*.ml{,i,y}>: pkg_oUnit
+<test/*.ml{,i,y}>: pkg_re.str
 <test/*.ml{,i,y}>: pkg_uuidm
 <test/*.ml{,i,y}>: use_redis
 # OASIS_STOP

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.3.1 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 797597d926bc254ba8caec885bf4542f) *)
+(* DO NOT EDIT (digest: f4efc07f392b077279ce72697adb7b6a) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6917,7 +6917,7 @@ let setup_t =
                       bs_compiled_object = Best;
                       bs_build_depends =
                         [
-                           FindlibPackage ("batteries", None);
+                           FindlibPackage ("re.str", None);
                            FindlibPackage ("uuidm", None)
                         ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
@@ -7107,7 +7107,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "\015}3'h\012\239\132^\173TOhY\197\196";
+     oasis_digest = Some "\150\1632\012\127qS\198\1999]\212?\180\218\023";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false

src/META

@@ -1,8 +1,8 @@
 # OASIS_START
-# DO NOT EDIT (digest: b056c40693e1e9ada07100e2100493f0)
+# DO NOT EDIT (digest: b919e1916716c906859709a7f8f4b98a)
 version = "0.2"
 description = "Ocaml bindings for Redis"
-requires = "batteries uuidm"
+requires = "re.str uuidm"
 archive(byte) = "redis.cma"
 archive(byte, plugin) = "redis.cma"
 archive(native) = "redis.cmxa"

src/cache.ml

@@ -1,5 +1,4 @@
 (** A convenience module for writing redis caches *)
-open Batteries
 
 (** Signature to parameterize the cache *)
 module type S = sig
@@ -23,7 +22,7 @@ module Make(IO : Make.IO)(Client : module type of Client.Make(IO))(S : S) = stru
     let key = S.cache_key key in
     let data = S.string_of_data data in
     set r key data >>= fun () ->
-    IO.return (Option.may
+    IO.return (Utils.Option.may
       (fun cache_expiration ->
         IO.ignore_result (expire r key cache_expiration)
       )
@@ -32,7 +31,7 @@ module Make(IO : Make.IO)(Client : module type of Client.Make(IO))(S : S) = stru
   let get r key =
     let key = S.cache_key key in
     get r key >>= fun value ->
-    IO.return (Option.map S.data_of_string value)
+    IO.return (Utils.Option.map S.data_of_string value)
 
   let delete r key =
     let key = S.cache_key key in

src/client.ml

@@ -2,7 +2,6 @@
 
     This has only been tested with Redis 2.2, but will probably work for >= 2.0
  **)
-open Batteries
 
 (* Make communication module *)
 module Make(IO : Make.IO) = struct
@@ -217,12 +216,12 @@ module Make(IO : Make.IO) = struct
   (* multibulks all of whose entries are not nil *)
   let return_no_nil_multibulk reply =
     return_bulk_multibulk reply >>= fun list ->
-    IO.return (List.filter_map identity list)
+    IO.return (Utils.List.filter_map (fun x -> x) list)
 
   let return_key_value_multibulk reply =
     return_bulk_multibulk reply >>= fun list ->
       try
-        IO.return (List.filter_map (function
+        IO.return (Utils.List.filter_map (function
           | (Some k, Some v) -> Some (k, v)
           | _ -> None
         ) (deinterleave list))
@@ -237,9 +236,9 @@ module Make(IO : Make.IO) = struct
   let return_info_bulk reply =
     return_bulk reply >>= function
       | Some b ->
-          let fields = String.nsplit b "\r\n" in
-          let fields = List.filter (fun x -> x <> "" && not (String.starts_with x "#") ) fields in
-          IO.return (List.map (fun f -> String.split f ":") fields)
+          let fields = Utils.String.nsplit b "\r\n" in
+          let fields = List.filter (fun x -> x <> "" && not (String.get x 0 = '#')) fields in
+          IO.return (Utils.List.filter_map (fun f -> Utils.String.split f ":") fields)
       | None   -> IO.return []
 
   (* generate command for SORT *)
@@ -866,7 +865,7 @@ module Make(IO : Make.IO) = struct
 
   (* Lists the currently active channels. If no pattern is specified, all channels are listed. *)
   let pubsub_channels connection channels =
-    let message = Option.default "*" channels in
+    let message = Utils.Option.default "*" channels in
     let command = ["PUBSUB"; "CHANNELS"; message ] in
     send_request connection command >>= return_multibulk
 

src/utils.ml

@@ -0,0 +1,37 @@
+module List = struct
+  let filter_map f l =
+    let rec loop l accum =
+      match l with
+      | [] -> accum
+      | hd :: tl ->
+         match f hd with
+         | Some x -> loop tl (x :: accum)
+         | None -> loop tl accum
+    in
+    List.rev (loop l [])
+end
+
+module String = struct
+  module Str = Re_str
+
+  let nsplit str delim = Str.split (Str.regexp delim) str
+
+  let split str delim =
+    match Str.bounded_split (Str.regexp delim) str 2 with
+    | a :: b :: [] -> Some (a, b)
+    | _ -> None
+end
+
+module Option = struct
+  let default d = function
+    | None -> d
+    | Some v -> v
+
+  let may f = function
+    | None -> ()
+    | Some v -> f v; ()
+
+  let map f = function
+    | None -> None
+    | Some v -> Some (f v)
+end

src/utils.mli

@@ -0,0 +1,14 @@
+module List : sig
+  val filter_map : ('a -> 'b option) -> 'a list -> 'b list
+end
+
+module String : sig
+  val nsplit : string -> string -> string list
+  val split : string -> string -> (string * string) option
+end
+
+module Option : sig
+  val default : 'a -> 'a option -> 'a
+  val may : ('a -> unit) -> 'a option -> unit
+  val map : ('a -> 'b) -> 'a option -> 'b option
+end