Skip to content

Commit d1e9014

Browse files
authored
Merge pull request #81 from moremoban/dev
release 0.2.3
2 parents d17151b + 7a5c0e0 commit d1e9014

File tree

35 files changed

+380
-142
lines changed

35 files changed

+380
-142
lines changed

.gitignore

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,8 @@ flycheck_*.el
242242
# Swap
243243
[._]*.s[a-v][a-z]
244244
[._]*.sw[a-p]
245-
[._]s[a-v][a-z]
245+
[._]s[a-rt-v][a-z]
246+
[._]ss[a-gi-z]
246247
[._]sw[a-p]
247248

248249
# Session
@@ -263,6 +264,7 @@ tags
263264
# User-specific stuff
264265
.idea/**/workspace.xml
265266
.idea/**/tasks.xml
267+
.idea/**/usage.statistics.xml
266268
.idea/**/dictionaries
267269
.idea/**/shelf
268270

@@ -280,8 +282,7 @@ tags
280282
.idea/**/libraries
281283

282284
# CMake
283-
cmake-build-debug/
284-
cmake-build-release/
285+
cmake-build-*/
285286

286287
# Mongo Explorer plugin
287288
.idea/**/mongoSettings.xml
@@ -414,7 +415,7 @@ local.properties
414415
# CDT-specific (C/C++ Development Tooling)
415416
.cproject
416417

417-
# CDT- autotools
418+
# CDT- autotools
418419
.autotools
419420

420421
# Java annotation processor (APT)
@@ -438,6 +439,9 @@ local.properties
438439
# Code Recommenders
439440
.recommenders/
440441

442+
# Annotation Processing
443+
.apt_generated/
444+
441445
# Scala IDE specific (Scala & Java development for Eclipse)
442446
.cache-main
443447
.scala_dependencies

.moban.cd/changelog.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
name: moban
22
organisation: moremoban
33
releases:
4+
- changes:
5+
- action: Added
6+
details:
7+
- "`#76`: running moban as a module from python command"
8+
- "`#32`: copy a directory recusively"
9+
- "`#33`: template all files in a directory"
10+
date: 10-07-2018
11+
version: 0.2.3
412
- changes:
513
- action: Added
614
details:
715
- "`#31`: create directory if missing during copying"
816
- action: Updated
917
details:
1018
- "`#28`: if a template has been copied once before, it is skipped in the next moban call"
11-
date: unreleased
19+
date: 16-06-2018
1220
version: 0.2.2
1321
- changes:
1422
- action: Updated

.moban.cd/moban.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ organisation: moremoban
33
author: C. W.
44
55
license: MIT
6-
version: 0.2.2
7-
current_version: 0.2.2
8-
release: 0.2.2
6+
version: 0.2.3
7+
current_version: 0.2.3
8+
release: 0.2.3
99
branch: master
1010
command_line_interface: "moban"
1111
entry_point: "moban.main:main"

CHANGELOG.rst

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
Change log
22
================================================================================
33

4-
0.2.2 - unreleased
4+
0.2.3 - 10-07-2018
5+
--------------------------------------------------------------------------------
6+
7+
Added
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
#. `#76 <https://github.com/moremoban/moban/issues/76>`_: running moban as a
11+
module from python command
12+
#. `#32 <https://github.com/moremoban/moban/issues/32>`_: copy a directory
13+
recusively
14+
#. `#33 <https://github.com/moremoban/moban/issues/33>`_: template all files in
15+
a directory
16+
17+
0.2.2 - 16-06-2018
518
--------------------------------------------------------------------------------
619

720
Added

docs/conf.py

Lines changed: 152 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,180 @@
33
'Yet another jinja2 cli command for static text generation' +
44
''
55
)
6+
# -*- coding: utf-8 -*-
7+
#
8+
# Configuration file for the Sphinx documentation builder.
9+
#
10+
# This file does only contain a selection of the most common options. For a
11+
# full list see the documentation:
12+
# http://www.sphinx-doc.org/en/master/config
13+
14+
# -- Path setup --------------------------------------------------------------
15+
16+
# If extensions (or modules to document with autodoc) are in another directory,
17+
# add these directories to sys.path here. If the directory is relative to the
18+
# documentation root, use os.path.abspath to make it absolute, like shown here.
19+
#
20+
# import os
21+
# import sys
22+
# sys.path.insert(0, os.path.abspath('.'))
23+
24+
# -- Project information -----------------------------------------------------
25+
26+
project = u'moban'
27+
copyright = u'2017-2018 Onni Software Ltd.'
28+
author = u'C. W.'
29+
30+
# The short X.Y version
31+
version = u'0.2.3'
32+
# The full version, including alpha/beta/rc tags
33+
release = u'0.2.3'
34+
35+
36+
# -- General configuration ---------------------------------------------------
37+
38+
# If your documentation needs a minimal Sphinx version, state it here.
39+
#
40+
# needs_sphinx = '1.0'
41+
42+
# Add any Sphinx extension module names here, as strings. They can be
43+
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
44+
# ones.
645
extensions = [
746
'sphinx.ext.autodoc',
847
'sphinx.ext.doctest',
948
'sphinx.ext.intersphinx',
1049
'sphinx.ext.viewcode',
1150
]
12-
intersphinx_mapping = {
13-
}
51+
52+
# Add any paths that contain templates here, relative to this directory.
1453
templates_path = ['_templates']
54+
55+
# The suffix(es) of source filenames.
56+
# You can specify multiple suffix as a list of string:
57+
#
58+
# source_suffix = ['.rst', '.md']
1559
source_suffix = '.rst'
60+
61+
# The master toctree document.
1662
master_doc = 'index'
1763

18-
project = u'moban'
19-
copyright = u'2017-2018 Onni Software Ltd.'
20-
version = '0.2.2'
21-
release = '0.2.2'
64+
# The language for content autogenerated by Sphinx. Refer to documentation
65+
# for a list of supported languages.
66+
#
67+
# This is also used if you do content translation via gettext catalogs.
68+
# Usually you set "language" from the command line for these cases.
69+
language = 'en'
70+
71+
# List of patterns, relative to source directory, that match files and
72+
# directories to ignore when looking for source files.
73+
# This pattern also affects html_static_path and html_extra_path.
2274
exclude_patterns = []
75+
76+
# The name of the Pygments (syntax highlighting) style to use.
2377
pygments_style = 'sphinx'
24-
html_theme = 'default'
78+
79+
80+
# -- Options for HTML output -------------------------------------------------
81+
82+
# The theme to use for HTML and HTML Help pages. See the documentation for
83+
# a list of builtin themes.
84+
#
85+
html_theme = 'alabaster'
86+
87+
# Theme options are theme-specific and customize the look and feel of a theme
88+
# further. For a list of options available for each theme, see the
89+
# documentation.
90+
#
91+
# html_theme_options = {}
92+
93+
# Add any paths that contain custom static files (such as style sheets) here,
94+
# relative to this directory. They are copied after the builtin static files,
95+
# so a file named "default.css" will overwrite the builtin "default.css".
2596
html_static_path = ['_static']
97+
98+
# Custom sidebar templates, must be a dictionary that maps document names
99+
# to template names.
100+
#
101+
# The default sidebars (for documents that don't match any pattern) are
102+
# defined by theme itself. Builtin themes are using these templates by
103+
# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
104+
# 'searchbox.html']``.
105+
#
106+
# html_sidebars = {}
107+
108+
109+
# -- Options for HTMLHelp output ---------------------------------------------
110+
111+
# Output file base name for HTML help builder.
26112
htmlhelp_basename = 'mobandoc'
27-
latex_elements = {}
113+
114+
115+
# -- Options for LaTeX output ------------------------------------------------
116+
117+
latex_elements = {
118+
# The paper size ('letterpaper' or 'a4paper').
119+
#
120+
# 'papersize': 'letterpaper',
121+
122+
# The font size ('10pt', '11pt' or '12pt').
123+
#
124+
# 'pointsize': '10pt',
125+
126+
# Additional stuff for the LaTeX preamble.
127+
#
128+
# 'preamble': '',
129+
130+
# Latex figure (float) alignment
131+
#
132+
# 'figure_align': 'htbp',
133+
}
134+
135+
# Grouping the document tree into LaTeX files. List of tuples
136+
# (source start file, target name, title,
137+
# author, documentclass [howto, manual, or own class]).
28138
latex_documents = [
29-
('index', 'moban.tex',
30-
'moban Documentation',
31-
'Onni Software Ltd.', 'manual'),
139+
(master_doc, 'moban.tex', u'moban Documentation',
140+
u'Onni Software Ltd.', 'manual'),
32141
]
142+
143+
144+
# -- Options for manual page output ------------------------------------------
145+
146+
# One entry per manual page. List of tuples
147+
# (source start file, name, description, authors, manual section).
33148
man_pages = [
34-
('index', 'moban',
35-
'moban Documentation',
36-
[u'Onni Software Ltd.'], 1)
149+
(master_doc, 'moban', u'moban Documentation',
150+
[author], 1)
37151
]
152+
153+
154+
# -- Options for Texinfo output ----------------------------------------------
155+
156+
# Grouping the document tree into Texinfo files. List of tuples
157+
# (source start file, target name, title, author,
158+
# dir menu entry, description, category)
159+
texinfo_documents = [
160+
(master_doc, 'moban', u'moban Documentation',
161+
author, 'moban', 'One line description of project.',
162+
'Miscellaneous'),
163+
]
164+
165+
# -- Extension configuration -------------------------------------------------
166+
# -- Options for intersphinx extension ---------------------------------------
167+
168+
# Example configuration for intersphinx: refer to the Python standard library.
169+
intersphinx_mapping = {'https://docs.python.org/': None}
170+
# TODO: html_theme not configurable upstream
171+
html_theme = 'default'
172+
173+
# TODO: DESCRIPTION not configurable upstream
38174
texinfo_documents = [
39175
('index', 'moban',
40176
'moban Documentation',
41177
'Onni Software Ltd.', 'moban',
42178
DESCRIPTION,
43179
'Miscellaneous'),
44180
]
181+
intersphinx_mapping.update({
182+
})
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
configuration:
2+
configuration_dir: 'config'
3+
configuration: level8.yml
4+
template_dir:
5+
- template-folder
6+
targets:
7+
- templated-folder: templates
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Level 8: Pass a folder full of templates
2+
================================================================================
3+
4+
We already know that in moban file, you can pass
5+
on a dictionary in targets section, and it apply the template. The assumption
6+
was that the template parameter is a file. Now, what if the parameter is a
7+
directory?
8+
9+
When you pass a directory with full of templates, moban will also assume the
10+
target is a directory and will generate the output there. When saving the
11+
files, it will remove its file suffices automatically.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a: "test"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
it is a {{a}}

moban/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
__version__ = "0.0.7"
2-
__author__ = "C.W."
1+
from moban._version import __version__
2+
from moban._version import __author__
3+
4+
__all__ = ("__author__", "__version__")

0 commit comments

Comments
 (0)