Drop Reason and Esy support (#112)

* Drop Reason and Esy support

* Remove generators

* Update changelog

* Hide subprocesses output in non-verbose mode

* Update CI scripts

* Update roadmap

* Increase timeout

* Vendor inquire

* Update CI

* Update demo

* Default to TCSANOW to change term attributes

Author: tmattio

.gitattributes

@@ -2,9 +2,6 @@
 *.ml linguist-language=OCaml
 *.mli linguist-language=OCaml
 
-# Disable syntax detection for .spin
-.spin linguist-language=Text
-
 # Disable syntax detection for cram tests
 *.t linguist-language=Text
 

.github/workflows/ci.yml

@@ -17,7 +17,6 @@ jobs:
         os:
           - macos-latest
           - ubuntu-latest
-          - windows-latest
 
         ocaml-compiler:
           - 4.12.x
@@ -34,7 +33,6 @@ jobs:
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
           dune-cache: ${{ matrix.os != 'macos-latest' }}
-          opam-depext-flags: --with-test
 
       - name: Install ocamlformat
         run: opam install ocamlformat.0.18.0

.github/workflows/release.yml

@@ -29,7 +29,6 @@ jobs:
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
           dune-cache: ${{ matrix.os != 'macos-latest' }}
-          opam-depext-flags: --with-test
 
       - name: Use Node.js 12.x
         if: ${{ matrix.os == 'ubuntu-latest' }}

.gitignore

@@ -1,15 +1,11 @@
-# ocamlbuild working directory
+# Dune generated files
 _build/
-
-# ocamlbuild targets
-*.byte
-*.native
+*.install
 
 # Merlin configuring file for Vim and Emacs
 .merlin
 
-# Dune generated files
-*.install
-
 # Local OPAM switch
-_opam/
+_opam/
+
+_generated*/

CHANGES.md

@@ -4,13 +4,14 @@
 
 - Added a `parse_binaries` stanza that can be `true` to force Spin to parse binary files
 - Added a `raw_files` stanza that takes a list of file or glob expressions to instruct Spin to copy files instead of parsing them
-- A lock file is now generated for Opam projects
-- Added `ocaml-lsp-server` in `esy.json` files
 - Added a new `c-bindings` template for C bindings using `ctypes`
 - Added a new `js` template for javascript applications with `js_of_ocaml`
 
 ## Changed
 
+- Removed the `gen` subcommand. The generators will come back with a much better workflow
+- Dropped support for Esy and Reason. The templates are now using the recommended OCaml setup only. The previous templates are hosted at https://github.com/ocaml-templates/
+- Changed the templates to use the `ISC` license
 - Increase version of `ocamlformat` to `0.18.0` in templates
 - Do not install merlin when installing dev dependencies in templates
 - Drop support for BuckleScript in PPX
@@ -19,7 +20,7 @@
 - Remove python dependency to serve documentation in Makefile
 - Inline release script in Makefile
 - Remove global `-open StdLabels` in templates
-- The `spa` template has been removed from the official templates and now lives at https://github.com/tmattio/spin-incr-dom
+- The `spa` template has been removed from the official templates and now lives at https://github.com/ocaml-templates/spin-incr-dom
 - Spin does not parse binary files by default anymore, they are simply copied to the destination folder
 - Use `test` stanza for unit tests now that Alcotest prints colors by default
 - Remove unused flags defined in the root's `dune` file
@@ -122,7 +123,7 @@ Since the beginning of the project, a lot of learnings have been made and this n
 
 ## Added
 
-- Support user configuration file that stores general configuration such as the user's name, Github username, etc.
+- Support user configuration file that stores general configuration such as the user's name, Github author_name, etc.
 - Provide a `config` subcommand that can be used to change the user configuration.
 - The generators can now print a message when the generation succeeds with the `message` stanza.
 

LICENSE

@@ -1,7 +1,15 @@
-Copyright 2019 Thibaut Mattio
+ISC License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Copyright (c) 2021 Thibaut Mattio
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

Makefile

@@ -31,8 +31,8 @@ test: ## Run the unit tests
 	opam exec -- dune build --root . @test/runtest
 	opam exec -- dune build --root . @test_bin/runtest
 
-.PHONY: test-template
-test-template: ## Run the template integration tests
+.PHONY: test-templates
+test-templates: ## Run the template integration tests
 	opam exec -- dune build --root . @test_template/runtest -f -j 1
 
 .PHONY: clean

README.md

@@ -1,7 +1,7 @@
 <p align="center">
     <img width="300" src="https://raw.githubusercontent.com/tmattio/spin/master/doc/logo.svg?sanitize=true" alt="Logo">
   	<br><br>
-    Reason and OCaml project generator.
+    OCaml project generator.
 </p>
 
 
@@ -33,7 +33,7 @@
 
 🚀 Quickly start new projects that are ready for the real world.
 
-❤️ Have a great developer experience when developing with Reason/OCaml.
+❤️ Have a great developer experience when developing with OCaml.
 
 🏄 Be as productive as Ruby-on-Rails or Elixir's Mix users.
 
@@ -84,13 +84,12 @@ The official Spin templates templates are the following:
 
 If you'd like to add an official template, don't hesitate to open a PR!
 
-### Other Reason/OCaml templates
+### Other OCaml templates
+
+You can find community Spin templates for various projects here: [https://github.com/ocaml-templates](https://github.com/ocaml-templates)
 
 Here are some non-official Spin templates that you can use:
 
-- [**spin-rescript**](https://github.com/tmattio/spin-rescript) - Spin template for ReScript applications
-- [**spin-jsoo-react**](https://github.com/tmattio/spin-jsoo-react) - Spin template for React applications with Js_of_ocaml
-- [**spin-incr-dom**](https://github.com/tmattio/spin-incr-dom) - Single page application with Js_of_ocaml using Incr_dom
 - [**spin-sihl**](https://github.com/oxidizing/spin-sihl) - Spin template for [Sihl](https://github.com/oxidizing/sihl) applications
 
 ### Other non-OCaml templates
@@ -117,14 +116,6 @@ When `--ignore-config` is passed, the configuration file will be ignored and the
 
 List the official Spin templates.
 
-### `spin gen`
-
-List the generators available for the current project.
-
-### `spin gen GENERATOR`
-
-Generate a new component in the current project.
-
 ### `spin config`
 
 Prompt the user for values that can be saved in the configuration file.
@@ -137,11 +128,8 @@ See our [development board](https://github.com/tmattio/spin/projects/1) for a li
 
 Here are some of the improvements we'll be working on as well in for next releases:
 
-- [ ] Add cram tests to CI
-- [ ] Support Opam 2.0.X (add to CI)
 - [ ] Support windows
 - [ ] Support CLI options/args for configurations
-- [ ] Extract current templates in community templates, and drop support for Reason/Esy
 - [ ] Minimal `hello` template
 - [ ] Generators for `lib/bin/test` for all templates
 
@@ -153,7 +141,7 @@ Take a look at our [Contributing Guide](CONTRIBUTING.md) to get started.
 
 ## License
 
-Distributed under the MIT License. See [LICENSE](LICENSE) for more information.
+Distributed under the ISC License. See [LICENSE](LICENSE) for more information.
 
 ## Acknowledgements
 

bin/commands/cmd_gen.ml

@@ -75,8 +75,6 @@ let spin_error_to_code = function
     6
   | `Failed_to_generate _ ->
     7
-  | `Generator_error _ ->
-    8
 
 let handle_errors = function
   | Ok () ->
@@ -94,6 +92,4 @@ let exits =
   ::
   Term.exit_info 6 ~doc:"on invalid spin template."
   ::
-  Term.exit_info 7 ~doc:"on failure to generate project."
-  ::
-  Term.exit_info 8 ~doc:"on failure to run a generator." :: Term.default_exits
+  Term.exit_info 7 ~doc:"on failure to generate project." :: Term.default_exits

bin/common.ml

@@ -2,12 +2,12 @@ open Cmdliner
 
 let () = Printexc.record_backtrace true
 
-let cmds = [ Cmd_config.cmd; Cmd_gen.cmd; Cmd_ls.cmd; Cmd_new.cmd ]
+let cmds = [ Cmd_config.cmd; Cmd_ls.cmd; Cmd_new.cmd ]
 
 let run () =
   let message =
     {|
-Generate Reason and OCaml projects.
+Generate OCaml projects.
 
 Usage:
   spin COMMAND
@@ -32,7 +32,7 @@ Use `spin COMMAND --help` for help on a single command.|}
 
 (* Command line interface *)
 
-let doc = "Generate Reason and OCaml projects"
+let doc = "Generate OCaml projects"
 
 let sdocs = Manpage.s_common_options
 
@@ -42,7 +42,7 @@ let envs = Common.envs
 
 let man =
   [ `S Manpage.s_description
-  ; `P "$(mname) helps to bootstrap Reason and OCaml projects."
+  ; `P "$(mname) helps to bootstrap OCaml projects."
   ; `P
       "It can generate new projects from local or remote templates, and \
        generate components in existing projects."

bin/main.ml

@@ -58,52 +58,6 @@ prompted for configuration that have been saved.
 
     Run as if spin was started in `PATH` instead of the current directory.
 
-## `gen`
-
-```
-spin gen [OPTION]... [GENERATOR]
-```
-
-### Description
-
-`gen` generates new files in the current project if a generator is
-provided, or list the available generators for the current project if
-not.
-
-`gen` assumes it is run in a project generated with `new`, it will
-read the source template of the project from the file `.spin` located
-at the root of the project. If the source is not a local directory and
-cannot be found in the cache, it will be downloaded before the
-generator is run.
-
-If the provided generator exists in the source template, the user will
-be prompted for the configurations of the generator and the generator
-will be run at the root of the project.
-
-### Arguments
-
-- `GENERATOR`
-
-    The generator to use. If absent, list the available generators for
-    the current project.
-
-### Options
-
-- `-C PATH`
-
-    Run as if spin was started in PATH instead of the current
-    directory.
-
-- `-d, --default`
-
-    Use default values without prompting when the configuration has a
-    default value.
-
-- `--ignore-config`
-
-    Prompt for values regardless of whether they are in the user's
-    configuration file.
-
 ## `ls`
 
 ```