rgrinberg · rgrinberg · Jan 10, 2021
diff --git a/dune-project b/dune-project
@@ -14,8 +14,6 @@
 
 (source (github rgrinberg/ocaml-mustache))
 
-
-
 (generate_opam_files true)
 
 (package
@@ -26,9 +24,21 @@ Read and write mustache templates, and render them by providing a json object.
 Contains the `mustache` command line utility for driving logic-less templates.
 ")
  (depends
-  (jsonm (>= 1.0.1))
   (ounit :with-test)
   (ezjsonm :with-test)
   (menhir (>= 20180703))
+  (ocaml (>= 4.08))))
+
+(package
+ (name mustache-cli)
+ (synopsis "Mustache logic-less templates in OCaml")
+ (description "
+Read and write mustache templates, and render them by providing a json object.
+Contains the `mustache` command line utility for driving logic-less templates.
+")
+ (depends
+  (mustache (= :version))
+  (ounit :with-test)
+  (ezjsonm :with-test)
   (cmdliner (>= 1.0.4))
   (ocaml (>= 4.08))))
diff --git a/mustache-cli.opam b/mustache-cli.opam
@@ -0,0 +1,41 @@
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+synopsis: "Mustache logic-less templates in OCaml"
+description: """
+
+Read and write mustache templates, and render them by providing a json object.
+Contains the `mustache` command line utility for driving logic-less templates.
+"""
+maintainer: ["Rudi Grinberg <me@rgrinerg.com>"]
+authors: [
+  "Rudi Grinberg <me@rgrinberg.com>"
+  "Armaël Guéneau <armael.gueneau@ens-lyon.fr>"
+  "Gabriel Scherer <gabriel.scherer@gmail.com>"
+]
+license: "MIT"
+homepage: "https://github.com/rgrinberg/ocaml-mustache"
+bug-reports: "https://github.com/rgrinberg/ocaml-mustache/issues"
+depends: [
+  "dune" {>= "2.7"}
+  "mustache" {= version}
+  "ounit" {with-test}
+  "ezjsonm" {with-test}
+  "cmdliner" {>= "1.0.4"}
+  "ocaml" {>= "4.08"}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/rgrinberg/ocaml-mustache.git"
diff --git a/bin/dune → mustache-cli/dune b/bin/dune → mustache-cli/dune
@@ -1,7 +1,7 @@
 (executable
  (name mustache_cli)
  (public_name mustache)
- (modules mustache_cli)
+ (package mustache-cli)
  (libraries mustache jsonm cmdliner))
 
 (rule

diff --git a/bin/mustache_cli.ml → mustache-cli/mustache_cli.ml b/bin/mustache_cli.ml → mustache-cli/mustache_cli.ml
diff --git a/bin/test/dune → mustache-cli/test/dune b/bin/test/dune → mustache-cli/test/dune
diff --git a/bin/test/errors/dune → mustache-cli/test/errors/dune b/bin/test/errors/dune → mustache-cli/test/errors/dune
diff --git a/bin/test/errors/json-errors.t → mustache-cli/test/errors/json-errors.t b/bin/test/errors/json-errors.t → mustache-cli/test/errors/json-errors.t
diff --git a/bin/test/errors/parsing-errors.t → mustache-cli/test/errors/parsing-errors.t b/bin/test/errors/parsing-errors.t → mustache-cli/test/errors/parsing-errors.t
diff --git a/...ender-errors.t/invalid-dotted-name-1.json → ...ender-errors.t/invalid-dotted-name-1.json b/...ender-errors.t/invalid-dotted-name-1.json → ...ender-errors.t/invalid-dotted-name-1.json
diff --git a/...r-errors.t/invalid-dotted-name-1.mustache → ...r-errors.t/invalid-dotted-name-1.mustache b/...r-errors.t/invalid-dotted-name-1.mustache → ...r-errors.t/invalid-dotted-name-1.mustache
diff --git a/...ender-errors.t/invalid-dotted-name-2.json → ...ender-errors.t/invalid-dotted-name-2.json b/...ender-errors.t/invalid-dotted-name-2.json → ...ender-errors.t/invalid-dotted-name-2.json
diff --git a/...r-errors.t/invalid-dotted-name-2.mustache → ...r-errors.t/invalid-dotted-name-2.mustache b/...r-errors.t/invalid-dotted-name-2.mustache → ...r-errors.t/invalid-dotted-name-2.mustache
diff --git a/...rors/render-errors.t/missing-section.json → ...rors/render-errors.t/missing-section.json b/...rors/render-errors.t/missing-section.json → ...rors/render-errors.t/missing-section.json
diff --git a/.../render-errors.t/missing-section.mustache → .../render-errors.t/missing-section.mustache b/.../render-errors.t/missing-section.mustache → .../render-errors.t/missing-section.mustache
diff --git a/...ors/render-errors.t/missing-variable.json → ...ors/render-errors.t/missing-variable.json b/...ors/render-errors.t/missing-variable.json → ...ors/render-errors.t/missing-variable.json
diff --git a/...render-errors.t/missing-variable.mustache → ...render-errors.t/missing-variable.mustache b/...render-errors.t/missing-variable.mustache → ...render-errors.t/missing-variable.mustache
diff --git a/...st/errors/render-errors.t/non-scalar.json → ...st/errors/render-errors.t/non-scalar.json b/...st/errors/render-errors.t/non-scalar.json → ...st/errors/render-errors.t/non-scalar.json
diff --git a/...rrors/render-errors.t/non-scalar.mustache → ...rrors/render-errors.t/non-scalar.mustache b/...rrors/render-errors.t/non-scalar.mustache → ...rrors/render-errors.t/non-scalar.mustache
diff --git a/...est/errors/render-errors.t/reference.json → ...est/errors/render-errors.t/reference.json b/...est/errors/render-errors.t/reference.json → ...est/errors/render-errors.t/reference.json
diff --git a/...errors/render-errors.t/reference.mustache → ...errors/render-errors.t/reference.mustache b/...errors/render-errors.t/reference.mustache → ...errors/render-errors.t/reference.mustache
diff --git a/bin/test/errors/render-errors.t/run.t → ...che-cli/test/errors/render-errors.t/run.t b/bin/test/errors/render-errors.t/run.t → ...che-cli/test/errors/render-errors.t/run.t
diff --git a/...ender-errors.t/z-missing-partial.mustache → ...ender-errors.t/z-missing-partial.mustache b/...ender-errors.t/z-missing-partial.mustache → ...ender-errors.t/z-missing-partial.mustache
diff --git a/bin/test/errors/sys-errors.t → mustache-cli/test/errors/sys-errors.t b/bin/test/errors/sys-errors.t → mustache-cli/test/errors/sys-errors.t
diff --git a/bin/test/inheritance.t/base.mustache → ...ache-cli/test/inheritance.t/base.mustache b/bin/test/inheritance.t/base.mustache → ...ache-cli/test/inheritance.t/base.mustache
diff --git a/bin/test/inheritance.t/header.mustache → ...he-cli/test/inheritance.t/header.mustache b/bin/test/inheritance.t/header.mustache → ...he-cli/test/inheritance.t/header.mustache
diff --git a/bin/test/inheritance.t/mypage.mustache → ...he-cli/test/inheritance.t/mypage.mustache b/bin/test/inheritance.t/mypage.mustache → ...he-cli/test/inheritance.t/mypage.mustache
diff --git a/bin/test/inheritance.t/run.t → mustache-cli/test/inheritance.t/run.t b/bin/test/inheritance.t/run.t → mustache-cli/test/inheritance.t/run.t
diff --git a/...t/inheritance.t/test-indent-less.mustache → ...t/inheritance.t/test-indent-less.mustache b/...t/inheritance.t/test-indent-less.mustache → ...t/inheritance.t/test-indent-less.mustache
diff --git a/...t/inheritance.t/test-indent-more.mustache → ...t/inheritance.t/test-indent-more.mustache b/...t/inheritance.t/test-indent-more.mustache → ...t/inheritance.t/test-indent-more.mustache
diff --git a/...t/inheritance.t/test-indentation.mustache → ...t/inheritance.t/test-indentation.mustache b/...t/inheritance.t/test-indentation.mustache → ...t/inheritance.t/test-indentation.mustache
diff --git a/bin/test/manpage-examples.t/data.json → ...che-cli/test/manpage-examples.t/data.json b/bin/test/manpage-examples.t/data.json → ...che-cli/test/manpage-examples.t/data.json
diff --git a/bin/test/manpage-examples.t/hello.mustache → ...li/test/manpage-examples.t/hello.mustache b/bin/test/manpage-examples.t/hello.mustache → ...li/test/manpage-examples.t/hello.mustache
diff --git a/bin/test/manpage-examples.t/new-post.json → ...cli/test/manpage-examples.t/new-post.json b/bin/test/manpage-examples.t/new-post.json → ...cli/test/manpage-examples.t/new-post.json
diff --git a/...t/manpage-examples.t/page-layout.mustache → ...t/manpage-examples.t/page-layout.mustache b/...t/manpage-examples.t/page-layout.mustache → ...t/manpage-examples.t/page-layout.mustache
diff --git a/bin/test/manpage-examples.t/page.mustache → ...cli/test/manpage-examples.t/page.mustache b/bin/test/manpage-examples.t/page.mustache → ...cli/test/manpage-examples.t/page.mustache
diff --git a/bin/test/manpage-examples.t/post.mustache → ...cli/test/manpage-examples.t/post.mustache b/bin/test/manpage-examples.t/post.mustache → ...cli/test/manpage-examples.t/post.mustache
diff --git a/bin/test/manpage-examples.t/run.t → mustache-cli/test/manpage-examples.t/run.t b/bin/test/manpage-examples.t/run.t → mustache-cli/test/manpage-examples.t/run.t
diff --git a/bin/test/partials.t/bar.mustache → mustache-cli/test/partials.t/bar.mustache b/bin/test/partials.t/bar.mustache → mustache-cli/test/partials.t/bar.mustache
diff --git a/bin/test/partials.t/data.json → mustache-cli/test/partials.t/data.json b/bin/test/partials.t/data.json → mustache-cli/test/partials.t/data.json
diff --git a/bin/test/partials.t/foo.mustache → mustache-cli/test/partials.t/foo.mustache b/bin/test/partials.t/foo.mustache → mustache-cli/test/partials.t/foo.mustache
diff --git a/bin/test/partials.t/run.t → mustache-cli/test/partials.t/run.t b/bin/test/partials.t/run.t → mustache-cli/test/partials.t/run.t
diff --git a/mustache.opam b/mustache.opam
@@ -17,11 +17,9 @@ homepage: "https://github.com/rgrinberg/ocaml-mustache"
 bug-reports: "https://github.com/rgrinberg/ocaml-mustache/issues"
 depends: [
   "dune" {>= "2.7"}
-  "jsonm" {>= "1.0.1"}
   "ounit" {with-test}
   "ezjsonm" {with-test}
   "menhir" {>= "20180703"}
-  "cmdliner" {>= "1.0.4"}
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]

diff --git a/examples/dune → mustache/examples/dune b/examples/dune → mustache/examples/dune
@@ -1,4 +1,3 @@
 (executable
  (name mustache_example)
- (modules mustache_example)
  (libraries mustache ezjsonm))
diff --git a/examples/mustache_example.ml → mustache/examples/mustache_example.ml b/examples/mustache_example.ml → mustache/examples/mustache_example.ml
diff --git a/lib/dune → mustache/lib/dune b/lib/dune → mustache/lib/dune
diff --git a/lib/mustache.ml → mustache/lib/mustache.ml b/lib/mustache.ml → mustache/lib/mustache.ml
diff --git a/lib/mustache.mli → mustache/lib/mustache.mli b/lib/mustache.mli → mustache/lib/mustache.mli
diff --git a/lib/mustache_lexer.mll → mustache/lib/mustache_lexer.mll b/lib/mustache_lexer.mll → mustache/lib/mustache_lexer.mll
diff --git a/lib/mustache_parser.mly → mustache/lib/mustache_parser.mly b/lib/mustache_parser.mly → mustache/lib/mustache_parser.mly
diff --git a/lib/mustache_types.ml → mustache/lib/mustache_types.ml b/lib/mustache_types.ml → mustache/lib/mustache_types.ml
diff --git a/lib_test/compat/dune → mustache/lib_test/compat/dune b/lib_test/compat/dune → mustache/lib_test/compat/dune
diff --git a/lib_test/compat/mustache_v200.ml → mustache/lib_test/compat/mustache_v200.ml b/lib_test/compat/mustache_v200.ml → mustache/lib_test/compat/mustache_v200.ml
diff --git a/lib_test/compat/mustache_v200.mli → mustache/lib_test/compat/mustache_v200.mli b/lib_test/compat/mustache_v200.mli → mustache/lib_test/compat/mustache_v200.mli
diff --git a/lib_test/compat/user_program.expected → ...che/lib_test/compat/user_program.expected b/lib_test/compat/user_program.expected → ...che/lib_test/compat/user_program.expected
diff --git a/lib_test/compat/user_program.ml → mustache/lib_test/compat/user_program.ml b/lib_test/compat/user_program.ml → mustache/lib_test/compat/user_program.ml
diff --git a/lib_test/dune → mustache/lib_test/dune b/lib_test/dune → mustache/lib_test/dune
diff --git a/lib_test/spec_mustache.ml → mustache/lib_test/spec_mustache.ml b/lib_test/spec_mustache.ml → mustache/lib_test/spec_mustache.ml
diff --git a/lib_test/test_mustache.ml → mustache/lib_test/test_mustache.ml b/lib_test/test_mustache.ml → mustache/lib_test/test_mustache.ml
diff --git a/specs/VERSION → mustache/specs/VERSION b/specs/VERSION → mustache/specs/VERSION
diff --git a/specs/comments.json → mustache/specs/comments.json b/specs/comments.json → mustache/specs/comments.json
diff --git a/specs/comments.yml → mustache/specs/comments.yml b/specs/comments.yml → mustache/specs/comments.yml
diff --git a/specs/inheritance.json → mustache/specs/inheritance.json b/specs/inheritance.json → mustache/specs/inheritance.json
diff --git a/specs/inheritance.yml → mustache/specs/inheritance.yml b/specs/inheritance.yml → mustache/specs/inheritance.yml
diff --git a/specs/interpolation.json → mustache/specs/interpolation.json b/specs/interpolation.json → mustache/specs/interpolation.json
diff --git a/specs/interpolation.yml → mustache/specs/interpolation.yml b/specs/interpolation.yml → mustache/specs/interpolation.yml
diff --git a/specs/inverted.json → mustache/specs/inverted.json b/specs/inverted.json → mustache/specs/inverted.json
diff --git a/specs/inverted.yml → mustache/specs/inverted.yml b/specs/inverted.yml → mustache/specs/inverted.yml
diff --git a/specs/partials.json → mustache/specs/partials.json b/specs/partials.json → mustache/specs/partials.json
diff --git a/specs/partials.yml → mustache/specs/partials.yml b/specs/partials.yml → mustache/specs/partials.yml
diff --git a/specs/sections.json → mustache/specs/sections.json b/specs/sections.json → mustache/specs/sections.json
diff --git a/specs/sections.yml → mustache/specs/sections.yml b/specs/sections.yml → mustache/specs/sections.yml
diff --git a/test/args.json → mustache/test/args.json b/test/args.json → mustache/test/args.json
diff --git a/test/templ1.html → mustache/test/templ1.html b/test/templ1.html → mustache/test/templ1.html