Issue 639 prints in cdxj

ipwb/__main__.py

@@ -1,26 +1,25 @@
 import sys
-import os
 import argparse
 import tempfile
 import string  # For generating a temp file for stdin
 import random  # For generating a temp file for stdin
-from .__init__ import __version__ as ipwbVersion
+
+from ipwb.check_for_update import check_pypi_for_update
+from .__init__ import __version__ as ipwb_version
 
 # ipwb modules
 from . import replay
 from . import indexer
-from . import util as ipwbUtil
-
-from .util import IPWBREPLAY_HOST, IPWBREPLAY_PORT
+from . import util
 
 
 def main():
-    ipwbUtil.checkForUpdate()
-    args = checkArgs(sys.argv)
+    check_pypi_for_update()
+    checkArgs(sys.argv)
 
 
 def checkArgs_index(args):
-    if not ipwbUtil.isDaemonAlive():
+    if not util.isDaemonAlive():
         sys.exit()
     encKey = None
     compressionLevel = None
@@ -140,11 +139,11 @@ def checkArgs(argsIn):
         '-d', '--daemon',
         help=("Multi-address of IPFS daemon "
               "(default /dns/localhost/tcp/5001/http)"),
-        default=ipwbUtil.IPFSAPI_MUTLIADDRESS,
+        default=util.IPFSAPI_MUTLIADDRESS,
         dest='daemon_address')
     parser.add_argument(
         '-v', '--version', help='Report the version of ipwb', action='version',
-        version='InterPlanetary Wayback ' + ipwbVersion)
+        version='InterPlanetary Wayback ' + ipwb_version)
 
     argCount = len(argsIn)
     cmdList = ['index', 'replay']

ipwb/check_for_update.py

@@ -0,0 +1,30 @@
+import logging
+import re
+
+import requests
+
+from ipwb import __version__ as ipwb_version
+
+logger = logging.getLogger(__name__)
+
+
+def get_latest_ipwb_version() -> str:
+    """Fetch latest IPWB version from PyPI."""
+    response = requests.get('https://pypi.python.org/pypi/ipwb/json').json()
+    return response['info']['version']
+
+
+def check_pypi_for_update():
+    """Check if IPWB is outdated and print out a message if it is."""
+    latest = get_latest_ipwb_version()
+    current = re.sub(r'\.0+', '.', ipwb_version)
+
+    if current != latest and current is not None:
+        logger.warning(
+            'This version of ipwb is outdated. ' +
+            'Please run:\n\n' +
+            '   pip install --upgrade ipwb\n\n'
+            '* Latest version: %s\n' +
+            '* Installed version: %s',
+            latest, current
+        )

ipwb/util.py

@@ -1,7 +1,6 @@
 from __future__ import print_function
 
 from os.path import expanduser
-from os.path import basename
 
 import os
 import sys
@@ -15,17 +14,18 @@
 import logging
 import platform
 
-from six.moves.urllib.request import urlopen
 import json
-from .__init__ import __version__ as ipwbVersion
 
 from pkg_resources import parse_version
 
-# from requests.exceptions import ConnectionError
 from ipfshttpclient.exceptions import ConnectionError
 from ipfshttpclient.exceptions import AddressError
 from multiaddr.exceptions import StringParseError
 
+
+logger = logging.getLogger(__name__)
+
+
 IPFSAPI_MUTLIADDRESS = '/dns/localhost/tcp/5001/http'
 # or '/dns/{host}/tcp/{port}/http'
 # or '/ip4/{ipaddress}/tcp/{port}/http'
@@ -303,24 +303,3 @@ def unsurt(surt):
     except ValueError:
         # May not be a valid surt
         return surt
-
-
-def compareCurrentAndLatestIPWBVersions():
-    try:
-        resp = urlopen('https://pypi.python.org/pypi/ipwb/json')
-        jResp = json.loads(resp.read())
-        latestVersion = jResp['info']['version']
-        currentVersion = re.sub(r'\.0+', '.', ipwbVersion)
-        return (currentVersion, latestVersion)
-    except Exception as e:
-        return (None, None)
-
-
-def checkForUpdate():
-    (current, latest) = compareCurrentAndLatestIPWBVersions()
-
-    if current != latest and current is not None:
-        print('This version of ipwb is outdated.'
-              ' Please run pip install --upgrade ipwb.')
-        print('* Latest version: {0}'.format(latest))
-        print('* Installed version: {0}'.format(current))

tests/test_check_for_update.py

@@ -0,0 +1,39 @@
+from unittest import mock
+
+from ipwb import check_for_update
+
+
+def test_get_latest_ipwb_version():
+    requests_get = mock.MagicMock()
+    requests_get.return_value.json.return_value = {
+        'info': {
+            'version': 'foo!'
+        }
+    }
+
+    with mock.patch('requests.get', requests_get):
+        assert check_for_update.get_latest_ipwb_version() == 'foo!'
+
+
+def test_check_pypi_for_update():
+    get_latest_ipwb_version = mock.MagicMock()
+    get_latest_ipwb_version.return_value = 'foo!'
+
+    logger = mock.MagicMock()
+
+    with mock.patch.multiple(
+        check_for_update,
+        get_latest_ipwb_version=get_latest_ipwb_version,
+        ipwb_version='bar!',
+        logger=logger,
+    ):
+        check_for_update.check_pypi_for_update()
+
+    logger.warning.assert_called_once_with(
+        'This version of ipwb is outdated. Please run:\n\n' +
+        '   pip install --upgrade ipwb\n\n' +
+        '* Latest version: %s\n' +
+        '* Installed version: %s',
+        'foo!',
+        'bar!',
+    )