From 1d552630fc67473ae446d169f37857a4a8c9f0b6 Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Mon, 26 Sep 2016 16:44:27 -0700 Subject: [PATCH 1/4] Update CONTRIBUTING.md to be more welcoming. (#3540) --- CONTRIBUTING.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5f1625658..d740b7d89 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,4 +15,21 @@ to the Sphinx generated docs is provided below. --> -https://certbot.eff.org/docs/contributing.html +# Certbot Contributing Guide + +Hi! Welcome to the Certbot project. We look forward to collaborating with you. + +If you're reporting a bug in Certbot, please make sure to include: + - The version of Certbot you're running. + - The operating system you're running it on. + - The commands you ran. + - What you expected to happen, and + - What actually happened. + +If you're a developer, we have some helpful information in our +[Developer's Guide](https://certbot.eff.org/docs/contributing.html) to get you +started. In particular, we recommend you read these sections + + - [Finding issues to work on](https://certbot.eff.org/docs/contributing.html#find-issues-to-work-on) + - [Coding style](https://certbot.eff.org/docs/contributing.html#coding-style) + - [Submitting a pull request](https://certbot.eff.org/docs/contributing.html#submitting-a-pull-request) From 4358c81f068501076057d1b071263290e5dc45ac Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Tue, 27 Sep 2016 12:08:32 -0700 Subject: [PATCH 2/4] Improve CHANGES.rst. (#3541) Link to a more accurate / useful GitHub page. Partial fix for #3420. * Improve CHANGES.rst. --- CHANGES.rst | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 4ce41a8bc..3b92c125f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,11 +1,8 @@ ChangeLog ========= -Please note: -the change log will only get updated after first release - for now please use the -`commit log `_. +To see the changes in a given release, view the issues closed in a given +release's GitHub milestone: -To see the changes in a given release, inspect the github milestone for the -release. For instance: - -https://github.com/certbot/certbot/issues?utf8=%E2%9C%93&q=milestone%3A0.3.0 + - `Past releases `_ + - `Upcoming releases `_ From b65ea31b42fe419102c08b914c075ba1d1958dfb Mon Sep 17 00:00:00 2001 From: Joona Hoikkala Date: Wed, 28 Sep 2016 20:42:00 +0300 Subject: [PATCH 3/4] Add rope directory to gitignore (#3554) * Ignore .ropeproject --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 48ec7910b..ac2842e27 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ tags *.sw? \#*# .idea +.ropeproject # auth --cert-path --chain-path /*.pem From 769ebfce5ef6059c35a75f2bd63d1419be41e924 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Wed, 28 Sep 2016 15:52:08 -0700 Subject: [PATCH 4/4] Remove pointless question (#3526) * remove unhelpful question about servernames and default vhosts * add prefix about names found in config files * test we include configuration files prefix * Tell the user what kind of conf files were missing domains * Revert "Tell the user what kind of conf files were missing domains" This reverts commit 1066a88daec7d995e2163aa8bcad456846ae8637. --- certbot/display/ops.py | 25 +++++++++++-------------- certbot/tests/display/ops_test.py | 10 ++-------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/certbot/display/ops.py b/certbot/display/ops.py index e8520fe96..ee570221f 100644 --- a/certbot/display/ops.py +++ b/certbot/display/ops.py @@ -103,18 +103,8 @@ def choose_names(installer): names = get_valid_domains(domains) if not names: - manual = z_util(interfaces.IDisplay).yesno( - "No names were found in your configuration files.{0}You should " - "specify ServerNames in your config files in order to allow for " - "accurate installation of your certificate.{0}" - "If you do use the default vhost, you may specify the name " - "manually. Would you like to continue?{0}".format(os.linesep), - default=True) - - if manual: - return _choose_names_manually() - else: - return [] + return _choose_names_manually( + "No names were found in your configuration files. ") code, names = _filter_names(names) if code == display_util.OK and names: @@ -157,10 +147,17 @@ def _filter_names(names): return code, [str(s) for s in names] -def _choose_names_manually(): - """Manually input names for those without an installer.""" +def _choose_names_manually(prompt_prefix=""): + """Manually input names for those without an installer. + :param str prompt_prefix: string to prepend to prompt for domains + + :returns: list of provided names + :rtype: `list` of `str` + + """ code, input_ = z_util(interfaces.IDisplay).input( + prompt_prefix + "Please enter in your domain name(s) (comma and/or space separated) ", cli_flag="--domains") diff --git a/certbot/tests/display/ops_test.py b/certbot/tests/display/ops_test.py index 26f67b69f..2e3e65261 100644 --- a/certbot/tests/display/ops_test.py +++ b/certbot/tests/display/ops_test.py @@ -206,20 +206,14 @@ class ChooseNamesTest(unittest.TestCase): @mock.patch("certbot.display.ops.z_util") def test_no_names_choose(self, mock_util): self.mock_install().get_all_names.return_value = set() - mock_util().yesno.return_value = True domain = "example.com" mock_util().input.return_value = (display_util.OK, domain) actual_doms = self._call(self.mock_install) self.assertEqual(mock_util().input.call_count, 1) self.assertEqual(actual_doms, [domain]) - - @mock.patch("certbot.display.ops.z_util") - def test_no_names_quit(self, mock_util): - self.mock_install().get_all_names.return_value = set() - mock_util().yesno.return_value = False - - self.assertEqual(self._call(self.mock_install), []) + self.assertTrue( + "configuration files" in mock_util().input.call_args[0][0]) @mock.patch("certbot.display.ops.z_util") def test_filter_names_valid_return(self, mock_util):