Skip to content

Commit

Permalink
v1.0.0 - initial stable release
Browse files Browse the repository at this point in the history
  • Loading branch information
clarketm committed Feb 4, 2019
1 parent f9cdcc5 commit 00f3c79
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
4 changes: 1 addition & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
include LICENSE README.md
recursive-include s3recon *
recursive-include data *
include LICENSE README.md s3recon/s3recon.yml data/*.txt
2 changes: 1 addition & 1 deletion s3recon/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.0.0"
__version__ = "1.0.0"
14 changes: 9 additions & 5 deletions s3recon/s3recon.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env python3

from asyncio import get_event_loop, gather
from collections import defaultdict
from datetime import datetime
from json import dumps
from logging import getLogger, basicConfig, INFO
from os import environ
from pathlib import Path
from random import choice
Expand Down Expand Up @@ -32,6 +32,11 @@

filterwarnings("ignore", category=InsecureRequestWarning)

logger = getLogger(__name__)

# TODO: opt to change log-level
basicConfig(format="%(message)s", level=INFO)


def bucket_exists(url, timeout):
exists = False
Expand Down Expand Up @@ -60,7 +65,7 @@ def find_bucket(url, timeout):
if exists:
access = public_key if public else private_key
access_word = public_text if public else private_text
print(f"{access} {access_word} {url}", end="\n")
logger.info(f"{access} {access_word} {url}")
return access, url

return None
Expand Down Expand Up @@ -88,7 +93,6 @@ def read_config():

for c in config_hierarchy:
try:
print(c)
c = load(open(c, "r"))
merge(config, c)
except IOError:
Expand Down Expand Up @@ -123,8 +127,8 @@ def main(words, timeout, output):
private, public = collect_results(r)
stop = datetime.now()

print(f"Complete after: {stop - start}")
print(f"Output written to: {output.name}")
logger.info(f"Complete after: {stop - start}")
logger.info(f"Output written to: {output.name}")

output.write(
dumps(
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def open_local(paths, mode="r", encoding="utf8"):
long_description_content_type="text/markdown",
url="https://github.com/clarketm/s3recon",
packages=setuptools.find_packages(),
include_package_data=True,
install_requires=install_requires,
entry_points={"console_scripts": ["s3recon=s3recon.s3recon:cli"]},
classifiers=(
Expand Down

0 comments on commit 00f3c79

Please sign in to comment.