Skip to content

cli wip #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vsui wants to merge 17 commits into
base: master
Choose a base branch
from
Open

cli wip #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cfc911d
cli: catch boost::program_options parsing errors
vsui Dec 18, 2018
0d777be
cli: log command wip
vsui Dec 19, 2018
6230675
cli: add `head list` and `link list`
vsui Dec 19, 2018
2bae932
cli: modify append interface
vsui Dec 19, 2018
419ecb8
cli: remove rename
vsui Dec 19, 2018
af9bf8b
cli: remove dead code
vsui Dec 19, 2018
0d78486
cli: dump log number and first eighty bytes in hex
vsui Dec 19, 2018
0f8718d
cli: append file as single log entry
vsui Dec 19, 2018
94fcc3e
cli: left-pad hex on log dump
vsui Dec 19, 2018
fc9035f
cli: add test
vsui Dec 20, 2018
07a1256
cli: fix test path
vsui Dec 20, 2018
3c36f4f
cli: install zlog cli tool
dotnwat Dec 20, 2018
42f9f29
cli: prevent segfault when reading log name
vsui Dec 20, 2018
91c2c12
cli: better error handle on read
vsui Dec 20, 2018
23f7685
cli: add read command
vsui Dec 20, 2018
2a0f41c
cli: better error reporting for bad cli calls
vsui Dec 20, 2018
0a02b4a
Merge branch 'cli' of https://github.com/vsui/zlog into cli
vsui Dec 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions ci/cli-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#!/bin/bash
set -e
set -x

CLI_CMD=zlog
LMDB_DIR=$(mktemp -d)

INPUT_FILE=$(mktemp)
OUTPUT_FILE=$(mktemp)
EXPECTED_FILE=$(mktemp)
trap "rm -rf ${LMDB_DIR} ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECTED_FILE}" exit

${CLI_CMD} --backend lmdb --db-path ${LMDB_DIR} log create testlog
! ${CLI_CMD} --backend lmdb --db-path ${LMDB_DIR} log create testlog

${CLI_CMD} --backend lmdb --db-path ${LMDB_DIR} log append testlog 'just a lil test'
${CLI_CMD} --backend lmdb --db-path ${LMDB_DIR} log append testlog 'and another'
${CLI_CMD} --backend lmdb --db-path ${LMDB_DIR} log append testlog 'one more and were done'

echo '616e6420616e6f74686572' >> ${EXPECTED_FILE}
${CLI_CMD} --backend lmdb --db-path ${LMDB_DIR} log read testlog 1 >> ${OUTPUT_FILE}
diff ${EXPECTED_FILE} ${OUTPUT_FILE}

> ${EXPECTED_FILE}
> ${OUTPUT_FILE}

echo 'arthur willey!' >> ${INPUT_FILE}
echo 'nautili hunter' >> ${INPUT_FILE}
echo 'abcdefghijlmno' >> ${INPUT_FILE}

${CLI_CMD} --backend lmdb --db-path ${LMDB_DIR} log append testlog -i ${INPUT_FILE}

echo '0: 6a7573742061206c696c2074657374' >> ${EXPECTED_FILE}
echo '1: 616e6420616e6f74686572' >> ${EXPECTED_FILE}
echo '2: 6f6e65206d6f726520616e64207765726520646f6e65' >> ${EXPECTED_FILE}
echo '3: 6172746875722077696c6c6579210a6e617574696c692068756e7465720a6162636465666768696a6c6d6e6f0a' >> ${EXPECTED_FILE}

${CLI_CMD} --backend lmdb --db-path ${LMDB_DIR} log dump testlog >> ${OUTPUT_FILE}

diff ${EXPECTED_FILE} ${OUTPUT_FILE}

${CLI_CMD} --backend lmdb --db-path ${LMDB_DIR} log fill testlog 30
! ${CLI_CMD} --backend lmdb --db-path ${LMDB_DIR} log fill testlog 1

${CLI_CMD} --backend lmdb --db-path ${LMDB_DIR} log trim testlog 2

5 changes: 5 additions & 0 deletions ci/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,8 @@ if [[ "$OSTYPE" != "darwin"* && "$JNI" == "ON" ]]; then

popd
fi

# test cli
export PATH
${ZLOG_DIR}/ci/cli-test.sh

1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,4 @@ target_link_libraries(zlog
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_SYSTEM_LIBRARY}
)
install(TARGETS zlog DESTINATION bin)
Loading