Merge pull request #392 from moremoban/dev

release 0.7.9

.moban.cd/changelog.yml

@@ -1,6 +1,12 @@
 name: moban
 organisation: moremoban
 releases:
+  - changes:
+      - action: Updated
+        details:
+          - "`#390`: single render action will print to stdout by defafult"
+    date: 06.08.2020
+    version: 0.7.9
   - changes:
       - action: Added
         details:

.moban.cd/moban.yml

@@ -4,9 +4,9 @@ organisation: moremoban
 author: C. W.
 contact: wangc_2011@hotmail.com
 license: MIT
-version: 0.7.8
-current_version: 0.7.8
-release: 0.7.8
+version: 0.7.9
+current_version: 0.7.9
+release: 0.7.9
 branch: master
 master: index
 command_line_interface: "moban"

.moban.d/moban_readme.jj2

@@ -44,16 +44,11 @@ versions lower than 0.7.0 if you are still using python 2.
 Quick start
 ================================================================================
 
-.. image:: https://github.com/moremoban/moban/raw/dev/docs/images/moban-in-intro.gif
-
 {% raw %}
 .. code-block:: bash
 
     $ export HELLO="world"
     $ moban "{{HELLO}}"
-    Templating {{HELLO}}... to moban.output
-    Templated 1 file.
-    $ cat moban.output
     world
 
 Or
@@ -76,7 +71,7 @@ A bit formal example:
 .. code-block:: bash
 
 	$ moban -c data.yml -t my.template
-	$ cat moban.output
+    world
 
 Given data.yml as:
 
@@ -94,11 +89,6 @@ and my.template as:
 
 {% endraw %}
 
-moban.output will contain:
-
-.. code-block:: bash
-
-    world
 
 Please note that data.yml will take precedence over environment variables.
 
@@ -182,6 +172,13 @@ Assume that the custom example was saved in `custom-jj2-plugin`
 
 Moban will then load your custom jinja2 functions
 
+Slim template syntax for jinja2
+---------------------------------
+
+with `moban-slim <https://github.com/moremoban/moban-slim>`_ installed,
+
+{% include "slim_example.rst.jj2" %}
+
 Handlebars.js template
 ----------------------------
 

CHANGELOG.rst

@@ -1,6 +1,14 @@
 Change log
 ================================================================================
 
+0.7.9 - 06.08.2020
+--------------------------------------------------------------------------------
+
+**Updated**
+
+#. `#390 <https://github.com/moremoban/moban/issues/390>`_: single render action
+   will print to stdout by defafult
+
 0.7.8 - 09.06.2020
 --------------------------------------------------------------------------------
 

Makefile

@@ -21,7 +21,7 @@ lint:
 	yamllint -d "{extends: default, ignore: .moban.cd/changelog.yml}" .
 
 format:
-	isort -y $(find moban -name "*.py"|xargs echo) $(find tests -name "*.py"|xargs echo)
+	isort $(find moban -name "*.py"|xargs echo) $(find tests -name "*.py"|xargs echo)
 	git diff
 	black -l 79 moban
 	git diff

README.rst

@@ -44,16 +44,11 @@ versions lower than 0.7.0 if you are still using python 2.
 Quick start
 ================================================================================
 
-.. image:: https://github.com/moremoban/moban/raw/dev/docs/images/moban-in-intro.gif
-
 
 .. code-block:: bash
 
     $ export HELLO="world"
     $ moban "{{HELLO}}"
-    Templating {{HELLO}}... to moban.output
-    Templated 1 file.
-    $ cat moban.output
     world
 
 Or
@@ -75,7 +70,7 @@ A bit formal example:
 .. code-block:: bash
 
 	$ moban -c data.yml -t my.template
-	$ cat moban.output
+    world
 
 Given data.yml as:
 
@@ -92,11 +87,6 @@ and my.template as:
     {{hello}}
 
 
-moban.output will contain:
-
-.. code-block:: bash
-
-    world
 
 Please note that data.yml will take precedence over environment variables.
 
@@ -179,6 +169,31 @@ Assume that the custom example was saved in `custom-jj2-plugin`
 
 Moban will then load your custom jinja2 functions
 
+Slim template syntax for jinja2
+---------------------------------
+
+with `moban-slim <https://github.com/moremoban/moban-slim>`_ installed,
+
+Given a data.json file with the following content
+
+.. code-block::
+
+    {
+      "person": {
+        "firstname": "Smith",
+        "lastname": "Jones",
+      },
+    }
+
+.. code-block:: bash
+
+
+   $ moban --template-type slim -c data.json  "{{person.firstname}} {{person.lastname}}"
+   Slimming <p>{{first... to moban.output
+   Slimmed 1 file.
+   $ cat moban.output
+   Smith Jones
+
 Handlebars.js template
 ----------------------------
 

docs/conf.py

@@ -25,9 +25,9 @@
 copyright = '2017-2020 Onni Software Ltd.'
 author = 'C. W.'
 # The short X.Y version
-version = '0.7.8'
+version = '0.7.9'
 # The full version, including alpha/beta/rc tags
-release = '0.7.8'
+release = '0.7.9'
 
 # -- General configuration ---------------------------------------------------
 

moban/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.7.8"
+__version__ = "0.7.9"
 __author__ = "C. W."

moban/constants.py

@@ -56,7 +56,7 @@
         file_system.path_join(".", DEFAULT_TEMPLATE_DIRNAME),
     ],
     # moban.output, default output file name
-    LABEL_OUTPUT: "%s.output" % PROGRAM_NAME,
+    LABEL_OUTPUT: "-",
     # data.yml, default data input file
     LABEL_CONFIG: "data%s" % DEFAULT_YAML_SUFFIX,
     LABEL_TEMPLATE_TYPE: DEFAULT_TEMPLATE_TYPE,

moban/externals/buffered_writer.py

@@ -11,7 +11,9 @@ def __init__(self):
         self.fs_list = {}
 
     def write_file_out(self, filename, content):
-        if file_system.is_zip_alike_url(filename):
+        if filename == "-":
+            print(content.decode())
+        elif file_system.is_zip_alike_url(filename):
             self.write_file_out_to_zip(filename, content)
         else:
             write_file_out(filename, content)

moban/externals/reporter.py

@@ -1,3 +1,5 @@
+import sys
+
 import crayons
 
 import moban.constants as constants
@@ -13,6 +15,8 @@
 MESSAGE_FILE_EXTENSION_NOT_NEEDED = "File extension is not required for ad-hoc\
  type"
 
+GLOBAL = {"PRINT": True}
+
 
 def report_templating(
     action_in_present_continuous_tense, source_file, destination_file
@@ -49,11 +53,13 @@ def report_partial_run(action_in_past_tense, file_count, total):
 
 
 def report_error_message(message):
-    do_print(crayons.white("Error: ", bold=True) + crayons.red(message))
+    error_print(crayons.white("Error: ", bold=True) + crayons.red(message))
 
 
 def report_warning_message(message):
-    do_print(crayons.white("Warning: ", bold=True) + crayons.yellow(message))
+    error_print(
+        crayons.white("Warning: ", bold=True) + crayons.yellow(message)
+    )
 
 
 def report_info_message(message):
@@ -98,4 +104,9 @@ def report_file_extension_not_needed():
 
 
 def do_print(message):
-    print(message)
+    if GLOBAL["PRINT"]:
+        print(message)
+
+
+def error_print(message):
+    sys.stderr.write(message + "\n")

moban/main.py

@@ -238,6 +238,7 @@ def handle_command_line(options):
     """
     act upon command options
     """
+    reporter.GLOBAL["PRINT"] = False
     options = data_loader.merge(options, constants.DEFAULT_OPTIONS)
     engine = ENGINES.get_engine(
         options[constants.LABEL_TEMPLATE_TYPE],

mobanfile

@@ -5,6 +5,7 @@ configuration:
     - "git://github.com/moremoban/moban-anyconfig.git?branch=master!/.moban.d/"
     - "git://github.com/moremoban/moban-handlebars.git?branch=dev!/.moban.d/"
     - "git://github.com/moremoban/moban-velocity.git?branch=dev!/.moban.d/"
+    - "git://github.com/moremoban/moban-slim.git?branch=dev!/.moban.d/"
     - "git://github.com/moremoban/httpfs.git?branch=master!/.moban.d/"
     - "git://github.com/moremoban/gitfs2.git?branch=dev!/.moban.d/"
     - "git://github.com/moremoban/pypifs.git?branch=master!/.moban.d/"

setup.py

@@ -41,7 +41,7 @@
 
 NAME = "moban"
 AUTHOR = "C. W."
-VERSION = "0.7.8"
+VERSION = "0.7.9"
 EMAIL = "wangc_2011@hotmail.com"
 LICENSE = "MIT"
 ENTRY_POINTS = {
@@ -53,7 +53,7 @@
     "General purpose static text generator"
 )
 URL = "https://github.com/moremoban/moban"
-DOWNLOAD_URL = "%s/archive/0.7.8.tar.gz" % URL
+DOWNLOAD_URL = "%s/archive/0.7.9.tar.gz" % URL
 FILES = ["README.rst", "CONTRIBUTORS.rst", "CHANGELOG.rst"]
 KEYWORDS = [
     "python",
@@ -96,8 +96,8 @@
 }
 # You do not need to read beyond this line
 PUBLISH_COMMAND = "{0} setup.py sdist bdist_wheel upload -r pypi".format(sys.executable)
-GS_COMMAND = ("gs moban v0.7.8 " +
-              "Find 0.7.8 in changelog for more details")
+GS_COMMAND = ("gs moban v0.7.9 " +
+              "Find 0.7.9 in changelog for more details")
 NO_GS_MESSAGE = ("Automatic github release is disabled. " +
                  "Please install gease to enable it.")
 UPLOAD_FAILED_MSG = (