Remove name from core (used as wizard.name)

Author: dwhswenson

paths_cli/tests/wizard/test_core.py

@@ -10,25 +10,25 @@
     make_mock_wizard, make_mock_retry_wizard
 )
 
-def test_name():
-    wizard = make_mock_wizard('foo')
-    cv = CoordinateFunctionCV(lambda s: s.xyz[0][0])
-    assert not cv.is_named
-    result = name(wizard, cv, obj_type="CV", store_name="cvs")
-    assert result is cv
-    assert result.is_named
-    assert result.name == 'foo'
+# def test_name():
+    # wizard = make_mock_wizard('foo')
+    # cv = CoordinateFunctionCV(lambda s: s.xyz[0][0])
+    # assert not cv.is_named
+    # result = name(wizard, cv, obj_type="CV", store_name="cvs")
+    # assert result is cv
+    # assert result.is_named
+    # assert result.name == 'foo'
 
-def test_name_exists():
-    wizard = make_mock_retry_wizard(['foo', 'bar'])
-    wizard.cvs['foo'] = 'placeholder'
-    cv = CoordinateFunctionCV(lambda s: s.xyz[0][0])
-    assert not cv.is_named
-    result = name(wizard, cv, obj_type="CV", store_name="cvs")
-    assert result is cv
-    assert result.is_named
-    assert result.name == 'bar'
-    assert wizard.console.input.call_count == 2
+# def test_name_exists():
+    # wizard = make_mock_retry_wizard(['foo', 'bar'])
+    # wizard.cvs['foo'] = 'placeholder'
+    # cv = CoordinateFunctionCV(lambda s: s.xyz[0][0])
+    # assert not cv.is_named
+    # result = name(wizard, cv, obj_type="CV", store_name="cvs")
+    # assert result is cv
+    # assert result.is_named
+    # assert result.name == 'bar'
+    # assert wizard.console.input.call_count == 2
 
 @pytest.mark.parametrize('req,expected', [
     (('foo', 2, 2), '2'), (('foo', 2, float('inf')), 'at least 2'),

paths_cli/tests/wizard/test_wizard.py

@@ -1,7 +1,7 @@
 import pytest
 import mock
 from paths_cli.tests.wizard.mock_wizard import (
-    MockConsole
+    MockConsole, make_mock_wizard, make_mock_retry_wizard
 )
 import pathlib
 
@@ -120,10 +120,25 @@ def test_exception(self):
         assert "RuntimeError: baz" in console.log_text
 
     def test_name(self):
-        # why does that exist? cf core.name
-        # actually, it looks like we never use core.name; remove that and
-        # move its test here?
-        pass
+        wizard = make_mock_wizard('foo')
+        cv = CoordinateFunctionCV(lambda s: s.xyz[0][0])
+        assert not cv.is_named
+        result = wizard.name(cv, obj_type="CV", store_name="cvs")
+        assert result is cv
+        assert result.is_named
+        assert result.name == 'foo'
+
+    def test_name_exists(self):
+        wizard = make_mock_retry_wizard(['foo', 'bar'])
+        wizard.cvs['foo'] = 'placeholder'
+        cv = CoordinateFunctionCV(lambda s: s.xyz[0][0])
+        assert not cv.is_named
+        result = wizard.name(cv, obj_type="CV", store_name="cvs")
+        assert result is cv
+        assert result.is_named
+        assert result.name == 'bar'
+        assert wizard.console.input.call_count == 2
+
 
     @pytest.mark.parametrize('named', [True, False])
     def test_register(self, named):

paths_cli/wizard/core.py

@@ -6,39 +6,6 @@
 
 WizardSay = namedtuple("WizardSay", ['msg', 'mode'])
 
-def name(wizard, obj, obj_type, store_name, default=None):
-    wizard.say(f"Now let's name your {obj_type}.")
-    name = None
-    while name is None:
-        name = wizard.ask("What do you want to call it?")
-        if name in getattr(wizard, store_name):
-            wizard.bad_input(f"Sorry, you already have {a_an(obj_type)} "
-                             f"{obj_type} named {name}. Please try another "
-                             "name.")
-            name = None
-
-    obj = obj.named(name)
-
-    wizard.say(f"'{name}' is a good name for {a_an(obj_type)} {obj_type}. "
-               + name_joke(name, obj_type))
-    return obj
-
-def abort_retry_quit(wizard, obj_type):
-    a_an = a_an(obj_type)
-    retry = wizard.ask(f"Do you want to try again to make {a_an} "
-                       f"{obj_type}, do you want to continue without, or "
-                       f"do you want to quit?",
-                       options=["[R]etry", "[C]ontinue", "[Q]uit"])
-    if retry == 'q':
-        exit()
-    elif retry == 'r':
-        return
-    elif retry == 'c':
-        return "continue"
-    else:
-        raise ImpossibleError()
-
-
 def interpret_req(req):
     _, min_, max_ = req
     string = ""

paths_cli/wizard/tps.py

@@ -11,7 +11,7 @@ def tps_scheme(wizard, network=None):
         network = get_missing_object(wizard, wizard.networks, 'network',
                                      tps_network)
 
-    shooting_strategy = shooting(wizard, network)
+    shooting_strategy = shooting(wizard, network=network)
 
     if not isinstance(shooting_strategy, paths.MoveStrategy):
         # this means we got a fixed scheme and can't do strategies