Merge branch '62-support-multiple-categories-in-self-doc' into 'master'

Resolve "Support multiple categories in self-doc" Closes #62 See merge request consensus.enterprises/drumkit!43
consensus-enterprises · Jun 24, 2021 · d90432a · d90432a
2 parents b9c0b98 + d1d4cb1
commit d90432a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/features/selfdoc.feature b/features/selfdoc.feature
@@ -31,6 +31,21 @@ Feature: Selfdoc for Drumkit development
   init-project-hugo-docs
   init-project-packer
   """
+  And I run "make help-category"
+  Then I should get:
+  """
+  Available help categories:
+  """
+  And I run "make help-hugo"
+  Then I should get:
+  """
+  hugo-ci-local
+  """
+  And I run "make help-testing"
+  Then I should get:
+  """
+  hugo-ci-local
+  """
 
   Scenario: I can see documentation that only exists in the local drumkit mk.d files
   Given I bootstrap Drumkit

diff --git a/mk/projects/15_packer.mk b/mk/projects/15_packer.mk
@@ -19,10 +19,10 @@ init-project-packer-static: mustache
 	@make -s $(PACKER_SH_SCRIPTS) $(PACKER_JSON_DIR)/40-$$CONTAINER_PROJECT_NAME.json
 
 init-project-packer: init-project-packer-intro init-project-packer-static ##@projects Initialize a packer project.
-	@make -s init-project-packer-vars
+	@make -s init-project-packer-vars 
 	@echo "Finished initializing Drumkit Packer project."
 
-$(MK_D)/20_ci.mk:
+$(MK_D)/20_ci.mk: ##@testing Create .gitlab-ci.yml file for new 
 	@echo "Initializing CI makefile."
 	@mkdir -p $(MK_D)
 	@mustache ENV $(FILES_DIR)/packer/20_ci.mk.tmpl > $@

diff --git a/mk/projects/20_ansible.mk b/mk/projects/20_ansible.mk
@@ -7,7 +7,7 @@ include $(SELF_DIR)ansible/*.mk
 
 init-project-ansible-intro:
 	@echo "Initializing Drumkit Ansible project."
-init-project-ansible: init-project-ansible-intro roles/consensus.utils ansible.cfg ansible-add-host ansible-add-group README.md ##@projects Initialize a project for working with Ansible.
+init-project-ansible: init-project-ansible-intro roles/consensus.utils ansible.cfg ansible-add-host ansible-add-group README.md ##@projects@ansible Initialize a project for working with Ansible.
 	@echo "Finished initializing Drumkit Ansible project."
 
 ansible-clean-examples:

diff --git a/mk/projects/20_drupal.mk b/mk/projects/20_drupal.mk
@@ -28,7 +28,7 @@ $(MK_D)/10_variables.mk:
 	@mustache ENV $(FILES_DIR)/drupal-project/10_variables.mk.tmpl > $@
 
 init-project-drupal-deps: deps-php behat docker lando
-init-project-drupal: init-project-drupal-user-vars init-project-drupal-deps drupal-drumkit-dir drupal-composer-codebase ##@projects Initialize a project for developing Drupal 8 with Lando.
+init-project-drupal: init-project-drupal-user-vars init-project-drupal-deps drupal-drumkit-dir drupal-composer-codebase ##@projects@drupal Initialize a project for developing Drupal 8 with Lando.
 	@grep "all:" Makefile > /dev/null || echo "all: start build install" >> Makefile
 	@echo "Finished initializing Drupal drumkit."
 	@echo "You can spin up your project using the following commands:"

diff --git a/mk/projects/20_hugo-docs.mk b/mk/projects/20_hugo-docs.mk
@@ -1,6 +1,6 @@
 .PHONY: init-project-hugo-docs hugo-ci-local
 
-init-project-hugo-docs: docs docs/config.yaml docs/layouts/index.json docs/themes/learn docs/content/_index.md .gitlab-ci.yml ##@projects Initialize a hugo site
+init-project-hugo-docs: docs docs/config.yaml docs/layouts/index.json docs/themes/learn docs/content/_index.md .gitlab-ci.yml ##@projects@hugo Initialize a hugo site
 	@echo "Initializing Hugo Docs project."
 	@git add docs
 	@git commit -m "Initialize docs site."
@@ -37,7 +37,7 @@ docs/layouts/index.json:
 	@echo "Initializing search index.json."
 	@cp $(FILES_DIR)/hugo-docs/index.json $@
 
-hugo-ci-local: gitlab-runner .gitlab-ci.yml ##Run CI tests for hugo docs project
+hugo-ci-local: gitlab-runner .gitlab-ci.yml ##@hugo@testing Run CI tests for hugo docs project
 	@echo "Running gitlab tests for hugo"
 	@gitlab-runner exec docker test