From a28aef2f184ad0958e8589b4ba8d183eaddb1dc3 Mon Sep 17 00:00:00 2001 From: patiencedaur Date: Fri, 24 Sep 2021 12:00:55 +0300 Subject: [PATCH 1/9] Build cartridge-cli doc from multiple files --- build_submodules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_submodules.sh b/build_submodules.sh index 668c532d94..d2644fa9ea 100755 --- a/build_submodules.sh +++ b/build_submodules.sh @@ -42,7 +42,7 @@ yes | cp -rf "${monitoring_root}" "${monitoring_dest}/" yes | cp -rf "${monitoring_grafana_root}" "${monitoring_dest}/" mkdir -p "${cartridge_cli_dest}" -yes | cp -rf "${cartridge_cli_root}/index.rst" "${cartridge_cli_index_dest}" +find ${cartridge_cli_root} -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -r --parents {} "${rst_dest}" \; mkdir -p "${cartridge_kubernetes_dest}" yes | cp -rf "${cartridge_kubernetes_root}" "${cartridge_kubernetes_dest}" From a88afe333740448af44a7b9b5a46a476e2806261 Mon Sep 17 00:00:00 2001 From: patiencedaur Date: Sat, 25 Sep 2021 14:11:28 +0300 Subject: [PATCH 2/9] Fix Cartridge CLI build destination --- build_submodules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_submodules.sh b/build_submodules.sh index d2644fa9ea..7c829cd45f 100755 --- a/build_submodules.sh +++ b/build_submodules.sh @@ -42,7 +42,7 @@ yes | cp -rf "${monitoring_root}" "${monitoring_dest}/" yes | cp -rf "${monitoring_grafana_root}" "${monitoring_dest}/" mkdir -p "${cartridge_cli_dest}" -find ${cartridge_cli_root} -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -r --parents {} "${rst_dest}" \; +find ${cartridge_cli_root} -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -r --parents {} "${cartridge_cli_dest}" \; mkdir -p "${cartridge_kubernetes_dest}" yes | cp -rf "${cartridge_kubernetes_root}" "${cartridge_kubernetes_dest}" From 8656baea30658c3fae7ea22abda88e6438f008d4 Mon Sep 17 00:00:00 2001 From: patiencedaur Date: Sat, 25 Sep 2021 14:29:21 +0300 Subject: [PATCH 3/9] Debug cartridge-clu build --- build_submodules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_submodules.sh b/build_submodules.sh index 7c829cd45f..0f6db6b5e7 100755 --- a/build_submodules.sh +++ b/build_submodules.sh @@ -42,7 +42,7 @@ yes | cp -rf "${monitoring_root}" "${monitoring_dest}/" yes | cp -rf "${monitoring_grafana_root}" "${monitoring_dest}/" mkdir -p "${cartridge_cli_dest}" -find ${cartridge_cli_root} -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -r --parents {} "${cartridge_cli_dest}" \; +find ${cartridge_cli_root} -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -rv --parents {} "${cartridge_cli_dest}" \; mkdir -p "${cartridge_kubernetes_dest}" yes | cp -rf "${cartridge_kubernetes_root}" "${cartridge_kubernetes_dest}" From e3aa98c84b8e32f64203dfedd6f7de7ffa571b56 Mon Sep 17 00:00:00 2001 From: patiencedaur Date: Sat, 25 Sep 2021 15:04:41 +0300 Subject: [PATCH 4/9] Remove erroneous parent copying for cartridge-cli --- build_submodules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_submodules.sh b/build_submodules.sh index 0f6db6b5e7..6c6f9167d3 100755 --- a/build_submodules.sh +++ b/build_submodules.sh @@ -42,7 +42,7 @@ yes | cp -rf "${monitoring_root}" "${monitoring_dest}/" yes | cp -rf "${monitoring_grafana_root}" "${monitoring_dest}/" mkdir -p "${cartridge_cli_dest}" -find ${cartridge_cli_root} -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -rv --parents {} "${cartridge_cli_dest}" \; +find ${cartridge_cli_root} -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -rv {} "${cartridge_cli_dest}" \; mkdir -p "${cartridge_kubernetes_dest}" yes | cp -rf "${cartridge_kubernetes_root}" "${cartridge_kubernetes_dest}" From a207897608c5a68995284ca6eeb7adaacbbbbe7f Mon Sep 17 00:00:00 2001 From: patiencedaur Date: Tue, 28 Sep 2021 11:36:26 +0300 Subject: [PATCH 5/9] Include cartridge_cli commands subfolder in the build --- build_submodules.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build_submodules.sh b/build_submodules.sh index 6c6f9167d3..6c66b1ee9e 100755 --- a/build_submodules.sh +++ b/build_submodules.sh @@ -41,8 +41,9 @@ mkdir -p "${monitoring_dest}" yes | cp -rf "${monitoring_root}" "${monitoring_dest}/" yes | cp -rf "${monitoring_grafana_root}" "${monitoring_dest}/" -mkdir -p "${cartridge_cli_dest}" -find ${cartridge_cli_root} -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -rv {} "${cartridge_cli_dest}" \; +mkdir -p "${cartridge_cli_dest}/commands" +find ${cartridge_cli_root} -maxdepth 1 -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -v {} "${cartridge_cli_dest}" \; +yes | cp -rfv "${cartridge_cli_root}/commands" "${cartridge_cli_dest}" mkdir -p "${cartridge_kubernetes_dest}" yes | cp -rf "${cartridge_kubernetes_root}" "${cartridge_kubernetes_dest}" From 2c4ee6dbd39a542679bd60504fcca6f2d2da18d4 Mon Sep 17 00:00:00 2001 From: Nick Volynkin Date: Tue, 28 Sep 2021 16:36:57 +0700 Subject: [PATCH 6/9] Build_submodules script had been taught to behave --- build_submodules.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build_submodules.sh b/build_submodules.sh index 6c66b1ee9e..bdb73eb010 100755 --- a/build_submodules.sh +++ b/build_submodules.sh @@ -13,7 +13,6 @@ po_src="${project_root}/modules/cartridge/build.luarocks/build.rst/locale/ru/LC_ po_dest="${project_root}/locale/ru/LC_MESSAGES/book/cartridge" cartridge_cli_root="${project_root}/modules/cartridge-cli/doc" cartridge_cli_dest="${rst_dest}/cartridge_cli" -cartridge_cli_index_dest="${cartridge_cli_dest}/index.rst" monitoring_root="${project_root}/modules/metrics/doc/monitoring" monitoring_dest="${project_root}/doc/book" monitoring_grafana_root="${project_root}/modules/grafana-dashboard/doc/monitoring" @@ -41,9 +40,9 @@ mkdir -p "${monitoring_dest}" yes | cp -rf "${monitoring_root}" "${monitoring_dest}/" yes | cp -rf "${monitoring_grafana_root}" "${monitoring_dest}/" -mkdir -p "${cartridge_cli_dest}/commands" -find ${cartridge_cli_root} -maxdepth 1 -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -v {} "${cartridge_cli_dest}" \; -yes | cp -rfv "${cartridge_cli_root}/commands" "${cartridge_cli_dest}" +mkdir -p "${cartridge_cli_dest}" +cd ${cartridge_cli_root} || exit +find . -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -rv --parents {} "${cartridge_cli_dest}" \; mkdir -p "${cartridge_kubernetes_dest}" yes | cp -rf "${cartridge_kubernetes_root}" "${cartridge_kubernetes_dest}" From 5240dcbc70a0fd747849ee206c8a010b032149a2 Mon Sep 17 00:00:00 2001 From: patiencedaur Date: Fri, 1 Oct 2021 11:26:34 +0300 Subject: [PATCH 7/9] Fix links broken by the new Cartridge CLI doc --- doc/getting_started/getting_started_cartridge.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/getting_started/getting_started_cartridge.rst b/doc/getting_started/getting_started_cartridge.rst index a32f4fa829..46fae8d634 100644 --- a/doc/getting_started/getting_started_cartridge.rst +++ b/doc/getting_started/getting_started_cartridge.rst @@ -17,7 +17,7 @@ Next, create an application named ``myapp``. Say: This will create a Tarantool Cartridge application in the ``./myapp`` directory, with a handful of -:ref:`template files and directories ` +:doc:`template files and directories ` inside. Go inside and make a dry run: @@ -222,5 +222,5 @@ Everything is up and running! What's next? cluster and try some cool cluster management features. * Get inspired with `these examples `_ and implement more sophisticated business logic for your role. -* :ref:`Pack ` your application for easy distribution. +* :ref:`Pack ` your application for easy distribution. Choose what you like: a DEB or RPM package, a TGZ archive, or a Docker image. From 65fd0e378042661213a4ba76c92cc9d039307b97 Mon Sep 17 00:00:00 2001 From: Nick Volynkin Date: Fri, 1 Oct 2021 19:54:40 +0700 Subject: [PATCH 8/9] fix a link in getting started with Cartridge --- doc/getting_started/getting_started_cartridge.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/getting_started/getting_started_cartridge.rst b/doc/getting_started/getting_started_cartridge.rst index 46fae8d634..2ae3114e6b 100644 --- a/doc/getting_started/getting_started_cartridge.rst +++ b/doc/getting_started/getting_started_cartridge.rst @@ -222,5 +222,5 @@ Everything is up and running! What's next? cluster and try some cool cluster management features. * Get inspired with `these examples `_ and implement more sophisticated business logic for your role. -* :ref:`Pack ` your application for easy distribution. +* :doc:`Pack ` your application for easy distribution. Choose what you like: a DEB or RPM package, a TGZ archive, or a Docker image. From 4a37a06e5460c2ea2a14fd82241b0c91c266ec90 Mon Sep 17 00:00:00 2001 From: Nick Volynkin Date: Fri, 1 Oct 2021 20:58:17 +0700 Subject: [PATCH 9/9] Update translations --- .../getting_started_cartridge.po | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/locale/ru/LC_MESSAGES/getting_started/getting_started_cartridge.po b/locale/ru/LC_MESSAGES/getting_started/getting_started_cartridge.po index c2e7e43d7f..fa4a0e4264 100644 --- a/locale/ru/LC_MESSAGES/getting_started/getting_started_cartridge.po +++ b/locale/ru/LC_MESSAGES/getting_started/getting_started_cartridge.po @@ -20,12 +20,12 @@ msgstr "$ cartridge create --name myapp" msgid "" "This will create a Tarantool Cartridge application in the ``./myapp`` " -"directory, with a handful of :ref:`template files and directories " -"` inside." +"directory, with a handful of :doc:`template files and directories " +"` inside." msgstr "" "Эта команда создает новое Tarantool Cartridge-приложение в директории " -"``./myapp``. Там теперь содержатся созданные по шаблону :ref:`файлы и " -"директории `." +"``./myapp``. Там теперь содержатся созданные по шаблону :doc:`файлы и " +"директории `." msgid "Go inside and make a dry run:" msgstr "Войдите внутрь этой директории и запустите ваше приложение:" @@ -392,10 +392,10 @@ msgstr "" " для вашей роли." msgid "" -":ref:`Pack ` your application for easy" -" distribution. Choose what you like: a DEB or RPM package, a TGZ archive, or" -" a Docker image." +":doc:`Pack ` your application " +"for easy distribution. Choose what you like: a DEB or RPM package, a TGZ " +"archive, or a Docker image." msgstr "" -":ref:`Упакуйте ` ваше приложение для " -"дальнейшего распространения. Вы можете выбрать любой из поддерживаемых видов" -" пакетов: DEB, RPM, архив TGZ или Docker-образ." +":doc:`Упакуйте ` ваше " +"приложение для дальнейшего распространения. Вы можете выбрать любой из " +"поддерживаемых видов пакетов: DEB, RPM, архив TGZ или Docker-образ."