From 3f562702fcf9ddce1b23c770bc21c9a427a3ab0a Mon Sep 17 00:00:00 2001 From: Johan Bloemberg Date: Sun, 22 Oct 2017 15:15:35 +0200 Subject: [PATCH 1/8] Packaging and dependencies. --- setup.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 setup.py diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..77f3cac --- /dev/null +++ b/setup.py @@ -0,0 +1,16 @@ +from setuptools import find_packages, setup + +setup( + name='checkdnssec', + version='0.1', + packages='checkdnssec', + install_requires=[ + 'dnspython', + 'pycrypto', + ], + entry_points={ + 'console_scripts': [ + 'checkdnssec = checkdnssec:main', + ], + }, +) From 6c70a36ff4f4bf734069f16d0fdc0a40081b96c0 Mon Sep 17 00:00:00 2001 From: Johan Bloemberg Date: Sun, 22 Oct 2017 15:16:27 +0200 Subject: [PATCH 2/8] Allow main to be exported as command. --- checkdnssec.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checkdnssec.py b/checkdnssec.py index ede175b..21bb8df 100644 --- a/checkdnssec.py +++ b/checkdnssec.py @@ -59,11 +59,11 @@ def get_dnssec(dnsresolver, domain_name): return +if __name__ == "__main__": + main() - -if __name__ == "__main__": - +def main(): dnsresolver = dns.resolver.Resolver() # set a default nameserver dnsresolver.nameservers = ["8.8.8.8"] From 7dcf74cb0d8813f12b3f3565449dacad283f2261 Mon Sep 17 00:00:00 2001 From: Johan Bloemberg Date: Sun, 22 Oct 2017 15:19:13 +0200 Subject: [PATCH 3/8] Fix package search. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 77f3cac..6bf2acf 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ setup( name='checkdnssec', version='0.1', - packages='checkdnssec', + packages=find_packages(), install_requires=[ 'dnspython', 'pycrypto', From d4cc7c808ee19f63e1884144d182eecaa6ca16f0 Mon Sep 17 00:00:00 2001 From: Johan Bloemberg Date: Sun, 22 Oct 2017 15:20:13 +0200 Subject: [PATCH 4/8] ignores --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1e2bcb3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +__pycache__/ +*.egg-info From 02f03fa5f9a1ef14101d8d05812a8fa44c7a2f64 Mon Sep 17 00:00:00 2001 From: Johan Bloemberg Date: Sun, 22 Oct 2017 15:23:06 +0200 Subject: [PATCH 5/8] Allow arguments on command line, and provide exit code as feedback. --- checkdnssec.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/checkdnssec.py b/checkdnssec.py index 21bb8df..109cf02 100644 --- a/checkdnssec.py +++ b/checkdnssec.py @@ -69,11 +69,16 @@ def main(): dnsresolver.nameservers = ["8.8.8.8"] dnsresolver.timeout = 1.0 dnsresolver.lifetime = 1.0 - domain_name = "faalkaart.nl." - + if len(sys.argv) == 2: + domain_name = sys.argv[1] + else: + domaigitgn_name = "faalkaart.nl." + try: get_dnssec(dnsresolver, domain_name) - print("Success " + domain_name) except: print("Failure " + domain_name) - + sys.exit(1) + + print("Success " + domain_name) + sys.exit(0) From c60ba957d13270a91c896ffb789f775cb1f09c2e Mon Sep 17 00:00:00 2001 From: Johan Bloemberg Date: Sun, 22 Oct 2017 15:35:42 +0200 Subject: [PATCH 6/8] add travis config, basic tox setup --- .envrc | 2 ++ .gitignore | 1 + .travis.yml | 22 ++++++++++++++++++++++ tox.ini | 0 4 files changed, 25 insertions(+) create mode 100644 .envrc create mode 100644 .travis.yml create mode 100644 tox.ini diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..2bfabec --- /dev/null +++ b/.envrc @@ -0,0 +1,2 @@ +layout python3 +python setup.py develop diff --git a/.gitignore b/.gitignore index 1e2bcb3..f9463ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ __pycache__/ *.egg-info +.tox diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..77253b3 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +language: python +# supported python versions +python: + - 3.4 + - 3.6 + - 2.7 + - pypy3 + +# test installation using tox (no testsuite/codestyle yet) +install: pip install tox-travis +script: tox + +# push package to pypi +deploy: + provider: pypi + user: + password: + secure: + distributions: "sdist bdist_wheel" + on: + # don't push on every pull request + repo: suresync/checkdnssec diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..e69de29 From b6f3b829d934300e305dfe3af3cafd30496feb08 Mon Sep 17 00:00:00 2001 From: Johan Bloemberg Date: Sun, 22 Oct 2017 17:31:05 +0200 Subject: [PATCH 7/8] Add pypi deployment. --- .travis.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 77253b3..71127b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,19 @@ language: python -# supported python versions python: - 3.4 - 3.6 - 2.7 - pypy3 -# test installation using tox (no testsuite/codestyle yet) install: pip install tox-travis script: tox -# push package to pypi deploy: provider: pypi - user: + user: faalkaart password: - secure: - distributions: "sdist bdist_wheel" + secure: EiiJBSC1D6+mWqKOWZvXmkcMvJGcGTt+ZtT4mjR4+ft5X+FAI/i8ouzKlRBAhzM3FTAQbAU6+vD8KGS/NrRqmIL7kOvE4TBegBSZk4jcfp5YNqD3LNmdHOl3O66dR3HJBIYmz10XuzhBIdK/If7nohywGjIIiaxlM8LpQif26cKiFnsMn1USI5aA+3+DVePg6TghcX9Sm4ne2x41DwdEZ+LnlPO0ajc+HzszkznZ6xM6H8y061LtFnI3mJNL/vH6EKMofTSimpgpgLu4mA3XOgLxZYd2FOAXYCzwjpQlPL8yM1XtgWUNMQ/Kp5DF/FtNAF4bDweCr5MSG5o/9+jwO60Z1BD1nCi3bblYDVWQooaC/WKhh7k9YJk0Rn4DmqQUdLn2AffPbLBFvM3Y6t3hcLBOte1XW97EVgGysgCY9IaCrdV1HKaDGlLQCtro+DZ6UA6+sgQkB6ls+lQS1EctYDwW/zjv2MuVHZplCH43xkuGHNOaxwi6jhkB6jk1a0gYl43oLmzz9KMEnvgAEDDCbE6S+IooKPQXpxHNG2X1bStbDdQIpFv4e468uGy6MFx0OV0vwfJSs6jJi5VO/HPg87P73gBb+orcj5mtNO04cPJgvWmquXYg3NQmO+B7VoLihYmYksqhuPi29vIZjGaUSZUF6ElszCd7XSwwSR8cOh0= + distributions: sdist bdist_wheel on: - # don't push on every pull request - repo: suresync/checkdnssec + repo: failmap/checkdnssec + tags: true From b20dacf65587d465f32441fce637f1ffd1bd5f5d Mon Sep 17 00:00:00 2001 From: Johan Bloemberg Date: Sun, 22 Oct 2017 17:33:15 +0200 Subject: [PATCH 8/8] Auto version from git. --- setup.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6bf2acf..9811fa2 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,16 @@ from setuptools import find_packages, setup +from subprocess import check_output + + +def version_from_git(): + """Acquire package version form current git tag.""" + return check_output(['git', 'describe', '--tags', '--abbrev=0'], + universal_newlines=True) + setup( name='checkdnssec', - version='0.1', + version=version_from_git(), packages=find_packages(), install_requires=[ 'dnspython',