Merge pull request #200 from hannesm/ci

add thread to tags (as requested by @cfcs in #199), make opam lint happy

.travis.yml

@@ -9,14 +9,12 @@ env:
     - TESTS=false
 matrix:
   include:
-  - os: linux
-    env: OCAML_VERSION=4.03
-  - os: linux
-    env: OCAML_VERSION=4.04
   - os: linux
     env: OCAML_VERSION=4.05
   - os: linux
     env: OCAML_VERSION=4.06
+  - os: linux
+    env: OCAML_VERSION=4.07
   - os: osx
     env: OCAML_VERSION=4.06
 notifications:

README.md

@@ -68,7 +68,7 @@ but I've some [work-in-progress](https://github.com/hannesm/conex).
 Be aware that this is unreleased software.  Bug reports are welcome
 (pull requests as well).
 
-Get OCaml (>= 4.06.0), get opam (>= 2.0.0),
+Get OCaml (>= 4.05.0), get opam (>= 2.0.0),
 [gmp](http://gmplib.org/) is required as well.
 If you have an older OCaml compiler, run `opam switch 4.07.1` and follow instructions.
 

_tags

@@ -3,22 +3,18 @@ true : warn(+A-4-44-48-58)
 "src" : include
 "cli" : include
 
-true : package(sexplib astring uchar)
+true : package(sexplib astring uchar ptime erm_xmpp lwt tls tls.lwt hex otr x509), thread
 
 <src/xconfig.ml>: package(otr ppx_sexp_conv)
 <src/utils.ml>: package(uutf)
-<src/persistency.ml>: package(lwt lwt.unix nocrypto)
-<src/xjid.{ml,mli}>: package(ppx_sexp_conv erm_xmpp)
-<src/user.{ml,mli}>: package(ppx_sexp_conv otr hex ptime ptime.clock.os)
-<src/xmpp_callbacks.ml>: package(erm_xmpp lwt tls tls.lwt ptime)
-<src/xmpp_connection.ml>: package(erm_xmpp lwt tls tls.lwt)
+<src/persistency.ml>: package(lwt.unix nocrypto)
+<src/xjid.{ml,mli}>: package(ppx_sexp_conv)
+<src/user.{ml,mli}>: package(ppx_sexp_conv ptime.clock.os)
 
 <cli/*>: package(notty lwt)
 <cli/cli_support.ml>: package(uutf uucp uuseg)
-<cli/cli_client.ml>: package(lwt lwt.unix otr erm_xmpp ptime ptime.clock.os)
-<cli/cli_input.ml>: package(erm_xmpp otr)
-<cli/cli_commands.ml>: package(hex otr erm_xmpp)
-<cli/cli_config.ml>: package(nocrypto otr tls.lwt x509 ptime ptime.clock.os)
-<cli/cli_state.ml>: package(hex nocrypto erm_xmpp tls.lwt x509)
+<cli/cli_client.ml>: package(lwt.unix ptime.clock.os)
+<cli/cli_config.ml>: package(nocrypto ptime.clock.os)
+<cli/cli_state.ml>: package(nocrypto)
 
-<bin/jackline.{ml,byte,native}>: package(erm_xmpp hex lwt lwt.unix notty notty.lwt nocrypto otr sexplib tls tls.lwt ptime ptime.clock.os)
+<bin/jackline.{ml,byte,native}>: package(lwt.unix notty notty.lwt nocrypto sexplib ptime.clock.os)

opam

@@ -13,7 +13,7 @@ build: [
 ]
 
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.05.0"}
   "ocamlfind" {build}
   "ocamlbuild" {build}
   "ppx_sexp_conv" {build}
@@ -35,3 +35,23 @@ depends: [
   "uuseg" {>= "1.0.0"}
   "uutf" {>= "1.0.0"}
 ]
+synopsis: "Jackline - a minimalistic secure XMPP client"
+description: """
+Jackline uses several clean-slate libraries (OCaml-TLS, OCaml-OTR) and only has
+a minimal few features: no support for HTML markup, avatars, which music you're
+playing, timezone you're living in, ...
+
+Supported features:
+- single XMPP account
+- OTR (built-in and enabled by default)
+- strict TLS certificate verification
+- plain text (no HTML!)
+- [XEP-0184](http://xmpp.org/extensions/xep-0184.html) (Message Delivery Receipts)
+- _no_ import of OTR keys or configuration
+- _no_ plaintext connections to XMPP server
+
+Preserving three core properties:
+- any data written on disk (using lots of silly parens) by jackline will stay being readable by every future jackline version
+- once the initial configuration file (and private key and maybe password) is created, it will never be written to by jackline
+- jackline will never transmit any data or open a network connection unless initiated by you (this means no 'autoconnect on startup', or 'user is typing' indication sent).  There is an automated reconnect to the same server if the connection terminated.
+"""