From b67f694e857503a2fa660b02b7769d9d2f47094d Mon Sep 17 00:00:00 2001 From: Alexandre Terrasa Date: Fri, 22 Jun 2018 00:05:13 -0400 Subject: [PATCH] src/doc/commands/templates: move `commands_json` to `json_commands` Signed-off-by: Alexandre Terrasa --- src/doc/commands/commands_docdown.nit | 2 +- .../{commands/commands_md.nit => templates/md_commands.nit} | 2 +- .../tests/test_md_commands.nit} | 4 ++-- .../tests/test_md_commands.sav}/test_cmd_ancestors.res | 0 .../tests/test_md_commands.sav}/test_cmd_call.res | 0 .../tests/test_md_commands.sav}/test_cmd_children.res | 0 .../tests/test_md_commands.sav}/test_cmd_comment.res | 0 .../tests/test_md_commands.sav}/test_cmd_descendants.res | 0 .../tests/test_md_commands.sav}/test_cmd_entity.res | 0 .../tests/test_md_commands.sav}/test_cmd_features.res | 0 .../tests/test_md_commands.sav}/test_cmd_ini_clone.res | 0 .../tests/test_md_commands.sav}/test_cmd_ini_contrib_file.res | 0 .../test_cmd_ini_contrib_file_content.res | 0 .../tests/test_md_commands.sav}/test_cmd_ini_contributors.res | 0 .../tests/test_md_commands.sav}/test_cmd_ini_desc.res | 0 .../tests/test_md_commands.sav}/test_cmd_ini_git.res | 0 .../tests/test_md_commands.sav}/test_cmd_ini_issues.res | 0 .../tests/test_md_commands.sav}/test_cmd_ini_license.res | 0 .../tests/test_md_commands.sav}/test_cmd_ini_license_file.res | 0 .../test_cmd_ini_license_file_content.res | 0 .../tests/test_md_commands.sav}/test_cmd_ini_maintainer.res | 0 .../tests/test_md_commands.sav}/test_cmd_lin.res | 0 .../tests/test_md_commands.sav}/test_cmd_link.res | 0 .../tests/test_md_commands.sav}/test_cmd_main_compile.res | 0 .../tests/test_md_commands.sav}/test_cmd_mains.res | 0 .../tests/test_md_commands.sav}/test_cmd_man_options.res | 0 .../tests/test_md_commands.sav}/test_cmd_man_synopsis.res | 0 .../tests/test_md_commands.sav}/test_cmd_mentities.res | 0 .../tests/test_md_commands.sav}/test_cmd_new.res | 0 .../tests/test_md_commands.sav}/test_cmd_param.res | 0 .../tests/test_md_commands.sav}/test_cmd_parents.res | 0 .../tests/test_md_commands.sav}/test_cmd_return.res | 0 .../tests/test_md_commands.sav}/test_cmd_search.res | 0 .../tests/test_md_commands.sav}/test_cmd_testing.res | 0 src/doc/term/term.nit | 1 + 35 files changed, 5 insertions(+), 4 deletions(-) rename src/doc/{commands/commands_md.nit => templates/md_commands.nit} (99%) rename src/doc/{commands/tests/test_commands_md.nit => templates/tests/test_md_commands.nit} (98%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_ancestors.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_call.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_children.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_comment.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_descendants.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_entity.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_features.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_ini_clone.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_ini_contrib_file.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_ini_contrib_file_content.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_ini_contributors.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_ini_desc.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_ini_git.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_ini_issues.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_ini_license.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_ini_license_file.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_ini_license_file_content.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_ini_maintainer.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_lin.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_link.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_main_compile.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_mains.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_man_options.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_man_synopsis.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_mentities.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_new.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_param.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_parents.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_return.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_search.res (100%) rename src/doc/{commands/tests/test_commands_md.sav => templates/tests/test_md_commands.sav}/test_cmd_testing.res (100%) diff --git a/src/doc/commands/commands_docdown.nit b/src/doc/commands/commands_docdown.nit index 1699454ab9..ece9daec3e 100644 --- a/src/doc/commands/commands_docdown.nit +++ b/src/doc/commands/commands_docdown.nit @@ -15,7 +15,7 @@ # Doc down related queries module commands_docdown -import commands_md +import templates::md_commands import markdown # Retrieve the MDoc summary diff --git a/src/doc/commands/commands_md.nit b/src/doc/templates/md_commands.nit similarity index 99% rename from src/doc/commands/commands_md.nit rename to src/doc/templates/md_commands.nit index f8dee5b2d1..4c004c7a97 100644 --- a/src/doc/commands/commands_md.nit +++ b/src/doc/templates/md_commands.nit @@ -13,7 +13,7 @@ # limitations under the License. # Render commands results as Markdown -module commands_md +module md_commands import commands_catalog import commands_graph diff --git a/src/doc/commands/tests/test_commands_md.nit b/src/doc/templates/tests/test_md_commands.nit similarity index 98% rename from src/doc/commands/tests/test_commands_md.nit rename to src/doc/templates/tests/test_md_commands.nit index 031e21e636..de7d65597b 100644 --- a/src/doc/commands/tests/test_commands_md.nit +++ b/src/doc/templates/tests/test_md_commands.nit @@ -12,11 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -module test_commands_md is test +module test_md_commands is test import test_commands intrude import doc::commands::commands_main -import doc::commands::commands_md +import md_commands class TestCommandsMd super TestCommands diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_ancestors.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_ancestors.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_ancestors.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_ancestors.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_call.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_call.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_call.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_call.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_children.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_children.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_children.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_children.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_comment.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_comment.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_comment.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_comment.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_descendants.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_descendants.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_descendants.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_descendants.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_entity.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_entity.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_entity.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_entity.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_features.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_features.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_features.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_features.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_clone.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_clone.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_clone.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_clone.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_contrib_file.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_contrib_file.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_contrib_file.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_contrib_file.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_contrib_file_content.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_contrib_file_content.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_contrib_file_content.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_contrib_file_content.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_contributors.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_contributors.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_contributors.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_contributors.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_desc.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_desc.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_desc.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_desc.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_git.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_git.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_git.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_git.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_issues.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_issues.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_issues.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_issues.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_license.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_license.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_license.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_license.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_license_file.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_license_file.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_license_file.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_license_file.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_license_file_content.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_license_file_content.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_license_file_content.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_license_file_content.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_maintainer.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_maintainer.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_ini_maintainer.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_ini_maintainer.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_lin.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_lin.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_lin.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_lin.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_link.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_link.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_link.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_link.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_main_compile.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_main_compile.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_main_compile.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_main_compile.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_mains.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_mains.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_mains.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_mains.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_man_options.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_man_options.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_man_options.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_man_options.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_man_synopsis.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_man_synopsis.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_man_synopsis.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_man_synopsis.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_mentities.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_mentities.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_mentities.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_mentities.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_new.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_new.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_new.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_new.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_param.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_param.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_param.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_param.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_parents.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_parents.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_parents.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_parents.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_return.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_return.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_return.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_return.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_search.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_search.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_search.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_search.res diff --git a/src/doc/commands/tests/test_commands_md.sav/test_cmd_testing.res b/src/doc/templates/tests/test_md_commands.sav/test_cmd_testing.res similarity index 100% rename from src/doc/commands/tests/test_commands_md.sav/test_cmd_testing.res rename to src/doc/templates/tests/test_md_commands.sav/test_cmd_testing.res diff --git a/src/doc/term/term.nit b/src/doc/term/term.nit index d6539691c7..e23e623c71 100644 --- a/src/doc/term/term.nit +++ b/src/doc/term/term.nit @@ -16,6 +16,7 @@ module term import commands::commands_parser import templates::term_model +import templates::md_commands redef class CommandParser