Shim renew() in main.py, keep the work in renewal.py

letsencrypt/cli.py

@@ -355,11 +355,10 @@ class HelpfulArgumentParser(object):
 
     def __init__(self, args, plugins, detect_defaults=False):
         from letsencrypt import main
-        from letsencrypt import renew
         self.VERBS = {"auth": main.obtain_cert, "certonly": main.obtain_cert,
                       "config_changes": main.config_changes, "run": main.run,
                       "install": main.install, "plugins": main.plugins_cmd,
-                      "renew": renew.renew, "revoke": main.revoke,
+                      "renew": main.renew, "revoke": main.revoke,
                       "rollback": main.rollback, "everything": main.run}
 
         # List of topics for which additional help can be provided

letsencrypt/main.py

@@ -27,7 +27,7 @@ from letsencrypt import interfaces
 from letsencrypt import le_util
 from letsencrypt import log
 from letsencrypt import reporter
-from letsencrypt import renew
+from letsencrypt import renewal
 from letsencrypt import storage
 
 from letsencrypt.display import util as display_util, ops as display_ops
@@ -186,7 +186,7 @@ def _handle_identical_cert_request(config, cert):
     :rtype: tuple
 
     """
-    if renew.should_renew(config, cert):
+    if renewal.should_renew(config, cert):
         return "renew", cert
     if config.reinstall:
         # Set with --reinstall, force an identical certificate to be
@@ -263,7 +263,7 @@ def _find_duplicative_certs(config, domains):
     # Verify the directory is there
     le_util.make_or_verify_dir(configs_dir, mode=0o755, uid=os.geteuid())
 
-    for renewal_file in renew.renewal_conf_files(cli_config):
+    for renewal_file in renewal.renewal_conf_files(cli_config):
         try:
             candidate_lineage = storage.RenewableCert(renewal_file, cli_config)
         except (errors.CertStorageError, IOError):
@@ -552,6 +552,11 @@ def obtain_cert(config, plugins, lineage=None):
                   config.installer, "server; fullchain is", lineage.fullchain)
     _suggest_donation_if_appropriate(config, action)
 
+def renew(config, unused_plugins):
+    """Renew previously-obtained certificates."""
+    renewal.renew_all_lineages(config)
+
+
 
 def setup_log_file_handler(config, logfile, fmt):
     """Setup file debug logging."""

letsencrypt/renewal.py

@@ -236,8 +236,8 @@ def _renew_describe_results(config, renew_successes, renew_failures,
         print("**          (The test certificates above have not been saved.)")
 
 
-def renew(config, unused_plugins):
-    """Renew previously-obtained certificates."""
+def renew_all_lineages(config):
+    """Examine each lineage; renew if due and report results"""
 
     if config.domains != []:
         raise errors.Error("Currently, the renew verb is only capable of "

letsencrypt/tests/cli_test.py

@@ -23,7 +23,7 @@ from letsencrypt import crypto_util
 from letsencrypt import errors
 from letsencrypt import le_util
 from letsencrypt import main
-from letsencrypt import renew
+from letsencrypt import renewal
 from letsencrypt import storage
 
 from letsencrypt.plugins import disco
@@ -666,7 +666,7 @@ class CLITest(unittest.TestCase):  # pylint: disable=too-many-public-methods
             configuration.RenewerConfiguration(config))
         renewalparams = lineage.configuration["renewalparams"]
         # pylint: disable=protected-access
-        renew._restore_webroot_config(config, renewalparams)
+        renewal._restore_webroot_config(config, renewalparams)
         self.assertEqual(config.webroot_path, ["/var/www/"])
 
     def test_renew_verb_empty_config(self):
@@ -745,7 +745,7 @@ class CLITest(unittest.TestCase):  # pylint: disable=too-many-public-methods
 
     def test_renew_reconstitute_error(self):
         # pylint: disable=protected-access
-        with mock.patch('letsencrypt.main.renew._reconstitute') as mock_reconstitute:
+        with mock.patch('letsencrypt.main.renewal._reconstitute') as mock_reconstitute:
             mock_reconstitute.side_effect = Exception
             self._test_renew_common(assert_oc_called=False, error_expected=True)