Skip to content

Commit

Permalink
Merge pull request #110 from cytopia/release-0.1.2
Browse files Browse the repository at this point in the history
Release 0.1.2
  • Loading branch information
cytopia authored Nov 2, 2021
2 parents 7794bac + de36764 commit 5a2f807
Show file tree
Hide file tree
Showing 10 changed files with 93 additions and 66 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
## Unreleased


## Release 0.1.2

### Fixes
- Fixes: [#109](https://github.com/cytopia/pwncat/issues/109) when pasting in term I donot get full line echo


## Release 0.1.1

### Fixes
Expand Down
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ _code-pycodestyle:
echo "# Check pycodestyle: $${V}"; \
echo "# -------------------------------------------------------------------- #"
@#
docker pull cytopia/pycodestyle
docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data --entrypoint= cytopia/pycodestyle sh -c ' \
mkdir -p /tmp \
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
Expand All @@ -163,6 +164,7 @@ _code-pydocstyle:
echo "# Check pydocstyle: $${V}"; \
echo "# -------------------------------------------------------------------- #"
@#
docker pull cytopia/pydocstyle
docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data --entrypoint= cytopia/pydocstyle sh -c ' \
mkdir -p /tmp \
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
Expand All @@ -175,6 +177,7 @@ _code-pylint:
echo "# Check pylint: $${V}"; \
echo "# -------------------------------------------------------------------- #"
@#
docker pull cytopia/pylint
docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data --entrypoint= cytopia/pylint sh -c ' \
mkdir -p /tmp \
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
Expand All @@ -187,6 +190,7 @@ _code-black:
echo "# Check Python Black: $${V}"; \
echo "# -------------------------------------------------------------------- #"
@#
docker pull cytopia/black
docker run --rm $$(tty -s && echo "-it" || echo) -v ${PWD}:/data --entrypoint= cytopia/black sh -c ' \
mkdir -p /tmp \
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
Expand All @@ -199,6 +203,7 @@ _code-mypy:
echo "# Check Mypy: $${V}"; \
echo "# -------------------------------------------------------------------- #"
@#
docker pull cytopia/mypy
docker run --rm $$(tty -s && echo "-it" || echo) -v ${PWD}:/data --entrypoint= cytopia/mypy sh -c ' \
mkdir -p /tmp \
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
Expand Down Expand Up @@ -499,6 +504,7 @@ docs: _docs-version_readme

.PHONY: _docs-man
_docs-man: $(BINPATH)$(BINNAME)
docker pull python:3-alpine
docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data -w /data -e UID=$(UID) -e GID=${GID} python:3-alpine sh -c ' \
apk add help2man \
&& help2man -n $(BINNAME) --no-info --source=https://github.com/cytopia/pwncat -s 1 -o $(MANPATH)$(BINNAME).1 $(BINPATH)$(BINNAME) \
Expand All @@ -520,6 +526,7 @@ _docs-man: $(BINPATH)$(BINNAME)
.PHONY: _docs-api
_docs-api:
@# Generate pdoc API page
docker pull python:3-alpine
docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data -w /data -e UID=$(UID) -e GID=${GID} python:3-alpine sh -c ' \
pip install pdoc3 \
&& mkdir -p /tmp \
Expand All @@ -531,6 +538,8 @@ _docs-api:
.PHONY: _docs-mypy_type_coverage
_docs-mypy_type_coverage:
@# Generate mypy code coverage page
docker pull cytopia/mypy
docker pull python:3-alpine
docker run --rm $$(tty -s && echo "-it" || echo) -v ${PWD}:/data -w /data -e UID=$(UID) -e GID=${GID} --entrypoint= cytopia/mypy sh -c ' \
mypy --config-file setup.cfg --html-report tmp $(BINPATH)$(BINNAME) \
&& cp -f tmp/mypy-html.css docs/css/mypy.css \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
</tbody>
</table>

> <sup>[1] <a href="https://cytopia.github.io/pwncat/pwncat.type.html">mypy type coverage</a> <strong>(fully typed: 93.96%)</strong></sup><br/>
> <sup>[1] <a href="https://cytopia.github.io/pwncat/pwncat.type.html">mypy type coverage</a> <strong>(fully typed: 94.00%)</strong></sup><br/>
> <sup>[2] <strong>Failing builds do not indicate broken functionality.</strong> Integration tests run for multiple hours and break sporadically for various different reasons (network timeouts, unknown cancellations of GitHub Actions, etc): <a href="https://github.com/actions/virtual-environments/issues/736">#735</a>, <a href="https://github.com/actions/virtual-environments/issues/841">#841</a></sup><br/>
> <sup></sup>
Expand Down Expand Up @@ -166,7 +166,7 @@ tool that works on older and newer machines (hence Python 2+3 compat). Most impo

## :tada: Install

Current version is: **0.1.1**
Current version is: **0.1.2**

#### Generic

Expand Down
7 changes: 5 additions & 2 deletions bin/pwncat
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ if os.environ.get("MYPY_CHECK", False):

APPNAME = "pwncat"
APPREPO = "https://github.com/cytopia/pwncat"
VERSION = "0.1.1"
VERSION = "0.1.2"

# Default timeout for timeout-based sys.stdin and socket.recv
TIMEOUT_READ_STDIN = 0.05
Expand Down Expand Up @@ -3525,7 +3525,10 @@ class IOStdinStdout(IO):

# [2/3] (Linux/Mac) Raw mode
if self.__stdin_israw():
self.__set_input_timeout()
# Issue #109
# when pasting in term I donot get full line echo
# To mitigate this, I'm disabling the select.select call on sys.stdin
# self.__set_input_timeout()
if self.__py3:
return sys.stdin.buffer.read(1)
return sys.stdin.read(1) # type: ignore
Expand Down
16 changes: 11 additions & 5 deletions docs/pwncat.api.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1" />
<meta name="generator" content="pdoc 0.9.2" />
<meta name="generator" content="pdoc 0.10.0" />
<title>pwncat API documentation</title>
<meta name="description" content="pwncat." />
<link rel="preload stylesheet" as="style" href="https://cdnjs.cloudflare.com/ajax/libs/10up-sanitize.css/11.0.1/sanitize.min.css" integrity="sha256-PK9q560IAAa6WVRRh76LtCaI8pjTJ2z11v0miyNNjrs=" crossorigin>
Expand Down Expand Up @@ -157,7 +157,7 @@ <h1 class="title">Module <code>pwncat</code></h1>

APPNAME = &#34;pwncat&#34;
APPREPO = &#34;https://github.com/cytopia/pwncat&#34;
VERSION = &#34;0.1.1&#34;
VERSION = &#34;0.1.2&#34;

# Default timeout for timeout-based sys.stdin and socket.recv
TIMEOUT_READ_STDIN = 0.05
Expand Down Expand Up @@ -3554,7 +3554,10 @@ <h1 class="title">Module <code>pwncat</code></h1>

# [2/3] (Linux/Mac) Raw mode
if self.__stdin_israw():
self.__set_input_timeout()
# Issue #109
# when pasting in term I donot get full line echo
# To mitigate this, I&#39;m disabling the select.select call on sys.stdin
# self.__set_input_timeout()
if self.__py3:
return sys.stdin.buffer.read(1)
return sys.stdin.read(1) # type: ignore
Expand Down Expand Up @@ -12672,7 +12675,10 @@ <h2 id="args">Args</h2>

# [2/3] (Linux/Mac) Raw mode
if self.__stdin_israw():
self.__set_input_timeout()
# Issue #109
# when pasting in term I donot get full line echo
# To mitigate this, I&#39;m disabling the select.select call on sys.stdin
# self.__set_input_timeout()
if self.__py3:
return sys.stdin.buffer.read(1)
return sys.stdin.read(1) # type: ignore
Expand Down Expand Up @@ -18108,7 +18114,7 @@ <h4><code><a title="pwncat.TransformSafeword" href="#pwncat.TransformSafeword">T
</nav>
</main>
<footer id="footer">
<p>Generated by <a href="https://pdoc3.github.io/pdoc"><cite>pdoc</cite> 0.9.2</a>.</p>
<p>Generated by <a href="https://pdoc3.github.io/pdoc" title="pdoc: Python API documentation generator"><cite>pdoc</cite> 0.10.0</a>.</p>
</footer>
</body>
</html>
Loading

0 comments on commit 5a2f807

Please sign in to comment.