From: Greg Wilson <gvwilson@third-bit.com>
Date: Tue, 21 Jun 2016 19:26:09 +0000 (-0400)
Subject: Tidying up based on first contact with R maintainers.
X-Git-Url: https://git.arvados.org/rnaseq-cwl-training.git/commitdiff_plain/600e4a3f3cc4532b83601fc8fbf022dbed419af8

Tidying up based on first contact with R maintainers.

1.  Renaming Ruby file to use underscore in name (consistent with other `bin` scripts).
2.  Generating `_includes/all_figures.html` for the first time when creating a new lesson.
---

diff --git a/Makefile b/Makefile
index b645947..154203a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@
 # Settings
 MAKEFILES=Makefile $(wildcard *.mk)
 JEKYLL=jekyll
+PARSER=bin/markdown_ast.rb
 DST=_site
 
 # Controls
@@ -24,7 +25,7 @@ site :
 
 ## figures        : re-generate inclusion displaying all figures.
 figures :
-	@bin/extract_figures.py -s _episodes -p bin/markdown-ast.rb > _includes/all_figures.html
+	@bin/extract_figures.py -s _episodes -p ${PARSER} > _includes/all_figures.html
 
 ## clean          : clean up junk files.
 clean :
@@ -71,7 +72,7 @@ HTML_FILES = \
 
 ## lesson-check   : validate lesson Markdown.
 lesson-check :
-	@bin/lesson_check.py -s . -p bin/markdown-ast.rb
+	@bin/lesson_check.py -s . -p ${PARSER}
 
 unittest :
 	python bin/test_lesson_check.py
diff --git a/bin/lesson_initialize.py b/bin/lesson_initialize.py
index cfd8f6f..f3955e0 100755
--- a/bin/lesson_initialize.py
+++ b/bin/lesson_initialize.py
@@ -315,6 +315,10 @@ permalink: /guide/
 FIXME
 '''
 
+INCLUDES_ALL_FIGURES_HTML = '''\
+<!-- empty -->
+'''
+
 BOILERPLATE = (
     ('AUTHORS', ROOT_AUTHORS),
     ('CITATION', ROOT_CITATION),
@@ -327,7 +331,8 @@ BOILERPLATE = (
     ('_extras/about.md', EXTRAS_ABOUT_MD),
     ('_extras/discuss.md', EXTRAS_DISCUSS_MD),
     ('_extras/figures.md', EXTRAS_FIGURES_MD),
-    ('_extras/guide.md', EXTRAS_GUIDE_MD)
+    ('_extras/guide.md', EXTRAS_GUIDE_MD),
+    ('_includes/all_figures.html', INCLUDES_ALL_FIGURES_HTML)
 )
 
 
diff --git a/bin/markdown-ast.rb b/bin/markdown_ast.rb
similarity index 100%
rename from bin/markdown-ast.rb
rename to bin/markdown_ast.rb