Version 0.1.20.1.2

3 files changed, 74 insertions, 63 deletions

diff --git a/ChangeLog.md b/ChangeLog.md
index 735cac7..8147650 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,10 @@
+0.1.2
+=====
+
+* Rewrite to use `optparse-applicative` instead of `docopt`.
+* Rewrite to use `getAddrInfo` instead of `inet_addr`.
+
+
 0.1.1
 =====
 
diff --git a/README.md b/README.md
index c369f9b..3dde9c1 100644
--- a/README.md
+++ b/README.md
@@ -25,19 +25,19 @@ Usage
 =====
 Type `juandelacosa --help` to see usage summary:
 
-    Usage:
-      juandelacosa [options]
+    Usage: juandelacosa [-f|--file FILE] [-g|--group STRING] [-d|--datadir DIR]
+                        [(-p|--port INT) | (-s|--socket PATH)]
 
-    Options:
-      -f, --file=MYCNF         Read this MySQL client config file
-      -g, --group=GROUP        Read this options group in the above file [default: client]
-
-      -d, --datadir=DIR        Data directory including static files [default: <cabal data dir>]
-
-      -s, --socket=SOCK        Listen on this UNIX-socket [default: /tmp/juandelacosa.sock]
-      -p, --port=PORT          Instead of UNIX-socket, listen on this TCP port (localhost)
-
-      -h, --help               Show this message
+    Available options:
+      -f,--file FILE           Read this MySQL client config file
+      -g,--group STRING        Read this options group in the above file
+                               (default: "client")
+      -d,--datadir DIR         Data directory including static files
+                               (default: "...")
+      -p,--port INT            listen on this TCP port (localhost only)
+      -s,--socket PATH         Listen on this UNIX-socket
+                               (default: "/tmp/juandelacosa.sock")
+      -h,--help                Show this help text
 
 
 Database Privileges
@@ -53,6 +53,6 @@ GRANT SELECT ON `mysql`.`user` TO 'juandelacosa'@'localhost';
 Screenshots
 ===========
 ![Reset Password](./screenshots/resetpassword.png)
-![Password Chnaged](./screenshots/passwordchanged.png)
+![Password Changed](./screenshots/passwordchanged.png)
 ![No Account](./screenshots/noaccout.png)
 
diff --git a/juandelacosa.cabal b/juandelacosa.cabal
index 02dc050..935f123 100644
--- a/juandelacosa.cabal
+++ b/juandelacosa.cabal
@@ -1,58 +1,62 @@
-name: juandelacosa
-version: 0.1.1
-synopsis: Manage users in MariaDB >= 10.1.1
+name:               juandelacosa
+version:            0.1.2
+cabal-version:      1.20
+license:            MIT
+license-file:       LICENSE
+copyright:          2016, Zalora South East Asia Pte. Ltd
+maintainer:         Igor Pashev <pashev.igor@gmail.com>
+author:             Igor Pashev <pashev.igor@gmail.com>
+synopsis:           Manage users in MariaDB >= 10.1.1
 description:
-  HTTP server for managing MariaDB users.  Designed to work behind
-  Sproxy and assuming users' logins are their email addresses
-  (MariaDB allows up to 80 characters).
-license: MIT
-license-file: LICENSE
-author: Igor Pashev <pashev.igor@gmail.com>
-maintainer: Igor Pashev <pashev.igor@gmail.com>
-copyright: 2016, Zalora South East Asia Pte. Ltd
-category: Databases, Web
-build-type: Simple
-extra-source-files: README.md ChangeLog.md
-cabal-version: >= 1.20
+    HTTP server for managing MariaDB users.  Designed to work behind
+    Sproxy and assuming users' logins are their email addresses
+    (MariaDB allows up to 80 characters).
+
+category:           Databases, Web
+build-type:         Simple
 data-files:
-  index.html
-  static/external/bootstrap/css/*.min.css
-  static/external/bootstrap/js/*.min.js
-  static/external/jquery-2.2.4.min.js
-  static/juandelacosa.js
+    index.html
+    static/external/bootstrap/css/*.min.css
+    static/external/bootstrap/js/*.min.js
+    static/external/jquery-2.2.4.min.js
+    static/juandelacosa.js
+
+extra-source-files:
+    README.md
+    ChangeLog.md
 
 source-repository head
-  type: git
-  location: https://github.com/zalora/juandelacosa.git
+    type:     git
+    location: https://github.com/ip1981/juandelacosa.git
 
 executable juandelacosa
-    default-language: Haskell2010
-    ghc-options: -Wall -static
-    hs-source-dirs: src
-    main-is: Main.hs
+    main-is:          Main.hs
+    hs-source-dirs:   src
     other-modules:
-      Application
-      LogFormat
-      Server
-    build-depends:
-        base                     >= 4.8 && < 50
-      , base64-bytestring        >= 1.0
-      , bytestring               >= 0.10
-      , data-default-class
-      , entropy                  >= 0.3
-      , fast-logger
-      , http-types               >= 0.9
-      , mtl                      >= 2.2
-      , mysql                    >= 0.1
-      , mysql-simple             >= 0.2
-      , network                  >= 2.6
-      , optparse-applicative     >= 0.13.0.0
-      , resource-pool            >= 0.2
-      , scotty                   >= 0.10
-      , text                     >= 1.2
-      , unix                     >= 2.7
-      , wai                      >= 3.2
-      , wai-extra                >= 3.0
-      , wai-middleware-static    >= 0.8
-      , warp                     >= 3.2
+        Application
+        LogFormat
+        Server
 
+    default-language: Haskell2010
+    ghc-options:      -Wall -static
+    build-depends:
+        base >=4.8 && <50,
+        base64-bytestring >=1.0,
+        bytestring >=0.10,
+        data-default-class -any,
+        entropy >=0.3,
+        fast-logger -any,
+        http-types >=0.9,
+        mtl >=2.2,
+        mysql >=0.1,
+        mysql-simple >=0.2,
+        network >=2.6,
+        optparse-applicative >=0.13.0.0,
+        resource-pool >=0.2,
+        scotty >=0.10,
+        text >=1.2,
+        unix >=2.7,
+        wai >=3.2,
+        wai-extra >=3.0,
+        wai-middleware-static >=0.8,
+        warp >=3.2