From 49da8a2602d494e493a94bea0269cb882b5c4f17 Mon Sep 17 00:00:00 2001 From: sonny Date: Fri, 1 Jan 2021 14:21:33 +0100 Subject: [PATCH 1/2] Fix gitlab ci include path --- .gitlab-ci.yml | 4 ++-- CHANGELOG.md | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b83da50..c505c28 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,5 +13,5 @@ cache: - .cache/poetry include: - - local: '/gitlab-ci/test.yml' - - local: '/gitlab-ci/release.yml' + - local: '/gitlab/test.yml' + - local: '/gitlab/release.yml' diff --git a/CHANGELOG.md b/CHANGELOG.md index bd929af..c233e9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.1.1 + +- Fix gitlab ci include path + ## 0.1 - Initial release From e7800241402d1ae0555be5fb9ec7238c55401b42 Mon Sep 17 00:00:00 2001 From: sonny Date: Sat, 2 Jan 2021 14:40:28 +0100 Subject: [PATCH 2/2] Rename project --- .coveragerc | 2 +- .isort.cfg | 2 +- CHANGELOG.md | 4 +++ pyproject.toml | 6 ++--- {ip_listener => transip_client}/__init__.py | 0 {ip_listener => transip_client}/cli.py | 2 +- {ip_listener => transip_client}/main.py | 0 {ip_listener => transip_client}/tests.py | 28 ++++++++++----------- 8 files changed, 24 insertions(+), 20 deletions(-) rename {ip_listener => transip_client}/__init__.py (100%) rename {ip_listener => transip_client}/cli.py (94%) rename {ip_listener => transip_client}/main.py (100%) rename {ip_listener => transip_client}/tests.py (92%) diff --git a/.coveragerc b/.coveragerc index 5536201..5e8d914 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,5 +1,5 @@ [run] -source = ./ip_listener/ +source = ./transip_client/ omit = **/tests/** **/tests.py diff --git a/.isort.cfg b/.isort.cfg index 2443b1a..9327a6a 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -4,7 +4,7 @@ line_length = 88 multi_line_output = 3 skip = env/, venv/ default_section = THIRDPARTY -known_first_party = ip_listener +known_first_party = transip_client sections = FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER lines_between_types=1 lines_after_imports=2 diff --git a/CHANGELOG.md b/CHANGELOG.md index c233e9f..6ae58d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.2.0 + +- Rename project + ## 0.1.1 - Fix gitlab ci include path diff --git a/pyproject.toml b/pyproject.toml index ab4ac69..63ff6ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] -name = "ip-listener" -version = "0.1.0" +name = "transip_client" +version = "0.2.0" description = "Listens for changes about the current public IP and acts upon it." authors = ["sonny "] license = "GPL-3.0" @@ -22,7 +22,7 @@ autoflake = "^1.4" coverage = "^5.3.1" [tool.poetry.scripts] -listen = "ip_listener.cli:run" +listen = "transip_client.cli:run" [build-system] requires = ["poetry>=0.12"] diff --git a/ip_listener/__init__.py b/transip_client/__init__.py similarity index 100% rename from ip_listener/__init__.py rename to transip_client/__init__.py diff --git a/ip_listener/cli.py b/transip_client/cli.py similarity index 94% rename from ip_listener/cli.py rename to transip_client/cli.py index d6f669a..0eeada7 100644 --- a/ip_listener/cli.py +++ b/transip_client/cli.py @@ -1,6 +1,6 @@ import click -from ip_listener.main import detect +from transip_client.main import detect DEFAULT_DNS = "myip.opendns.com" DEFAULT_DNS_NAME = "@resolver1.opendns.com" diff --git a/ip_listener/main.py b/transip_client/main.py similarity index 100% rename from ip_listener/main.py rename to transip_client/main.py diff --git a/ip_listener/tests.py b/transip_client/tests.py similarity index 92% rename from ip_listener/tests.py rename to transip_client/tests.py index 06276b8..2a2fa3b 100644 --- a/ip_listener/tests.py +++ b/transip_client/tests.py @@ -7,18 +7,18 @@ from click.testing import CliRunner from pkg_resources import get_distribution from requests import HTTPError -from ip_listener.cli import DEFAULT_API_URL, run +from transip_client.cli import DEFAULT_API_URL, run class RunTestCase(TestCase): def setUp(self): - patcher = patch("ip_listener.main.subprocess.check_output") + patcher = patch("transip_client.main.subprocess.check_output") self.mocked_dns = patcher.start() - patcher = patch("ip_listener.main.requests.get") + patcher = patch("transip_client.main.requests.get") self.mocked_get = patcher.start() - patcher = patch("ip_listener.main.requests.put") + patcher = patch("transip_client.main.requests.put") self.mocked_put = patcher.start() self.runner = CliRunner() @@ -46,11 +46,11 @@ class RunTestCase(TestCase): ], } - with self.assertLogs("ip_listener.main", level="INFO") as logger: + with self.assertLogs("transip_client.main", level="INFO") as logger: result = self.runner.invoke(run, ["foobar.com", "TOKEN"]) self.assertEqual( - logger.output, ["INFO:ip_listener.main:Updated domain foobar.com"] + logger.output, ["INFO:transip_client.main:Updated domain foobar.com"] ) self.assertEqual(result.exit_code, 0) @@ -83,7 +83,7 @@ class RunTestCase(TestCase): self.mocked_dns.return_value = b"111.420\n" self.mocked_get.return_value.raise_for_status.side_effect = HTTPError - with self.assertLogs("ip_listener.main", level="INFO") as logger: + with self.assertLogs("transip_client.main", level="INFO") as logger: result = self.runner.invoke(run, ["foobar.com", "TOKEN"]) error_log = logger.output[0] @@ -189,13 +189,13 @@ class RunTestCase(TestCase): ], } - with self.assertLogs("ip_listener.main", level="INFO") as logger: + with self.assertLogs("transip_client.main", level="INFO") as logger: result = self.runner.invoke( run, ["foobar.com", "TOKEN", "--api-url", "https://other-provider.com"] ) self.assertEqual( - logger.output, ["INFO:ip_listener.main:Updated domain foobar.com"] + logger.output, ["INFO:transip_client.main:Updated domain foobar.com"] ) self.assertEqual(result.exit_code, 0) @@ -247,13 +247,13 @@ class RunTestCase(TestCase): ], } - with self.assertLogs("ip_listener.main", level="INFO") as logger: + with self.assertLogs("transip_client.main", level="INFO") as logger: result = self.runner.invoke( run, ["foobar.com", "TOKEN"], env={"API_URL": "https://new-api.com"} ) self.assertEqual( - logger.output, ["INFO:ip_listener.main:Updated domain foobar.com"] + logger.output, ["INFO:transip_client.main:Updated domain foobar.com"] ) self.assertEqual(result.exit_code, 0) @@ -332,7 +332,7 @@ class RunTestCase(TestCase): }, ] - with self.assertLogs("ip_listener.main", level="INFO") as logger: + with self.assertLogs("transip_client.main", level="INFO") as logger: result = self.runner.invoke( run, ["TOKEN"], env={"DOMAINS": "foobar.com foofoo.com"} ) @@ -341,8 +341,8 @@ class RunTestCase(TestCase): self.assertEqual( logger.output, [ - "INFO:ip_listener.main:Updated domain foobar.com", - "INFO:ip_listener.main:Updated domain foofoo.com", + "INFO:transip_client.main:Updated domain foobar.com", + "INFO:transip_client.main:Updated domain foofoo.com", ], )