87: Moved to_cli(), from_cli() functions from plugable.py into new cli.py file; moved corresponding unit tests into new test_cli.py file

4 files changed, 76 insertions, 30 deletions

diff --git a/ipalib/cli.py b/ipalib/cli.py
new file mode 100644
index 000000000..5e257f709
--- /dev/null
+++ b/ipalib/cli.py
@@ -0,0 +1,40 @@
+# Authors:
+#   Jason Gerard DeRose <jderose@redhat.com>
+#
+# Copyright (C) 2008  Red Hat
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+"""
+Functionality for Command Line Inteface.
+"""
+
+
+def to_cli(name):
+    """
+    Takes a Python identifier and transforms it into form suitable for the
+    Command Line Interface.
+    """
+    assert isinstance(name, str)
+    return name.replace('_', '-')
+
+
+def from_cli(cli_name):
+    """
+    Takes a string from the Command Line Interface and transforms it into a
+    Python identifier.
+    """
+    assert isinstance(cli_name, basestring)
+    return cli_name.replace('-', '_')
diff --git a/ipalib/plugable.py b/ipalib/plugable.py
index 0a6a0caaf..ecbd5855d 100644
--- a/ipalib/plugable.py
+++ b/ipalib/plugable.py
@@ -26,24 +26,6 @@ import inspect
 import errors
 
 
-def to_cli(name):
-    """
-    Takes a Python identifier and transforms it into form suitable for the
-    Command Line Interface.
-    """
-    assert isinstance(name, str)
-    return name.replace('_', '-')
-
-
-def from_cli(cli_name):
-    """
-    Takes a string from the Command Line Interface and transforms it into a
-    Python identifier.
-    """
-    assert isinstance(cli_name, basestring)
-    return cli_name.replace('-', '_')
-
-
 def check_identifier(name):
     """
     Raises errors.NameSpaceError if `name` is not a valid Python identifier
diff --git a/ipalib/tests/test_cli.py b/ipalib/tests/test_cli.py
new file mode 100644
index 000000000..91bc0a29c
--- /dev/null
+++ b/ipalib/tests/test_cli.py
@@ -0,0 +1,36 @@
+# Authors:
+#   Jason Gerard DeRose <jderose@redhat.com>
+#
+# Copyright (C) 2008  Red Hat
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+"""
+Unit tests for `ipalib.cli` module.
+"""
+
+from ipalib import cli
+
+
+def test_to_cli():
+    f = cli.to_cli
+    assert f('initialize') == 'initialize'
+    assert f('user_add') == 'user-add'
+
+
+def test_from_cli():
+    f = cli.from_cli
+    assert f('initialize') == 'initialize'
+    assert f('user-add') == 'user_add'
diff --git a/ipalib/tests/test_plugable.py b/ipalib/tests/test_plugable.py
index 6a1d8a605..258f7b1d1 100644
--- a/ipalib/tests/test_plugable.py
+++ b/ipalib/tests/test_plugable.py
@@ -25,18 +25,6 @@ from tstutil import raises, getitem, no_set, no_del, read_only
 from ipalib import plugable, errors
 
 
-def test_to_cli():
-    f = plugable.to_cli
-    assert f('initialize') == 'initialize'
-    assert f('user_add') == 'user-add'
-
-
-def test_from_cli():
-    f = plugable.from_cli
-    assert f('initialize') == 'initialize'
-    assert f('user-add') == 'user_add'
-
-
 def test_valid_identifier():
     f = plugable.check_identifier
     okay = [