Merge pull request #429 from NathanReb/update-cmdliner

Fix compat with cmdliner 1.1+

Author: Leonidas-from-XIV

CHANGES.md

@@ -8,6 +8,9 @@
 
 ### Fixed
 
+- Fix compatibility with Cmdliner 1.1.0. This also unfortunately means that the
+  minimum OCaml version is 4.08 now. (#429, @NathanReb)
+
 ### Removed
 
 ### Security

bin/bistro.ml

@@ -50,14 +50,15 @@ let man =
     `P "See dune-release(7) for more information.";
   ]
 
-let cmd =
-  ( Term.(
-      pure bistro $ Cli.setup $ Cli.dry_run $ Cli.pkg_names $ Cli.pkg_version
-      $ Cli.dist_tag $ Cli.keep_v $ Cli.token $ Cli.include_submodules
-      $ Cli.draft $ Cli.keep_build_dir $ Cli.skip_lint $ Cli.skip_build
-      $ Cli.skip_tests $ Cli.local_repo $ Cli.remote_repo $ Cli.opam_repo
-      $ Cli.no_auto_open),
-    Term.info "bistro" ~doc ~sdocs ~exits ~man ~man_xrefs )
+let term =
+  Term.(
+    const bistro $ Cli.setup $ Cli.dry_run $ Cli.pkg_names $ Cli.pkg_version
+    $ Cli.dist_tag $ Cli.keep_v $ Cli.token $ Cli.include_submodules $ Cli.draft
+    $ Cli.keep_build_dir $ Cli.skip_lint $ Cli.skip_build $ Cli.skip_tests
+    $ Cli.local_repo $ Cli.remote_repo $ Cli.opam_repo $ Cli.no_auto_open)
+
+let info = Cmd.info "bistro" ~doc ~sdocs ~exits ~man ~man_xrefs
+let cmd = Cmd.v info term
 
 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli

bin/bistro.mli

@@ -6,7 +6,8 @@
 
 (** The [bistro] command. *)
 
-val cmd : int Cmdliner.Term.t * Cmdliner.Term.info
+val term : int Cmdliner.Term.t
+val cmd : int Cmdliner.Cmd.t
 
 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli

bin/check.ml

@@ -76,9 +76,11 @@ let man =
        dune-release creates the distribution tarball.";
   ]
 
-let cmd =
-  ( Term.(
-      const check $ Cli.pkg_names $ Cli.pkg_version $ Cli.dist_tag $ Cli.keep_v
-      $ Cli.build_dir $ Cli.skip_lint $ Cli.skip_build $ Cli.skip_tests
-      $ working_tree),
-    Term.info "check" ~doc ~man )
+let term =
+  Term.(
+    const check $ Cli.pkg_names $ Cli.pkg_version $ Cli.dist_tag $ Cli.keep_v
+    $ Cli.build_dir $ Cli.skip_lint $ Cli.skip_build $ Cli.skip_tests
+    $ working_tree)
+
+let info = Cmd.info "check" ~doc ~man
+let cmd = Cmd.v info term

bin/check.mli

@@ -1,3 +1,3 @@
 (** The [check] command. *)
 
-val cmd : int Cmdliner.Term.t * Cmdliner.Term.info
+val cmd : int Cmdliner.Cmd.t

bin/cli.ml

@@ -82,7 +82,7 @@ let token =
      token is provided through an environment variable."
   in
   let docv = "TOKEN" in
-  let env = Arg.env_var "DUNE_RELEASE_GITHUB_TOKEN" in
+  let env = Cmd.Env.info "DUNE_RELEASE_GITHUB_TOKEN" in
   let arg =
     Arg.(value & opt (some string) None & info [ "token" ] ~doc ~docv ~env)
   in
@@ -207,7 +207,7 @@ let user =
 
 let local_repo =
   let doc = "Location of the local fork of opam-repository" in
-  let env = Arg.env_var "DUNE_RELEASE_LOCAL_REPO" in
+  let env = Cmd.Env.info "DUNE_RELEASE_LOCAL_REPO" in
   let arg =
     Arg.(
       value
@@ -218,7 +218,7 @@ let local_repo =
 
 let remote_repo =
   let doc = "Location of the remote fork of opam-repository" in
-  let env = Arg.env_var "DUNE_RELEASE_REMOTE_REPO" in
+  let env = Cmd.Env.info "DUNE_RELEASE_REMOTE_REPO" in
   let arg =
     Arg.(
       value
@@ -233,7 +233,7 @@ let opam_repo =
      to release to a custom repo. Useful for testing purposes."
   in
   let docv = "GITHUB_USER_OR_ORG/REPO_NAME" in
-  let env = Arg.env_var "DUNE_RELEASE_OPAM_REPO" in
+  let env = Cmd.Env.info "DUNE_RELEASE_OPAM_REPO" in
   named
     (fun x -> `Opam_repo x)
     Arg.(
@@ -282,11 +282,11 @@ let setup style_renderer log_level cwd =
 
 let setup =
   let style_renderer =
-    let env = Arg.env_var "DUNE_RELEASE_COLOR" in
+    let env = Cmd.Env.info "DUNE_RELEASE_COLOR" in
     Fmt_cli.style_renderer ~docs:Manpage.s_common_options ~env ()
   in
   let log_level =
-    let env = Arg.env_var "DUNE_RELEASE_VERBOSITY" in
+    let env = Cmd.Env.info "DUNE_RELEASE_VERBOSITY" in
     Logs_cli.level ~docs:Manpage.s_common_options ~env ()
   in
   let cwd =
@@ -299,15 +299,6 @@ let setup =
   in
   Term.(ret (const setup $ style_renderer $ log_level $ cwd))
 
-(* Verbosity propagation. *)
-
-let propagate_verbosity_to_pkg_file () =
-  match Logs.level () with
-  | None -> Cmd.(v "-q")
-  | Some Logs.Info -> Cmd.(v "-v")
-  | Some Logs.Debug -> Cmd.(v "-v" % "-v")
-  | Some _ -> Cmd.empty
-
 (* Error handling *)
 
 let warn_if_vcs_dirty msg =
@@ -329,8 +320,8 @@ let handle_error = function
         r
 
 let exits =
-  Term.exit_info 3 ~doc:"on indiscriminate errors reported on stderr."
-  :: Term.default_exits
+  Cmd.Exit.info 3 ~doc:"on indiscriminate errors reported on stderr."
+  :: Cmd.Exit.defaults
 
 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli

bin/cli.mli

@@ -116,13 +116,6 @@ val setup : unit Term.t
     side effect, set {!Logs} log verbosity, adjusts colored output and sets the
     current working directory. *)
 
-(** {1 Verbosity propagation} *)
-
-val propagate_verbosity_to_pkg_file : unit -> Bos.Cmd.t
-(** [propagate_verbosity_to_pkg_file ()] is a command line fragment that has the
-    option to propagate the current log verbosity to an invocation of the
-    package description. *)
-
 (** {1 Warnings and errors} *)
 
 val warn_if_vcs_dirty : string -> (unit, R.msg) result
@@ -131,7 +124,7 @@ val warn_if_vcs_dirty : string -> (unit, R.msg) result
 val handle_error : (int, R.msg) result -> int
 (** [handle_error r] is [r]'s result or logs [r]'s error and returns [3]. *)
 
-val exits : Term.exit_info list
+val exits : Cmd.Exit.info list
 (** [exits] is are the exit codes common to all commands. *)
 
 (*---------------------------------------------------------------------------

bin/config.ml

@@ -153,10 +153,6 @@ let man =
        newly created opam-repository PR or not.";
   ]
 
-let info =
-  let doc = "Displays or update dune-release global configuration" in
-  Cmdliner.Term.info ~doc ~man "config"
-
 let action =
   let docv = "ACTION" in
   let doc =
@@ -178,5 +174,10 @@ let value =
   let doc = "The new field value" in
   Cmdliner.Arg.(value & pos 2 (some string) None & info ~doc ~docv [])
 
-let term = Cmdliner.Term.(pure run $ action $ key $ value)
-let cmd = (term, info)
+let term = Cmdliner.Term.(const run $ action $ key $ value)
+
+let info =
+  let doc = "Displays or update dune-release global configuration" in
+  Cmdliner.Cmd.info ~doc ~man "config"
+
+let cmd = Cmdliner.Cmd.v info term

bin/config.mli

@@ -1 +1 @@
-val cmd : int Cmdliner.Term.t * Cmdliner.Term.info
+val cmd : int Cmdliner.Cmd.t

bin/delegate_info.ml

@@ -21,9 +21,9 @@ let var =
   let doc = "The variable to print." in
   Arg.(required & pos 0 (some string) None & info [] ~doc ~docv:"VAR")
 
-let term = Term.(pure run $ var)
+let term = Term.(const run $ var)
 
 let info =
-  Term.info "delegate-info" ~doc:"Prints out the given variable to stdout"
+  Cmd.info "delegate-info" ~doc:"Prints out the given variable to stdout"
 
-let cmd = (term, info)
+let cmd = Cmd.v info term

bin/delegate_info.mli

@@ -1 +1 @@
-val cmd : int Cmdliner.Term.t * Cmdliner.Term.info
+val cmd : int Cmdliner.Cmd.t

bin/distrib.ml

@@ -71,12 +71,12 @@ let exits = Cli.exits
 
 let envs =
   [
-    Term.env_info "DUNE_RELEASE_BZIP2"
+    Cmd.Env.info "DUNE_RELEASE_BZIP2"
       ~doc:
         "The $(b,bzip2) tool to use to compress the\n\
         \    archive. Gets the archive on stdin and must output the result on\n\
         \    standard out.";
-    Term.env_info "DUNE_RELEASE_TAR"
+    Cmd.Env.info "DUNE_RELEASE_TAR"
       ~doc:
         "The $(b,tar) tool to use to unarchive a tbz\n\
         \    archive (archive creation itself is handled by dune-release).";
@@ -136,12 +136,14 @@ let man =
          relies on bzip2 to be a reproducible function across platforms." );
   ]
 
-let cmd =
-  ( Term.(
-      pure distrib_cli $ Cli.setup $ Cli.dry_run $ Cli.build_dir $ Cli.pkg_names
-      $ Cli.pkg_version $ Cli.dist_tag $ Cli.keep_v $ Cli.keep_build_dir
-      $ Cli.skip_lint $ Cli.skip_build $ Cli.skip_tests $ Cli.include_submodules),
-    Term.info "distrib" ~doc ~sdocs ~exits ~envs ~man ~man_xrefs )
+let term =
+  Term.(
+    const distrib_cli $ Cli.setup $ Cli.dry_run $ Cli.build_dir $ Cli.pkg_names
+    $ Cli.pkg_version $ Cli.dist_tag $ Cli.keep_v $ Cli.keep_build_dir
+    $ Cli.skip_lint $ Cli.skip_build $ Cli.skip_tests $ Cli.include_submodules)
+
+let info = Cmd.info "distrib" ~doc ~sdocs ~exits ~envs ~man ~man_xrefs
+let cmd = Cmd.v info term
 
 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli

bin/distrib.mli

@@ -37,7 +37,7 @@ val distrib :
 
 (** The [distrib] command. *)
 
-val cmd : int Cmdliner.Term.t * Cmdliner.Term.info
+val cmd : int Cmdliner.Cmd.t
 
 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli

bin/help.ml

@@ -445,9 +445,9 @@ let man =
     `P "Use `topics' as $(i,TOPIC) to get a list of topics.";
   ]
 
-let cmd =
-  ( Term.(ret (const help $ Term.man_format $ topic $ Term.choice_names)),
-    Term.info "help" ~doc ~exits ~man ~man_xrefs )
+let term = Term.(ret (const help $ Arg.man_format $ topic $ Term.choice_names))
+let info = Cmd.info "help" ~doc ~exits ~man ~man_xrefs
+let cmd = Cmd.v info term
 
 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli

bin/help.mli

@@ -6,7 +6,7 @@
 
 (** The [help] command. *)
 
-val cmd : int Cmdliner.Term.t * Cmdliner.Term.info
+val cmd : int Cmdliner.Cmd.t
 
 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli

bin/lint.ml

@@ -35,7 +35,7 @@ let lints =
 
 let doc = "Check package distribution consistency and conventions"
 let sdocs = Manpage.s_common_options
-let exits = Term.exit_info 1 ~doc:"on lint failure" :: Cli.exits
+let exits = Cmd.Exit.info 1 ~doc:"on lint failure" :: Cli.exits
 let man_xrefs = [ `Main; `Cmd "distrib" ]
 
 let man =
@@ -52,11 +52,13 @@ let man =
        dune-release-distrib(1) for more details.";
   ]
 
-let cmd =
-  ( Term.(
-      pure lint $ Cli.setup $ Cli.dry_run $ Cli.pkg_names $ Cli.pkg_version
-      $ Cli.dist_tag $ Cli.keep_v $ lints),
-    Term.info "lint" ~doc ~sdocs ~exits ~man ~man_xrefs )
+let term =
+  Term.(
+    const lint $ Cli.setup $ Cli.dry_run $ Cli.pkg_names $ Cli.pkg_version
+    $ Cli.dist_tag $ Cli.keep_v $ lints)
+
+let info = Cmd.info "lint" ~doc ~sdocs ~exits ~man ~man_xrefs
+let cmd = Cmd.v info term
 
 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli

bin/lint.mli

@@ -6,7 +6,7 @@
 
 (** The [lint] command. *)
 
-val cmd : int Cmdliner.Term.t * Cmdliner.Term.info
+val cmd : int Cmdliner.Cmd.t
 
 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli

bin/main.ml

@@ -46,10 +46,11 @@ let man =
   ]
 
 let main =
-  ( fst Bistro.cmd,
-    Term.info "dune-release" ~version:"%%VERSION%%" ~doc ~sdocs ~exits ~man )
+  Cmd.group ~default:Bistro.term
+    (Cmd.info "dune-release" ~version:"%%VERSION%%" ~doc ~sdocs ~exits ~man)
+    cmds
 
-let main () = Term.(exit_status @@ eval_choice main cmds)
+let main () = Stdlib.exit @@ Cmd.eval' main
 let () = main ()
 
 (*---------------------------------------------------------------------------

bin/opam.ml

@@ -399,18 +399,18 @@ let man =
         "outputs the field $(i,FIELD) of the package's opam file." );
   ]
 
-let cmd =
-  let info = Term.info "opam" ~doc ~sdocs ~envs ~man ~man_xrefs in
-  let t =
-    Term.(
-      pure opam_cli $ Cli.setup $ Cli.dry_run $ Cli.build_dir $ Cli.local_repo
-      $ Cli.remote_repo $ Cli.opam_repo $ Cli.user $ Cli.keep_v $ Cli.dist_opam
-      $ Cli.dist_uri $ Cli.dist_file $ Cli.dist_tag $ Cli.pkg_names
-      $ Cli.pkg_version $ pkg_descr $ Cli.readme $ Cli.change_log
-      $ Cli.publish_msg $ action $ field_arg $ Cli.no_auto_open $ Cli.yes
-      $ Cli.token $ Cli.draft)
-  in
-  (t, info)
+let info = Cmd.info "opam" ~doc ~sdocs ~envs ~man ~man_xrefs
+
+let term =
+  Term.(
+    const opam_cli $ Cli.setup $ Cli.dry_run $ Cli.build_dir $ Cli.local_repo
+    $ Cli.remote_repo $ Cli.opam_repo $ Cli.user $ Cli.keep_v $ Cli.dist_opam
+    $ Cli.dist_uri $ Cli.dist_file $ Cli.dist_tag $ Cli.pkg_names
+    $ Cli.pkg_version $ pkg_descr $ Cli.readme $ Cli.change_log
+    $ Cli.publish_msg $ action $ field_arg $ Cli.no_auto_open $ Cli.yes
+    $ Cli.token $ Cli.draft)
+
+let cmd = Cmd.v info term
 
 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli

bin/opam.mli

@@ -69,7 +69,7 @@ val field :
 
 (** The [opam] command. *)
 
-val cmd : int Cmdliner.Term.t * Cmdliner.Term.info
+val cmd : int Cmdliner.Cmd.t
 
 (*---------------------------------------------------------------------------
    Copyright (c) 2016 Daniel C. Bünzli