Code refactoring 2

.moban.cd/moban.yml

@@ -4,8 +4,8 @@ organisation: moremoban
 author: C. W.
 contact: wangc_2011@hotmail.com
 license: MIT
-version: 0.6.4
-current_version: 0.6.4
+version: 0.6.5
+current_version: 0.6.5
 release: 0.6.4
 branch: master
 master: index

docs/conf.py

@@ -25,7 +25,7 @@
 copyright = '2017-2019 Onni Software Ltd.'
 author = 'C. W.'
 # The short X.Y version
-version = '0.6.4'
+version = '0.6.5'
 # The full version, including alpha/beta/rc tags
 release = '0.6.4'
 

moban/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.6.4"
+__version__ = "0.6.5"
 __author__ = "C. W."

moban/mobanfile/__init__.py → moban/core/mobanfile/__init__.py

@@ -10,12 +10,12 @@
 from moban.core.utils import verify_the_existence_of_directories
 from moban.deprecated import handle_copy, handle_requires
 from moban.core.data_loader import merge
-from moban.mobanfile.targets import (
+from moban.core.moban_factory import expand_template_directories
+from moban.core.mobanfile.targets import (
     parse_targets,
     extract_target,
     extract_group_targets,
 )
-from moban.core.moban_factory import expand_template_directories
 
 LOG = logging.getLogger(__name__)
 

moban/mobanfile/targets.py → moban/core/mobanfile/targets.py

@@ -4,7 +4,7 @@
 from moban import core, constants, exceptions
 from moban.externals import reporter
 from moban.core.definitions import TemplateTarget
-from moban.mobanfile.templates import handle_template
+from moban.core.mobanfile.templates import handle_template
 
 LOG = logging.getLogger(__name__)
 

moban/main.py

@@ -14,7 +14,8 @@
 import logging.config
 from collections import defaultdict
 
-from moban import core, constants, mobanfile, exceptions
+from moban import core, constants, exceptions
+from moban.core import mobanfile
 from moban._version import __version__
 from moban.externals import reporter, file_system
 from moban.core.hashstore import HASH_STORE

setup.py

@@ -38,7 +38,7 @@
 
 NAME = "moban"
 AUTHOR = "C. W."
-VERSION = "0.6.4"
+VERSION = "0.6.5"
 EMAIL = "wangc_2011@hotmail.com"
 LICENSE = "MIT"
 ENTRY_POINTS = {

tests/mobanfile/test_mobanfile.py

@@ -6,7 +6,7 @@
 
 @patch("moban.core.moban_factory.MobanEngine.render_to_files")
 def test_handle_targets(fake_renderer):
-    from moban.mobanfile import handle_targets
+    from moban.core.mobanfile import handle_targets
 
     TEMPLATE = "copier-test01.csv"
     OUTPUT = "output.csv"
@@ -39,7 +39,7 @@ def test_handle_targets(fake_renderer):
 
 @patch("moban.core.moban_factory.MobanEngine.render_to_files")
 def test_handle_targets_sequence(fake_renderer):
-    from moban.mobanfile import handle_targets
+    from moban.core.mobanfile import handle_targets
 
     TEMPLATE1 = "a.template.jj2"
     OUTPUT1 = "filterme.handlebars"  # in the future, this could dynamic output

tests/mobanfile/test_targets.py

@@ -2,8 +2,8 @@
 
 import fs.path
 from nose.tools import eq_, raises
-from moban.mobanfile import targets
 from moban.exceptions import GroupTargetNotFound
+from moban.core.mobanfile import targets
 from moban.core.definitions import TemplateTarget
 
 TEMPLATE = "a.jj2"

tests/mobanfile/test_templates.py

@@ -1,7 +1,7 @@
 import fs.path
 from mock import patch
 from nose.tools import eq_
-from moban.mobanfile.templates import handle_template
+from moban.core.mobanfile.templates import handle_template
 
 
 class TestHandleTemplateFunction: