Merge branch 'dev'

Conflicts:
	README.md
	_oasis
	setup.ml

.gitignore

@@ -16,3 +16,4 @@ dist
 *.vim
 .settings/
 *.back
+tags

.gitlab-ci.yml

@@ -1,15 +1,94 @@
-before_script:
-  - apt-get update -qq && apt-get install -y -qq opam ocaml ocaml-native-compilers
-  - opam --version
+stages:
+  # Test with alpine
+  - test
+  # Test with alpine, other version of the compiler
+  - other_version
+  # Real world distributions
+  - real
 
-# OCaml version of the ci runner, i.e. from the system
-#ocaml_sys:
-#  script: "./gitlab-ci.sh system"
+# OCaml version 4.04
+ocaml_404:
+  before_script:
+    - sudo apk update && sudo apk add m4
+  stage: other_version
+  image: ocaml/opam:alpine_ocaml-4.04.0
+  script: "./gitlab-ci.sh"
+  allow_failure: true
+
+# OCaml version 4.04
+ocaml_404_flambda:
+  before_script:
+    - sudo apk update && sudo apk add m4
+  stage: other_version
+  image: ocaml/opam:alpine_ocaml-4.04.0_flambda
+  script: "./gitlab-ci.sh"
+  allow_failure: true
 
 # OCaml version 4.02
 ocaml_402:
-  script: "./gitlab-ci.sh 4.02.3"
+  before_script:
+    - sudo apk update && sudo apk add m4
+  stage: other_version
+  image: ocaml/opam:alpine_ocaml-4.02.3
+  script: "./gitlab-ci.sh"
+  allow_failure: true
 
 # OCaml version 4.03
 ocaml_403:
-  script: "./gitlab-ci.sh 4.03.0+beta2"
+  before_script:
+    - sudo apk update && sudo apk add m4
+  stage: test
+  image: ocaml/opam:alpine_ocaml-4.03.0
+  script: "./gitlab-ci.sh"
+  allow_failure: false
+
+# OCaml version 4.03, with flambda optimisation
+ocaml_403_flambda:
+  before_script:
+    - sudo apk update && sudo apk add m4
+  stage: other_version
+  image: ocaml/opam:alpine_ocaml-4.03.0_flambda
+  script: "./gitlab-ci.sh"
+  allow_failure: true
+
+# ---------------
+ubuntu:
+  before_script:
+    - sudo apt-get update && sudo apt-get install -y m4
+  stage: real
+  image: ocaml/opam:ubuntu
+  script: "export OC_NOTEST=true; ./gitlab-ci.sh system"
+  allow_failure: true
+
+
+debian:
+  before_script:
+    - sudo apt-get update && sudo apt-get install -y m4
+  stage: real
+  image: ocaml/opam:debian
+  script: "export OC_NOTEST=true; ./gitlab-ci.sh system"
+  allow_failure: true
+
+centos:
+  before_script:
+    - sudo yum install -y m4
+  stage: real
+  image: ocaml/opam:centos
+  script: "export OC_NOTEST=true; ./gitlab-ci.sh system"
+  allow_failure: true
+
+fedora:
+  before_script:
+    - sudo dnf install -y m4
+  stage: real
+  image: ocaml/opam:fedora
+  script: "export OC_NOTEST=true; ./gitlab-ci.sh system"
+  allow_failure: true
+
+opensuse:
+  before_script:
+    - sudo zypper --non-interactive up && sudo zypper --non-interactive in m4
+  stage: real
+  image: ocaml/opam:opensuse
+  script: "export OC_NOTEST=true; ./gitlab-ci.sh system"
+  allow_failure: true

0install.sh

@@ -18,7 +18,7 @@ if [ ! -d $dist ]; then
   mkdir $dist
 fi
 # Archive name, _the bin emphasis the difference with source tarball
-id=`git describe --abbrev=40 --candidates=50 HEAD`
+id=`git describe --abbrev=10 --candidates=50 HEAD`
 name=oclaunch-${id}_$(arch)_bin
 final_binary_path=./$name/oclaunch
 final_binary_name=oclaunch
@@ -41,14 +41,16 @@ tar_name=${name}.tar
 tar -cvaf ${tar_name} $name >> $dbg_log
 
 echo "========= Creating first archive ========="
-coproc lzma -f -9 ${tar_name} >> $dbg_log
+coproc lzma -kf -9 ${tar_name} >> $dbg_log
+coproc gzip -kf -9 ${tar_name} >> $dbg_log
 
 # Create stripped archive
 tar_name_stripped=${name}_stripped.tar
 strip $final_binary_path
 tar -cvaf ${tar_name_stripped} $name >> $dbg_log
 echo "========= Creating second (stripped) archive ========="
-coproc lzma -f -9 ${tar_name_stripped} >> $dbg_log
+coproc lzma -kf -9 ${tar_name_stripped} >> $dbg_log
+coproc gzip -kf -9 ${tar_name_stripped} >> $dbg_log
 
 # Wait for the detached compression process  to finish
 # (see lines starting with 'coproc')

AUTHORS.md

@@ -1,12 +1,12 @@
 <!--- OASIS_START --->
-<!--- DO NOT EDIT (digest: 8b50d3b615117789414f2ad56e4f9d35) --->
+<!--- DO NOT EDIT (digest: 7d7e6e9b59529ebaf8057deb13b160d9) --->
 
 Authors of OcLaunch:
 
-* Joly Clément <leowzukw@vmail.me>
+* Joly Clément <leowzukw@oclaunch.eu.org>
 
 Current maintainers of OcLaunch:
 
-* Joly Clément <leowzukw@vmail.me>
+* Joly Clément <leowzukw@oclaunch.eu.org>
 
 <!--- OASIS_STOP --->

CHANGELOG.md

@@ -11,12 +11,20 @@ This version introduce major changes in the tmp and rc file.
 
 #### Major
 
- + Changed tmp file format, the new one would allow to do more things: (See #6)
+ + Allow to temporary disable oclaunch auto-run. Please refer to documentation for more.
+ + Changed tmp file structure, the new one would allow to do more things: (See #6)
     + Restart edited command (reset number of launch).
     + Support multiple configuration file.
     + More natural behavior when starting from an empty file. (Don't increment
      number of launch when nothing is actually launched).
+    + Change name to improve multi-user compatibility.
     + For the future : Running infinite, daemon mode...
+    + Format changed too, from [biniou](http://mjambon.com/biniou.html) to
+      [Bin\_proto](https://github.com/janestreet/bin_prot). This is faster and
+      remove dependencies since it's included in Core library.
+ + New format and structure for the rc file, using **serial expression**: (see #5)
+    + Allows to add tags to command
+    + Allow to contain setting
  + Beautified rc file:
     + Remove doubled entries before each write of the rc file. Trailing spaces
       are remove too. Empty entries are dropped.
@@ -33,10 +41,14 @@ This version introduce major changes in the tmp and rc file.
       any argument. This way, the program tries to launch the corresponding
       command or the next one. The problem is that you can't call it with an
       option. To do this, use the **`run` subcommand**.
+ + Add `--yes` option.
  + Improve **list subcommand**, now using Textutils library, displaying in an
-   array. Add `--el` argument to limit the length of displayed entries.
+   array. Add `--length` argument to limit the length of displayed entries.
  + Improve **edit subcommand** (explain how to use to add commands, improve
    messages, offer to reedit when nothing was done).
+ + Improve **delete subcommand**, asking for confirmation before deleting.
+ + Allow *most subcommand* (in fact every subcommand for which it makes sense) to
+   parse lists of entries ids like **1,4-8,10**
 
 #### Minor
 
@@ -49,16 +61,23 @@ This version introduce major changes in the tmp and rc file.
       cd7fdc0c022aa36b39f02813c4ebe54a533f0041 and
       bd712c97c788922aabdda15f75e78cb05882c53f).
  + Code clean up (especially indentation, thanks to ocp-indent), messages
-   improvement.
+   improvement (for instance to make it clearer, give more accurate tips or
+   engage users, thanks to s.oclaunch.eu.org service).
  + Allow to set parameters with environment variable, such as `OC_RC, `OC_VERB`,
    `OC_NOCOLOR`. This is added to the previous variable `OC_TMP`. See #20.
  + Add unit tests and clean them up.
  + Add licence warning.
- + Remove core\_extended dependency, incorporating some code from the library
-   directly in the program, and using Textutils and Re2 library instead.
- + Display debugging information before each message.
+ + Improve help messages, by rewriting some and display it in a more subtle way
+   according to the current internal state.
+ + Remove core\_extended dependency, using Textutils and Re2 library instead.
+ + Display debugging information before each message. Flush stdout on each
+   message.
+ + Some subcommand, such as `run`, take list of ids instead of only one.
+ + Adapt code a bit for OCaml 4.03.
  + TODO XXX Add basic signal handling (`--signals`), to relaunch when doing
    ctrl-C. See issue #14 for known problems.
+ + Adapt to OCaml compiler version 4.03 (only supported)
+ + Improve opam file, installs less dependencies, with ability to run tests
 
 #### Community
 
@@ -66,7 +85,8 @@ This version introduce major changes in the tmp and rc file.
    release source-code, binaries, signing, run test…). Stripped (and thus smaller)
    binaries are being tested too. Add *indentation script* too.
  + Improve README.md file, using special code in \_oasis Description field.
- + Using Gitlab CI to build with several versions of the compiler.
+ + Using Gitlab CI to build with several versions of the compiler (fasten with
+   Docker).
 
 ## 0.2.x
 

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributions are most welcome, not only for the code !
 
-See [the website](http://oclaunch.eu.org/contribute) for details.
+See [the website](https://oclaunch.eu.org/contribute) for details.
 
 By participating in this project you agree to abide by its
-[rules](http://www.oclaunch.eu.org/rules).
+[rules](https://www.oclaunch.eu.org/rules).

INSTALL.md

@@ -1,5 +1,5 @@
 <!--- OASIS_START --->
-<!--- DO NOT EDIT (digest: 82837b65c0730b7a1c78065ed839afd8) --->
+<!--- DO NOT EDIT (digest: 2c6cebfec70788a5252cb011aa9c4cdf) --->
 
 This is the INSTALL file for the OcLaunch distribution.
 
@@ -11,12 +11,13 @@ Dependencies
 
 In order to compile this package, you will need:
 
-* ocaml for all, test tests
+* ocaml for all, test alcotests
 * findlib
 * core
 * textutils
-* atdgen
 * re2
+* atdgen
+* yojson for executable oclaunch
 * alcotest for executable run_test
 * oUnit for executable run_test
 

Makefile

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 46f8bd9984975bd4727bed22d0876cd2)
+# DO NOT EDIT (digest: 0ea630b0d23ed49c1bf5c457a3a51866)
 
 SETUP = ./setup.exe
 
@@ -38,7 +38,7 @@ configure: $(SETUP)
 	$(SETUP) -configure $(CONFIGUREFLAGS)
 
 setup.exe: setup.ml
-	ocamlfind ocamlopt -o $@ $< || ocamlfind ocamlc -o $@ $< || true
+	ocamlfind ocamlopt -o $@ setup.ml || ocamlfind ocamlc -o $@ setup.ml || true
 	$(RM) setup.cmi setup.cmo setup.cmx setup.o
 
 .PHONY: build doc test all install uninstall reinstall clean distclean configure

README.md

@@ -1,21 +1,21 @@
 <!--- OASIS_START --->
-<!--- DO NOT EDIT (digest: bb1a2659cf85c6b63c792f893b6264c7) --->
+<!--- DO NOT EDIT (digest: f1b0331dfcbba0e361627569042612c3) --->
 
 OcLaunch - Launch commands automagically
 ========================================
 
-[![Gitlab
-CI](https://gitlab.com/WzukW/oclaunch/badges/dev/build.svg)](https://gitlab.com/WzukW/oclaunch/builds)
-[![platform
-LINUX](https://img.shields.io/badge/platform-LINUX-lightgrey.svg)](http://download.tuxfamily.org/oclaunch/oclaunch.xml)
-[![language
-OCaml](https://img.shields.io/badge/language-OCaml-orange.svg)](http://www.ocaml.org/)
 [![licence
 CeCILL](https://img.shields.io/badge/licence-CeCILL-blue.svg)](http://oclaunch.eu.org/floss-under-cecill)
+[![command
+line](https://img.shields.io/badge/command-line-lightgrey.svg)](http://oclaunch.eu.org/videos)
+[![platform UNIX (esp.
+LINUX)](https://img.shields.io/badge/platform-UNIX_\(esp._LINUX\)-lightgrey.svg)](http://download.tuxfamily.org/oclaunch/oclaunch.xml)
+[![language
+OCaml](https://img.shields.io/badge/language-OCaml-orange.svg)](http://www.ocaml.org/)
 [![opam
 oclaunch](https://img.shields.io/badge/opam-oclaunch-red.svg)](http://opam.ocaml.org/packages/oclaunch/oclaunch.0.2.2/)
 [![Getting
-help](https://img.shields.io/badge/Get-Help!-yellow.svg)](http://www.oclaunch.eu.org/help.html)
+help](https://img.shields.io/badge/Get-Help!-orange.svg)](http://www.oclaunch.eu.org/help.html)
 <hr/><p>OcLaunch is a command-line tool to launch successively (each time the
 program is called) commands. It is designed to be used with any program,
 interactive or not. Feedback is welcome at *contact@oclaunch.eu.org*.
@@ -29,7 +29,7 @@ You will not see anything more.</li> </ul></p>
 See the file [INSTALL.md](INSTALL.md) for building and installation
 instructions.
 
-[Home page](http://www.oclaunch.eu.org)
+[Home page](https://oclaunch.eu.org)
 
 Copyright and license
 ---------------------

TODO.md

@@ -2,7 +2,6 @@
 
 ## Users idees
 
- + Add confirmation on delete.
  + Add undo command ?
  + Show help in context
  + Allow to delete a command after a certain number of launch
@@ -16,9 +15,10 @@
 
 ## Short term
 
- + Add command --edit-rc to edit configuration file
+ + Add second way (added to current position based one) to point the entry you want, with a short hash
+   of the command for instance. This would be more stable after position change.
+ + Add command edit-rc to edit configuration file
  + Add command to exchange item
- + Change config file format (Sexp ?)
  + Run commands based on patterns (i.e. "run git" to run "git bundle /tmp/bundle
    --all" ), bypassing command numbers
  + Allow to append arguments (i.e. "run 3 -- A...B" to run "git rev-list
@@ -44,7 +44,7 @@
 
 ### Misc
  + Documentation ;-)
- + Handle errors in reading rc file
+ + Handle errors reading rc file
  + Return error code when necessary
  + Log duration of commands, ignore some return code
 
@@ -53,9 +53,6 @@
 
 ## Long term
  + Translate displayed messages.
- + Better command line interface by grouping commands.
- + Use Batteries instead of Core to improve apps size?
  + Be more carefull with file reading, lazy evaluation (especially in
    tmp_file.get_accurate_log)
- + Improve file_com.ml
 

VERSION

@@ -1 +1 @@
-0.3.0-pre2
+0.3.0-rc1

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: db4bdd27155ce9d25c2a54aac4c69750)
+# DO NOT EDIT (digest: aae44abd7445bfd1f8f3765494c03212)
 # 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
@@ -20,6 +20,8 @@ true: annot, bin_annot
 <src/oclaunch.{native,byte}>: pkg_re2
 <src/oclaunch.{native,byte}>: pkg_textutils
 <src/oclaunch.{native,byte}>: pkg_threads
+<src/oclaunch.{native,byte}>: pkg_yojson
+<src/*.ml{,i,y}>: pkg_yojson
 # Executable run_test
 <src/test/test.{native,byte}>: pkg_alcotest
 <src/test/test.{native,byte}>: pkg_atdgen

atdgen_update.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright © Joly Clément, 2014-2015
 #
-#  leowzukw@vmail.me
+#  leowzukw@oclaunch.eu.org
 #
 #  Ce logiciel est un programme informatique servant à exécuter
 #  automatiquement des programmes à l'ouverture du terminal.

bench/Makefile

@@ -1,3 +1,5 @@
 all:
 	corebuild -pkg core_bench sprintf_vs_concat.byte
 	corebuild -pkg core_bench swap.byte
+	corebuild -pkg core_bench,yojson,atdgen biniou_vs_binprot.byte
+	corebuild -pkg core_bench,yojson rc_file_format.byte

bench/biniou_vs_binprot.ml

@@ -0,0 +1,522 @@
+(******************************************************************************)
+(* Copyright © Joly Clément, 2016                                        *)
+(*                                                                            *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
+(*                                                                            *)
+(*  Ce logiciel est un programme informatique servant à exécuter              *)
+(*  automatiquement des programmes à l'ouverture du terminal.                 *)
+(*                                                                            *)
+(*  Ce logiciel est régi par la licence CeCILL soumise au droit français et   *)
+(*  respectant les principes de diffusion des logiciels libres. Vous pouvez   *)
+(*  utiliser, modifier et/ou redistribuer ce programme sous les conditions    *)
+(*  de la licence CeCILL telle que diffusée par le CEA, le CNRS et l'INRIA    *)
+(*  sur le site "http://www.cecill.info".                                     *)
+(*                                                                            *)
+(*  En contrepartie de l'accessibilité au code source et des droits de copie, *)
+(*  de modification et de redistribution accordés par cette licence, il n'est *)
+(*  offert aux utilisateurs qu'une garantie limitée.  Pour les mêmes raisons, *)
+(*  seule une responsabilité restreinte pèse sur l'auteur du programme,  le   *)
+(*  titulaire des droits patrimoniaux et les concédants successifs.           *)
+(*                                                                            *)
+(*  A cet égard  l'attention de l'utilisateur est attirée sur les risques     *)
+(*  associés au chargement,  à l'utilisation,  à la modification et/ou au     *)
+(*  développement et à la reproduction du logiciel par l'utilisateur étant    *)
+(*  donné sa spécificité de logiciel libre, qui peut le rendre complexe à     *)
+(*  manipuler et qui le réserve donc à des développeurs et des professionnels *)
+(*  avertis possédant  des  connaissances  informatiques approfondies.  Les   *)
+(*  utilisateurs sont donc invités à charger  et  tester  l'adéquation  du    *)
+(*  logiciel à leurs besoins dans des conditions permettant d'assurer la      *)
+(*  sécurité de leurs systèmes et ou de leurs données et, plus généralement,  *)
+(*  à l'utiliser et l'exploiter dans les mêmes conditions de sécurité.        *)
+(*                                                                            *)
+(*  Le fait que vous puissiez accéder à cet en-tête signifie que vous avez    *)
+(*  pris connaissance de la licence CeCILL, et que vous en avez accepté les   *)
+(*  termes.                                                                   *)
+(******************************************************************************)
+
+open Core.Std;;
+
+(* Test which is the faster, to read and write, biniou or core's bin_prot.
+ * That's not the only criteria, but we need to know *)
+open Core_bench.Std;;
+
+(* Common parts *)
+type rc_entry = {
+    commands: (string * int);
+}
+[@@deriving bin_io];;
+type rc_name = string
+[@@deriving bin_io];;
+type tmp_file = {
+  rc: (rc_name * (rc_entry list)) list;
+  daemon: int;
+}
+[@@deriving bin_io];;
+
+(* XXX Copy to give the same data, marked with another type *)
+let tmp_data_bin : tmp_file = {
+  rc = [
+    ("./dev1.scm",
+     [
+        { commands = ("bump -w daemon,rc,commands /tmp/v033", 1) };
+        { commands = ("bdmp -w daemon,rc,commands /tmp/v033", 1) };
+        { commands = ("bdup -w daemon,rc,commands /tmp/v033", 1) };
+        { commands = ("bdump -aemon,rc,commands /tmp/v033", 1) };
+        { commands = ("bdump -,commands /tmp/v033", 1) };
+        { commands = ("bdump -,commands /tmp/v033", 1) };
+        { commands = ("bdump -p/v033", 1) };
+        { commands = ("bdump -,commands /tmp/v033", 1) };
+        { commands = ("bdummmands /tmp/v033", 1) };
+        { commands = ("echo \"Finish\"", 1) };
+        { commands = ("free -h", 1) };
+        { commands = ("du -sh ./_build/src/oclaunch.native", 1) };
+        { commands = ("task", 1) };
+        { commands = ("ydump dev.json", 1) }
+     ]);
+    ("./dev2.scm",
+     [
+        { commands = ("Voluptatem occaecati cumque voluptatem voluptatem itaque dolorum. Incidunt voluptas et a qui repellat est omnis. Cupiditate nesciunt perspiciatis dolores laboriosam asperiores ad corporis. Deserunt fugiat nisi est.", 1) };
+        { commands = ("Maxime assumenda quo tempora. Ad necessitatibus quis et possimus saepe. Adipisci doloremque omnis repudiandae. Ad enim qui est nemo. Qui dolorem aut quibusdam fugiat est dolores excepturi aut.", 1) };
+        { commands = ("Earum error est et repudiandae impedit illo explicabo sint. Magni accusamus dolorem animi sed unde soluta ex rerum. Quos voluptas labore quis saepe. Dolorem esse sunt at rerum. Sit non aut dolores sint est nam. Voluptatem autem eos ut voluptate sint dolores.", 1) };
+        { commands = ("Et aut dolorem quam quo minus velit omnis facilis. Rerum quos consectetur velit nihil distinctio in eligendi. Ut optio deserunt et praesentium. Quibusdam veniam laudantium error consequatur.", 1) };
+        { commands = ("Occaecati optio est ut. Ratione et perspiciatis deserunt nihil vitae dignissimos. Tempore animi dolorem aut totam non laboriosam quis in. Pariatur quam pariatur eum. Odit officiis ipsa omnis fugit voluptatem corrupti deleniti. Nemo asperiores commodi quae explicabo temporibus ipsam autem.", 1) };
+        { commands = ("bdump -w daemon,rc,commands /tmp/v033", 1) };
+        { commands = ("echo \"Finish\"", 1) };
+        { commands = ("free -h", 1) };
+        { commands = ("du -sh ./_build/src/oclaunch.native", 1) };
+        { commands = ("task", 1) };
+        { commands = ("ydump dev.json", 1) }
+     ]);
+    ("lipsum",
+     ([
+        { commands = ("Donec in", 1) };
+        { commands = ("nisl", 1) };
+        { commands = ("mattis,", 1) };
+        { commands = ("scelerisque", 1) };
+        { commands = ("ipsum a,", 1) };
+        { commands = ("porttitor", 1) };
+        { commands = ("diam.", 1) };
+        { commands = ("Vestibulum", 1) };
+        { commands = ("sed purus", 1) };
+        { commands = ("at arcu", 1) };
+        { commands = ("iaculis", 1) };
+        { commands = ("condimentum.", 1) };
+        { commands = ("Praesent", 1) };
+        { commands = ("dictum", 1) };
+        { commands = ("lacus non", 1) };
+        { commands = ("justo", 1) };
+        { commands = ("feugiat", 1) };
+        { commands = ("sollicitudin.", 1) };
+        { commands = ("Fusce", 1) };
+        { commands = ("eleifend", 1) };
+        { commands = ("malesuada", 1) };
+        { commands = ("venenatis.", 1) };
+        { commands = ("Integer", 1) };
+        { commands = ("fermentum", 1) };
+        { commands = ("feugiat", 1) };
+        { commands = ("dui, eu", 1) };
+        { commands = ("tincidunt", 1) };
+        { commands = ("dui", 1) };
+        { commands = ("pharetra", 1) };
+        { commands = ("ac. Aenean", 1) };
+        { commands = ("egestas", 1) };
+        { commands = ("nibh eu", 1) };
+        { commands = ("dui", 1) };
+        { commands = ("ultricies", 1) };
+        { commands = ("gravida.", 1) };
+        { commands = ("Lorem", 1) };
+        { commands = ("ipsum", 1) };
+        { commands = ("dolor sit", 1) };
+        { commands = ("amet,", 1) };
+        { commands = ("consectetur", 1) };
+        { commands = ("adipiscing", 1) };
+        { commands = ("elit. Cras", 1) };
+        { commands = ("quis diam", 1) };
+        { commands = ("accumsan,", 1) };
+        { commands = ("cursus", 1) };
+        { commands = ("purus", 1) };
+        { commands = ("quis,", 1) };
+        { commands = ("efficitur", 1) };
+        { commands = ("mi.", 1) };
+        { commands = ("Vestibulum", 1) };
+        { commands = ("eleifend", 1) };
+        { commands = ("nisi", 1) };
+        { commands = ("risus, ut", 1) };
+        { commands = ("condimentum", 1) };
+        { commands = ("orci", 1) };
+        { commands = ("malesuada", 1) };
+        { commands = ("a. Nunc", 1) };
+        { commands = ("risus", 1) };
+        { commands = ("urna,", 1) };
+        { commands = ("tempor id", 1) };
+        { commands = ("dui in,", 1) };
+        { commands = ("blandit", 1) };
+        { commands = ("ullamcorper", 1) };
+        { commands = ("augue.", 1) };
+        { commands = ("Phasellus", 1) };
+        { commands = ("ut ex", 1) };
+        { commands = ("ullamcorper,", 1) };
+        { commands = ("sollicitudin", 1) };
+        { commands = ("justo", 1) };
+        { commands = ("luctus,", 1) };
+        { commands = ("pharetra", 1) };
+        { commands = ("felis.", 1) };
+        { commands = ("Phasellus", 1) };
+        { commands = ("convallis", 1) };
+        { commands = ("velit mi.", 1) };
+        { commands = ("Vestibulum", 1) };
+        { commands = ("vel dui", 1) };
+        { commands = ("mauris.", 1) };
+        { commands = ("Donec", 1) };
+        { commands = ("vestibulum", 1) };
+        { commands = ("tempus", 1) };
+        { commands = ("justo vel", 1) };
+        { commands = ("pharetra.", 1) };
+        { commands = ("Cum sociis", 1) };
+        { commands = ("natoque", 1) };
+        { commands = ("penatibus", 1) };
+        { commands = ("et magnis", 1) };
+        { commands = ("dis", 1) };
+        { commands = ("parturient", 1) };
+        { commands = ("montes,", 1) };
+        { commands = ("nascetur", 1) };
+        { commands = ("ridiculus", 1) };
+        { commands = ("mus.", 1) };
+        { commands = ("Nullam non", 1) };
+        { commands = ("dui quis", 1) };
+        { commands = ("tellus", 1) };
+        { commands = ("pulvinar", 1) };
+        { commands = ("convallis", 1) };
+        { commands = ("vel eget", 1) };
+        { commands = ("mi. Proin", 1) };
+        { commands = ("aliquet,", 1) };
+        { commands = ("lorem at", 1) };
+        { commands = ("auctor", 1) };
+        { commands = ("volutpat,", 1) };
+        { commands = ("orci est", 1) };
+        { commands = ("vehicula", 1) };
+        { commands = ("diam, in", 1) };
+        { commands = ("sollicitudin", 1) };
+        { commands = ("velit", 1) };
+        { commands = ("massa et", 1) };
+        { commands = ("diam.", 1) };
+        { commands = ("Praesent", 1) };
+        { commands = ("sed diam", 1) };
+        { commands = ("iaculis,", 1) };
+        { commands = ("mollis", 1) };
+        { commands = ("justo sit", 1) };
+        { commands = ("amet,", 1) };
+        { commands = ("cursus", 1) };
+        { commands = ("augue.", 1) };
+        { commands = ("Quisque", 1) };
+        { commands = ("ultrices", 1) };
+        { commands = ("odio ut", 1) };
+        { commands = ("leo", 1) };
+        { commands = ("eleifend", 1) };
+        { commands = ("faucibus.", 1) };
+        { commands = ("Ut", 1) };
+        { commands = ("ullamcorper", 1) };
+        { commands = ("non magna", 1) };
+        { commands = ("a commodo.", 1) };
+        { commands = ("Nullam in", 1) };
+        { commands = ("orci arcu.", 1) };
+        { commands = ("Nunc", 1) };
+        { commands = ("iaculis", 1) };
+        { commands = ("auctor", 1) };
+        { commands = ("lobortis.", 1) };
+        { commands = ("Maecenas", 1) };
+        { commands = ("laoreet", 1) };
+        { commands = ("imperdiet", 1) };
+        { commands = ("congue.", 1) };
+        { commands = ("Nullam", 1) };
+        { commands = ("pellentesque", 1) };
+        { commands = ("varius", 1) };
+        { commands = ("nunc, sed", 1) };
+        { commands = ("tincidunt", 1) };
+        { commands = ("nulla", 1) };
+        { commands = ("luctus et.", 1) };
+        { commands = ("Integer a", 1) };
+        { commands = ("risus", 1) };
+        { commands = ("urna. Nunc", 1) };
+        { commands = ("in auctor", 1) };
+        { commands = ("sapien.", 1) };
+        { commands = ("Nulla", 1) };
+        { commands = ("pellentesque,", 1) };
+        { commands = ("orci sit", 1) };
+        { commands = ("amet", 1) };
+        { commands = ("efficitur", 1) };
+        { commands = ("egestas,", 1) };
+        { commands = ("quam urna", 1) };
+        { commands = ("tempor", 1) };
+        { commands = ("nibh, eu", 1) };
+        { commands = ("varius", 1) };
+        { commands = ("dolor erat", 1) };
+        { commands = ("nec ex.", 1) };
+     ]))
+  ];
+  daemon = 2
+};;
+
+let tmp_data : Tmp_biniou_t.tmp_file = {
+  rc = [
+    ("./dev1.scm",
+     [
+        { commands = ("bump -w daemon,rc,commands /tmp/v033", 1) };
+        { commands = ("bdmp -w daemon,rc,commands /tmp/v033", 1) };
+        { commands = ("bdup -w daemon,rc,commands /tmp/v033", 1) };
+        { commands = ("bdump -aemon,rc,commands /tmp/v033", 1) };
+        { commands = ("bdump -,commands /tmp/v033", 1) };
+        { commands = ("bdump -,commands /tmp/v033", 1) };
+        { commands = ("bdump -p/v033", 1) };
+        { commands = ("bdump -,commands /tmp/v033", 1) };
+        { commands = ("bdummmands /tmp/v033", 1) };
+        { commands = ("echo \"Finish\"", 1) };
+        { commands = ("free -h", 1) };
+        { commands = ("du -sh ./_build/src/oclaunch.native", 1) };
+        { commands = ("task", 1) };
+        { commands = ("ydump dev.json", 1) }
+     ]);
+    ("./dev2.scm",
+     [
+        { commands = ("Voluptatem occaecati cumque voluptatem voluptatem itaque dolorum. Incidunt voluptas et a qui repellat est omnis. Cupiditate nesciunt perspiciatis dolores laboriosam asperiores ad corporis. Deserunt fugiat nisi est.", 1) };
+        { commands = ("Maxime assumenda quo tempora. Ad necessitatibus quis et possimus saepe. Adipisci doloremque omnis repudiandae. Ad enim qui est nemo. Qui dolorem aut quibusdam fugiat est dolores excepturi aut.", 1) };
+        { commands = ("Earum error est et repudiandae impedit illo explicabo sint. Magni accusamus dolorem animi sed unde soluta ex rerum. Quos voluptas labore quis saepe. Dolorem esse sunt at rerum. Sit non aut dolores sint est nam. Voluptatem autem eos ut voluptate sint dolores.", 1) };
+        { commands = ("Et aut dolorem quam quo minus velit omnis facilis. Rerum quos consectetur velit nihil distinctio in eligendi. Ut optio deserunt et praesentium. Quibusdam veniam laudantium error consequatur.", 1) };
+        { commands = ("Occaecati optio est ut. Ratione et perspiciatis deserunt nihil vitae dignissimos. Tempore animi dolorem aut totam non laboriosam quis in. Pariatur quam pariatur eum. Odit officiis ipsa omnis fugit voluptatem corrupti deleniti. Nemo asperiores commodi quae explicabo temporibus ipsam autem.", 1) };
+        { commands = ("bdump -w daemon,rc,commands /tmp/v033", 1) };
+        { commands = ("echo \"Finish\"", 1) };
+        { commands = ("free -h", 1) };
+        { commands = ("du -sh ./_build/src/oclaunch.native", 1) };
+        { commands = ("task", 1) };
+        { commands = ("ydump dev.json", 1) }
+     ]);
+    ("lipsum",
+     ([
+        { commands = ("Donec in", 1) };
+        { commands = ("nisl", 1) };
+        { commands = ("mattis,", 1) };
+        { commands = ("scelerisque", 1) };
+        { commands = ("ipsum a,", 1) };
+        { commands = ("porttitor", 1) };
+        { commands = ("diam.", 1) };
+        { commands = ("Vestibulum", 1) };
+        { commands = ("sed purus", 1) };
+        { commands = ("at arcu", 1) };
+        { commands = ("iaculis", 1) };
+        { commands = ("condimentum.", 1) };
+        { commands = ("Praesent", 1) };
+        { commands = ("dictum", 1) };
+        { commands = ("lacus non", 1) };
+        { commands = ("justo", 1) };
+        { commands = ("feugiat", 1) };
+        { commands = ("sollicitudin.", 1) };
+        { commands = ("Fusce", 1) };
+        { commands = ("eleifend", 1) };
+        { commands = ("malesuada", 1) };
+        { commands = ("venenatis.", 1) };
+        { commands = ("Integer", 1) };
+        { commands = ("fermentum", 1) };
+        { commands = ("feugiat", 1) };
+        { commands = ("dui, eu", 1) };
+        { commands = ("tincidunt", 1) };
+        { commands = ("dui", 1) };
+        { commands = ("pharetra", 1) };
+        { commands = ("ac. Aenean", 1) };
+        { commands = ("egestas", 1) };
+        { commands = ("nibh eu", 1) };
+        { commands = ("dui", 1) };
+        { commands = ("ultricies", 1) };
+        { commands = ("gravida.", 1) };
+        { commands = ("Lorem", 1) };
+        { commands = ("ipsum", 1) };
+        { commands = ("dolor sit", 1) };
+        { commands = ("amet,", 1) };
+        { commands = ("consectetur", 1) };
+        { commands = ("adipiscing", 1) };
+        { commands = ("elit. Cras", 1) };
+        { commands = ("quis diam", 1) };
+        { commands = ("accumsan,", 1) };
+        { commands = ("cursus", 1) };
+        { commands = ("purus", 1) };
+        { commands = ("quis,", 1) };
+        { commands = ("efficitur", 1) };
+        { commands = ("mi.", 1) };
+        { commands = ("Vestibulum", 1) };
+        { commands = ("eleifend", 1) };
+        { commands = ("nisi", 1) };
+        { commands = ("risus, ut", 1) };
+        { commands = ("condimentum", 1) };
+        { commands = ("orci", 1) };
+        { commands = ("malesuada", 1) };
+        { commands = ("a. Nunc", 1) };
+        { commands = ("risus", 1) };
+        { commands = ("urna,", 1) };
+        { commands = ("tempor id", 1) };
+        { commands = ("dui in,", 1) };
+        { commands = ("blandit", 1) };
+        { commands = ("ullamcorper", 1) };
+        { commands = ("augue.", 1) };
+        { commands = ("Phasellus", 1) };
+        { commands = ("ut ex", 1) };
+        { commands = ("ullamcorper,", 1) };
+        { commands = ("sollicitudin", 1) };
+        { commands = ("justo", 1) };
+        { commands = ("luctus,", 1) };
+        { commands = ("pharetra", 1) };
+        { commands = ("felis.", 1) };
+        { commands = ("Phasellus", 1) };
+        { commands = ("convallis", 1) };
+        { commands = ("velit mi.", 1) };
+        { commands = ("Vestibulum", 1) };
+        { commands = ("vel dui", 1) };
+        { commands = ("mauris.", 1) };
+        { commands = ("Donec", 1) };
+        { commands = ("vestibulum", 1) };
+        { commands = ("tempus", 1) };
+        { commands = ("justo vel", 1) };
+        { commands = ("pharetra.", 1) };
+        { commands = ("Cum sociis", 1) };
+        { commands = ("natoque", 1) };
+        { commands = ("penatibus", 1) };
+        { commands = ("et magnis", 1) };
+        { commands = ("dis", 1) };
+        { commands = ("parturient", 1) };
+        { commands = ("montes,", 1) };
+        { commands = ("nascetur", 1) };
+        { commands = ("ridiculus", 1) };
+        { commands = ("mus.", 1) };
+        { commands = ("Nullam non", 1) };
+        { commands = ("dui quis", 1) };
+        { commands = ("tellus", 1) };
+        { commands = ("pulvinar", 1) };
+        { commands = ("convallis", 1) };
+        { commands = ("vel eget", 1) };
+        { commands = ("mi. Proin", 1) };
+        { commands = ("aliquet,", 1) };
+        { commands = ("lorem at", 1) };
+        { commands = ("auctor", 1) };
+        { commands = ("volutpat,", 1) };
+        { commands = ("orci est", 1) };
+        { commands = ("vehicula", 1) };
+        { commands = ("diam, in", 1) };
+        { commands = ("sollicitudin", 1) };
+        { commands = ("velit", 1) };
+        { commands = ("massa et", 1) };
+        { commands = ("diam.", 1) };
+        { commands = ("Praesent", 1) };
+        { commands = ("sed diam", 1) };
+        { commands = ("iaculis,", 1) };
+        { commands = ("mollis", 1) };
+        { commands = ("justo sit", 1) };
+        { commands = ("amet,", 1) };
+        { commands = ("cursus", 1) };
+        { commands = ("augue.", 1) };
+        { commands = ("Quisque", 1) };
+        { commands = ("ultrices", 1) };
+        { commands = ("odio ut", 1) };
+        { commands = ("leo", 1) };
+        { commands = ("eleifend", 1) };
+        { commands = ("faucibus.", 1) };
+        { commands = ("Ut", 1) };
+        { commands = ("ullamcorper", 1) };
+        { commands = ("non magna", 1) };
+        { commands = ("a commodo.", 1) };
+        { commands = ("Nullam in", 1) };
+        { commands = ("orci arcu.", 1) };
+        { commands = ("Nunc", 1) };
+        { commands = ("iaculis", 1) };
+        { commands = ("auctor", 1) };
+        { commands = ("lobortis.", 1) };
+        { commands = ("Maecenas", 1) };
+        { commands = ("laoreet", 1) };
+        { commands = ("imperdiet", 1) };
+        { commands = ("congue.", 1) };
+        { commands = ("Nullam", 1) };
+        { commands = ("pellentesque", 1) };
+        { commands = ("varius", 1) };
+        { commands = ("nunc, sed", 1) };
+        { commands = ("tincidunt", 1) };
+        { commands = ("nulla", 1) };
+        { commands = ("luctus et.", 1) };
+        { commands = ("Integer a", 1) };
+        { commands = ("risus", 1) };
+        { commands = ("urna. Nunc", 1) };
+        { commands = ("in auctor", 1) };
+        { commands = ("sapien.", 1) };
+        { commands = ("Nulla", 1) };
+        { commands = ("pellentesque,", 1) };
+        { commands = ("orci sit", 1) };
+        { commands = ("amet", 1) };
+        { commands = ("efficitur", 1) };
+        { commands = ("egestas,", 1) };
+        { commands = ("quam urna", 1) };
+        { commands = ("tempor", 1) };
+        { commands = ("nibh, eu", 1) };
+        { commands = ("varius", 1) };
+        { commands = ("dolor erat", 1) };
+        { commands = ("nec ex.", 1) };
+     ]))
+  ];
+  daemon = 2
+};;
+
+let tmp_base_name = "/tmp/bvsbp"
+
+(* With biniou *)
+let serialise_biniou data =
+  Tmp_biniou_b.string_of_tmp_file data
+;;
+let deserialise_biniou data =
+  Tmp_biniou_b.tmp_file_of_string data
+;;
+let biniou () =
+  serialise_biniou tmp_data
+  |> deserialise_biniou
+  (* Compare with source data *)
+  |> fun read -> assert (read = tmp_data)
+;;
+let write_biniou () =
+  let name = tmp_base_name ^ ".bi" in
+  serialise_biniou tmp_data
+  |> (fun data -> Out_channel.write_all ~data name)
+;;
+
+(* With bin_prot *)
+let serialise_binprot data =
+  let module Tmp_bi = struct
+    type t = tmp_file [@@deriving bin_io]
+  end in
+  Binable.to_string (module Tmp_bi) data
+;;
+let deserialise_binprot data =
+  let module Tmp_bi = struct
+    type t = tmp_file [@@deriving bin_io]
+  end in
+  Binable.of_string (module Tmp_bi) data
+;;
+let bin_prot () =
+  serialise_binprot tmp_data_bin
+  |> deserialise_binprot
+  (* Compare with source data *)
+  |> fun read -> assert (read = tmp_data_bin)
+;;
+let write_binprot () =
+  let name = tmp_base_name ^ ".bp" in
+  serialise_binprot tmp_data_bin
+  |> (fun data -> Out_channel.write_all ~data name)
+;;
+
+(* Serialise and deserialise data (with checks) *)
+let tests = [
+  "Binou", biniou;
+  "Bin_prot", bin_prot;
+]
+
+let () =
+  (* Write files once *)
+  write_biniou ();
+  write_binprot ();
+  (* Run tests *)
+  List.map tests ~f:(fun (name,test) -> Bench.Test.create ~name test)
+  |> Bench.make_command
+  |> Command.run

bench/make_unique.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)

bench/rc_file.json.human

@@ -0,0 +1,40 @@
+{
+  "progs": [
+    "This config file should be a machine output, quite long",
+    "The authors of the CeCILL (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre])",
+    "license are:",
+    "Commissariat à l'énergie atomique et aux énergies alternatives - CEA, a",
+    "public scientific, technical and industrial research establishment,",
+    "having its principal place of business at 25 rue Leblanc, immeuble Le",
+    "Ponant D, 75015 Paris, France.",
+    "Centre National de la Recherche Scientifique - CNRS, a public scientific",
+    "and technological establishment, having its principal place of business",
+    "at 3 rue Michel-Ange, 75794 Paris cedex 16, France.",
+    "Institut National de Recherche en Informatique et en Automatique -",
+    "Inria, a public scientific and technological establishment, having its",
+    "principal place of business at Domaine de Voluceau, Rocquencourt, BP",
+    "105, 78153 Le Chesnay cedex, France.", "Preamble",
+    "The purpose of this Free Software license agreement is to grant users",
+    "the right to modify and redistribute the software governed by this",
+    "license within the framework of an open source distribution model.",
+    "The exercising of this right is conditional upon certain obligations for",
+    "users so as to preserve this status for all subsequent redistributions.",
+    "In consideration of access to the source code and the rights to copy,",
+    "modify and redistribute granted by the license, users are provided only",
+    "with a limited warranty and the software's author, the holder of the",
+    "economic rights, and the successive licensors only have limited liability.",
+    "In this respect, the risks associated with loading, using, modifying",
+    "and/or developing or reproducing the software by the user are brought to",
+    "the user's attention, given its Free Software status, which may make it",
+    "complicated to use, with the result that its use is reserved for",
+    "developers and experienced professionals having in-depth computer",
+    "knowledge. Users are therefore encouraged to load and test the",
+    "suitability of the software as regards their requirements in conditions",
+    "enabling the security of their systems and/or data to be ensured and,",
+    "more generally, to use and operate it in the same conditions of",
+    "security. This Agreement may be freely reproduced and published,",
+    "provided it is not altered, and that no provisions are either added or",
+    "removed herefrom."
+  ],
+  "settings": []
+}

bench/rc_file.scm.human

@@ -0,0 +1,41 @@
+(
+  ("progs" (
+    "This config file should be a machine output, quite long"
+    "The authors of the CeCILL (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre])"
+    "license are:"
+    "Commissariat à l'énergie atomique et aux énergies alternatives - CEA, a"
+    "public scientific, technical and industrial research establishment,"
+    "having its principal place of business at 25 rue Leblanc, immeuble Le"
+    "Ponant D, 75015 Paris, France."
+    "Centre National de la Recherche Scientifique - CNRS, a public scientific"
+    "and technological establishment, having its principal place of business"
+    "at 3 rue Michel-Ange, 75794 Paris cedex 16, France."
+    "Institut National de Recherche en Informatique et en Automatique -"
+    "Inria, a public scientific and technological establishment, having its"
+    "principal place of business at Domaine de Voluceau, Rocquencourt, BP"
+    "105, 78153 Le Chesnay cedex, France."
+    "Preamble"
+    "The purpose of this Free Software license agreement is to grant users"
+    "the right to modify and redistribute the software governed by this"
+    "license within the framework of an open source distribution model."
+    "The exercising of this right is conditional upon certain obligations for"
+    "users so as to preserve this status for all subsequent redistributions."
+    "In consideration of access to the source code and the rights to copy,"
+    "modify and redistribute granted by the license, users are provided only"
+    "with a limited warranty and the software's author, the holder of the"
+    "economic rights, and the successive licensors only have limited liability."
+    "In this respect, the risks associated with loading, using, modifying"
+    "and/or developing or reproducing the software by the user are brought to"
+    "the user's attention, given its Free Software status, which may make it"
+    "complicated to use, with the result that its use is reserved for"
+    "developers and experienced professionals having in-depth computer"
+    "knowledge. Users are therefore encouraged to load and test the"
+    "suitability of the software as regards their requirements in conditions"
+    "enabling the security of their systems and/or data to be ensured and,"
+    "more generally, to use and operate it in the same conditions of"
+    "security. This Agreement may be freely reproduced and published,"
+    "provided it is not altered, and that no provisions are either added or"
+    "removed herefrom."
+  ))
+  ("settings" ())
+)

bench/rc_file_format.ml

@@ -0,0 +1,66 @@
+(******************************************************************************)
+(* Copyright © Joly Clément, 2016                                             *)
+(*                                                                            *)
+(*  leowzukw@vmail.me                                                         *)
+(*                                                                            *)
+(*  Ce logiciel est un programme informatique servant à exécuter              *)
+(*  automatiquement des programmes à l'ouverture du terminal.                 *)
+(*                                                                            *)
+(*  Ce logiciel est régi par la licence CeCILL soumise au droit français et   *)
+(*  respectant les principes de diffusion des logiciels libres. Vous pouvez   *)
+(*  utiliser, modifier et/ou redistribuer ce programme sous les conditions    *)
+(*  de la licence CeCILL telle que diffusée par le CEA, le CNRS et l'INRIA    *)
+(*  sur le site "http://www.cecill.info".                                     *)
+(*                                                                            *)
+(*  En contrepartie de l'accessibilité au code source et des droits de copie, *)
+(*  de modification et de redistribution accordés par cette licence, il n'est *)
+(*  offert aux utilisateurs qu'une garantie limitée.  Pour les mêmes raisons, *)
+(*  seule une responsabilité restreinte pèse sur l'auteur du programme,  le   *)
+(*  titulaire des droits patrimoniaux et les concédants successifs.           *)
+(*                                                                            *)
+(*  A cet égard  l'attention de l'utilisateur est attirée sur les risques     *)
+(*  associés au chargement,  à l'utilisation,  à la modification et/ou au     *)
+(*  développement et à la reproduction du logiciel par l'utilisateur étant    *)
+(*  donné sa spécificité de logiciel libre, qui peut le rendre complexe à     *)
+(*  manipuler et qui le réserve donc à des développeurs et des professionnels *)
+(*  avertis possédant  des  connaissances  informatiques approfondies.  Les   *)
+(*  utilisateurs sont donc invités à charger  et  tester  l'adéquation  du    *)
+(*  logiciel à leurs besoins dans des conditions permettant d'assurer la      *)
+(*  sécurité de leurs systèmes et ou de leurs données et, plus généralement,  *)
+(*  à l'utiliser et l'exploiter dans les mêmes conditions de sécurité.        *)
+(*                                                                            *)
+(*  Le fait que vous puissiez accéder à cet en-tête signifie que vous avez    *)
+(*  pris connaissance de la licence CeCILL, et que vous en avez accepté les   *)
+(*  termes.                                                                   *)
+(******************************************************************************)
+
+open Core.Std;;
+
+(* File to compare speed of the two format, json and sexp *)
+open Core_bench.Std
+
+(* Base file, machine output, see corresponding .human files for a human
+ * friendlier version *)
+let scm = "./rc_file.scm";;
+let json = "./rc_file.json";;
+
+let parse_scm () =
+  Sexp.load_sexp scm
+  |> ignore
+;;
+
+let parse_json () =
+  Yojson.Basic.from_file json
+  |> ignore
+;;
+
+let tests = [
+  "Sexp", parse_scm;
+  "Json", parse_json;
+]
+
+let () =
+  List.map tests ~f:(fun (name,test) -> Bench.Test.create ~name test)
+  |> Bench.make_command
+  |> Command.run
+

bench/sprintf_vs_concat.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)

bench/swap.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)

src/tmp_biniou.atd

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014                                             *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)

src/tmp_biniou_b.ml

@@ -61,7 +61,7 @@ let get_rc_entry_reader = (
   fun tag ->
     if tag <> 21 then Ag_ob_run.read_error () else
       fun ib ->
-        let field_commands = ref (Obj.magic 0.0) in
+        let field_commands = ref (Obj.magic (Sys.opaque_identity 0.0)) in
         let bits0 = ref 0 in
         let len = Bi_vint.read_uvint ib in
         for i = 1 to len do
@@ -100,7 +100,7 @@ let get_rc_entry_reader = (
 let read_rc_entry = (
   fun ib ->
     if Bi_io.read_tag ib <> 21 then Ag_ob_run.read_error_at ib;
-    let field_commands = ref (Obj.magic 0.0) in
+    let field_commands = ref (Obj.magic (Sys.opaque_identity 0.0)) in
     let bits0 = ref 0 in
     let len = Bi_vint.read_uvint ib in
     for i = 1 to len do
@@ -286,8 +286,8 @@ let get_tmp_file_reader = (
   fun tag ->
     if tag <> 21 then Ag_ob_run.read_error () else
       fun ib ->
-        let field_rc = ref (Obj.magic 0.0) in
-        let field_daemon = ref (Obj.magic 0.0) in
+        let field_rc = ref (Obj.magic (Sys.opaque_identity 0.0)) in
+        let field_daemon = ref (Obj.magic (Sys.opaque_identity 0.0)) in
         let bits0 = ref 0 in
         let len = Bi_vint.read_uvint ib in
         for i = 1 to len do
@@ -319,8 +319,8 @@ let get_tmp_file_reader = (
 let read_tmp_file = (
   fun ib ->
     if Bi_io.read_tag ib <> 21 then Ag_ob_run.read_error_at ib;
-    let field_rc = ref (Obj.magic 0.0) in
-    let field_daemon = ref (Obj.magic 0.0) in
+    let field_rc = ref (Obj.magic (Sys.opaque_identity 0.0)) in
+    let field_daemon = ref (Obj.magic (Sys.opaque_identity 0.0)) in
     let bits0 = ref 0 in
     let len = Bi_vint.read_uvint ib in
     for i = 1 to len do

configure

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # OASIS_START
-# DO NOT EDIT (digest: 6f7b8221311e800a7093dc3b793f67ca)
+# DO NOT EDIT (digest: 67dd0def14e1d99625d2485f6a4d5df1)
 set -e
 
 FST=true
@@ -23,5 +23,9 @@ for i in "$@"; do
   esac
 done
 
-make configure CONFIGUREFLAGS="$*"
+if [ ! -e setup.exe ] || [ _oasis -nt setup.exe ] || [ setup.ml -nt setup.exe ] || [ configure -nt setup.exe ]; then
+  ocamlfind ocamlopt -o setup.exe setup.ml || ocamlfind ocamlc -o setup.exe setup.ml || exit 1
+  rm -f setup.cmi setup.cmo setup.cmx setup.o
+fi
+./setup.exe -configure "$@"
 # OASIS_STOP

dev.json

@@ -1,7 +0,0 @@
-{
-  "progs": [
-    "ydump dev.json", "task", "task +next", "task +rdv", "echo \"Finish\"",
-    "bdump -w daemon,rc,commands /tmp/v033"
-  ],
-  "settings": []
-}

dev.scm

@@ -0,0 +1,9 @@
+;; You probably do NOT need to edit this file manually.
+;; Anyway, you may find help at https://s.oclaunch.eu.org/rc
+
+
+((entries
+  (((command "cat dev.scm") (tags ())) ((command task) (tags ()))
+   ((command "du -sh ./_build/src/oclaunch.native") (tags ()))
+   ((command "free -h") (tags ())) ((command "echo \"Finish\"") (tags ()))))
+ (common_tags ()) (settings ()))

fix-indent.ml

@@ -2,7 +2,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2016                                             *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -53,21 +53,32 @@ let ignored =
   |> String.split ~on:' '
   |> List.filter_map ~f:(function
          | "" | " " | "  " | "   " | "    " -> None
-         | path -> Some ("-e " ^ path ^ " "))
-  |> String.concat
+         | path -> Some path)
 ;;
 
-(* List ml files, basic regexp, should be enough *)
-let list_mlfiles path =
-  (* 1st grep: select ocaml files,
-   * 2nd grep: remove symlinks and ignored files *)
-  sprintf "tree -if %s | grep -e '.*\\.ml$' | grep -v -e '.* -> .*' %s"
-    path ignored
-  |> (fun cmd -> print_endline cmd; cmd)
-  |> Unix.open_process_in
-  |> In_channel.input_all
-  |> String.split ~on:'\n'
-  |> List.filter ~f:(function "" -> false | _ -> true)
+(* List ml files *)
+let list_mlfiles ?(follow_symlinks=true) path =
+  let is_dotml file =
+    String.split ~on:'.' file
+    |> List.last
+    |> function
+    | None -> false
+    | Some ext -> ext = "ml"
+  in
+  let is_ignored file =
+    List.find ignored (fun to_ignore -> to_ignore = file)
+    |> Option.is_some
+  in
+  let rec ls_rec s =
+    (* If follow_symlinks is set to false then any symlink seems do not to be a
+     * file *)
+    if Sys.is_file_exn ~follow_symlinks s
+    then [s]
+    else Sys.ls_dir s |> List.map ~f:(fun sub -> ls_rec (s ^/ sub))
+         |> List.concat
+  in
+  List.filter (ls_rec path)
+    ~f:(fun file -> not (is_ignored file) && is_dotml file)
 ;;
 
 (* Call ocp-indent for indentation *)
@@ -77,8 +88,9 @@ let ocp_indent file =
   |> Sys.command
   |> function
   | 0 -> printf "File: '%s' ok\n" file
-  | error -> printf "Error with file: '%s'; code: %i\n%!" file error;
-      exit_ocp_indent_error ()
+  | error ->
+    printf "Error with file: '%s'; code: %i\n%!" file error;
+    exit_ocp_indent_error ()
 ;;
 
 let () =

gitlab-ci.sh

@@ -1,13 +1,15 @@
 #!/bin/sh
 
-# Give OCaml version as first argument
+# OCaml version is assuming to be set (for instance as system compiler) if
+# nothing is passed
 
 # Inspired by https://github.com/ocaml/ocaml-ci-scripts
 
 # Use -y with evry opam command
 export OPAMYES=true
 # Installing opam
-opam init --comp="$1"
+comp=${1:-system}
+opam init --comp="${comp}"
 eval `opam config env`
 
 # Versions
@@ -20,13 +22,27 @@ echo "ocaml -version"
 ocaml -version
 echo "============"
 
+echo "= Dependancies ="
 # ocamlfind is mandatory to build
 opam install ocamlfind
-# XXX Manually install development dependancies, not yet supported (ait opam 1.3)
+# XXX Manually install development dependancies, not yet supported (wait opam 1.3)
 opam install alcotest oUnit
 
 # Installing dependancies and testing installation
-opam pin add oclaunch-ci .
-# Building OcLaunch and running tests
-./configure --enable-tests
-make test
+opam pin add oclaunch .
+echo "============"
+
+# Run test if OC_NOTEST is false
+if [ ! ${OC_NOTEST} ]; then
+  # Build OcLaunch only
+  ./configure
+  make
+else
+  # Building OcLaunch and running tests
+  ./configure --enable-tests
+  make test
+
+  # Test the produced binary
+  oclaunch -version
+  echo "En" | oclaunch
+fi

myocamlbuild.ml

@@ -1,19 +1,12 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 2948e791e5da69ac0f577932ef77419e) *)
+(* DO NOT EDIT (digest: ef1a54452f0cead733c1a9a890b617ad) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
 
-  let ns_ str =
-    str
-
-
-  let s_ str =
-    str
-
-
-  let f_ (str: ('a, 'b, 'c, 'd) format4) =
-    str
+  let ns_ str = str
+  let s_ str = str
+  let f_ (str: ('a, 'b, 'c, 'd) format4) = str
 
 
   let fn_ fmt1 fmt2 n =
@@ -23,25 +16,344 @@ module OASISGettext = struct
       fmt2^^""
 
 
-  let init =
-    []
+  let init = []
+end
 
+module OASISString = struct
+(* # 22 "src/oasis/OASISString.ml" *)
 
-end
 
-module OASISExpr = struct
-(* # 22 "src/oasis/OASISExpr.ml" *)
+  (** Various string utilities.
+
+      Mostly inspired by extlib and batteries ExtString and BatString libraries.
 
+      @author Sylvain Le Gall
+  *)
+
+
+  let nsplitf str f =
+    if str = "" then
+      []
+    else
+      let buf = Buffer.create 13 in
+      let lst = ref [] in
+      let push () =
+        lst := Buffer.contents buf :: !lst;
+        Buffer.clear buf
+      in
+      let str_len = String.length str in
+      for i = 0 to str_len - 1 do
+        if f str.[i] then
+          push ()
+        else
+          Buffer.add_char buf str.[i]
+      done;
+      push ();
+      List.rev !lst
+
+
+  (** [nsplit c s] Split the string [s] at char [c]. It doesn't include the
+      separator.
+  *)
+  let nsplit str c =
+    nsplitf str ((=) c)
+
+
+  let find ~what ?(offset=0) str =
+    let what_idx = ref 0 in
+    let str_idx = ref offset in
+    while !str_idx < String.length str &&
+          !what_idx < String.length what do
+      if str.[!str_idx] = what.[!what_idx] then
+        incr what_idx
+      else
+        what_idx := 0;
+      incr str_idx
+    done;
+    if !what_idx <> String.length what then
+      raise Not_found
+    else
+      !str_idx - !what_idx
+
+
+  let sub_start str len =
+    let str_len = String.length str in
+    if len >= str_len then
+      ""
+    else
+      String.sub str len (str_len - len)
+
+
+  let sub_end ?(offset=0) str len =
+    let str_len = String.length str in
+    if len >= str_len then
+      ""
+    else
+      String.sub str 0 (str_len - len)
+
+
+  let starts_with ~what ?(offset=0) str =
+    let what_idx = ref 0 in
+    let str_idx = ref offset in
+    let ok = ref true in
+    while !ok &&
+          !str_idx < String.length str &&
+          !what_idx < String.length what do
+      if str.[!str_idx] = what.[!what_idx] then
+        incr what_idx
+      else
+        ok := false;
+      incr str_idx
+    done;
+    if !what_idx = String.length what then
+      true
+    else
+      false
+
+
+  let strip_starts_with ~what str =
+    if starts_with ~what str then
+      sub_start str (String.length what)
+    else
+      raise Not_found
+
+
+  let ends_with ~what ?(offset=0) str =
+    let what_idx = ref ((String.length what) - 1) in
+    let str_idx = ref ((String.length str) - 1) in
+    let ok = ref true in
+    while !ok &&
+          offset <= !str_idx &&
+          0 <= !what_idx do
+      if str.[!str_idx] = what.[!what_idx] then
+        decr what_idx
+      else
+        ok := false;
+      decr str_idx
+    done;
+    if !what_idx = -1 then
+      true
+    else
+      false
+
+
+  let strip_ends_with ~what str =
+    if ends_with ~what str then
+      sub_end str (String.length what)
+    else
+      raise Not_found
+
+
+  let replace_chars f s =
+    let buf = Buffer.create (String.length s) in
+    String.iter (fun c -> Buffer.add_char buf (f c)) s;
+    Buffer.contents buf
+
+  let lowercase_ascii =
+    replace_chars
+      (fun c ->
+         if (c >= 'A' && c <= 'Z') then
+           Char.chr (Char.code c + 32)
+         else
+           c)
+
+  let uncapitalize_ascii s =
+    if s <> "" then
+      (lowercase_ascii (String.sub s 0 1)) ^ (String.sub s 1 ((String.length s) - 1))
+    else
+      s
+
+  let uppercase_ascii =
+    replace_chars
+      (fun c ->
+         if (c >= 'a' && c <= 'z') then
+           Char.chr (Char.code c - 32)
+         else
+           c)
+
+  let capitalize_ascii s =
+    if s <> "" then
+      (uppercase_ascii (String.sub s 0 1)) ^ (String.sub s 1 ((String.length s) - 1))
+    else
+      s
 
+end
 
+module OASISUtils = struct
+(* # 22 "src/oasis/OASISUtils.ml" *)
 
 
   open OASISGettext
 
 
-  type test = string
+  module MapExt =
+  struct
+    module type S =
+    sig
+      include Map.S
+      val add_list: 'a t -> (key * 'a) list -> 'a t
+      val of_list: (key * 'a) list -> 'a t
+      val to_list: 'a t -> (key * 'a) list
+    end
+
+    module Make (Ord: Map.OrderedType) =
+    struct
+      include Map.Make(Ord)
+
+      let rec add_list t =
+        function
+          | (k, v) :: tl -> add_list (add k v t) tl
+          | [] -> t
+
+      let of_list lst = add_list empty lst
+
+      let to_list t = fold (fun k v acc -> (k, v) :: acc) t []
+    end
+  end
+
+
+  module MapString = MapExt.Make(String)
+
+
+  module SetExt  =
+  struct
+    module type S =
+    sig
+      include Set.S
+      val add_list: t -> elt list -> t
+      val of_list: elt list -> t
+      val to_list: t -> elt list
+    end
+
+    module Make (Ord: Set.OrderedType) =
+    struct
+      include Set.Make(Ord)
+
+      let rec add_list t =
+        function
+          | e :: tl -> add_list (add e t) tl
+          | [] -> t
+
+      let of_list lst = add_list empty lst
+
+      let to_list = elements
+    end
+  end
+
+
+  module SetString = SetExt.Make(String)
+
+
+  let compare_csl s1 s2 =
+    String.compare (OASISString.lowercase_ascii s1) (OASISString.lowercase_ascii s2)
+
+
+  module HashStringCsl =
+    Hashtbl.Make
+      (struct
+         type t = string
+         let equal s1 s2 = (compare_csl s1 s2) = 0
+         let hash s = Hashtbl.hash (OASISString.lowercase_ascii s)
+       end)
+
+  module SetStringCsl =
+    SetExt.Make
+      (struct
+         type t = string
+         let compare = compare_csl
+       end)
+
+
+  let varname_of_string ?(hyphen='_') s =
+    if String.length s = 0 then
+      begin
+        invalid_arg "varname_of_string"
+      end
+    else
+      begin
+        let buf =
+          OASISString.replace_chars
+            (fun c ->
+               if ('a' <= c && c <= 'z')
+                 ||
+                  ('A' <= c && c <= 'Z')
+                 ||
+                  ('0' <= c && c <= '9') then
+                 c
+               else
+                 hyphen)
+            s;
+        in
+        let buf =
+          (* Start with a _ if digit *)
+          if '0' <= s.[0] && s.[0] <= '9' then
+            "_"^buf
+          else
+            buf
+        in
+          OASISString.lowercase_ascii buf
+      end
+
+
+  let varname_concat ?(hyphen='_') p s =
+    let what = String.make 1 hyphen in
+    let p =
+      try
+        OASISString.strip_ends_with ~what p
+      with Not_found ->
+        p
+    in
+    let s =
+      try
+        OASISString.strip_starts_with ~what s
+      with Not_found ->
+        s
+    in
+      p^what^s
+
+
+  let is_varname str =
+    str = varname_of_string str
+
 
+  let failwithf fmt = Printf.ksprintf failwith fmt
+
+
+  let rec file_location ?pos1 ?pos2 ?lexbuf () =
+      match pos1, pos2, lexbuf with
+      | Some p, None, _ | None, Some p, _ ->
+        file_location ~pos1:p ~pos2:p ?lexbuf ()
+      | Some p1, Some p2, _ ->
+        let open Lexing in
+        let fn, lineno = p1.pos_fname, p1.pos_lnum in
+        let c1 = p1.pos_cnum - p1.pos_bol in
+        let c2 = c1 + (p2.pos_cnum - p1.pos_cnum) in
+        Printf.sprintf (f_ "file %S, line %d, characters %d-%d")  fn lineno c1 c2
+      | _, _, Some lexbuf ->
+        file_location
+          ~pos1:(Lexing.lexeme_start_p lexbuf)
+          ~pos2:(Lexing.lexeme_end_p lexbuf)
+          ()
+      | None, None, None ->
+        s_ "<position undefined>"
+
+
+  let failwithpf ?pos1 ?pos2 ?lexbuf fmt =
+    let loc = file_location ?pos1 ?pos2 ?lexbuf () in
+    Printf.ksprintf (fun s -> failwith (Printf.sprintf "%s: %s" loc s)) fmt
+
+
+end
 
+module OASISExpr = struct
+(* # 22 "src/oasis/OASISExpr.ml" *)
+
+
+  open OASISGettext
+  open OASISUtils
+
+
+  type test = string
   type flag = string
 
 
@@ -54,7 +366,6 @@ module OASISExpr = struct
     | ETest of test * string
 
 
-
   type 'a choices = (t * 'a) list
 
 
@@ -129,7 +440,7 @@ module OASISExpr = struct
 end
 
 
-# 132 "myocamlbuild.ml"
+# 443 "myocamlbuild.ml"
 module BaseEnvLight = struct
 (* # 22 "src/base/BaseEnvLight.ml" *)
 
@@ -140,132 +451,103 @@ module BaseEnvLight = struct
   type t = string MapString.t
 
 
-  let default_filename =
-    Filename.concat
-      (Sys.getcwd ())
-      "setup.data"
+  let default_filename = Filename.concat (Sys.getcwd ()) "setup.data"
 
 
-  let load ?(allow_empty=false) ?(filename=default_filename) () =
-    if Sys.file_exists filename then
-      begin
-        let chn =
-          open_in_bin filename
-        in
-        let st =
-          Stream.of_channel chn
-        in
-        let line =
-          ref 1
-        in
-        let st_line =
-          Stream.from
-            (fun _ ->
-               try
-                 match Stream.next st with
-                   | '\n' -> incr line; Some '\n'
-                   | c -> Some c
-               with Stream.Failure -> None)
-        in
-        let lexer =
-          Genlex.make_lexer ["="] st_line
-        in
-        let rec read_file mp =
-          match Stream.npeek 3 lexer with
-            | [Genlex.Ident nm; Genlex.Kwd "="; Genlex.String value] ->
-                Stream.junk lexer;
-                Stream.junk lexer;
-                Stream.junk lexer;
-                read_file (MapString.add nm value mp)
-            | [] ->
-                mp
-            | _ ->
-                failwith
-                  (Printf.sprintf
-                     "Malformed data file '%s' line %d"
-                     filename !line)
-        in
-        let mp =
-          read_file MapString.empty
-        in
-          close_in chn;
-          mp
-      end
-    else if allow_empty then
-      begin
+  let load ?(allow_empty=false) ?(filename=default_filename) ?stream () =
+    let line = ref 1 in
+    let lexer st =
+      let st_line =
+        Stream.from
+          (fun _ ->
+             try
+               match Stream.next st with
+               | '\n' -> incr line; Some '\n'
+               | c -> Some c
+             with Stream.Failure -> None)
+      in
+      Genlex.make_lexer ["="] st_line
+    in
+    let rec read_file lxr mp =
+      match Stream.npeek 3 lxr with
+      | [Genlex.Ident nm; Genlex.Kwd "="; Genlex.String value] ->
+        Stream.junk lxr; Stream.junk lxr; Stream.junk lxr;
+        read_file lxr (MapString.add nm value mp)
+      | [] -> mp
+      | _ ->
+        failwith
+          (Printf.sprintf "Malformed data file '%s' line %d" filename !line)
+    in
+    match stream with
+    | Some st -> read_file (lexer st) MapString.empty
+    | None ->
+      if Sys.file_exists filename then begin
+        let chn = open_in_bin filename in
+        let st = Stream.of_channel chn in
+        try
+          let mp = read_file (lexer st) MapString.empty in
+          close_in chn; mp
+        with e ->
+          close_in chn; raise e
+      end else if allow_empty then begin
         MapString.empty
-      end
-    else
-      begin
+      end else begin
         failwith
           (Printf.sprintf
              "Unable to load environment, the file '%s' doesn't exist."
              filename)
       end
 
-
   let rec var_expand str env =
-    let buff =
-      Buffer.create ((String.length str) * 2)
-    in
-      Buffer.add_substitute
-        buff
-        (fun var ->
-           try
-             var_expand (MapString.find var env) env
-           with Not_found ->
-             failwith
-               (Printf.sprintf
-                  "No variable %s defined when trying to expand %S."
-                  var
-                  str))
-        str;
-      Buffer.contents buff
-
-
-  let var_get name env =
-    var_expand (MapString.find name env) env
-
-
-  let var_choose lst env =
-    OASISExpr.choose
-      (fun nm -> var_get nm env)
-      lst
+    let buff = Buffer.create ((String.length str) * 2) in
+    Buffer.add_substitute
+      buff
+      (fun var ->
+         try
+           var_expand (MapString.find var env) env
+         with Not_found ->
+           failwith
+             (Printf.sprintf
+                "No variable %s defined when trying to expand %S."
+                var
+                str))
+      str;
+    Buffer.contents buff
+
+
+  let var_get name env = var_expand (MapString.find name env) env
+  let var_choose lst env = OASISExpr.choose (fun nm -> var_get nm env) lst
 end
 
 
-# 237 "myocamlbuild.ml"
+# 523 "myocamlbuild.ml"
 module MyOCamlbuildFindlib = struct
 (* # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
 
 
   (** OCamlbuild extension, copied from
-    * http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
+    * https://ocaml.org/learn/tutorials/ocamlbuild/Using_ocamlfind_with_ocamlbuild.html
     * by N. Pouillard and others
     *
-    * Updated on 2009/02/28
+    * Updated on 2016-06-02
     *
     * Modified by Sylvain Le Gall
-    *)
+  *)
   open Ocamlbuild_plugin
 
-  type conf =
-    { no_automatic_syntax: bool;
-    }
 
-  (* these functions are not really officially exported *)
-  let run_and_read =
-    Ocamlbuild_pack.My_unix.run_and_read
+  type conf = {no_automatic_syntax: bool}
+
 
+  let run_and_read = Ocamlbuild_pack.My_unix.run_and_read
 
-  let blank_sep_strings =
-    Ocamlbuild_pack.Lexers.blank_sep_strings
+
+  let blank_sep_strings = Ocamlbuild_pack.Lexers.blank_sep_strings
 
 
   let exec_from_conf exec =
     let exec =
-      let env_filename = Pathname.basename BaseEnvLight.default_filename in
-      let env = BaseEnvLight.load ~filename:env_filename ~allow_empty:true () in
+      let env = BaseEnvLight.load ~allow_empty:true () in
       try
         BaseEnvLight.var_get exec env
       with Not_found ->
@@ -276,7 +558,7 @@ module MyOCamlbuildFindlib = struct
       if Sys.os_type = "Win32" then begin
         let buff = Buffer.create (String.length str) in
         (* Adapt for windowsi, ocamlbuild + win32 has a hard time to handle '\\'.
-         *)
+        *)
         String.iter
           (fun c -> Buffer.add_char buff (if c = '\\' then '/' else c))
           str;
@@ -285,7 +567,8 @@ module MyOCamlbuildFindlib = struct
         str
       end
     in
-      fix_win32 exec
+    fix_win32 exec
+
 
   let split s ch =
     let buf = Buffer.create 13 in
@@ -294,15 +577,15 @@ module MyOCamlbuildFindlib = struct
       x := (Buffer.contents buf) :: !x;
       Buffer.clear buf
     in
-      String.iter
-        (fun c ->
-           if c = ch then
-             flush ()
-           else
-             Buffer.add_char buf c)
-        s;
-      flush ();
-      List.rev !x
+    String.iter
+      (fun c ->
+         if c = ch then
+           flush ()
+         else
+           Buffer.add_char buf c)
+      s;
+    flush ();
+    List.rev !x
 
 
   let split_nl s = split s '\n'
@@ -344,85 +627,89 @@ module MyOCamlbuildFindlib = struct
   let dispatch conf =
     function
       | After_options ->
-          (* By using Before_options one let command line options have an higher
-           * priority on the contrary using After_options will guarantee to have
-           * the higher priority override default commands by ocamlfind ones *)
-          Options.ocamlc     := ocamlfind & A"ocamlc";
-          Options.ocamlopt   := ocamlfind & A"ocamlopt";
-          Options.ocamldep   := ocamlfind & A"ocamldep";
-          Options.ocamldoc   := ocamlfind & A"ocamldoc";
-          Options.ocamlmktop := ocamlfind & A"ocamlmktop";
-          Options.ocamlmklib := ocamlfind & A"ocamlmklib"
+        (* By using Before_options one let command line options have an higher
+         * priority on the contrary using After_options will guarantee to have
+         * the higher priority override default commands by ocamlfind ones *)
+        Options.ocamlc     := ocamlfind & A"ocamlc";
+        Options.ocamlopt   := ocamlfind & A"ocamlopt";
+        Options.ocamldep   := ocamlfind & A"ocamldep";
+        Options.ocamldoc   := ocamlfind & A"ocamldoc";
+        Options.ocamlmktop := ocamlfind & A"ocamlmktop";
+        Options.ocamlmklib := ocamlfind & A"ocamlmklib"
 
       | After_rules ->
 
-          (* When one link an OCaml library/binary/package, one should use
-           * -linkpkg *)
-          flag ["ocaml"; "link"; "program"] & A"-linkpkg";
-
-          if not (conf.no_automatic_syntax) then begin
-            (* For each ocamlfind package one inject the -package option when
-             * compiling, computing dependencies, generating documentation and
-             * linking. *)
-            List.iter
-              begin fun pkg ->
-                let base_args = [A"-package"; A pkg] in
-                (* TODO: consider how to really choose camlp4o or camlp4r. *)
-                let syn_args = [A"-syntax"; A "camlp4o"] in
-                let (args, pargs) =
-                  (* Heuristic to identify syntax extensions: whether they end in
-                     ".syntax"; some might not.
-                  *)
-                  if Filename.check_suffix pkg "syntax" ||
-                     List.mem pkg well_known_syntax then
-                    (syn_args @ base_args, syn_args)
-                  else
-                    (base_args, [])
-                in
-                flag ["ocaml"; "compile";  "pkg_"^pkg] & S args;
-                flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S args;
-                flag ["ocaml"; "doc";      "pkg_"^pkg] & S args;
-                flag ["ocaml"; "link";     "pkg_"^pkg] & S base_args;
-                flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S args;
-
-                (* TODO: Check if this is allowed for OCaml < 3.12.1 *)
-                flag ["ocaml"; "compile";  "package("^pkg^")"] & S pargs;
-                flag ["ocaml"; "ocamldep"; "package("^pkg^")"] & S pargs;
-                flag ["ocaml"; "doc";      "package("^pkg^")"] & S pargs;
-                flag ["ocaml"; "infer_interface"; "package("^pkg^")"] & S pargs;
-              end
-              (find_packages ());
-          end;
-
-          (* Like -package but for extensions syntax. Morover -syntax is useless
-           * when linking. *)
-          List.iter begin fun syntax ->
+        (* Avoid warnings for unused tag *)
+        flag ["tests"] N;
+
+        (* When one link an OCaml library/binary/package, one should use
+         * -linkpkg *)
+        flag ["ocaml"; "link"; "program"] & A"-linkpkg";
+
+        (* For each ocamlfind package one inject the -package option when
+         * compiling, computing dependencies, generating documentation and
+         * linking. *)
+        List.iter
+          begin fun pkg ->
+            let base_args = [A"-package"; A pkg] in
+            (* TODO: consider how to really choose camlp4o or camlp4r. *)
+            let syn_args = [A"-syntax"; A "camlp4o"] in
+            let (args, pargs) =
+              (* Heuristic to identify syntax extensions: whether they end in
+                 ".syntax"; some might not.
+              *)
+              if not (conf.no_automatic_syntax) &&
+                 (Filename.check_suffix pkg "syntax" ||
+                  List.mem pkg well_known_syntax) then
+                (syn_args @ base_args, syn_args)
+              else
+                (base_args, [])
+            in
+            flag ["ocaml"; "compile";  "pkg_"^pkg] & S args;
+            flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S args;
+            flag ["ocaml"; "doc";      "pkg_"^pkg] & S args;
+            flag ["ocaml"; "link";     "pkg_"^pkg] & S base_args;
+            flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S args;
+
+            (* TODO: Check if this is allowed for OCaml < 3.12.1 *)
+            flag ["ocaml"; "compile";  "package("^pkg^")"] & S pargs;
+            flag ["ocaml"; "ocamldep"; "package("^pkg^")"] & S pargs;
+            flag ["ocaml"; "doc";      "package("^pkg^")"] & S pargs;
+            flag ["ocaml"; "infer_interface"; "package("^pkg^")"] & S pargs;
+          end
+          (find_packages ());
+
+        (* Like -package but for extensions syntax. Morover -syntax is useless
+         * when linking. *)
+        List.iter begin fun syntax ->
           flag ["ocaml"; "compile";  "syntax_"^syntax] & S[A"-syntax"; A syntax];
           flag ["ocaml"; "ocamldep"; "syntax_"^syntax] & S[A"-syntax"; A syntax];
           flag ["ocaml"; "doc";      "syntax_"^syntax] & S[A"-syntax"; A syntax];
           flag ["ocaml"; "infer_interface"; "syntax_"^syntax] &
-                S[A"-syntax"; A syntax];
-          end (find_syntaxes ());
-
-          (* The default "thread" tag is not compatible with ocamlfind.
-           * Indeed, the default rules add the "threads.cma" or "threads.cmxa"
-           * options when using this tag. When using the "-linkpkg" option with
-           * ocamlfind, this module will then be added twice on the command line.
-           *
-           * To solve this, one approach is to add the "-thread" option when using
-           * the "threads" package using the previous plugin.
-           *)
-          flag ["ocaml"; "pkg_threads"; "compile"] (S[A "-thread"]);
-          flag ["ocaml"; "pkg_threads"; "doc"] (S[A "-I"; A "+threads"]);
-          flag ["ocaml"; "pkg_threads"; "link"] (S[A "-thread"]);
-          flag ["ocaml"; "pkg_threads"; "infer_interface"] (S[A "-thread"]);
-          flag ["ocaml"; "package(threads)"; "compile"] (S[A "-thread"]);
-          flag ["ocaml"; "package(threads)"; "doc"] (S[A "-I"; A "+threads"]);
-          flag ["ocaml"; "package(threads)"; "link"] (S[A "-thread"]);
-          flag ["ocaml"; "package(threads)"; "infer_interface"] (S[A "-thread"]);
+          S[A"-syntax"; A syntax];
+        end (find_syntaxes ());
+
+        (* The default "thread" tag is not compatible with ocamlfind.
+         * Indeed, the default rules add the "threads.cma" or "threads.cmxa"
+         * options when using this tag. When using the "-linkpkg" option with
+         * ocamlfind, this module will then be added twice on the command line.
+         *
+         * To solve this, one approach is to add the "-thread" option when using
+         * the "threads" package using the previous plugin.
+        *)
+        flag ["ocaml"; "pkg_threads"; "compile"] (S[A "-thread"]);
+        flag ["ocaml"; "pkg_threads"; "doc"] (S[A "-I"; A "+threads"]);
+        flag ["ocaml"; "pkg_threads"; "link"] (S[A "-thread"]);
+        flag ["ocaml"; "pkg_threads"; "infer_interface"] (S[A "-thread"]);
+        flag ["c"; "pkg_threads"; "compile"] (S[A "-thread"]);
+        flag ["ocaml"; "package(threads)"; "compile"] (S[A "-thread"]);
+        flag ["ocaml"; "package(threads)"; "doc"] (S[A "-I"; A "+threads"]);
+        flag ["ocaml"; "package(threads)"; "link"] (S[A "-thread"]);
+        flag ["ocaml"; "package(threads)"; "infer_interface"] (S[A "-thread"]);
+        flag ["c"; "package(threads)"; "compile"] (S[A "-thread"]);
 
       | _ ->
-          ()
+        ()
 end
 
 module MyOCamlbuildBase = struct
@@ -434,9 +721,6 @@ module MyOCamlbuildBase = struct
     *)
 
 
-
-
-
   open Ocamlbuild_plugin
   module OC = Ocamlbuild_pack.Ocaml_compiler
 
@@ -447,9 +731,6 @@ module MyOCamlbuildBase = struct
   type tag = string
 
 
-(* # 62 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
-
-
   type t =
       {
         lib_ocaml: (name * dir list * string list) list;
@@ -462,9 +743,10 @@ module MyOCamlbuildBase = struct
       }
 
 
-  let env_filename =
-    Pathname.basename
-      BaseEnvLight.default_filename
+(* # 110 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
+
+
+  let env_filename = Pathname.basename BaseEnvLight.default_filename
 
 
   let dispatch_combine lst =
@@ -483,12 +765,7 @@ module MyOCamlbuildBase = struct
 
 
   let dispatch t e =
-    let env =
-      BaseEnvLight.load
-        ~filename:env_filename
-        ~allow_empty:true
-        ()
-    in
+    let env = BaseEnvLight.load ~allow_empty:true () in
       match e with
         | Before_options ->
             let no_trailing_dot s =
@@ -516,7 +793,7 @@ module MyOCamlbuildBase = struct
                  | nm, [], intf_modules ->
                      ocaml_lib nm;
                      let cmis =
-                       List.map (fun m -> (String.uncapitalize m) ^ ".cmi")
+                       List.map (fun m -> (OASISString.uncapitalize_ascii m) ^ ".cmi")
                                 intf_modules in
                      dep ["ocaml"; "link"; "library"; "file:"^nm^".cma"] cmis
                  | nm, dir :: tl, intf_modules ->
@@ -529,7 +806,7 @@ module MyOCamlbuildBase = struct
                             ["compile"; "infer_interface"; "doc"])
                        tl;
                      let cmis =
-                       List.map (fun m -> dir^"/"^(String.uncapitalize m)^".cmi")
+                       List.map (fun m -> dir^"/"^(OASISString.uncapitalize_ascii m)^".cmi")
                                 intf_modules in
                      dep ["ocaml"; "link"; "library"; "file:"^dir^"/"^nm^".cma"]
                          cmis)
@@ -552,18 +829,19 @@ module MyOCamlbuildBase = struct
                    flag ["link"; "library"; "ocaml"; "native"; tag_libstubs lib]
                      (S[A"-cclib"; A("-l"^(nm_libstubs lib))]);
 
-                   flag ["link"; "program"; "ocaml"; "byte"; tag_libstubs lib]
-                     (S[A"-dllib"; A("dll"^(nm_libstubs lib))]);
+                   if bool_of_string (BaseEnvLight.var_get "native_dynlink" env) then
+                     flag ["link"; "program"; "ocaml"; "byte"; tag_libstubs lib]
+                         (S[A"-dllib"; A("dll"^(nm_libstubs lib))]);
 
                    (* When ocaml link something that use the C library, then one
                       need that file to be up to date.
                       This holds both for programs and for libraries.
                     *)
-  		 dep ["link"; "ocaml"; tag_libstubs lib]
-  		     [dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
+                   dep ["link"; "ocaml"; tag_libstubs lib]
+                     [dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
 
-  		 dep  ["compile"; "ocaml"; tag_libstubs lib]
-  		      [dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
+                   dep  ["compile"; "ocaml"; tag_libstubs lib]
+                     [dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
 
                    (* TODO: be more specific about what depends on headers *)
                    (* Depends on .h files *)
@@ -603,7 +881,7 @@ module MyOCamlbuildBase = struct
 end
 
 
-# 606 "myocamlbuild.ml"
+# 884 "myocamlbuild.ml"
 open Ocamlbuild_plugin;;
 let package_default =
   {
@@ -618,6 +896,6 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
 
 let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
 
-# 622 "myocamlbuild.ml"
+# 900 "myocamlbuild.ml"
 (* OASIS_STOP *)
 Ocamlbuild_plugin.dispatch dispatch_default;;

opam

@@ -1,24 +1,32 @@
 opam-version: "1.2"
 name: "oclaunch"
-version: "0.3.0-pre2"
-maintainer: "Leo <leowzukw@vmail.me>"
-authors: "Leo <leowzukw@vmail.me>"
+version: "0.3.0-rc1"
+maintainer: "Leo <leowzukw@oclaunch.eu.org>"
+authors: "Leo <leowzukw@oclaunch.eu.org>"
 homepage: "http://www.oclaunch.eu.org"
-bug-reports: "https://gitlab.com/WzukW/oclaunch/issues/new"
+bug-reports: "http://s.oclaunch.eu.org/bug"
 license: "CeCILL"
 dev-repo: "git@gitlab.com:WzukW/oclaunch.git"
+build-test: [
+  ["./configure" "--enable-tests" "--prefix=%{prefix}%"]
+  [make "test"]
+]
 build: [
-  ["./configure" "--prefix=%{prefix}%"]
+  ["./configure" "--disable-tests" "--prefix=%{prefix}%"]
   [make]
 ]
 install: [make "install"]
-remove: ["ocamlfind" "remove" "ocl"]
+remove: ["ocamlfind" "remove" "oclaunch"]
 depends: [
-  "atdgen"
-  "base-threads"
-  "core" {>= "112.35.00"}
-  "textutils"
-  "re2"
-  "ocamlfind" {build}
+  "ocamlbuild" { build }
+  "atdgen" { build & >= "1.9.1" }
+  "yojson" { build }
+  "base-threads" { build }
+  "core" {  build & >= "112.35.00"}
+  "textutils" { build }
+  "re2" { build }
+  "ocamlfind" { build }
+  "ounit" { test }
+  "alcotest" { test }
 ]
-available: [ocaml-version >= "4.02.0"]
+available: [ocaml-version >= "4.03.0"]

pkg.sh

@@ -1,5 +1,32 @@
-#!/bin/sh
+#!/bin/bash
 # A little script to create tarball, especially for Oasis2Opam
+# You may pass source commit as first argument, HEAD is used if omitted.
+
+create_archive() {
+  # Target commit (TC) i.e. commit from which tarball is created.
+  TC=$1
+  TCID=`git rev-parse ${TC}`
+  echo "Creating tarball from commit ${TCID} ($TC)."
+
+  # If no tag, use commit SHA1
+  id=`git describe --abbrev=10 --candidates=50 ${TCID}`
+  name=oclaunch_${id}_source # _source emphasis the difference with binary tarballs
+
+  echo "Writing in" $name".*"
+  git archive ${TCID} --prefix=${name}/ --format=zip -o dist/${name}.zip -9
+  # Creating .xz .gz and .bz2 from tar archive
+  tar_name=${name}.tar
+  git archive ${TCID} --prefix=${name}/ --format=tar \
+    | tee dist/${tar_name} \
+    | gzip -c9 > dist/${tar_name}.gz
+  bzip2 -c9 < dist/${tar_name} >  dist/${tar_name}.bz2
+  xz -c9 < dist/${tar_name} >  dist/${tar_name}.xz
+
+  # Verification
+  gzip -t < dist/${tar_name}.gz
+  bzip2 -t <  dist/${tar_name}.bz2
+  xz -t <  dist/${tar_name}.xz
+}
 
 echo "Start"
 
@@ -8,17 +35,13 @@ if ! [ -e dist ]; then
     mkdir dist
 fi
 
-# If no tag, use commit SHA1
-id=`git describe --abbrev=10 --candidates=50 HEAD`
-name=oclaunch_${id}_src # _src emphasis the difference with binary tarballs
-
-echo "Writing in" $name".*"
-git archive HEAD --prefix=${name}/ --format=zip -o dist/${name}.zip -9
-# Creating .xz .gz and .bz2 from tar archive
-tar_name=${name}.tar
-git archive HEAD --prefix=${name}/ --format=tar -o dist/${tar_name}
-cd dist
-gzip -c9 < ${tar_name} >  ${tar_name}.gz
-bzip2 -c9 < ${tar_name} >  ${tar_name}.bz2
-xz -c9 < ${tar_name} >  ${tar_name}.xz
+if [[ $1 = "" ]]; then
+  echo "No argument, using HEAD to create tarball."
+  create_archive HEAD
+else
+  # If several commits are given, create an archive for each
+  for commit in "$@"; do
+    create_archive $commit
+  done
+fi
 

src/.merlin

@@ -1,4 +1,4 @@
-PKG core yojson atdgen core_extended
+PKG core yojson atdgen
 
 S *
 

src/add_command.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -42,27 +42,32 @@ open Core.Std;;
 let new_list current_list position new_items =
   match position with
   | None -> List.append current_list new_items
-  | Some n -> (* If a number is given, add commands after position n by
-                 splitting the list and concatenating all. List.split_n works like this :
-               * #let l1 = [1;2;3;4;5;6] in
-               * # List.split_n l1 2;;
-               * - : int list * int list = ([1; 2], [3; 4; 5; 6]) *)
+  | Some n ->
+    (* If a number is given, add commands after position n by
+       splitting the list and concatenating all. List.split_n works like this:
+     * #let l1 = [1;2;3;4;5;6] in
+     * # List.split_n l1 2;;
+     * - : int list * int list = ([1; 2], [3; 4; 5; 6]) *)
     let l_begin,l_end = List.split_n current_list n in
     List.concat [ l_begin ; new_items ; l_end ]
 ;;
 
-
-
 (* Function which add the commands (one per line) ridden on stdin to the rc
  * file, and then display th new configuration *)
-let run ~(rc:File_com.t) position =
+let run ~(rc:Rc.t) position =
   (* Read command from stdin, as a list. fix_win_eol removes \r\n *)
-  let cmd_list = In_channel.input_lines ~fix_win_eol:true In_channel.stdin in
+  let cmd_list =
+    In_channel.input_lines ~fix_win_eol:true In_channel.stdin
+    |> List.map ~f:(fun command -> new Rc.entry command)
+  in
   (* Create an updated rc file *)
-  let updated_rc = { rc with Settings_t.progs = (new_list rc.Settings_t.progs position cmd_list)} in
-  File_com.write updated_rc;
+  let updated_rc =
+    rc#change_entries (new_list rc#entries position cmd_list)
+    |> Unify.prettify
+  in
+  updated_rc#write;
   (* Display the result *)
-  let reread_rc = File_com.init_rc () in
+  let reread_rc = Rc.init () in
   List_rc.run ~rc:reread_rc ()
 ;;
 

src/bug.ml

@@ -0,0 +1,48 @@
+(******************************************************************************)
+(* Copyright © Joly Clément, 2016                                             *)
+(*                                                                            *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
+(*                                                                            *)
+(*  Ce logiciel est un programme informatique servant à exécuter              *)
+(*  automatiquement des programmes à l'ouverture du terminal.                 *)
+(*                                                                            *)
+(*  Ce logiciel est régi par la licence CeCILL soumise au droit français et   *)
+(*  respectant les principes de diffusion des logiciels libres. Vous pouvez   *)
+(*  utiliser, modifier et/ou redistribuer ce programme sous les conditions    *)
+(*  de la licence CeCILL telle que diffusée par le CEA, le CNRS et l'INRIA    *)
+(*  sur le site "http://www.cecill.info".                                     *)
+(*                                                                            *)
+(*  En contrepartie de l'accessibilité au code source et des droits de copie, *)
+(*  de modification et de redistribution accordés par cette licence, il n'est *)
+(*  offert aux utilisateurs qu'une garantie limitée.  Pour les mêmes raisons, *)
+(*  seule une responsabilité restreinte pèse sur l'auteur du programme,  le   *)
+(*  titulaire des droits patrimoniaux et les concédants successifs.           *)
+(*                                                                            *)
+(*  A cet égard  l'attention de l'utilisateur est attirée sur les risques     *)
+(*  associés au chargement,  à l'utilisation,  à la modification et/ou au     *)
+(*  développement et à la reproduction du logiciel par l'utilisateur étant    *)
+(*  donné sa spécificité de logiciel libre, qui peut le rendre complexe à     *)
+(*  manipuler et qui le réserve donc à des développeurs et des professionnels *)
+(*  avertis possédant  des  connaissances  informatiques approfondies.  Les   *)
+(*  utilisateurs sont donc invités à charger  et  tester  l'adéquation  du    *)
+(*  logiciel à leurs besoins dans des conditions permettant d'assurer la      *)
+(*  sécurité de leurs systèmes et ou de leurs données et, plus généralement,  *)
+(*  à l'utiliser et l'exploiter dans les mêmes conditions de sécurité.        *)
+(*                                                                            *)
+(*  Le fait que vous puissiez accéder à cet en-tête signifie que vous avez    *)
+(*  pris connaissance de la licence CeCILL, et que vous en avez accepté les   *)
+(*  termes.                                                                   *)
+(******************************************************************************)
+
+(* Module containing useful functions to display bug report instructions *)
+
+open Core.Std;;
+
+(* Url of instructions to report bugs *)
+let url = "http://s.oclaunch.eu.org/bug";;
+
+(* Display instructions to report bug *)
+let report () =
+  sprintf "This is probably a bug, please report it (%s)." url
+  |> Messages.tips
+;;

src/clean_command.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -37,6 +37,8 @@
 open Core.Std;;
 
 let run ~rc () =
-  File_com.write rc;
-  Messages.debug "Configuration file cleaned up";
+  let rc_lean = Unify.prettify rc in
+  Messages.info "Configuration file cleaned up";
+  rc_lean#write;
+  List_rc.run ~rc:rc_lean ()
 ;;

src/color_print.ml

@@ -1 +0,0 @@
-third-part/core_extended/color_print.ml

src/command_def.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -34,7 +34,7 @@
 (*  termes.                                                                   *)
 (******************************************************************************)
 
-open Core.Std;;
+open! Core.Std;;
 
 open Command;;
 
@@ -42,45 +42,78 @@ open Command;;
 
 (* Type to return result of the work with common arguments *)
 type return_arg = {
-  rc : Settings_t.rc_file;
+  rc : Rc.t Lazy.t;
 }
 
+(* Shorthand *)
+let id_seq = Id_parsing.id_sequence;;
+let iter_seq = Id_parsing.helper;;
+
 (* A set of default arguments, usable with most of the commands *)
 let shared_params =
   let open Param in
   (* Way to treat common args *)
-  return (fun verbosity no_color rc_file_name handle_signal ->
+  return (fun verbosity assume_yes no_color rc_file_name handle_signal ->
          (* Set the level of verbosity *)
          Const.verbosity := verbosity;
+         (* Ask question or not, see Const.ask for details *)
+         Const.ask := Option.(
+                merge
+                  (some_if assume_yes true)
+                  !Const.ask
+                  ~f:( || )
+              );
          (* Do not use color *)
          Const.no_color := no_color || !Const.no_color;
-         (* Use given rc file, should run the nth argument if present *)
-         Const.rc_file := (Lazy.return rc_file_name);
+         (* Use given rc file, preserving lazyness, since Const.rc_file is not
+          * yet evaluated *)
+         Const.rc_file :=
+           Option.value_map ~f:(fun rfn -> Lazy.return rfn)
+             ~default:!Const.rc_file rc_file_name
+         ;
          (* Active signal handling *)
          if handle_signal then
            Signals.handle ();
 
          (* Debugging *)
-         Messages.debug (sprintf "Verbosity set to %i" !Const.verbosity);
-         Messages.debug (sprintf "Color %s" (match !Const.no_color with true -> "off" | false -> "on"));
-         Messages.debug (sprintf "Configuration file is %s" (Lazy.force !Const.rc_file));
-         Messages.debug (sprintf "Tmp file is %s" Const.tmp_file);
+         let d = Messages.debug in
+         d (sprintf "Verbosity set to %i" !Const.verbosity);
+         d (match !Const.ask with
+             | None -> "Assume nothing"
+             | Some false -> "Assume No"
+             | Some true -> "Assume Yes");
+         d (sprintf "Color %s" (match !Const.no_color with true -> "off" | false -> "on"));
+         begin
+           match Option.try_with (fun () -> Lazy.force !Const.rc_file) with
+           | None -> d "Configuration file will fail if used";
+           | Some rc -> d (sprintf "Configuration file is %s" rc);
+         end;
+         d (sprintf "Tmp file is %s" Const.tmp_file);
 
          (* Obtain data from rc_file *)
-         let rc_content = File_com.init_rc () in
+         d "Reading rc_file...";
+         let rc_content = lazy (Rc.init ()) in
+         d "Read rc_file";
          { rc = rc_content } (* We use type for futur use *)
        )
   (* Flag to set verbosity level *)
   <*> flag "-v" (optional_with_default !Const.verbosity int)
         ~aliases:["--verbose" ; "-verbose"]
         ~doc:"[n] Set verbosity level. \
-              The higher n is, the most verbose the program is."
+              The higher n is, the more verbose the program is."
+  (* Flag to assume yes *)
+  <*> flag "-y" no_arg
+        ~aliases:["--yes" ; "-yes"]
+        ~doc:" Assume yes, never ask anything. \
+              Setting OC_YES environment variable to '1' is the same. \
+              Set it to '0' to assume no. \
+              Set it to '-1' to be asked every time."
   (* Flag to set colors *)
   <*> flag "--no-color" no_arg
         ~aliases:["-no-color"]
         ~doc:" Use this flag to disable color usage."
   (* Flag to use different rc file *)
-  <*> flag "-c" (optional_with_default (Lazy.force !Const.rc_file) file)
+  <*> flag "-c" (optional file)
         ~aliases:["--rc" ; "-rc"]
         ~doc:"file Read configuration from the given file and continue parsing."
   (* Flag to handle signals *)
@@ -90,21 +123,27 @@ let shared_params =
               implemented the best way."
 ;;
 
+(* Common documentation for id sequences *)
+let id_parsing_doc =
+  ". Id sequence means a set of ids like this: 1,4-9,17. The command is run \
+   for each item of the generated list (1,4,5,6,7,8,9,17 in this case)"
 
 (* basic-commands *)
 
 (* To reset tmp file *)
 let reset =
   basic
-    ~summary:"Reinitialises launches for the command number [command] to [n]. \
-              With both the [command] and the [n] argumennt, the command number \
-              [command] is resetted to [n]. \
-              With only the [n] argument, every entry in current tmp file is resetted to [n]."
+    ~summary:("Reinitialises launches for the command number [command] to [n]. \
+               With both the [command] and the [n] argumennt, the command number \
+               [command] is resetted to [n]. \
+               With only the [n] argument, every entry in current tmp file is \
+               resetted to [n]. [command] may be a sequence of ids"
+              ^ id_parsing_doc)
     Spec.(
       empty
       +> shared_params
       +> anon ("target_number" %: int)
-      +> anon (maybe ("command_number" %: int))
+      +> anon (maybe ("command_number" %: id_seq))
     )
     (fun { rc } num cmd () ->
        (* Call the right function, according to optionnal argument.
@@ -113,19 +152,21 @@ let reset =
         * cmd = Some n
         * cmd: number of the command to be reseted
         * num: number to reset *)
+       let rc = Lazy.force rc in
        match ( num, cmd ) with
-       | ( num, Some cmd ) -> Tmp_file.reset_cmd ~rc num cmd
-       | ( num, None ) -> Tmp_file.reset2num ~rc num
+       | ( num, None ) | ( num, Some [] ) -> Tmp_file.reset2num num
+       | ( num, Some cmd_list ) ->
+         List.iter ~f:(fun cmd -> Tmp_file.reset_cmd ~rc num cmd) cmd_list
     )
 ;;
 let reset_all =
   basic
-    ~summary:" Reinitialises launches for everything."
+    ~summary:" Reinitialises launches for everything"
     Spec.(
       empty
       +> shared_params
     )
-    (fun { rc } () ->
+    (fun _ () ->
        Tmp_file.reset_all ()
     )
 ;;
@@ -134,30 +175,30 @@ let reset_all =
 let list =
   basic
     ~summary:"Print a list of all commands with their number. Useful to launch with number. \
-              Displays a star next to next command to launch."
+              Displays a star next to next command to launch"
     Spec.(
       empty
       +> shared_params
-    +> flag "--el" (optional int)
-         ~doc:" Max length of displayed entries, 0 keeps as-is"
-  )
-  (fun { rc } length () ->
-    (* XXX A match case to deal with optionnal argument is tricky *)
-    match length with
-    | None -> List_rc.run ~rc ()
-    | Some l -> List_rc.run ~rc ~elength:l ())
+      +> flag "-l" (optional int)
+           ~aliases:[ "--length" ; "-length" ; "--elength" ; "-elength" ]
+           ~doc:" Max length of displayed entries, 0 keeps as-is"
+    )
+    (fun { rc } elength () ->
+       let rc = Lazy.force rc in
+       List_rc.run ~rc ?elength ())
 ;;
 
 (* To clean-up rc file *)
 let clean =
   basic
     ~summary:"Remove doubled entries, trailing spaces in them... \
-              Useful after manual editing or with rc file from old version."
+              Useful after manual editing or with rc file from old version"
     Spec.(
       empty
       +> shared_params
     )
     (fun { rc } () ->
+       let rc = Lazy.force rc in
        Clean_command.run ~rc ()
     )
 ;;
@@ -165,42 +206,50 @@ let clean =
 (* To add a command to rc file, from stdin or directly *)
 let add =
   basic
-    ~summary:"Add the command given on stdin to the configuration file at a \
-              given position ([NUMBER]). If nothing is given, append it."
+    ~summary:("Add the command given on stdin to the configuration file at a \
+               given position(s) ([id_sequence]). If nothing is given, or if \
+               it is out of bound, append commands at the end"
+              ^ id_parsing_doc)
     Spec.(
       empty
       +> shared_params
-      +> anon  (maybe ("number" %: int))
+      +> anon (maybe ("id_sequence" %: id_seq))
     )
-    (fun { rc } num_cmd () ->
-       Add_command.run ~rc num_cmd
+    (fun { rc } cmd_seq () ->
+       let rc = Lazy.force rc in
+       iter_seq ~f:(fun num_cmd -> Add_command.run ~rc num_cmd) cmd_seq
     )
 ;;
 
 (* To remove a command from rc file *)
 let delete =
   basic
-    ~summary:"Remove the [COMMAND_NUMBER]th command from configuration file. \
-              If [COMMAND_NUMBER] is absent, remove last one."
+    ~summary:("Remove the [COMMAND_NUMBER]th command from configuration file. \
+               If [COMMAND_NUMBER] is absent, remove last one. \n\
+               [COMMAND_NUMBER] may be a sequence of ids"
+              ^ id_parsing_doc)
     Spec.(
       empty
       +> shared_params
-      +> anon (maybe ("command_number" %: int))
+      +> anon (maybe ("command_number" %: id_seq))
     )
-    (fun { rc } num_cmd () ->
-       (*Tmp_file.reset ~rc reset_cmd 0)*)
-       Remove_command.run ~rc num_cmd)
+    (fun { rc } cmd_seq () ->
+       let rc = Lazy.force rc in
+       iter_seq
+         ~f:(fun num_cmd ->
+              Remove_command.run ~rc num_cmd) cmd_seq)
 ;;
 
 (* To display current state *)
 let state =
   basic
-    ~summary:"Display current state of the program."
+    ~summary:"Display current state of the program"
     Spec.(
       empty
       +> shared_params
     )
     (fun { rc } () ->
+       let rc = Lazy.force rc in
        State.print_current ~rc ())
 ;;
 
@@ -208,19 +257,75 @@ let state =
 (* To edit the nth command *)
 let edit =
   basic
-    ~summary:"Edit the [COMMAND_NUMBER]th command of the rc file in your \
-              $EDITOR. May be used to add new entries, without argument, one new \
-              command per line."
+    ~summary:("Edit the [COMMAND_NUMBER]th command of the rc file in your \
+               $EDITOR. May be used to add new entries, without argument, one new \
+               command per line. \n\
+               [COMMAND_NUMBER] may be a sequence of ids"
+              ^ id_parsing_doc)
+
     Spec.(
       empty
       +> shared_params
-      +> anon (maybe ("command_number" %: int))
+      +> anon (maybe ("command_number" %: id_seq))
+    )
+    (fun { rc } cmd_seq () ->
+       let rc = Lazy.force rc in
+       iter_seq cmd_seq ~f:(fun n ->
+              let position =
+                Option.value n
+                  ~default:(List.length (rc#entries) - 1)
+              in
+              Edit_command.run ~rc position)
+    )
+;;
+
+(* Enable auto-launch *)
+let enable_al =
+  basic
+    ~summary:("Enable auto-launch, you may unset OC_DISABLE variable too.")
+
+    Spec.(
+      empty
+      +> shared_params
+    )
+    (fun _ () ->
+       Tmp_file.set_disable false
+    )
+;;
+
+(* Disable auto-launch *)
+let disable_al =
+  basic
+    ~summary:("Disable auto-launch, you may set OC_DISABLE variable too.")
+
+    Spec.(
+      empty
+      +> shared_params
+    )
+    (fun _ () ->
+       Tmp_file.set_disable true
+    )
+;;
+
+(* Import from older version *)
+let import =
+  basic
+    ~summary:"Import an rc file of version <= 0.2.x"
+
+    Spec.(
+      empty
+      +> shared_params
+      +> flag "--from" (optional file) ~aliases:["-from"; "-f"]
+           ~doc:"file Import from given [FILE], json format (default: default-rc-file.json)"
+      +> flag "--to" (optional file) ~aliases:["-t"; "-to"]
+           ~doc:"file Write imported file to [FILE], sexp format (default: default-rc-file.scm)"
+    )
+    (fun _ from to_file () ->
+       let open Option in
+       let from = value ~default:Const.rc_file_old (from >>| Lazy.return) in
+       let to_file = value ~default:!Const.rc_file (to_file >>| Lazy.return) in
+       Rc.import ~from ~to_file
     )
-    (fun { rc } n () ->
-       let position = Option.value
-                        ~default:(List.length (rc.Settings_t.progs) - 1) n
-       in
-       Edit_command.run ~rc position)
 ;;
 
 (* To display informations about the licence *)
@@ -243,14 +348,16 @@ let licence =
 (* Run nth command, default use *)
 let default =
   basic
-    ~summary:"Run the [COMMAND_NUMBER]th command"
+    ~summary:("Run the id sequence" ^ id_parsing_doc)
     Spec.(
       empty
       +> shared_params
-      +> anon (maybe ("command_number" %: int))
+      +> anon (maybe ("command_number" %: id_seq))
+    )
+    (fun { rc } cmd_seq () ->
+       let rc = Lazy.force rc in
+       iter_seq cmd_seq ~f:(fun n -> Default.run ~rc n)
     )
-    (fun { rc } n () ->
-       Default.run ~rc n)
 
 let run ~version ~build_info () =
   (* Store begin time *)
@@ -276,18 +383,17 @@ let run ~version ~build_info () =
   (* Parsing with subcommands *)
   let parse_sub () =
     group
-      ~summary:"OcLaunch program is published under CeCILL licence.\n \
+      ~summary:"OcLaunch program is published under CeCILL licence.\n\
                 You may run the program with 'licence' command or see \
                 http://cecill.info/licences/Licence_CeCILL_V2.1-en.html \
-                (http://huit.re/TmdOFmQT) for details. More informations here: \
-                http://oclaunch.eu.org/floss-under-cecill (http://lnch.ml/l)."
-      ~readme:(fun () -> "Use 'help' subcommand to get help (it works both \
-                          after the name of the software and with another subcommand). For \
-                          further help, see http://oclaunch.eu.org.")
+                (https://s.oclaunch.eu.org/cecill) for details. More here: \
+                https://oclaunch.eu.org/floss-under-cecill (https://s.oclaunch.eu.org/l)."
+      ~readme:(fun () -> Rc.welcome_msg)
       ~preserve_subcommand_order:()
       [ ("run", default) ; ("licence", licence) ; ("add", add) ; ("edit", edit)
       ; ("list", list) ; ("cleanup", clean) ; ("delete", delete)
-      ; ("state", state) ; ( "reset", reset) ; ( "reset-all", reset_all) ]
+      ; ("state", state) ; ( "reset", reset) ; ( "reset-all", reset_all)
+      ; ( "import", import ) ; ("enable", enable_al) ; ("disable", disable_al) ]
     |> run ~version ~build_info
   in
 
@@ -300,9 +406,12 @@ let run ~version ~build_info () =
            | Error _ -> parse_sub ())
     with
     | () -> `Exit 0
+    (* XXX Command.basic function catch exceptions, so this doesn't actually
+     * work. We may to place it before basic function to fix the problem. *)
     | exception message ->
       "Exception: " ^ (Exn.to_string message)
       |> Messages.warning;
+      Bug.report ();
       `Exit 20
   in
 
@@ -313,7 +422,7 @@ let run ~version ~build_info () =
                Messages.warning "Removing lockfile, should be removed before. \
                                  It's a bug!"; remove ()
              | Free -> ()
-             | Error -> Messages.warning "Error with lockfile"
+             | Err -> Messages.warning "Error with lockfile"
            ));
 
   (* Display total running time, pretty printing is handled by Time module *)

src/const.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -34,7 +34,7 @@
 (*  termes.                                                                   *)
 (******************************************************************************)
 
-(* File to stock configuration variables *)
+(* File to store configuration variables *)
 
 open Core.Std;;
 
@@ -48,7 +48,7 @@ let get_var: ?default:(string lazy_t) -> string lazy_t -> string lazy_t =
     let open Lazy in
     let msg =
       name >>| fun name ->
-      sprintf "ERROR: Couldn't get %s. Please consider setting it." name
+      sprintf "ERROR: Could not get $%s. Please consider setting it." name
     in
     (* Get the var *)
     name >>= fun name ->
@@ -63,6 +63,11 @@ let home =
   get_var (lazy "HOME")
 ;;
 
+(* Get current loged in user (different of logname, original user loged in) *)
+let user =
+  get_var (lazy "USER")
+;;
+
 (* Get default editor *)
 let editor = (* If editor is not set, it gets "", but an exception is raised *)
   get_var (lazy "EDITOR")
@@ -73,6 +78,22 @@ let verbosity =
   ref (get_var ~default:(lazy "4") (lazy "OC_VERB")
        |> Lazy.force
        |> Int.of_string);;
+(* Whether we ask for confirmation, used by Messages module *)
+(* None -> ask, no preference defined,
+ * Some true -> assume Yes
+ * Some false -> assume No *)
+let ask_unset = -1;; (* Constant to leave preference unset *)
+let ask =
+  ref (get_var ~default:(lazy (Int.to_string ask_unset)) (lazy "OC_YES")
+       |> Lazy.force
+       |> Int.of_string
+       (* XXX Hacking with get_var, using
+        * -1 for None, 0 for Some false and 1 for Some true *)
+       |> function
+       | unset when unset = ask_unset -> None | 0 -> Some false | 1 -> Some true
+       | _ -> None
+      )
+;;
 (* Use do not use colors, 0 -> false, anything -> true *)
 let no_color =
   ref (get_var ~default:(lazy "0") (lazy "OC_NOCOLOR")
@@ -80,13 +101,28 @@ let no_color =
        |> (function "0" -> false | _ -> true)
       )
 ;;
+(* If this variable is set, auto run is disabled *)
+(* TODO Allow to configure this in rc file *)
+let disabled =
+  lazy (Sys.getenv "OC_DISABLE" |> Option.is_some)
+;;
+
+(* Default place to read settings, before version 0.3.x *)
+let rc_file_old =
+  let internal_default : string lazy_t =
+    (* Default value, if no value is given (for instance as
+       command line argument), or no environnement variable is set *)
+    Lazy.(home >>| fun home -> home ^/ ".oclaunch_rc.json")
+  in
+  get_var ~default:internal_default (lazy "OC_RC_OLD")
+;;
 
 (* Default place to read settings *)
 let rc_file_default =
   let internal_default : string lazy_t =
     (* Default value, if no value is given (for instance as
        command line argument), or no environnement variable is set *)
-    Lazy.(home >>| fun home -> home ^ "/" ^ ".oclaunch_rc.json")
+    Lazy.(home >>| fun home -> home ^/ ".oclaunch_rc.scm")
   in
   get_var ~default:internal_default (lazy "OC_RC")
 ;;
@@ -94,8 +130,14 @@ let rc_file_default =
 let rc_file = ref rc_file_default;;
 (* Set tmp file, in witch stock launches, in biniou format *)
 let tmp_file =
-  get_var ~default:(lazy ("/tmp/.oclaunch_trace.dat")) (lazy "OC_TMP")
+  let default =
+    Lazy.(user >>| sprintf "/tmp/.oclaunch_trace_%s.dat")
+  in
+  get_var ~default (lazy "OC_TMP")
   |> Lazy.force
 ;;
-(* Default number for launch *)
+(* Name of lock file *)
+let lock_file =  "/tmp/.ocl.lock";;
+
+(* Default max number for launch *)
 let default_launch = 1;; (* TODO set it in rc file *)

src/const.mli

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -37,14 +37,18 @@
 (* Env variables *)
 val home : string lazy_t
 val editor : string lazy_t
+val disabled : bool lazy_t
 
 (* Settings *)
 val verbosity : int ref
+val ask : bool option ref
 val no_color : bool ref
 
 (* Files *)
-val rc_file : string Core.Std.Lazy.t ref
+val rc_file_old : string Lazy.t
+val rc_file : string Lazy.t ref
 val tmp_file : string
+val lock_file : string
 (* Conf *)
 val default_launch : int
 

src/default.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
-(* Copyright © Joly Clément, 2014-2015                                        *)
+(* Copyright © Joly Clément, 2014-2016                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -39,9 +39,43 @@ open Core.Std;;
 (* The module containing the step run when the program is
  * used without argument or with run command *)
 
+(* When there is nothing in rc file *)
+let nothing_in_rc () =
+  Messages.ok "There is nothing in your RC file!";
+  Messages.tips "You can add entries with 'edit' or 'add' subcommand.";
+;;
+
+(* If no command was found, all has been launched *)
+let no_cmd_found () =
+  Messages.ok "All has been launched!";
+  Messages.tips "You can reset with 'reset-all' subcommand";
+;;
+
+(* Run given (num) item *)
+let run_item ~rc num =
+  rc#entry ~n:num
+  |> function
+  | None -> Messages.warning "Your number is out of bound"
+  | Some entry ->
+    let cmd_to_exec = entry#command in
+    Exec_cmd.execute cmd_to_exec;
+;;
+
+(* Execute each item (one after the other) in config file *)
+let exec_each ~tmp =
+  if not (Tmp_file.is_disabled ~tmp)
+  then
+    Exec_cmd.what_next ~tmp
+    |> function
+    | Exec_cmd.Empty -> nothing_in_rc ()
+    | Finish -> no_cmd_found ()
+    | A cmd_to_exec -> Exec_cmd.execute cmd_to_exec
+  else Messages.debug "Disabled"
+;;
+
 (* cmd_number is the number of the command the user wants
  * to execute *)
-let run ~rc cmd_number =
+let run ~(rc:Rc.t) cmd_number =
 
   (* Wait for another oclaunch instance which could launch the same program at
    * the same time and then lock *)
@@ -51,20 +85,6 @@ let run ~rc cmd_number =
 
   let tmp = Tmp_file.init () in
   match cmd_number with
-  | None -> begin
-      (* Execute each item (one by one) in config file *)
-      Exec_cmd.what_next ~tmp
-      |> function
-      | None -> (* If no command was found, all has been launched *)
-        Messages.ok "All has been launched!";
-        Messages.tips "You can reset with 'reset-all' subcommand";
-        Lock.remove ()
-      | Some cmd_to_exec -> Exec_cmd.execute cmd_to_exec;
-    end
-  | Some num -> begin
-      File_com.num_cmd2cmd ~rc num
-      |> function
-      | None -> Messages.warning "Your number is out of bound"
-      | Some cmd_to_exec -> Exec_cmd.execute cmd_to_exec;
-    end
+  | None -> exec_each ~tmp; Lock.remove ()
+  | Some num -> run_item ~rc num
 ;;

src/default.mli

@@ -0,0 +1,40 @@
+(******************************************************************************)
+(* Copyright © Joly Clément, 2016                                             *)
+(*                                                                            *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
+(*                                                                            *)
+(*  Ce logiciel est un programme informatique servant à exécuter              *)
+(*  automatiquement des programmes à l'ouverture du terminal.                 *)
+(*                                                                            *)
+(*  Ce logiciel est régi par la licence CeCILL soumise au droit français et   *)
+(*  respectant les principes de diffusion des logiciels libres. Vous pouvez   *)
+(*  utiliser, modifier et/ou redistribuer ce programme sous les conditions    *)
+(*  de la licence CeCILL telle que diffusée par le CEA, le CNRS et l'INRIA    *)
+(*  sur le site "http://www.cecill.info".                                     *)
+(*                                                                            *)
+(*  En contrepartie de l'accessibilité au code source et des droits de copie, *)
+(*  de modification et de redistribution accordés par cette licence, il n'est *)
+(*  offert aux utilisateurs qu'une garantie limitée.  Pour les mêmes raisons, *)
+(*  seule une responsabilité restreinte pèse sur l'auteur du programme,  le   *)
+(*  titulaire des droits patrimoniaux et les concédants successifs.           *)
+(*                                                                            *)
+(*  A cet égard  l'attention de l'utilisateur est attirée sur les risques     *)
+(*  associés au chargement,  à l'utilisation,  à la modification et/ou au     *)
+(*  développement et à la reproduction du logiciel par l'utilisateur étant    *)
+(*  donné sa spécificité de logiciel libre, qui peut le rendre complexe à     *)
+(*  manipuler et qui le réserve donc à des développeurs et des professionnels *)
+(*  avertis possédant  des  connaissances  informatiques approfondies.  Les   *)
+(*  utilisateurs sont donc invités à charger  et  tester  l'adéquation  du    *)
+(*  logiciel à leurs besoins dans des conditions permettant d'assurer la      *)
+(*  sécurité de leurs systèmes et ou de leurs données et, plus généralement,  *)
+(*  à l'utiliser et l'exploiter dans les mêmes conditions de sécurité.        *)
+(*                                                                            *)
+(*  Le fait que vous puissiez accéder à cet en-tête signifie que vous avez    *)
+(*  pris connaissance de la licence CeCILL, et que vous en avez accepté les   *)
+(*  termes.                                                                   *)
+(******************************************************************************)
+
+open Core.Std;;
+
+val run : rc:Rc.t -> int option -> unit
+

src/edit_command.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -62,6 +62,7 @@ let new_list current_list position new_items =
 let gen_modification items =
   let r = "\n" in
   epur items
+  |> List.map ~f:(fun entry -> entry#command)
   |> (function
        | [] -> ""
        (* Only one element *)
@@ -73,39 +74,47 @@ let gen_modification items =
 ;;
 
 (* Function which get the nth element, put it in a file, let the user edit it,
- * and then remplace with the new result *)
-let rec run ~(rc:File_com.t) position =
+ * and then replace with the result *)
+let rec run ~(rc:Rc.t) position =
   (* Current list of commands *)
-  let current_list = rc.Settings_t.progs in
+  let current_list = rc#entries in
 
   (* Creating tmp file, for editing *)
   let tmp_filename = [
     "/tmp/oc_edit_" ;
     (Int.to_string (Random.int 100_000)) ;
     ".txt" ;
-  ] in
-  let tmp_edit = String.concat tmp_filename in
+  ]
+    |> String.concat
+  in
   (* Remove item to be edited *)
   let original_command,shorter_list =
     Remove_command.remove current_list position
   in
-  Out_channel.write_all tmp_edit original_command;
+  Out_channel.write_all tmp_filename ~data:original_command;
 
 
   (* Edit file *)
-  let edit = String.concat [ Lazy.force Const.editor ; " " ; tmp_edit ] in
+  let edit = String.concat [ Lazy.force Const.editor ; " " ; tmp_filename ] in
   Messages.debug edit;
   Sys.command edit
   |> (function
          0 -> ()
-       | n -> sprintf "Error while running %s: error code %i" edit n
-              |> Messages.warning);
+       | n ->
+         sprintf "Error while running %s: error code %i" edit n
+         |> Messages.warning);
 
   (* Reading and applying the result *)
-  let new_commands = In_channel.read_lines tmp_edit |> epur in
-  let cmd_list = new_list shorter_list position new_commands in
-  let updated_rc = { rc with Settings_t.progs = cmd_list} in
-  File_com.write updated_rc;
+  let new_commands =
+    In_channel.read_lines tmp_filename
+    |> List.map ~f:(fun command -> new Rc.entry command)
+    |> epur
+  in
+  let cmd_list =
+    new_list shorter_list position new_commands
+  in
+  let updated_rc = rc#change_entries cmd_list in
+  updated_rc#write;
   (* Display the result, only if modified *)
   let new_cmd_mod = gen_modification new_commands in
   (* We are doing things in this order to avoid multiple listing of rc file
@@ -125,7 +134,7 @@ let rec run ~(rc:File_com.t) position =
     begin
       sprintf "'%s' -> '%s'\n" original_command new_cmd_mod |> Messages.ok;
       (* Display new rc file *)
-      let reread_rc = File_com.init_rc () in
+      let reread_rc = Rc.init () in
       List_rc.run ~rc:reread_rc ()
     end;
 ;;

src/exec_cmd.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -36,27 +36,37 @@
 
 open Core.Std;;
 
+(* Type to give a more accurate representation of the program *)
+type state =
+  | Empty (* Empty rc file *)
+  | Finish (* everything was launched *)
+  | A of string (* There is this command to launch *)
+;;
+
 (* Function allowing to set the title of the current terminal windows
  * XXX Maybe better in some lib *)
 let set_title new_title =
   (* Use echo command to set term  title *)
   Sys.command (sprintf "echo -en \"\\033]0;%s\\a\"" new_title)
-  |> function | 0 -> () | _ -> sprintf "Error while setting terminal title"
-                               |> Messages.warning
+  |> function
+  | 0 -> ()
+  | _ -> sprintf "Error while setting terminal title" |> Messages.warning
 ;;
 
 (* Function to return the less launched command, at least the first one *)
 (* Log is a list of entry (commands) associated with numbers *)
 let less_launched (log : (string * int) list) =
+  let open Option in
   let max = Const.default_launch in (* Number of launch, maximum *)
-  (* Return smallest, n is the smaller key *)
-  let entries_by_number = List.Assoc.inverse log  in
-  List.min_elt ~cmp:(fun (n,_) (n',_) -> Int.compare n n') entries_by_number
-  |> (function Some (min,cmd) ->
-       if min < max
-       then Some cmd
-       else None
-             | None -> None)
+  (* Return smallest, n is the smaller key, if there are some entries *)
+  match log with
+  | [] -> Empty
+  | _ ->
+    let entries_by_number = List.Assoc.inverse log in
+    List.min_elt ~cmp:(fun (n,_) (n',_) -> Int.compare n n') entries_by_number
+    |> fun smallest ->
+    bind smallest (fun (min, cmd) -> some_if (min < max) cmd)
+    |> function None -> Finish | Some entry -> A entry
 ;;
 
 (* Function to get the number corresponding to the next command to launch (less
@@ -73,10 +83,12 @@ let less_launched_num log =
          then None
          else Some ( entry_number, launch_number ))
   (* Find the less launched by sorting and taking the first *)
-  |> List.sort ~cmp:(fun ( _, launch_number1 ) ( _, launch_number2 ) -> Int.compare launch_number1 launch_number2)
+  |> List.sort
+       ~cmp:(fun ( _, launch_number1 ) ( _, launch_number2 ) ->
+              Int.compare launch_number1 launch_number2)
   |> List.hd
   |> function
-  | Some ( entry_number, launch_number) ->
+  | Some ( entry_number, launch_number ) ->
     launch_number |> sprintf "Launch number found: %i" |> Messages.debug;
     Messages.debug "Return launch number (printed bellow):";
     Some ( Tools.spy1_int entry_number )
@@ -99,7 +111,7 @@ let what_next ~tmp =
 let display_result command status =
   match status with
   | 0 -> (* No problem, do nothing *) ()
-  | _ -> (* Problem occur,  display it *)
+  | _ -> (* Problem occur, report it *)
     sprintf "Problem while running: '%s'\nExited with code: %i\n"
       command status
     |> Messages.warning

src/file_com.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -41,13 +41,31 @@ open Core.Std;;
 (* Type of the values *)
 type t = Settings_v.rc_file;;
 
+(* Message to display on first use, i.e. on initialisation of rc file *)
+let welcome_msg =
+  sprintf
+    "Nice to meet you! Here is some tips to get started with OcLaunch.\n\
+     Use 'help' subcommand to get help (it works both after the name of the \
+     software and with another subcommand). For instance run\n\
+     `oclaunch help add`\n\
+     For further help, see https://oclaunch.eu.org. Report any bug at %s\
+     \n\
+     \n\
+     Feedback is welcome at feedback@oclaunch.eu.org.\n\
+     To get remind for new stable versions, subscribe to our low-traffic mailing \
+     list: announce@oclaunch.eu.org. \
+     More here: https://s.oclaunch.eu.org/ml\n\
+     See you soon! To keep in touch: https://s.oclaunch.eu.org/kt\n"
+    Bug.url
+;;
+
 (* Function to write the rc file *)
 let write (rc_file:t) =
   (* Short name *)
   let name = !Const.rc_file in
   (* Create string to be written, after removing duplicated commands (and
    * newlines) *)
-  let data = (Unify.prettify rc_file |> Settings_j.string_of_rc_file
+  let data = (rc_file |> Settings_j.string_of_rc_file
               |> Yojson.Basic.prettify ~std:true) in
   Out_channel.write_all (Lazy.force name) ~data
 ;;
@@ -63,11 +81,7 @@ let create_rc_file ~name =
   (* Notify that we initialise config file *)
   sprintf "Initializing empty configuration file in %s." name |> Messages.warning;
   (* Final \n to display newline before showing the licence. *)
-  Messages.tips "Feedback is welcome at feedback@oclaunch.eu.org.\n\
-  To get remind for new stable versions, subscribe to our low-traffic (up to 6 \
-  mail per year) mailing list: announce@oclaunch.eu.org.\n\
-  See you soon!\n";
-
+  Messages.tips welcome_msg;
   (* Display licence information *)
   Licencing.print ~cecill:false;
 

src/id_parsing.ml

@@ -0,0 +1,122 @@
+(******************************************************************************)
+(* Copyright © Joly Clément, 2014-2016                                        *)
+(*                                                                            *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
+(*                                                                            *)
+(*  Ce logiciel est un programme informatique servant à exécuter              *)
+(*  automatiquement des programmes à l'ouverture du terminal.                 *)
+(*                                                                            *)
+(*  Ce logiciel est régi par la licence CeCILL soumise au droit français et   *)
+(*  respectant les principes de diffusion des logiciels libres. Vous pouvez   *)
+(*  utiliser, modifier et/ou redistribuer ce programme sous les conditions    *)
+(*  de la licence CeCILL telle que diffusée par le CEA, le CNRS et l'INRIA    *)
+(*  sur le site "http://www.cecill.info".                                     *)
+(*                                                                            *)
+(*  En contrepartie de l'accessibilité au code source et des droits de copie, *)
+(*  de modification et de redistribution accordés par cette licence, il n'est *)
+(*  offert aux utilisateurs qu'une garantie limitée.  Pour les mêmes raisons, *)
+(*  seule une responsabilité restreinte pèse sur l'auteur du programme,  le   *)
+(*  titulaire des droits patrimoniaux et les concédants successifs.           *)
+(*                                                                            *)
+(*  A cet égard  l'attention de l'utilisateur est attirée sur les risques     *)
+(*  associés au chargement,  à l'utilisation,  à la modification et/ou au     *)
+(*  développement et à la reproduction du logiciel par l'utilisateur étant    *)
+(*  donné sa spécificité de logiciel libre, qui peut le rendre complexe à     *)
+(*  manipuler et qui le réserve donc à des développeurs et des professionnels *)
+(*  avertis possédant  des  connaissances  informatiques approfondies.  Les   *)
+(*  utilisateurs sont donc invités à charger  et  tester  l'adéquation  du    *)
+(*  logiciel à leurs besoins dans des conditions permettant d'assurer la      *)
+(*  sécurité de leurs systèmes et ou de leurs données et, plus généralement,  *)
+(*  à l'utiliser et l'exploiter dans les mêmes conditions de sécurité.        *)
+(*                                                                            *)
+(*  Le fait que vous puissiez accéder à cet en-tête signifie que vous avez    *)
+(*  pris connaissance de la licence CeCILL, et que vous en avez accepté les   *)
+(*  termes.                                                                   *)
+(******************************************************************************)
+
+open Core.Std;;
+
+(* Module containing code to parse id sequence, i.e. things like 1,2-6,23 *)
+
+(* An atom contains at least one number and at most one "-"
+   This way, atoms are things like "1,2" or "1-3" but not "1,3,4-5" *)
+type atom =
+  | Between of (int * int) (* Like 1-4 *)
+  | Unique of int (* Like 2 *)
+;;
+
+(* Return atom corresponding to a given string, correcting simple error *)
+let to_atom str =
+  let open Str in
+  (* Regexp to test atoms *)
+  let between = regexp "[a-zA-Z]*\\([0-9]+\\)-\\([0-9]+\\)[a-zA-Z]*" in
+  let unique = regexp "[a-zA-Z]*\\([0-9]+\\)[a-zA-Z]*" in
+
+  if string_match between str 0; then
+    (* String is like "1-5", we test this first to allow autocorrection of
+     * unique things *)
+    ( (replace_first between "\\1" str), (replace_first between "\\2" str) )
+    |> ( fun (a,b) -> Between ((Int.of_string a), (Int.of_string b)) )
+    |> Option.some
+  else if string_match unique str 0; then
+    (* String is like "1", or "1e", in which case its corrected to "1" *)
+    Unique (Int.of_string (replace_first unique "\\1" str))
+    |> Option.some
+  else None
+;;
+
+(* Create small substring (atoms) from id sequence, like this
+ * "1,2,6-10" -> [ "1,2" ; "6-10"] *)
+let atomise human_ids =
+  String.split ~on:',' human_ids
+  |> List.filter_map ~f:to_atom
+;;
+(* Turn interval (Between (,)) to list of Unique *)
+let deinter = function
+  | Unique a -> [Unique a]
+  | Between (a,b) ->
+    (* Two use cases to preserve order *)
+    if a < b
+    (* Note that (a-b+1) is the length of interval [a;b] *)
+    then List.init (b-a+1) ~f:(fun i -> Unique (a + i))
+    else List.init (a-b+1) ~f:(fun i -> Unique (a - i))
+;;
+
+(* Transform string (separated) as follow:
+ * 1,5 → [ 1; 5 ]
+ * 1-5 → [1; 2; 3; 4; 5]
+ * Multiple occurances should stay, i.e.
+ * 1,3,1-4 → [1,3,1,2,3,4]
+ * Order matters:
+ * 1-3 → [1,2,3]
+ * 3-1 → [3,2,1] *)
+let list_from_human human =
+  atomise human
+  |> List.map ~f:deinter
+  |> List.concat
+  (* Return final list of int *)
+  |> List.map ~f:(function
+           Unique a -> a | _ -> assert false)
+  |> Tools.spy1_list ~f:Int.to_string
+;;
+
+(* Type for command line parsing, an "id sequence" is something like 1,3-6,10 *)
+let id_sequence =
+  Command.Spec.Arg_type.create list_from_human
+;;
+
+(* With id sequences, we get None or Some [] from command line instructions and
+ * we get Some list in other cases. With this function, we iterate (over a list
+ * of ids) call of function having the following behavior:
+ * - Default value when nothing is given (None)
+ * - Execute things one by one *)
+let helper ~f = function
+  | None | Some [] ->
+    Messages.debug "Nothing given, default behavior";
+    (f None)
+  | Some li ->
+    Messages.debug "Working with the following arguments:";
+    Tools.spy1_list ~f:Int.to_string li |> ignore;
+    List.iter ~f:(fun element -> f (Some element)) li
+;;
+

src/id_parsing.mli

@@ -0,0 +1,41 @@
+(******************************************************************************)
+(* Copyright © Joly Clément, 2014-2016                                        *)
+(*                                                                            *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
+(*                                                                            *)
+(*  Ce logiciel est un programme informatique servant à exécuter              *)
+(*  automatiquement des programmes à l'ouverture du terminal.                 *)
+(*                                                                            *)
+(*  Ce logiciel est régi par la licence CeCILL soumise au droit français et   *)
+(*  respectant les principes de diffusion des logiciels libres. Vous pouvez   *)
+(*  utiliser, modifier et/ou redistribuer ce programme sous les conditions    *)
+(*  de la licence CeCILL telle que diffusée par le CEA, le CNRS et l'INRIA    *)
+(*  sur le site "http://www.cecill.info".                                     *)
+(*                                                                            *)
+(*  En contrepartie de l'accessibilité au code source et des droits de copie, *)
+(*  de modification et de redistribution accordés par cette licence, il n'est *)
+(*  offert aux utilisateurs qu'une garantie limitée.  Pour les mêmes raisons, *)
+(*  seule une responsabilité restreinte pèse sur l'auteur du programme,  le   *)
+(*  titulaire des droits patrimoniaux et les concédants successifs.           *)
+(*                                                                            *)
+(*  A cet égard  l'attention de l'utilisateur est attirée sur les risques     *)
+(*  associés au chargement,  à l'utilisation,  à la modification et/ou au     *)
+(*  développement et à la reproduction du logiciel par l'utilisateur étant    *)
+(*  donné sa spécificité de logiciel libre, qui peut le rendre complexe à     *)
+(*  manipuler et qui le réserve donc à des développeurs et des professionnels *)
+(*  avertis possédant  des  connaissances  informatiques approfondies.  Les   *)
+(*  utilisateurs sont donc invités à charger  et  tester  l'adéquation  du    *)
+(*  logiciel à leurs besoins dans des conditions permettant d'assurer la      *)
+(*  sécurité de leurs systèmes et ou de leurs données et, plus généralement,  *)
+(*  à l'utiliser et l'exploiter dans les mêmes conditions de sécurité.        *)
+(*                                                                            *)
+(*  Le fait que vous puissiez accéder à cet en-tête signifie que vous avez    *)
+(*  pris connaissance de la licence CeCILL, et que vous en avez accepté les   *)
+(*  termes.                                                                   *)
+(******************************************************************************)
+
+open Core.Std;;
+
+val list_from_human : string -> int list
+val id_sequence : int list Command.Spec.Arg_type.t
+val helper : f:(int option -> unit) -> int list option -> unit

src/list_rc.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -38,6 +38,7 @@ open Core.Std;;
 
 (* This modules contains function to list the content of the rc file *)
 
+
 (* Characters to append to show a command was truncated *)
 let trunc_indicator = "...";;
 
@@ -60,43 +61,52 @@ let truncate ?elength str =
    * - elength is not <= to the length of the indicator, otherwise the command
    * should pass untouched
    * - the command is longer than elength *)
-   if not(elength <= trunc_ind_l) && str_length > elength
+  if not(elength <= trunc_ind_l) && str_length > elength
   (* String.prefix is inclusive but incompatible with
    * 0 to keep whole string. Truncate to elength - trunc_ind_l since we add the
    * trunc_indicator (we need to cut a bit more) *)
-   then String.prefix str (elength - trunc_ind_l) |> fun short_entry ->
-        String.concat [ short_entry ; trunc_indicator ]
-   else str
+  then String.prefix str (elength - trunc_ind_l) |> fun short_entry ->
+       String.concat [ short_entry ; trunc_indicator ]
+  else str
+;;
+
+(* Generate list to feed the table, returning list of tuples
+ * (number of a command in rc file, command, number of launch). *)
+let generate_list ~rc ?elength log =
+  let rc_numbered =
+    rc#entries |> List.mapi ~f:(fun i entry -> ( entry#command, i ))
+  in
+  List.map log ~f:(function ( cmd, number ) ->
+         (* We are using list instead of tuple since it is what Text_utils want
+          * as input. *)
+         [
+           (List.Assoc.find_exn rc_numbered cmd |> Int.to_string);
+           (* Limit length, to get better display with long command. A default
+            * length is involved when no length is specified *)
+           truncate ?elength cmd;
+           (Int.to_string number)
+         ])
+  (* Make sure all will be in the right order (from id 0 to 10, for instance) *)
+  |> List.sort ~cmp:(fun entry1 entry2 ->
+         match entry1, entry2 with
+         | [ id1; _; _ ], [ id2; _; _ ] ->
+           Int.(compare (int_of_string id1) (int_of_string id2))
+         (* Considering transformation performed, nothing else is possible *)
+         | _ -> assert false
+       )
 ;;
 
 (* Function which list, rc would be automatically reread, this optional
  * argument is kept for backward compatibility
  * elength: truncate entries to length (0 does nothing)*)
-(* FIXME Remove ?rc or use it *)
 (* TODO:
  * - Test it, esp. ordering
  * - Allow to set form of the table, multiple rc file, display next to be
  * launched… *)
-let run ?rc ?elength () =
-  let rc_numbered =
-    File_com.init_rc ()
-    |> fun rc -> rc.Settings_t.progs
-                 |> List.mapi ~f:(fun i item -> ( item, i ))
-  in
+let run ~rc ?elength () =
   let tmp : Tmp_file.t = Tmp_file.init () in
   Tmp_file.get_accurate_log ~tmp ()
-  (* Generate list to feed the table,
-   * XXX assuming all will be in the right order *)
-  |> List.map ~f:(function
-           ( cmd, number ) ->
-           [ (* Number of a command in rc file, command, number of launch *)
-             (List.Assoc.find_exn rc_numbered cmd |> Int.to_string);
-             (* Limit length, to get better display with long command. A default
-              * length is involved when no length is specified *)
-             elength |> (function None -> truncate cmd
-                 | Some elength -> truncate ~elength cmd);
-             (Int.to_string number)
-           ])
+  |> generate_list ~rc ?elength
   |> Textutils.Ascii_table.simple_list_table
        ~display:Textutils.Ascii_table.Display.column_titles
        [ "Id" ; "Command" ; "Number of launch" ]

src/lock.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -42,29 +42,33 @@ open Core.Std;;
 type lock_status =
     Locked
   | Free
-  | Error
+  | Err
 ;;
-(* Name of the lock file *)
-(* TODO Put it in Const *)
-let lock_name = "/tmp/.ocl.lock";;
 
 (* Create lock file *)
 let lock () =
-  try Out_channel.write_all lock_name ~data:"OcLaunch is running and did not finish."
-  with Sys_error msg -> Messages.debug "Couldn't write in lock file."
+  try Out_channel.write_all Const.lock_file ~data:"OcLaunch is running and did not finish."
+  with Sys_error msg ->
+    Messages.debug "Couldn't write in lock file.";
+    Messages.debug "Due to";
+    Messages.debug msg
 ;;
 
 (* To know if we are locked, return None if there is no locker,  *)
 let status () =
-  match Sys.file_exists lock_name with
+  match Sys.file_exists Const.lock_file with
     `Yes -> Locked
   | `No -> Free
-  | `Unknown -> Error
+  | `Unknown -> Err
 ;;
 
 (* Remove the lock file *)
 let remove () =
-  Sys.remove lock_name
+  let open Sys in
+  file_exists Const.lock_file
+  |> function
+  | `Yes -> remove Const.lock_file
+  | _ -> Messages.debug "No lock file"
 ;;
 
 (* Pause the program until lock file is removed, until argument is the second *)
@@ -85,7 +89,7 @@ let wait ?(until=10) ?(delay=1) () =
       else
         None
     | Free -> Some (lock ())
-    | Error -> failwith "Problem with lock file"
+    | Err -> failwith "Problem with lock file"
   in
   wait_loop 0
   |> (function

src/lock.mli

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2015                                             *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -35,7 +35,7 @@
 (******************************************************************************)
 
 
-type lock_status = Locked | Free | Error
+type lock_status = Locked | Free | Err
 val status : unit -> lock_status
 val wait : ?until:int -> ?delay:int -> unit -> unit
 val remove : unit -> unit

src/messages.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015-2016                                   *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -41,6 +41,8 @@ open Core.Std;;
 (* TODO
  * - allow to display bold & underlined messages *)
 
+module A = Textutils.Console.Ansi;;
+
 (* Store whether a message was already displayed to reset if necessary (see
  * function reset) *)
 let already = ref false
@@ -52,50 +54,17 @@ let log_already () =
   | true -> ()
 ;;
 
-(* Types corresponding to some colors & style of the Core_extended.Color_print
- * library *)
-type color =
-  | Green
-  | Red
-  | Yellow
-  | White
-  | Plum
-  | Cyan
-;;
-
-type style =
-  | Bold
-  | Underline
-  | Normal
-;;
-
-(* General function to print things *)
-let print ~color ~style message =
-  (* Alias *)
-  let cpcolor = Color_print.color in
+(* Pack around Textutils.Console.Ansi to print things *)
+let print attr message =
   match !Const.no_color with
   | true -> printf "%s" message
   | false -> begin (* Use colors *)
       (* Log that we used colored messages *)
       log_already ();
-      (* This code create proper escapement to display text with bold/color... *)
-      color |>
-      (function
-        | Green -> cpcolor ~color:`Green message
-        | Red -> cpcolor ~color:`Red message
-        | Yellow -> cpcolor ~color:`Yellow message
-        | White -> cpcolor ~color:`White message
-        | Plum -> cpcolor ~color:`Plum message
-        | Cyan -> cpcolor ~color:`Cyan message
-      ) |> (* Finaly print escaped string *)
-      (fun colored_msg ->
-         let open Color_print in
-         match style with
-         | Bold -> bold_printf "%s" colored_msg
-         | Underline -> underline_printf "%s" colored_msg
-         | Normal -> printf "%s" colored_msg
-      )
-    end
+      A.printf attr "%s" message
+    end;
+    (* Be sure to show the message *)
+    Out_channel.(flush stdout);
 ;;
 
 (* Behave in a conform way to verbosity
@@ -119,21 +88,21 @@ let check_verbosity ?debug ~f function_number =
 let debug message =
   check_verbosity ~f:(fun () ->
          let mess = (Time.now() |> Time.to_string) ^ " " ^ message ^ "\n" in
-         print ~color:Plum ~style:Underline mess
+         print [ `Magenta ; `Bright ; `Underscore ] mess
        ) 5
 ;;
 
 let info message =
   check_verbosity ~debug ~f:(fun () ->
          let mess = message ^ "\n" in
-         print ~color:White ~style:Bold mess
+         print [ `White ; `Bright ] mess
        ) 3
 ;;
 
 let warning message =
   check_verbosity ~debug ~f:(fun () ->
          let mess = message ^ "\n" in
-         print ~color:Red ~style:Bold mess
+         print [ `Red ] mess
        ) 1
 ;;
 
@@ -145,26 +114,21 @@ let answer2str = function
 ;;
 (* State of the program, if you should always answer yes, no or ask to the user
  * (default)*)
-(* TODO Put it in Const *)
-let assume_yes = None;;
 (* Allow to assume yes or no like with a --yes option *)
 let check_assume_yes ~f =
-  match assume_yes with
-  | Some true -> Yes (* --yes *)
-  | Some false -> No (* --no *)
+  match !Const.ask with (* See Const.ask for details *)
+  | Some true -> Yes
+  | Some false -> No
   | None -> f ()
 ;;
 
 (* Get confirmation
  * TODO:
- * allow option like -y
  * test it (display, line return, etc...) *)
 let rec confirm info =
   check_assume_yes ~f:(fun () ->
-         print ~color:Cyan ~style:Normal info;
-         print ~color:Cyan ~style:Normal "\n(Yes/No): ";
-         (* XXX Be sure to show the message *)
-         Out_channel.(flush stdout);
+         print [ `Cyan ; `Bright ] info;
+         print [ `Cyan ; `Bright ] "\n(Yes/No): ";
          let str_answer = In_channel.(input_line ~fix_win_eol:true stdin) in
          str_answer |> Option.map ~f:String.lowercase
          |> (function
@@ -172,7 +136,7 @@ let rec confirm info =
               | Some "n" | Some "no" -> No
               | Some _ | None ->
                 warning "Please enter 'yes' or 'no', or 'y' or 'n' (case \
-                doesn't matter).";
+                         doesn't matter).";
                 confirm info)
        )
 ;;
@@ -180,23 +144,22 @@ let rec confirm info =
 let ok message =
   check_verbosity ~debug ~f:(fun () ->
          let mess = message ^ "\n" in
-         print ~color:Green ~style:Bold mess
+         print [ `Green ; `Bright ] mess
        ) 2
 ;;
 
 let tips message =
   check_verbosity ~debug ~f:(fun () ->
          let mess = message ^ "\n" in
-         print ~color:Yellow ~style:Normal mess
+         print [ `Yellow ] mess
        ) 4
 ;;
 
 
 (* Reset printing, to avoid color problem on some terminal (Konsole), the  *)
 let reset () =
-  let open Color_print in
   match !already with
   | true -> debug "Reseted colors";
-    normal "" |> printf "%s\n"
+    A.printf [] "\n"
   | false -> debug "Not resetted"; ()
 ;;

src/messages.mli

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)

src/oclaunch.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -38,12 +38,12 @@ open Core.Std;;
 
 (* Variable to store version number *)
 (* TODO Get value from file *)
-let version_number = "0.3.0-pre2";;
+let version_number = "0.3.0-rc1";;
 
 (* Variable store building information *)
 (* XXX This is fake value, it corresponds to the running
  * information *)
-let build_info = ( "Build with OCaml version " ^ (Sys.ocaml_version) ^ " on " ^ (Sys.os_type) );;
+let build_info = ( "Built with OCaml version " ^ (Sys.ocaml_version) ^ " on " ^ (Sys.os_type) );;
 
 let () =
   Command_def.run ~version:version_number ~build_info:build_info ()

src/rc.ml

@@ -0,0 +1,322 @@
+(******************************************************************************)
+(* Copyright © Joly Clément, 2016                                             *)
+(*                                                                            *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
+(*                                                                            *)
+(*  Ce logiciel est un programme informatique servant à exécuter              *)
+(*  automatiquement des programmes à l'ouverture du terminal.                 *)
+(*                                                                            *)
+(*  Ce logiciel est régi par la licence CeCILL soumise au droit français et   *)
+(*  respectant les principes de diffusion des logiciels libres. Vous pouvez   *)
+(*  utiliser, modifier et/ou redistribuer ce programme sous les conditions    *)
+(*  de la licence CeCILL telle que diffusée par le CEA, le CNRS et l'INRIA    *)
+(*  sur le site "http://www.cecill.info".                                     *)
+(*                                                                            *)
+(*  En contrepartie de l'accessibilité au code source et des droits de copie, *)
+(*  de modification et de redistribution accordés par cette licence, il n'est *)
+(*  offert aux utilisateurs qu'une garantie limitée.  Pour les mêmes raisons, *)
+(*  seule une responsabilité restreinte pèse sur l'auteur du programme,  le   *)
+(*  titulaire des droits patrimoniaux et les concédants successifs.           *)
+(*                                                                            *)
+(*  A cet égard  l'attention de l'utilisateur est attirée sur les risques     *)
+(*  associés au chargement,  à l'utilisation,  à la modification et/ou au     *)
+(*  développement et à la reproduction du logiciel par l'utilisateur étant    *)
+(*  donné sa spécificité de logiciel libre, qui peut le rendre complexe à     *)
+(*  manipuler et qui le réserve donc à des développeurs et des professionnels *)
+(*  avertis possédant  des  connaissances  informatiques approfondies.  Les   *)
+(*  utilisateurs sont donc invités à charger  et  tester  l'adéquation  du    *)
+(*  logiciel à leurs besoins dans des conditions permettant d'assurer la      *)
+(*  sécurité de leurs systèmes et ou de leurs données et, plus généralement,  *)
+(*  à l'utiliser et l'exploiter dans les mêmes conditions de sécurité.        *)
+(*                                                                            *)
+(*  Le fait que vous puissiez accéder à cet en-tête signifie que vous avez    *)
+(*  pris connaissance de la licence CeCILL, et que vous en avez accepté les   *)
+(*  termes.                                                                   *)
+(******************************************************************************)
+
+open Core.Std;;
+
+(* Rc files means configuration file. It consist in a list of **entries**, with
+ * settings and common tags. Each entry has a command to be run (used to
+ * identify the entry in tmp file), an id (based on the position in rc file, may
+ * change), a description (the command plus things that tags may add), a number
+ * of launch (stored in tmp file) and tags, which change default behavior *)
+
+(* A “basic” rc file is used to interface with the content actualy written to
+ * the drive, and it’s then transforme to create the rc file used almost
+ * everywhere.
+ * “Basic” may used qualify anything referring to a low-level object *)
+type basic_tag = {
+  name : string;
+  arguments : string sexp_list
+} [@@deriving sexp]
+;;
+type basic_entry = {
+  command : string;
+  tags : basic_tag list
+} [@@deriving sexp]
+;;
+type basic_rc = {
+  entries : basic_entry list;
+  common_tags : basic_tag list;
+  settings : string list;
+} [@@deriving sexp]
+;;
+
+(* Template for the rc_file *)
+let basic_template =
+  "((entries())(common_tags())(settings()))"
+;;
+
+(* Header added once wrtten to disk *)
+let rc_header =
+  "\
+  ;; You probably do NOT need to edit this file manually.\n\
+  ;; Anyway, you may find help at https://s.oclaunch.eu.org/rc\
+  "
+;;
+
+(* XXX Module exposing functions hidden by the mli file for tests *)
+module Test : sig
+  type basic_rc_t
+  val basic_rc_of_sexp : Sexp.t -> basic_rc_t
+  val basic_template : string
+end
+= struct
+  type basic_rc_t = basic_rc
+  let basic_rc_of_sexp = basic_rc_of_sexp
+  let basic_template = basic_template
+end;;
+
+(* Message to display on first use, i.e. on initialisation of rc file *)
+let welcome_msg =
+  sprintf
+    "Nice to meet you! Here is some tips to get started with OcLaunch.\n\
+     Use 'help' subcommand to get help (it works both after the name of the \
+     software and with another subcommand). For instance run\n\
+     `oclaunch help add`\n\
+     For further help, see https://oclaunch.eu.org. Report any bug at %s\
+     \n\
+     \n\
+     Feedback is welcome at feedback@oclaunch.eu.org.\n\
+     To get remind for new stable versions, subscribe to our low-traffic mailing \
+     list: announce@oclaunch.eu.org. \
+     More here: https://s.oclaunch.eu.org/ml\n\
+     See you soon! To keep in touch: https://s.oclaunch.eu.org/kt\n"
+    Bug.url
+;;
+
+let create_basic name =
+  sprintf "Initializing empty configuration file in %s.\n\
+           You may import your rc file from an older version with\n\
+           `oclaunch import`\
+          " name
+  |> Messages.warning;
+  Messages.tips welcome_msg;
+  Licencing.print ~cecill:false;
+  Out_channel.write_all name ~data:basic_template
+;;
+
+let rec get_basic rc_name =
+  match Sys.file_exists rc_name with
+  | `No -> create_basic rc_name; get_basic rc_name
+  | `Unknown -> failwith "Error reading configuration file";
+  | `Yes -> try Sexp.load_sexp rc_name |> basic_rc_of_sexp
+    with exn ->
+      Messages.warning "Problem reading rc file";
+      sprintf
+        "Remove file '%s' to get a fresh rc file next time you call oclaunch"
+        rc_name
+      |> Messages.tips;
+      raise exn
+;;
+
+(* From objects to types *)
+let tag_of_object tag = failwith "Not implemented";;
+let setting_of_object setting = failwith "Not implemented";;
+let entry_of_object entry =
+  {
+    command = entry#command;
+    tags = List.map ~f:tag_of_object entry#tags
+  }
+;;
+
+(* Now transformed objects *)
+
+(* Tags may be extend by plugins *)
+class tag name arg = object (self:'self)
+  val name : string = name
+  val arguments : string list = arg
+
+  method name = name
+  method arguments = arg
+
+  method equal (other:'self) =
+    (String.equal self#name other#name)
+    && (List.equal ~equal:String.equal self#arguments other#arguments)
+end;;
+
+class entry ?(tags=[]) command = object (self:'self)
+  val command : string = command
+  val tags : tag list = tags
+
+  method command = command
+  method tags = tags
+
+  method change_command new_command = {< command = new_command >}
+  method change_tags new_tags = {< tags = new_tags >}
+
+  (* Two entries are equal iff they have the same command and tags *)
+  method equal (other:'self) =
+    (String.equal self#command other#command)
+    && (List.equal self#tags other#tags
+          ~equal:(fun atag btag -> atag#equal btag))
+end;;
+
+(* XXX Pseudo comparator *)
+let equal one another =
+  one#equal another
+;;
+
+(* Types of objects, exposed *)
+type setting = < key : string; value : string >;;
+type t = <
+  add_common_tags : tag list -> t;
+  add_entries : entry list -> t;
+  add_settings : setting list -> t;
+  change_entries : entry list -> t;
+  change_entry : int -> f:(entry -> entry) -> t;
+  change_name : string -> t;
+  common_tags : tag list;
+  entries : entry list;
+  entry : n:int -> entry option;
+  filter_map_common_tags : f:(tag -> tag option) -> t;
+  filter_map_entries : f:(int -> entry -> entry option) -> t;
+  filter_map_settings : f:(setting -> setting option) -> t;
+  get_name : string;
+  to_string : string;
+  map_common_tags : f:(tag -> tag) -> t;
+  map_entries : f:(int -> entry -> entry) -> t;
+  map_settings : f:(setting -> setting) -> t;
+  read_common_tags : f:(tag -> unit) -> unit;
+  read_settings : f:(setting -> unit) -> unit;
+  remove_entry : int -> t;
+  settings : setting list;
+  write : unit
+>;;
+
+let object_of_tag tag = failwith "Not implemented"
+(* object
+   val name = tag.name;
+   val argument
+   end *)
+;;
+let object_of_tag_list =
+  List.map ~f:object_of_tag
+;;
+let object_of_entry object_common_tags entry =
+  new entry ~tags:((object_of_tag_list entry.tags) @ object_common_tags) entry.command
+;;
+let object_of_setting setting = failwith "Not implemented";;
+
+let init ?(rc=(!Const.rc_file)) () =
+  let basic_rc = get_basic (Lazy.force rc) in
+  let common_tags = object_of_tag_list basic_rc.common_tags in
+  object (self)
+    val entries = List.map ~f:(object_of_entry common_tags) basic_rc.entries
+    val common_tags = common_tags
+    val settings = List.map ~f:object_of_setting basic_rc.settings
+
+    method entries = entries
+    method common_tags = common_tags
+    method settings = settings
+
+    (* Change entry list *)
+    method change_entries new_entries = {< entries = new_entries >}
+
+    (* Get entry number n *)
+    method entry ~n = List.nth entries n
+
+    method add_entries new_entries =
+      {< entries = entries @ new_entries >}
+    method add_common_tags tags =
+      {< common_tags = tags @ common_tags >}
+    method add_settings new_settings =
+      {< settings = new_settings @ settings >}
+
+    method filter_map_entries ~f =
+      {< entries = List.filter_mapi entries ~f >}
+    method filter_map_common_tags ~f =
+      {< common_tags = List.filter_map common_tags ~f >}
+    method filter_map_settings ~f =
+      {< settings = List.filter_map settings ~f >}
+
+    method map_entries ~f =
+      {< entries = List.mapi entries ~f >}
+    method map_common_tags ~f =
+      {< common_tags = List.map common_tags ~f >}
+    method map_settings ~f =
+      {< settings = List.map settings ~f >}
+
+    method read_common_tags ~f =
+      List.iter common_tags ~f
+    method read_settings ~f =
+      List.iter settings ~f
+
+    (* Shorthand *)
+    method change_entry n ~f =
+      self#map_entries ~f:(fun i e -> if i=n then f e else e)
+    method remove_entry n =
+      self#filter_map_entries ~f:(fun i e -> if i=n then None else Some e)
+
+    (* Get a string representing rc file, on debugging purpose *)
+    method to_string = failwith "Not implemented"
+
+    (* Name of rc file when written to disk *)
+    val name = Lazy.force rc
+    method get_name = name
+    method change_name new_name = {< name = new_name >}
+    method write =
+      let body =
+        {
+          entries = List.map entries ~f:entry_of_object;
+          common_tags = List.map common_tags ~f:tag_of_object;
+          settings = List.map settings ~f:setting_of_object
+        } |> sexp_of_basic_rc
+        |> Sexp.to_string_hum
+      in
+      let data = String.concat [ rc_header ; "\n\n\n" ; body ; "\n" ] in
+      Out_channel.write_all name ~data
+    (* Write rc file at instantiation. Entries should be changed in group, to
+     * avoid multiple writing. Although, there is some cache done by out_channels,
+     * this is not very dangerous *)
+    initializer self#write
+  end;;
+
+let create_setting () = failwith "Not implemented"
+(*
+   (* Tools to create new tag *)
+   class enpty_tag = object
+   val
+*)
+
+let change_setting () = failwith "Not implemented"
+
+(* Empty entry *)
+let empty_entry () =
+  new entry ~tags:[] ""
+;;
+
+(* Import from older version *)
+let import ~from ~to_file =
+  let imported_rc : t = init ~rc:to_file () in
+  let to_import : File_com.t = File_com.init_rc ~rc:from () in
+  to_import.progs |> List.map ~f:(fun command -> new entry command)
+  |> imported_rc#add_entries
+  |> fun rc -> rc#write;
+  Messages.ok "Import successful!";
+  sprintf "from: %s; to: %s" (Lazy.force from) (Lazy.force to_file)
+  |> Messages.info;
+  Messages.tips "You may use `clean` subcommand to remove doubled entries."
+;;
+

src/rc.mli

@@ -0,0 +1,99 @@
+(******************************************************************************)
+(* Copyright © Joly Clément, 2016                                             *)
+(*                                                                            *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
+(*                                                                            *)
+(*  Ce logiciel est un programme informatique servant à exécuter              *)
+(*  automatiquement des programmes à l'ouverture du terminal.                 *)
+(*                                                                            *)
+(*  Ce logiciel est régi par la licence CeCILL soumise au droit français et   *)
+(*  respectant les principes de diffusion des logiciels libres. Vous pouvez   *)
+(*  utiliser, modifier et/ou redistribuer ce programme sous les conditions    *)
+(*  de la licence CeCILL telle que diffusée par le CEA, le CNRS et l'INRIA    *)
+(*  sur le site "http://www.cecill.info".                                     *)
+(*                                                                            *)
+(*  En contrepartie de l'accessibilité au code source et des droits de copie, *)
+(*  de modification et de redistribution accordés par cette licence, il n'est *)
+(*  offert aux utilisateurs qu'une garantie limitée.  Pour les mêmes raisons, *)
+(*  seule une responsabilité restreinte pèse sur l'auteur du programme,  le   *)
+(*  titulaire des droits patrimoniaux et les concédants successifs.           *)
+(*                                                                            *)
+(*  A cet égard  l'attention de l'utilisateur est attirée sur les risques     *)
+(*  associés au chargement,  à l'utilisation,  à la modification et/ou au     *)
+(*  développement et à la reproduction du logiciel par l'utilisateur étant    *)
+(*  donné sa spécificité de logiciel libre, qui peut le rendre complexe à     *)
+(*  manipuler et qui le réserve donc à des développeurs et des professionnels *)
+(*  avertis possédant  des  connaissances  informatiques approfondies.  Les   *)
+(*  utilisateurs sont donc invités à charger  et  tester  l'adéquation  du    *)
+(*  logiciel à leurs besoins dans des conditions permettant d'assurer la      *)
+(*  sécurité de leurs systèmes et ou de leurs données et, plus généralement,  *)
+(*  à l'utiliser et l'exploiter dans les mêmes conditions de sécurité.        *)
+(*                                                                            *)
+(*  Le fait que vous puissiez accéder à cet en-tête signifie que vous avez    *)
+(*  pris connaissance de la licence CeCILL, et que vous en avez accepté les   *)
+(*  termes.                                                                   *)
+(******************************************************************************)
+
+open Core.Std;;
+
+module Test :
+  sig
+    type basic_rc_t
+    val basic_rc_of_sexp : Sexp.t -> basic_rc_t
+    val basic_template : string
+  end
+
+val welcome_msg : string
+
+val equal : < equal : 'a -> bool; .. > -> 'a -> bool
+
+(* TODO Improve documentation *)
+class tag : string -> string list ->
+  object ('self)
+    val arguments : string list
+    val name : string
+    method arguments : string list
+    method name : string
+    method equal : 'self -> bool
+end
+class entry : ?tags:tag list -> string ->
+object ('self)
+  val command : string
+  val tags : tag list
+  method command : string
+  method tags : tag list
+  method change_command : string -> 'self
+  method change_tags : tag list -> 'self
+  method equal : 'self -> bool
+end
+type setting = < key : string; value : string >;;
+type t = <
+  entries : entry list;
+  common_tags : tag list;
+  settings : setting list;
+  change_entries : entry list -> t;
+  add_common_tags : tag list -> t;
+  add_entries : entry list -> t;
+  add_settings : setting list -> t;
+  change_entry : int -> f:(entry -> entry) -> t;
+  change_name : string -> t;
+  entry : n:int -> entry option;
+  filter_map_common_tags : f:(tag -> tag option) -> t;
+  filter_map_entries : f:(int -> entry -> entry option) -> t;
+  filter_map_settings : f:(setting -> setting option) -> t;
+  map_common_tags : f:(tag -> tag) -> t;
+  map_entries : f:(int -> entry -> entry) -> t;
+  map_settings : f:(setting -> setting) -> t;
+  get_name : string;
+  to_string : string;
+  read_common_tags : f:(tag -> unit) -> unit;
+  read_settings : f:(setting -> unit) -> unit;
+  remove_entry : int -> t;
+  write : unit
+>;;
+
+val init : ?rc:string lazy_t -> unit -> t
+
+val empty_entry : unit -> entry
+
+val import : from:(string Lazy.t) -> to_file:(string Lazy.t) -> unit

src/remove_command.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -41,7 +41,7 @@ open Core.Std;;
 (* Function remove nth command in the rc_file, returning the removed one and the
  * new list *)
 let remove current_list n =
-  let removed = ref "" in
+  let removed = ref (Rc.empty_entry ()) in
   (* The list without the nth item *)
   let new_list = List.filteri current_list ~f:(fun i _ ->
          if i <> n then
@@ -55,25 +55,33 @@ let remove current_list n =
              false
            end
        ) in
-  ( !removed, new_list )
+  ( !removed#command, new_list )
 ;;
 
-(* Function which add the commands (one per line) ridden on stdin to the rc
- * file, and then display th new configuration *)
-let run ~(rc:File_com.t) n_to_remove =
-  (* Get actual list of commands *)
-  let actual_list = rc.Settings_t.progs in
-  (* Get nth *)
-  let nth = Option.value n_to_remove
-              ~default:((List.length actual_list) - 1) in
-  (* Remove the nth command, after display it *)
+(* Perform removal *)
+let perform ~rc new_list =
+  let updated_rc = rc#change_entries new_list in
+  updated_rc#write;
+  (* Display the result, after rereading rc *)
+  let reread_rc = Rc.init () in
+  List_rc.run ~rc:reread_rc ()
+;;
+
+(* Function which removes a command, after getting confirmation, and then
+ * display the new configuration *)
+let run ~(rc:Rc.t) n_to_remove =
+  let actual_list = rc#entries in
+  (* Get nth command, default last *)
+  let nth =
+    Messages.debug "Will remove command number:";
+    Option.value n_to_remove ~default:((List.length actual_list) - 1)
+    |> Tools.spy1_int
+  in
+  (* Remove the nth command, after asking *)
   let removed,new_list = remove actual_list nth in
   sprintf "Removing: %s\n" removed
   |> Messages.warning;
-  (* Write new list to rc file *)
-  let updated_rc = { rc with Settings_t.progs = new_list } in
-  File_com.write updated_rc;
-  (* Display the result *)
-  let reread_rc = File_com.init_rc () in
-  List_rc.run ~rc:reread_rc ()
+  match Messages.confirm "Are you sure?" with
+  | Messages.Yes -> perform ~rc new_list
+  | Messages.No -> Messages.ok "Exiting, nothing done"; exit 0;
 ;;

src/settings.atd

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)

src/settings_j.ml

@@ -54,8 +54,8 @@ let read_rc_file = (
   fun p lb ->
     Yojson.Safe.read_space p lb;
     Yojson.Safe.read_lcurl p lb;
-    let field_progs = ref (Obj.magic 0.0) in
-    let field_settings = ref (Obj.magic 0.0) in
+    let field_progs = ref (Obj.magic (Sys.opaque_identity 0.0)) in
+    let field_settings = ref (Obj.magic (Sys.opaque_identity 0.0)) in
     let bits0 = ref 0 in
     try
       Yojson.Safe.read_space p lb;

src/signals.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2015                                             *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)

src/signals.mli

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2015                                             *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)

src/state.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -38,26 +38,27 @@ open Core.Std;;
 
 (* Module to display the current state of the program *)
 
-(* Display current number *)
-let print_current ~rc () =
-  Tmp_file.(init ()
-            |> (fun tmp -> get_accurate_log ~tmp ())
-            |> Exec_cmd.less_launched_num
-            |> Tools.spy1_int_option)
-  |> Option.value_map
-       ~default:"Nothing next"
-       ~f:(fun ( num : int ) ->
-
-            (* XXX Debug *)
-            sprintf "Num: %i" num |> Messages.debug;
-
-            File_com.num_cmd2cmd ~rc num
-            |> (function
-                 | Some cmd -> cmd
-                 | None -> Messages.warning "Error, should not append, this is a bug";
-                   assert false)
-            |> (fun ( cmd : string ) ->
-                 Messages.debug cmd; (* TODO Use tools.spy1 *)
-                 sprintf "Next: command %i, '%s'" num cmd))
-  |> Messages.ok
+(* Display current state *)
+let print_current ~(rc:Rc.t) () =
+  let tmp, log =
+    Tmp_file.init ()
+    |> (fun tmp -> (tmp, Tmp_file.get_accurate_log ~tmp ()))
+  in
+  let next_command =
+    match
+      Exec_cmd.less_launched_num log
+      |> Tools.spy1_int_option
+    with
+    | Some num ->
+      rc#entry ~n:num
+      |> Option.value_exn
+      |> fun entry -> sprintf "Next: command %i, '%s'" num entry#command
+    | None -> "Nothing next"
+  in
+  let is_disabled =
+    Tmp_file.is_disabled ~tmp
+    |> sprintf "Disabled: %b"
+  in
+  Messages.ok next_command;
+  Messages.ok is_disabled
 ;;

src/test/ec_t.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2015                                             *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -40,20 +40,29 @@ open Core.Std;;
 
 (* Function epur *)
 let epur () =
-  let current = Edit_command.epur [ "qw" ; "" ; "erty" ; "a" ; "" ; "zerty"] in
-  let expected = [ "qw" ; "erty" ; "a" ; "zerty" ] in
-  OUnit.assert_equal current expected
+  let current =
+    List.map ~f:Tools.to_entry [ "qw" ; "" ; "erty" ; "a" ; "" ; "zerty"]
+    |> Edit_command.epur
+  in
+  let expected = List.map ~f:Tools.to_entry [ "qw" ; "erty" ; "a" ; "zerty" ] in
+  OUnit.assert_equal ~cmp:(List.equal ~equal:Rc.equal) current expected
 ;;
 
 (* Function gen_modification *)
 let gm1 () =
-  let current = Edit_command.gen_modification [ "qw" ] in
+  let current =
+    List.map ~f:Tools.to_entry  [ "qw" ]
+    |> Edit_command.gen_modification
+  in
   let expected = "qw" in
   OUnit.assert_equal current expected
 ;;
 
 let gm2 () =
-  let current = Edit_command.gen_modification [ "qw" ; "erty" ; "a" ; "zerty"] in
+  let current =
+    List.map ~f:Tools.to_entry [ "qw" ; "erty" ; "a" ; "zerty"]
+    |> Edit_command.gen_modification
+  in
   let expected = "\nqw\nerty\na\nzerty\n" in
   OUnit.assert_equal current expected
 ;;

src/test/edit_t.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2015                                             *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -41,7 +41,7 @@ open Core.Std;;
 (* Function epur ============================= *)
 let epur test solution () =
   let actual = Edit_command.epur test in
-  OUnit.assert_equal actual solution
+  OUnit.assert_equal ~cmp:(List.equal ~equal:Rc.equal) actual solution
 ;;
 
 (* Data for above test *)
@@ -56,7 +56,10 @@ let ll_data = [
 ]
 
 let llt_l =
-  List.map ll_data ~f:(fun (t, s, name) -> ( (epur t s), name))
+  List.map ll_data ~f:(fun (t, s, name) -> (
+           let t = List.map ~f:Tools.to_entry t in
+           let s = List.map ~f:Tools.to_entry s in
+           (epur t s), name))
   |> List.map ~f:(fun ( f,name ) -> (name, `Quick, f))
 ;;
 (* =========================================== *)
@@ -124,7 +127,9 @@ let gm_data = [
 ]
 
 let gmt_l =
-  List.map gm_data ~f:(fun (t, s, name) -> ( (gen_mod t s), name))
+  List.map gm_data ~f:(fun (t, s, name) ->
+         let t = List.map ~f:Tools.to_entry t in
+         ( (gen_mod t s), name))
   |> List.map ~f:(fun ( f,name ) -> (name, `Quick, f))
 ;;
 (* =========================================== *)

src/test/exec_t.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2015                                             *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -58,7 +58,7 @@ let common_data =
   [
     ( [ ( "cmd1", 4 ) ; ( "cmd2", 0 ) ], "Canonical case 1" );
     ( [ ( "cmd1", 0 ) ; ( "cmd2", 5 ) ], "Canonical case 2" );
-    ( [], "Empty list" );
+    ( [], "Empty RC file" );
     ( [ ( "cmd1", 0 ) ; ( "cmd2", 3 ) ; ( "cmd3", 4 )  ; ( "cmd4", 5 ) ], "Canonical case 3" );
     ( [ ( "cmd1", 0 ) ; ( "cmd2", 4 ) ; ( "cmd3", 4 )  ; ( "cmd5", 5 ) ],
       "Twice the same number, with others" );
@@ -81,16 +81,16 @@ let add_solutions data expected =
 (* Data customized for the tests *)
 let ll_data =
   add_solutions common_data
-    [
-      Some "cmd2";
-      Some "cmd1";
-      None;
-      Some "cmd1";
-      Some "cmd1";
-      None;
-      None;
-      Some "cmd1";
-      Some "cmd3"
+    Exec_cmd.[
+      A "cmd2";
+      A "cmd1";
+      Empty;
+      A "cmd1";
+      A "cmd1";
+      Finish;
+      Finish;
+      A "cmd1";
+      A "cmd3"
     ]
 ;;
 let ll_data2 =

src/test/id_parsing_t.ml

@@ -0,0 +1,79 @@
+(******************************************************************************)
+(* Copyright © Joly Clément, 2015                                             *)
+(*                                                                            *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
+(*                                                                            *)
+(*  Ce logiciel est un programme informatique servant à exécuter              *)
+(*  automatiquement des programmes à l'ouverture du terminal.                 *)
+(*                                                                            *)
+(*  Ce logiciel est régi par la licence CeCILL soumise au droit français et   *)
+(*  respectant les principes de diffusion des logiciels libres. Vous pouvez   *)
+(*  utiliser, modifier et/ou redistribuer ce programme sous les conditions    *)
+(*  de la licence CeCILL telle que diffusée par le CEA, le CNRS et l'INRIA    *)
+(*  sur le site "http://www.cecill.info".                                     *)
+(*                                                                            *)
+(*  En contrepartie de l'accessibilité au code source et des droits de copie, *)
+(*  de modification et de redistribution accordés par cette licence, il n'est *)
+(*  offert aux utilisateurs qu'une garantie limitée.  Pour les mêmes raisons, *)
+(*  seule une responsabilité restreinte pèse sur l'auteur du programme,  le   *)
+(*  titulaire des droits patrimoniaux et les concédants successifs.           *)
+(*                                                                            *)
+(*  A cet égard  l'attention de l'utilisateur est attirée sur les risques     *)
+(*  associés au chargement,  à l'utilisation,  à la modification et/ou au     *)
+(*  développement et à la reproduction du logiciel par l'utilisateur étant    *)
+(*  donné sa spécificité de logiciel libre, qui peut le rendre complexe à     *)
+(*  manipuler et qui le réserve donc à des développeurs et des professionnels *)
+(*  avertis possédant  des  connaissances  informatiques approfondies.  Les   *)
+(*  utilisateurs sont donc invités à charger  et  tester  l'adéquation  du    *)
+(*  logiciel à leurs besoins dans des conditions permettant d'assurer la      *)
+(*  sécurité de leurs systèmes et ou de leurs données et, plus généralement,  *)
+(*  à l'utiliser et l'exploiter dans les mêmes conditions de sécurité.        *)
+(*                                                                            *)
+(*  Le fait que vous puissiez accéder à cet en-tête signifie que vous avez    *)
+(*  pris connaissance de la licence CeCILL, et que vous en avez accepté les   *)
+(*  termes.                                                                   *)
+(******************************************************************************)
+
+open Core.Std;;
+
+(* A module containing tests for src/id_parsing.ml *)
+
+(* Function to_human ============================= *)
+let to_human test solution () =
+  let actual = Id_parsing.list_from_human test in
+  (* Spying expression *)
+  List.sexp_of_t Int.sexp_of_t actual |> Sexp.to_string
+  |> printf "actual: %s\n";
+  OUnit.assert_equal actual solution
+;;
+
+(* Data for above test *)
+let ll_data = [
+  ( "1", [1], "Canonical case: unique" );
+  ( "1-3", [1;2;3], "Canonical case: between" );
+  ( "3-1", [3;2;1], "Canonical case: between, reversed" );
+  ( "1-3,5-8,10-12", [1;2;3;5;6;7;8;10;11;12], "Canonical case: list of interval" );
+  ( "1,3,5", [1;3;5], "Canonical case: list of unique" );
+  ( "1-3,5,10-12,23", [1;2;3;5;10;11;12;23], "Canonical case: both" );
+  ( "0-30", [0; 1; 2; 3; 4; 5; 6; 7; 8; 9; 10; 11; 12; 13; 14; 15; 16; 17; 18;
+             19; 20; 21; 22; 23; 24; 25; 26; 27; 28; 29; 30], "Long interval" );
+  ( "1-3", [1;2;3], "With errors" );
+  ( "1-3", [1;2;3], "With double" );
+  ( "24-24", [24], "Interval a-a" );
+  ( "", [], "Empty list" );
+  ( "1e", [1], "Basic correction of malformed input" );
+  ( "aaaavvvbg", [], "Empty list resulting of incorrect input" );
+  ( "i5a", [5], "A number inside letters" );
+  ( "eff", [], "Only letters" );
+  ( "a3-1u", [3;2;1], "Between inside letters" );
+]
+
+let llt_l =
+  List.map ll_data ~f:(fun (t, s, name) -> ( (to_human t s), name))
+  |> List.map ~f:(fun ( f,name ) -> (name, `Quick, f))
+;;
+(* =========================================== *)
+
+(* To be used in test.ml *)
+let alco = [( "Id_parsing.ml: to human", llt_l )];;
+

src/test/listrc_t.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2016                                             *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -57,16 +57,15 @@ let data = [
 
   ( ("cmd1", 0, "cmd1"), "Keep as-is" );
   ( ("cmd1", -5, "cmd1"), "Negative figure, keep as-is" );
-  ( ("cmd1", (String.length List_rc.trunc_indicator), "cmd1"), "On the \
-  indicator, keep as-is" );
-  ( ("cmd1", (String.length List_rc.trunc_indicator) - 1, "cmd1"), "Under \
-  indicator, keep as-is" );
+  ( ("cmd1", (String.length List_rc.trunc_indicator), "cmd1"),
+    "On the indicator, keep as-is" );
+  ( ("cmd1", (String.length List_rc.trunc_indicator) - 1, "cmd1"),
+    "Under indicator, keep as-is" );
 ];;
 
 let tests =
   List.map data ~f:(fun (t, name) ->
-    (name, `Quick, (trunc t))
-  )
+         (name, `Quick, (trunc t)))
 ;;
 
 (* To be used in test.ml *)

src/test/rc_t.ml

@@ -0,0 +1,57 @@
+(******************************************************************************)
+(* Copyright © Joly Clément, 2016                                             *)
+(*                                                                            *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
+(*                                                                            *)
+(*  Ce logiciel est un programme informatique servant à exécuter              *)
+(*  automatiquement des programmes à l'ouverture du terminal.                 *)
+(*                                                                            *)
+(*  Ce logiciel est régi par la licence CeCILL soumise au droit français et   *)
+(*  respectant les principes de diffusion des logiciels libres. Vous pouvez   *)
+(*  utiliser, modifier et/ou redistribuer ce programme sous les conditions    *)
+(*  de la licence CeCILL telle que diffusée par le CEA, le CNRS et l'INRIA    *)
+(*  sur le site "http://www.cecill.info".                                     *)
+(*                                                                            *)
+(*  En contrepartie de l'accessibilité au code source et des droits de copie, *)
+(*  de modification et de redistribution accordés par cette licence, il n'est *)
+(*  offert aux utilisateurs qu'une garantie limitée.  Pour les mêmes raisons, *)
+(*  seule une responsabilité restreinte pèse sur l'auteur du programme,  le   *)
+(*  titulaire des droits patrimoniaux et les concédants successifs.           *)
+(*                                                                            *)
+(*  A cet égard  l'attention de l'utilisateur est attirée sur les risques     *)
+(*  associés au chargement,  à l'utilisation,  à la modification et/ou au     *)
+(*  développement et à la reproduction du logiciel par l'utilisateur étant    *)
+(*  donné sa spécificité de logiciel libre, qui peut le rendre complexe à     *)
+(*  manipuler et qui le réserve donc à des développeurs et des professionnels *)
+(*  avertis possédant  des  connaissances  informatiques approfondies.  Les   *)
+(*  utilisateurs sont donc invités à charger  et  tester  l'adéquation  du    *)
+(*  logiciel à leurs besoins dans des conditions permettant d'assurer la      *)
+(*  sécurité de leurs systèmes et ou de leurs données et, plus généralement,  *)
+(*  à l'utiliser et l'exploiter dans les mêmes conditions de sécurité.        *)
+(*                                                                            *)
+(*  Le fait que vous puissiez accéder à cet en-tête signifie que vous avez    *)
+(*  pris connaissance de la licence CeCILL, et que vous en avez accepté les   *)
+(*  termes.                                                                   *)
+(******************************************************************************)
+
+open Core.Std;;
+
+(* Tests for src/rc.ml *)
+
+(* Rc template =================================== *)
+let rc_template =
+  let test () =
+    let r = Rc.Test.(basic_rc_of_sexp (Sexp.of_string basic_template)) in
+    (* XXX Actualy, we want to test this runs without exception *)
+    OUnit.assert_equal r r;
+  in
+  [(
+    "Test rc template correctness",
+    `Quick,
+    test
+  )]
+(* =========================================== *)
+
+(* To be used in test.ml *)
+let alco = [( "Rc.ml", rc_template )];;
+

src/test/test.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2015                                             *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -38,8 +38,14 @@ open Core.Std;;
 
 (* A module launching all tests *)
 
+let tests =
+  [
+    Ec_t.alco ; Exec_t.alco ; Edit_t.alco ; Unify_t.alco ; Listrc_t.alco ;
+    Id_parsing_t.alco ; Rc_t.alco
+  ]
+;;
+
 let () =
   Alcotest.run "Test suite for the project"
-    (List.concat [ Ec_t.alco ; Exec_t.alco ; Edit_t.alco ; Unify_t.alco ;
-    Listrc_t.alco ])
+    (List.concat tests)
 ;;

src/test/unify_t.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2016                                             *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -41,7 +41,7 @@ open Core.Std;;
 (* Function make_uniq ============================= *)
 let make_uniq test solution () =
   let actual = Unify.make_uniq test in
-  OUnit.assert_equal actual solution
+  OUnit.assert_equal ~cmp:(List.equal ~equal:Rc.equal) actual solution
 ;;
 
 (* Big and sometimes strange list, to be used in test data set.
@@ -56,7 +56,7 @@ let big_unique length = (* Long list of unique elements *)
 let big_same length = (* Long list of unique elements *)
   let message = "all the same element" in
   let same_element = "cmd1" in
-  let test_case = List.init ~f:(fun i -> same_element) length in
+  let test_case = List.init ~f:(fun _ -> same_element) length in
   ( test_case, [ same_element ], message )
 ;;
 let big_periodic length = (* Long list of unique elements *)
@@ -109,7 +109,10 @@ let make_uniq_data = [
 ;;
 
 let t_set_fast =
-  List.map make_uniq_data ~f:(fun (t, s, name) -> ( (make_uniq t s), name))
+  List.map make_uniq_data ~f:(fun (t, s, name) -> (
+           let t = List.map ~f:Tools.to_entry t in
+           let s = List.map ~f:Tools.to_entry s in
+           (make_uniq t s), name))
   |> List.map ~f:(fun ( f,name ) -> (name, `Quick, f))
 ;;
 
@@ -117,7 +120,10 @@ let t_set_long =
   List.map
     ((big_pack ~message:"Much longer than real use case list of " 1_000)
      @ (big_pack ~message:"Crazy long list of " 9_999))
-    ~f:(fun (t, s, name) -> ( (make_uniq t s), name))
+    ~f:(fun (t, s, name) ->
+         let t = List.map ~f:Tools.to_entry t in
+         let s = List.map ~f:Tools.to_entry s in
+         ( (make_uniq t s), name))
   |> List.map ~f:(fun ( f,name ) -> (name, `Slow, f))
 ;;
 

src/third-part/core_extended/INRIA-DISCLAIMER.txt

@@ -1,13 +0,0 @@
-THIS SOFTWARE IS PROVIDED BY INRIA AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INRIA OR ITS CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-

src/third-part/core_extended/LICENSE.txt

@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-

src/third-part/core_extended/README

@@ -1,15 +0,0 @@
-Files in this directory are based on the file with the same name of the
-Core_extended library, published under Apache-2.0 as follow:
-
-(C) 2008-2016 Jane Street Group LLC <opensource@janestreet.com>
-Apache-2.0
-
-You may find a copy of the Apache licence in the LICENSE.txt file in this
-folder. The THIRD-PARTY.txt, LICENSE.txt (in this folder) and
-INRIA-DISCLAIMER.txt have been reproduced as they were in commit
-987a5b7994104e6cb41867bb4775ac970fb64830.
-
-The file color_print.ml is as it was in commit
-7351d453b3a7a8d2c77fdff817f19ebf1df1400d. It is symbolic linked in src/ folder,
-for convenience.
-

src/third-part/core_extended/THIRD-PARTY.txt

@@ -1,19 +0,0 @@
-The repository contains 3rd-party code in the following locations and
-under the following licenses:
-
-- type_conv, sexplib and bin_prot: based on Tywith, by Martin
-  Sandin.  License can be found in base/sexplib/LICENSE-Tywith.txt,
-  base/type_conv/LICENSE-Tywith.txt, and base/bin_prot/LICENSE-Tywith.txt.
-
-- Core's implementation of union-find: based on an implementation by
-  Henry Matthew Fluet, Suresh Jagannathan, and Stephen Weeks. License
-  can be found in base/core/MLton-license.
-
-- Various Core libraries are based on INRIA's OCaml
-  distribution. Relicensed under Apache 2.0, as permitted under the
-  Caml License for Consortium members:
-
-     http://caml.inria.fr/consortium/license.en.html
-
-  See also the disclaimer INRIA-DISCLAIMER.txt.
-

src/third-part/core_extended/color_print.ml

@@ -1,136 +0,0 @@
-(* Copyright Jane Street Group, LLC 2012- 2016 *)
-open Core.Std
-
-let ansi_regexp = Memo.unit (fun () -> Re2.Std.Re2.create_exn "\027\\[.*?m")
-
-let ansi_capture_regexp = Memo.unit (fun () -> Re2.Std.Re2.create_exn "(\027\\[.*?m)")
-let normal_capture_regexp = Memo.unit (fun () -> Re2.Std.Re2.create_exn "(\027\\[0m)")
-
-let normal str =
-  Re2.Std.Re2.rewrite_exn (ansi_regexp ()) ~template:"" str
-
-let add_after_ansi str ~code =
-  Re2.Std.Re2.rewrite_exn (ansi_capture_regexp ()) ~template:("\\1" ^ code) str
-let add_after_normal str ~code =
-  Re2.Std.Re2.rewrite_exn (normal_capture_regexp ()) ~template:("\\1" ^ code) str
-
-let ansi_code ~code = "\027[" ^ code ^ "m"
-
-let normal_code    = ansi_code ~code:"0"
-let bold_code      = ansi_code ~code:"1"
-let underline_code = ansi_code ~code:"4"
-let red_code       = ansi_code ~code:"31"
-let green_code     = ansi_code ~code:"32"
-let yellow_code    = ansi_code ~code:"33"
-let blue_code      = ansi_code ~code:"34"
-let magenta_code   = ansi_code ~code:"35"
-let cyan_code      = ansi_code ~code:"36"
-let inverse_code   = ansi_code ~code:"7"
-
-let float_to_int x ~max =
-    if x <= 0. then 0
-    else if x >= 1. then max
-    else Float.iround_exn ~dir:`Nearest (x *. Float.of_int max)
-
-let gray_code ~brightness =
-  let brightness = float_to_int brightness ~max:23 in
-  ansi_code ~code:("38;5;" ^ Int.to_string (brightness + 232))
-let rgbint_code ~r ~g ~b =
-  ansi_code ~code:("38;5;" ^ Int.to_string (16 + r*36 + g*6 + b))
-let rgb_code ~r ~g ~b =
-  let r = float_to_int r ~max:5 in
-  let g = float_to_int g ~max:5 in
-  let b = float_to_int b ~max:5 in
-  rgbint_code ~r ~g ~b
-
-type color = [
-| `Black | `Gray | `Light_gray | `White
-| `Dark_red | `Red | `Pink | `Light_pink
-| `Orange | `Amber
-| `Dark_yellow | `Gold | `Yellow | `Khaki | `Wheat
-| `Chartreuse | `Green_yellow
-| `Dark_green | `Green | `Light_green | `Bright_green
-| `Spring_green | `Medium_spring_green
-| `Dark_cyan | `Sea_green | `Cyan | `Turquoise | `Pale_turquoise
-| `Dodger_blue | `Deep_sky_blue
-| `Dark_blue | `Blue | `Light_slate_blue | `Light_steel_blue
-| `Blue_violet | `Violet
-| `Dark_magenta | `Purple | `Magenta | `Orchid | `Plum
-| `Rose | `Deep_pink
-] [@@deriving sexp, bin_io]
-
-let color_code ~(color:color) =
-  let (r,g,b) =
-    match (color:color) with
-    | `Black -> (0,0,0) | `Gray -> (2,2,2) | `Light_gray -> (3,3,3) | `White -> (5,5,5)
-    | `Dark_red -> (2,0,0) | `Red -> (5,0,0) | `Pink -> (5,2,2) | `Light_pink -> (5,3,3)
-    | `Orange -> (5,2,0) | `Amber -> (5,3,0)
-    | `Dark_yellow -> (2,2,0) | `Gold -> (3,3,0) | `Yellow -> (5,5,0) | `Khaki -> (5,5,2) | `Wheat -> (5,5,3)
-    | `Chartreuse -> (2,5,0) | `Green_yellow -> (3,5,0)
-    | `Dark_green -> (0,2,0) | `Green -> (0,5,0) | `Light_green -> (2,5,2) | `Bright_green -> (3,5,3)
-    | `Spring_green -> (0,5,2) | `Medium_spring_green -> (0,5,3)
-    | `Dark_cyan -> (0,2,2) | `Sea_green -> (0,3,3) | `Cyan -> (0,5,5) | `Turquoise -> (2,5,5) | `Pale_turquoise -> (3,5,5)
-    | `Dodger_blue -> (0,2,5) | `Deep_sky_blue -> (0,3,5)
-    | `Dark_blue -> (0,0,2) | `Blue -> (0,0,5) | `Light_slate_blue -> (2,2,5) | `Light_steel_blue -> (3,3,5)
-    | `Blue_violet -> (2,0,5) | `Violet -> (3,0,5)
-    | `Dark_magenta -> (2,0,2) | `Purple -> (3,0,3) | `Magenta -> (5,0,5) | `Orchid -> (5,2,5) | `Plum -> (5,3,5)
-    | `Rose -> (5,0,2) | `Deep_pink -> (5,0,3)
-  in
-  rgbint_code ~r ~g ~b
-
-
-let wrap ?(override=false) str ~code =
-  code
-  ^ (if override
-     then add_after_ansi str ~code
-     else add_after_normal str ~code)
-  ^ normal_code
-
-let bold      ?override str = wrap ?override str ~code:bold_code
-let underline ?override str = wrap ?override str ~code:underline_code
-let red       ?override str = wrap ?override str ~code:red_code
-let green     ?override str = wrap ?override str ~code:green_code
-let yellow    ?override str = wrap ?override str ~code:yellow_code
-let blue      ?override str = wrap ?override str ~code:blue_code
-let magenta   ?override str = wrap ?override str ~code:magenta_code
-let cyan      ?override str = wrap ?override str ~code:cyan_code
-let inverse   ?override str = wrap ?override str ~code:inverse_code
-
-let gray  ?override str ~brightness = wrap ?override str ~code:(gray_code ~brightness)
-let rgb   ?override str ~r ~g ~b    = wrap ?override str ~code:(rgb_code ~r ~g ~b)
-let color ?override str ~color      = wrap ?override str ~code:(color_code ~color)
-
-let wrap_print ?override ~code fmt =
-  Printf.ksprintf (fun str -> print_string (wrap ?override str ~code)) fmt
-
-let bold_printf      ?override fmt = wrap_print ?override ~code:bold_code      fmt
-let underline_printf ?override fmt = wrap_print ?override ~code:underline_code fmt
-let inverse_printf   ?override fmt = wrap_print ?override ~code:inverse_code   fmt
-let red_printf       ?override fmt = wrap_print ?override ~code:red_code       fmt
-let yellow_printf    ?override fmt = wrap_print ?override ~code:yellow_code    fmt
-let green_printf     ?override fmt = wrap_print ?override ~code:green_code     fmt
-let blue_printf      ?override fmt = wrap_print ?override ~code:blue_code      fmt
-let magenta_printf   ?override fmt = wrap_print ?override ~code:magenta_code   fmt
-let cyan_printf      ?override fmt = wrap_print ?override ~code:cyan_code      fmt
-
-let gray_printf ?override ~brightness fmt = wrap_print ?override ~code:(gray_code ~brightness) fmt
-let rgb_printf ?override ~r ~g ~b     fmt = wrap_print ?override ~code:(rgb_code ~r ~g ~b)     fmt
-let color_printf ?override ~color     fmt = wrap_print ?override ~code:(color_code ~color)     fmt
-
-let wrap_sprint ?override ~code fmt =
-  Printf.ksprintf (fun str -> wrap ?override str ~code) fmt
-
-let bold_sprintf      ?override fmt = wrap_sprint ?override ~code:bold_code      fmt
-let underline_sprintf ?override fmt = wrap_sprint ?override ~code:underline_code fmt
-let inverse_sprintf   ?override fmt = wrap_sprint ?override ~code:inverse_code   fmt
-let red_sprintf       ?override fmt = wrap_sprint ?override ~code:red_code       fmt
-let yellow_sprintf    ?override fmt = wrap_sprint ?override ~code:yellow_code    fmt
-let green_sprintf     ?override fmt = wrap_sprint ?override ~code:green_code     fmt
-let blue_sprintf      ?override fmt = wrap_sprint ?override ~code:blue_code      fmt
-let magenta_sprintf   ?override fmt = wrap_sprint ?override ~code:magenta_code   fmt
-let cyan_sprintf      ?override fmt = wrap_sprint ?override ~code:cyan_code      fmt
-
-let gray_sprintf ?override ~brightness fmt = wrap_sprint ?override ~code:(gray_code ~brightness) fmt
-let rgb_sprintf ?override ~r ~g ~b     fmt = wrap_sprint ?override ~code:(rgb_code ~r ~g ~b)     fmt
-let color_sprintf ?override ~color     fmt = wrap_sprint ?override ~code:(color_code ~color)     fmt
-

src/tmp_file.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
-(* Copyright © Joly Clément, 2014-2015                                        *)
+(* Copyright © Joly Clément, 2014-2016                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -37,14 +37,34 @@
 open Core.Std;;
 
 (* Type of the values *)
-type t = Tmp_biniou_t.tmp_file;;
+type rc_name = string [@@deriving bin_io];;
+type rc_entry = { commands: (string * int) } [@@deriving bin_io];;
+type tmp_file = {
+  rc: (rc_name * (rc_entry list)) list;
+  disabled: bool;
+  daemon: int
+} [@@deriving bin_io];;
+type t = tmp_file;;
+
+(* To use with Binable module *)
+module T = struct
+  type t = tmp_file [@@deriving bin_io]
+end;;
+
+(* Get Bin_prot representation of data (string) *)
+let serialise data =
+  Binable.to_string (module T) data
+;;
+(* Get data from Bin_prot representation (string) *)
+let deserialise data =
+  Binable.of_string (module T) data
+;;
 
 (* Function to write the tmp file *)
 let write (tmp_file:t) =
   (* Short name *)
   let name = Const.tmp_file in
-  let biniou_tmp = Tmp_biniou_b.string_of_tmp_file tmp_file in
-  Out_channel.write_all name ~data:biniou_tmp
+  Out_channel.write_all name ~data:(serialise tmp_file)
 ;;
 
 (* XXX Using and keyword because each function can call each other *)
@@ -55,10 +75,7 @@ let rec read () =
   (* Get the string corresponding to the file *)
   let file_content = In_channel.read_all name in
   try
-    Tmp_biniou_b.tmp_file_of_string file_content
-  (* In previous version, the JSON format was used, otherwise the file can
-   * have a bad format. In this case, the Ag_ob_run.Error("Read error (1)")
-   * exeption is throw. We catch it here *)
+    deserialise file_content
   with _ ->
     (* If file is not in the right format, delete it and create a new one.
      * Then, read it *)
@@ -67,11 +84,9 @@ let rec read () =
     create_tmp_file ();
     read ()
 
-(* Function to create the tmp file *)
+(* Function to create an empty tmp file *)
 and create_tmp_file () =
-  (* An empty list, without rc, commands, launch... *)
-  Tmp_biniou_v.create_tmp_file ~daemon:0 ~rc:[] ()
-  (* Convert it to biniou *)
+  { daemon = 0; rc = []; disabled = false }
   |> write
 ;;
 
@@ -92,7 +107,7 @@ let rec init () =
 (* Get a log of values from the tmp file, like this
  * (cmd,number of launch) list *)
 let get_log ~rc_tmp =
-  List.map ~f:(fun { Tmp_biniou_t.commands = (cmd,number) } ->
+  List.map ~f:(fun { commands = (cmd,number) } ->
          (cmd,number)) rc_tmp
 ;;
 
@@ -121,22 +136,21 @@ let log ~cmd ?(func= (+) 1 ) () =
   (* Get rc_file name *)
   let name = Lazy.force !Const.rc_file in
   (* Function to generate the new list with right number *)
-  let new_li (li : Tmp_biniou_t.rc_entry list) =
+  let new_li (li : rc_entry list) =
     let open List.Assoc in
     (* Only number of launch associated with commands *)
     let l = get_log ~rc_tmp:li in
     find l cmd
     |> (function None -> add l cmd Const.default_launch | Some n -> add l cmd (func n))
-    |> List.map ~f:(fun e -> { Tmp_biniou_t.commands = e})
+    |> List.map ~f:(fun e -> { commands = e})
   in
   (* Write the file with the new value *)
   let updated_li =
-    List.Assoc.(find file.Tmp_biniou_t.rc name)
+    List.Assoc.(find file.rc name)
     |> Option.value ~default:[]
     |> new_li
   in
-  write Tmp_biniou_t.{ file with rc = List.Assoc.add file.rc name
-                                        updated_li }
+  write { file with rc = List.Assoc.add file.rc name updated_li }
 ;;
 
 (* Return current number *)
@@ -144,30 +158,45 @@ let get_current () =
   failwith "Deprecated"
 ;;
 
+(* Types used to return accurate logs *)
+type accurate_log =
+  (Rc.entry * int) list
+;;
+type accurate_log_simple =
+  (string * int) list
+;;
+
 (* Get number of launch for each command in rc file, as follow:
- * (command:string, number of the command:int) list *)
-let get_accurate_log ?rc_name ~tmp () =
+ * (Rc.entry, number of launch for the command:int) list *)
+let get_accurate_log_complete ?rc_name ~tmp () =
   let open List in
-
-  (* Read rc *)
-  (* XXX Forcing evaluation of lazy value Const.rc_file before it is
-   *   necessary *)
-  let name : string = Option.value ~default:(Lazy.force !Const.rc_file) rc_name
-  in
-  let rc =  File_com.init_rc ~rc:(Lazy.return name) () in
-
-  let rc_in_tmp = get_log ~rc_tmp:(Assoc.find tmp.Tmp_biniou_t.rc name
+  let rc = Rc.init ?rc:rc_name () in
+  let rc_in_tmp = get_log ~rc_tmp:(Assoc.find tmp.rc rc#get_name
                                    |> Option.value ~default:[])
   in
-  map rc.Settings_t.progs ~f:(fun key ->
+  map rc#entries ~f:(fun entry ->
+         let key = entry#command in
          Assoc.find rc_in_tmp key
          |> Option.value ~default:0
-         |> (function number -> (key,number)))
+         |> (function number -> (entry, number)))
+;;
+
+(* Get (may transform an existing log) number of launch for each command in rc file, as follow:
+ * (command:string, number of launch for the command:int) list *)
+let get_accurate_log ?entry_log ~tmp () =
+  let entry_log =
+    match entry_log with
+    | None -> get_accurate_log_complete ~tmp ()
+    | Some log -> log
+  in
+  entry_log |>
+  List.map ~f:(fun (entry, nb_of_launch) -> (entry#command, nb_of_launch))
 ;;
 
 (* Reset number of launch for a given command
  * cmd: number of the command to be reseted
  * num: number to reset *)
+(* FIXME cmd is not very clear for a command number *)
 let reset_cmd ~rc num cmd =
   (* Debugging *)
   [(num,"num") ; (cmd,"cmd")]
@@ -177,9 +206,9 @@ let reset_cmd ~rc num cmd =
   let ac_log = get_accurate_log ~tmp:(init ()) () in
   (* The command (string) corresponding to the number *)
   let cmd_str =
-    File_com.num_cmd2cmd ~rc cmd
+    rc#entry ~n:cmd
     |> function
-      Some s -> s
+      Some s -> s#command
     | None -> failwith "Out of bound"
   in
 
@@ -199,7 +228,7 @@ let reset_cmd ~rc num cmd =
 
 (* Reset all commands to a number
  * num: number to reset *)
-let reset2num ~rc num =
+let reset2num num =
   (* Debugging *)
   "Num: " ^ (Int.to_string num)
   |> Messages.debug;
@@ -219,14 +248,29 @@ let reset_all () =
     let tmp = init () in
     (* Get rc_file name *)
     let name = Lazy.force !Const.rc_file in
-    write Tmp_biniou_t.{ tmp with rc = List.Assoc.add tmp.rc name [] }
+    write { tmp with rc = List.Assoc.add tmp.rc name [] }
   in
   Messages.debug "Asking question";
   Messages.confirm "You will lose number of launch for every command. \
                     Are you sure?"
-  |> (fun answer -> sprintf "Answer %s" (Messages.answer2str answer) |> Messages.debug; answer) (* Spy *)
+  |> Tools.spy1_answer
   |> function
     Messages.Yes -> reset_without_ask (); Messages.ok "Successfully reseted!"
   | Messages.No -> ()
 ;;
 
+(* Check whether the program has been disabled (concerning automatic launch) *)
+let is_disabled ~tmp =
+  sprintf "Tmp.disabled: %b" tmp.disabled
+  |> Messages.debug;
+  let r = tmp.disabled || (Lazy.force Const.disabled) in
+  sprintf "Tmp.disabled or OC_DISABLE set: %b" r
+  |> Messages.debug;
+  r
+;;
+
+(* Disable auto-launch *)
+let set_disable target =
+  write { (init ()) with disabled = target }
+;;
+

src/tmp_file.mli

@@ -1,7 +1,7 @@
 (******************************************************************************)
-(* Copyright © Joly Clément, 2014                                             *)
+(* Copyright © Joly Clément, 2014-2016                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -34,7 +34,15 @@
 (*  termes.                                                                   *)
 (******************************************************************************)
 
-type t = Tmp_biniou_t.tmp_file
+type rc_name = string;;
+type rc_entry = { commands: (string * int) };;
+type tmp_file = {
+  rc: (rc_name * (rc_entry list)) list;
+  disabled: bool; (* Suspend launch of new entries *)
+  daemon: int
+};;
+type t = tmp_file;;
+
 val write : t -> unit
 
 (* Use this function to read tmp file, it will be created if necessary *)
@@ -43,10 +51,21 @@ val init : unit -> t
 val verify_key_exist : key:'a -> 'a -> bool
 val is_prog_in_rc : 'a list -> 'a -> bool
 val log : cmd:string -> ?func:(int -> int) -> unit -> unit
+
 (** Return current state *)
 val get_current : unit -> int
-val get_accurate_log : ?rc_name:string -> tmp:t -> unit -> (string * int) list
+
+(* Accurate logs *)
+type accurate_log = (Rc.entry * int) list
+type accurate_log_simple = (string * int) list
+val get_accurate_log_complete : ?rc_name:string lazy_t -> tmp:t -> unit -> accurate_log
+val get_accurate_log : ?entry_log:accurate_log -> tmp:t -> unit -> accurate_log_simple
+
 (* Resetting command *)
-val reset_cmd : rc:Settings_t.rc_file -> int -> int -> unit
-val reset2num : rc:Settings_t.rc_file -> int -> unit
+val reset_cmd : rc:Rc.t -> int -> int -> unit
+val reset2num : int -> unit
 val reset_all : unit -> unit
+
+(* Disable auto-launch *)
+val is_disabled : tmp:t -> bool
+val set_disable : bool -> unit

src/tools.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2015                                             *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -63,6 +63,12 @@ let spy1_int_option io =
 let spy1_string str =
   spy str str
 ;;
+let spy1_string_option so =
+  so
+  |> (function None -> "None"
+             | Some str -> sprintf "Some %s" str)
+  |> spy so
+;;
 let spy1_float f =
   sprintf "%f" f
   |> spy f
@@ -83,6 +89,13 @@ let spy1_log (log : (string * int) list) =
   |> printing;
   log
 ;;
-let spy1_rc rc =
-  failwith "Not implemented"
+let spy1_answer answer =
+  answer
+  |> Messages.answer2str
+  |> sprintf "Answer %s"
+  |> spy answer
 ;;
+
+(* It's simpler to define strings (for instance in the test) and convert it to
+ * entry then *)
+let to_entry command = new Rc.entry command;;

src/tools.mli

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2015                                             *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -40,7 +40,9 @@ open Core.Std;;
 val spy1_int : int -> int
 val spy1_int_option : int option -> int option
 val spy1_string : string -> string
+val spy1_string_option : string option -> string option
 val spy1_float : float -> float
 val spy1_list : f:('a -> string)-> 'a list -> 'a list
 val spy1_log : (string * int) list -> (string * int) list
-val spy1_rc : 'a -> 'a
+val spy1_answer : Messages.answer -> Messages.answer
+val to_entry : string -> Rc.entry

src/unify.ml

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2016                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -48,7 +48,7 @@ open Core.Std;;
 let make_uniq dubbled_entries =
   let seen = ref [] in (* Entries already added *)
   List.(filter dubbled_entries ~f:(fun entry ->
-         (exists !seen ~f:(fun in_seen -> in_seen = entry)) |> function
+         (exists !seen ~f:(fun in_seen -> in_seen#equal entry)) |> function
          | false -> (* Entry not already seen, keep it *)
            seen := (entry :: !seen); true
          (* Already kept, discard *)
@@ -62,12 +62,12 @@ let prettify_cmd cmds =
   let without_lr =
     (* Removing line return, and trailing spaces, at the end or
        at the start of a command *)
-    List.filter_map cmds ~f:(fun str ->
-           trim str |> function
+    List.filter_map cmds ~f:(fun entry ->
+           trim entry#command |> function
            | "" ->
              Messages.debug "Trimmed command";
              None
-           | s -> Some s)
+           | s -> Some ((entry#change_command s)))
   in
 
   (* Remove doubled entries *)
@@ -85,10 +85,9 @@ let prettify_cmd cmds =
 (* Removing doubled entries (cmds). We need to remove carriage return before
  * deduplicating, since they don't need to be in rc file, and the first one
  * would be kept during deduplication. *)
-let prettify rc_file =
-  let cmds = rc_file.Settings_v.progs in
+let prettify (rc:Rc.t) =
+  let cmds = rc#entries in
   let unique = prettify_cmd cmds in
-  (* Store the deduplicated list in new rc_file *)
-  {rc_file with Settings_v.progs = unique}
+  rc#change_entries unique
 ;;
 

src/unify.mli

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* Copyright © Joly Clément, 2014-2015                                        *)
 (*                                                                            *)
-(*  leowzukw@vmail.me                                                         *)
+(*  leowzukw@oclaunch.eu.org                                                  *)
 (*                                                                            *)
 (*  Ce logiciel est un programme informatique servant à exécuter              *)
 (*  automatiquement des programmes à l'ouverture du terminal.                 *)
@@ -36,6 +36,6 @@
 
 open Core.Std;;
 
-val make_uniq : 'a list -> 'a list
-val prettify_cmd : string list -> string list
-val prettify : Settings_t.rc_file -> Settings_t.rc_file
+val make_uniq : (< equal : 'a -> bool; .. > as 'a) list -> 'a list
+val prettify_cmd : Rc.entry list -> Rc.entry list
+val prettify : Rc.t -> Rc.t

test.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Some script to test the behavior of the program with custom rc file
-OC_TMP=/tmp/v033 OC_RC="./dev.json" OC_VERB=5 ./oclaunch.native $*
+OC_TMP=/tmp/v033 OC_RC="./dev.scm" OC_VERB=5 ./oclaunch.native $*

test/env.sh

@@ -2,7 +2,7 @@
 
 # Copyright © Joly Clément, 2014-2015
 #
-#  leowzukw@vmail.me
+#  leowzukw@oclaunch.eu.org
 #
 #  Ce logiciel est un programme informatique servant à exécuter
 #  automatiquement des programmes à l'ouverture du terminal.
@@ -38,8 +38,10 @@
 # are not set
 
 # Binary
-binary=../oclaunch.native
+binary=./oclaunch.native
 
+# Should run errorless
+env -i $binary licence
 # Should throw one error, about $HOME
 env -i $binary