Split wormhole_cli out to separate package

setup.py

@@ -16,11 +16,12 @@ setup(name="magic-wormhole",
       packages=["wormhole",
                 "wormhole.blocking",
                 "txwormhole",
-                "wormhole.scripts", "wormhole.test", "wormhole.util",
+                "wormhole_cli",
+                "wormhole.test", "wormhole.util",
                 "wormhole_server"],
       package_data={"wormhole_server": ["db-schemas/*.sql"]},
       entry_points={"console_scripts":
-                    ["wormhole = wormhole.scripts.runner:entry",
+                    ["wormhole = wormhole_cli.runner:entry",
                      "wormhole-server = wormhole_server.runner:entry",
                      ]},
       install_requires=["spake2==0.3", "pynacl", "requests", "argparse",

src/wormhole/test/test_load.py

@@ -8,3 +8,5 @@ class Import(unittest.TestCase):
         self.assertTrue(len(wormhole_server.__version__))
         import txwormhole
         self.assertTrue(len(txwormhole.__version__))
+        import wormhole_cli
+        self.assertTrue(len(wormhole_cli.__version__))

src/wormhole/test/test_progress.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 import io, time
 from twisted.trial import unittest
-from ..scripts import progress
+from wormhole_cli import progress
 
 class Progress(unittest.TestCase):
     def test_time(self):

src/wormhole/test/test_scripts.py

@@ -6,8 +6,8 @@ from twisted.internet.utils import getProcessOutputAndValue
 from twisted.internet.defer import inlineCallbacks
 from .. import __version__
 from .common import ServerBase
-from ..scripts import runner, cmd_send, cmd_receive
-from ..scripts.cmd_send import build_phase1_data
+from wormhole_cli import runner, cmd_send, cmd_receive
+from wormhole_cli.cmd_send import build_phase1_data
 from ..errors import TransferError
 from ..timing import DebugTiming
 

src/wormhole_cli/__init__.py

@@ -0,0 +1,2 @@
+from wormhole import __version__
+__version__ # hush pyflakes

src/wormhole_cli/cli_args.py

@@ -1,7 +1,7 @@
 import argparse
 from textwrap import dedent
-from .. import public_relay
-from .. import __version__
+from . import public_relay
+from wormhole import __version__
 
 parser = argparse.ArgumentParser(
     usage="wormhole SUBCOMMAND (subcommand-options)",

src/wormhole_cli/cmd_receive.py

@@ -4,7 +4,7 @@ from twisted.internet import reactor, defer
 from twisted.internet.defer import inlineCallbacks, returnValue
 from txwormhole.transcribe import Wormhole, WrongPasswordError
 from txwormhole.transit import TransitReceiver
-from ..errors import TransferError
+from wormhole.errors import TransferError
 from .progress import ProgressPrinter
 
 

src/wormhole_cli/cmd_send.py

@@ -3,7 +3,7 @@ import os, sys, io, json, binascii, six, tempfile, zipfile
 from twisted.protocols import basic
 from twisted.internet import reactor, defer
 from twisted.internet.defer import inlineCallbacks, returnValue
-from ..errors import TransferError
+from wormhole.errors import TransferError
 from .progress import ProgressPrinter
 from txwormhole.transcribe import Wormhole, WrongPasswordError
 from txwormhole.transit import TransitSender

src/wormhole_cli/runner.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 import os, sys
-from ..errors import TransferError
-from ..timing import DebugTiming
+from wormhole.errors import TransferError
+from wormhole.timing import DebugTiming
 from .cli_args import parser
 
 def dispatch(args):