make clean example
|
@ -1,8 +0,0 @@
|
||||||
import toml
|
|
||||||
|
|
||||||
pyproject = toml.load("pyproject.toml")
|
|
||||||
|
|
||||||
pyproject["tool"]["poetry"]["dependencies"]["python"] = "*"
|
|
||||||
|
|
||||||
with open("pyproject.toml", "w") as toml_file:
|
|
||||||
toml.dump(pyproject, toml_file)
|
|
4
.gitattributes
vendored
|
@ -1,4 +0,0 @@
|
||||||
*.journal text eol=lf
|
|
||||||
*.feature text eol=lf
|
|
||||||
poetry.lock text eol=lf
|
|
||||||
pyrpoject.toml text eol=lf
|
|
12
.github/FUNDING.yml
vendored
|
@ -1,12 +0,0 @@
|
||||||
# These are supported funding model platforms
|
|
||||||
|
|
||||||
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
|
|
||||||
patreon: # Replace with a single Patreon username
|
|
||||||
open_collective: jrnl
|
|
||||||
ko_fi: # Replace with a single Ko-fi username
|
|
||||||
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
|
||||||
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
|
||||||
liberapay: # Replace with a single Liberapay username
|
|
||||||
issuehunt: # Replace with a single IssueHunt username
|
|
||||||
otechie: # Replace with a single Otechie username
|
|
||||||
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
|
|
74
.github/ISSUE_TEMPLATE/bug_report.yaml
vendored
|
@ -1,74 +0,0 @@
|
||||||
name: Bug Report
|
|
||||||
description: Create a report to help us improve
|
|
||||||
title: "Bug Report"
|
|
||||||
labels: [ ":new:", "bug" ]
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
# Bug Report
|
|
||||||
Hello, and thank you for reporting an issue!
|
|
||||||
|
|
||||||
Please fill out the points below, as it will make our process much easier.
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: diagnostic
|
|
||||||
attributes:
|
|
||||||
label: Diagnostic output
|
|
||||||
description: Run `jrnl --diagnostic` and paste the output below
|
|
||||||
placeholder: Paste output here
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: current-behavior
|
|
||||||
attributes:
|
|
||||||
label: Current Behavior
|
|
||||||
description: Please put a short description of what is currently happening.
|
|
||||||
placeholder: Tell us what is happening
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: expected-behavior
|
|
||||||
attributes:
|
|
||||||
label: Expected Behavior
|
|
||||||
description: Please write a short description of what you would expect to happen
|
|
||||||
placeholder: Tell us what should be happening
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: repro-steps
|
|
||||||
attributes:
|
|
||||||
label: Repro Steps
|
|
||||||
description: |
|
|
||||||
Provide the steps to reproduce the problem.
|
|
||||||
|
|
||||||
Please be as precise as possible, since more info will let us help you faster.
|
|
||||||
placeholder: Repro steps
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: debug-output
|
|
||||||
attributes:
|
|
||||||
label: Debug output
|
|
||||||
description: |
|
|
||||||
Please provide the output of your command with the `--debug` flag on.
|
|
||||||
placeholder: "example: `jrnl --debug lorem ipsum`"
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: other-info
|
|
||||||
attributes:
|
|
||||||
label: Other Information
|
|
||||||
description: >
|
|
||||||
Is there anything else we should know?
|
|
||||||
|
|
||||||
(e.g. more detailed explanation, stacktraces, related
|
|
||||||
issues, suggestions how to fix, links for us to have context, eg.
|
|
||||||
stackoverflow, gitter, etc)
|
|
||||||
validations:
|
|
||||||
required: false
|
|
1
.github/ISSUE_TEMPLATE/config.yml
vendored
|
@ -1 +0,0 @@
|
||||||
blank_issues_enabled: false
|
|
41
.github/ISSUE_TEMPLATE/documentation.yaml
vendored
|
@ -1,41 +0,0 @@
|
||||||
name: Documentation Change
|
|
||||||
description: Request or report any updates to our documentation (https://jrnl.sh)
|
|
||||||
title: Documentation Change
|
|
||||||
labels: [ ":new:", "documentation" ]
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
# Documentation Change
|
|
||||||
Hello, and thank you for reporting an issue!
|
|
||||||
|
|
||||||
Please fill out the points below, as it will make our process much easier.
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: affected-pages
|
|
||||||
attributes:
|
|
||||||
label: Affected Page(s)
|
|
||||||
description: >
|
|
||||||
Please tell us which page, or pages, from the documentation site
|
|
||||||
(https://jrnl.sh) are affected in this issue
|
|
||||||
placeholder: "example: https://jrnl.sh/en/stable/overview"
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: what-could-be-better
|
|
||||||
attributes:
|
|
||||||
label: What Could Be Better?
|
|
||||||
description: >
|
|
||||||
Please write a short description of what you hope can be clarified or
|
|
||||||
further explained.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: other-info
|
|
||||||
attributes:
|
|
||||||
label: Other Information
|
|
||||||
description: Is there anything else we should know that might be helpful?
|
|
||||||
validations:
|
|
||||||
required: false
|
|
43
.github/ISSUE_TEMPLATE/feature_request.yaml
vendored
|
@ -1,43 +0,0 @@
|
||||||
name: Feature Request
|
|
||||||
description: Suggest an idea for jrnl
|
|
||||||
title: "Feature Report"
|
|
||||||
labels: [ ":new:", "enhancement" ]
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
# Feature Request
|
|
||||||
Hello, and thank you for reporting an issue!
|
|
||||||
|
|
||||||
Please fill out the points below, as it will make our process much easier.
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: user-case
|
|
||||||
attributes:
|
|
||||||
label: Use Case/Motivation
|
|
||||||
description: What is the motivation / use case for changing the behavior?
|
|
||||||
placeholder: Tell us about your idea
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: example-usage
|
|
||||||
attributes:
|
|
||||||
label: Example Usage
|
|
||||||
description: Please provide examples of the usage you would like to see.
|
|
||||||
placeholder: e.g `jrnl --new-flag="super cool new feature"`
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: other-info
|
|
||||||
attributes:
|
|
||||||
label: Other Information
|
|
||||||
description: >
|
|
||||||
Is there anything else we should know?
|
|
||||||
|
|
||||||
(e.g. more detailed explanation, stacktraces, related
|
|
||||||
issues, suggestions how to fix, links for us to have context, eg.
|
|
||||||
stackoverflow, gitter, etc)
|
|
||||||
validations:
|
|
||||||
required: false
|
|
54
.github/ISSUE_TEMPLATE/support_request.yaml
vendored
|
@ -1,54 +0,0 @@
|
||||||
name: Support Request
|
|
||||||
description: Get help with jrnl
|
|
||||||
title: Support Request
|
|
||||||
labels: [ ":new:", "support" ]
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
# Support Request
|
|
||||||
Hello, and thank you for reporting an issue!
|
|
||||||
|
|
||||||
Please fill out the points below, as it will make our process much easier.
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: diagnostic
|
|
||||||
attributes:
|
|
||||||
label: Diagnostic output
|
|
||||||
description: Run `jrnl --diagnostic` and paste the output below
|
|
||||||
placeholder: Paste output here
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: current-behavior
|
|
||||||
attributes:
|
|
||||||
label: What are you trying to do?
|
|
||||||
description: Please put a short description of what is happening.
|
|
||||||
placeholder: Tell us what is happening
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: tried
|
|
||||||
attributes:
|
|
||||||
label: What have you tried?
|
|
||||||
description: >
|
|
||||||
Have you tried anything to fix the problem? This can help give us more
|
|
||||||
information to help you with.
|
|
||||||
placeholder: Tell us what should be happening
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: other-info
|
|
||||||
attributes:
|
|
||||||
label: Other Information
|
|
||||||
description: >
|
|
||||||
Is there anything else we should know?
|
|
||||||
|
|
||||||
(e.g. more detailed explanation, stacktraces, related
|
|
||||||
issues, suggestions how to fix, links for us to have context, eg.
|
|
||||||
stackoverflow, gitter, etc)
|
|
||||||
validations:
|
|
||||||
required: false
|
|
24
.github/PULL_REQUEST_TEMPLATE.md
vendored
|
@ -1,24 +0,0 @@
|
||||||
<!--
|
|
||||||
Thank you for wanting to contribute!
|
|
||||||
|
|
||||||
Please fill out this description, and the checklist below.
|
|
||||||
|
|
||||||
Here are some key points to include in your description:
|
|
||||||
- What is this new code intended to do?
|
|
||||||
- Are there any related issues?
|
|
||||||
- What is the motivation for this change?
|
|
||||||
- What is an example of usage, or changes to config files? (if applicable)
|
|
||||||
-->
|
|
||||||
|
|
||||||
### Checklist
|
|
||||||
|
|
||||||
- [ ] I have read the [contributing doc](https://github.com/jrnl-org/jrnl/blob/develop/docs/contributing.md).
|
|
||||||
- [ ] I have included a link to the relevant issue number.
|
|
||||||
- [ ] I have checked to ensure there aren't other open [pull requests](../pulls)
|
|
||||||
for the same issue.
|
|
||||||
- [ ] I have written new tests for these changes, as needed.
|
|
||||||
<!--
|
|
||||||
NOTE: Your PR may not be reviewed if there are any failing tests. You can run
|
|
||||||
tests locally with `poe test` (see the contributing doc if you need help with
|
|
||||||
`poe`), or use our automated tests after you submit your PR.
|
|
||||||
-->
|
|
17
.github/actionlint-matcher.json
vendored
|
@ -1,17 +0,0 @@
|
||||||
{
|
|
||||||
"problemMatcher": [
|
|
||||||
{
|
|
||||||
"owner": "actionlint",
|
|
||||||
"pattern": [
|
|
||||||
{
|
|
||||||
"regexp": "^(?:\\x1b\\[\\d+m)?(.+?)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*: (?:\\x1b\\[\\d+m)*(.+?)(?:\\x1b\\[\\d+m)* \\[(.+?)\\]$",
|
|
||||||
"file": 1,
|
|
||||||
"line": 2,
|
|
||||||
"column": 3,
|
|
||||||
"message": 4,
|
|
||||||
"code": 5
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
45
.github/actions/run_tests/action.yaml
vendored
|
@ -1,45 +0,0 @@
|
||||||
name: run jrnl tests
|
|
||||||
description: Runs all jrnl tests on multiple platforms
|
|
||||||
inputs:
|
|
||||||
cache-string:
|
|
||||||
description: 'Cache string secret. Change to bust the cache'
|
|
||||||
required: true
|
|
||||||
runs:
|
|
||||||
using: "composite"
|
|
||||||
steps:
|
|
||||||
- run: git config --global core.autocrlf false
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
- name: Set up Python ${{ matrix.python-version }}
|
|
||||||
uses: actions/setup-python@v4
|
|
||||||
with:
|
|
||||||
python-version: ${{ matrix.python-version }}
|
|
||||||
|
|
||||||
- name: Capture full Python version in env
|
|
||||||
run: echo "PYTHON_FULL_VERSION=$(python --version)" >> $GITHUB_ENV
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
- name: poetry cache # Change CACHE_STRING secret to bust the cache
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: .venv
|
|
||||||
key: ${{ runner.os }}-${{ hashFiles('poetry.lock') }}-${{ env.PYTHON_FULL_VERSION }}-${{ inputs.cache-string }}
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
echo '::group::poetry'
|
|
||||||
pip --disable-pip-version-check install poetry
|
|
||||||
poetry config --local virtualenvs.in-project true
|
|
||||||
echo '::endgroup::'
|
|
||||||
|
|
||||||
echo '::group::Other dependencies'
|
|
||||||
poetry install --remove-untracked
|
|
||||||
echo '::endgroup::'
|
|
||||||
|
|
||||||
echo 'DEPS_INSTALLED=true' >> $GITHUB_ENV
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
- name: Linting & Testing
|
|
||||||
if: ${{ env.DEPS_INSTALLED == 'true' }}
|
|
||||||
run: poetry run poe test
|
|
||||||
shell: bash
|
|
39
.github/lock.yml
vendored
|
@ -1,39 +0,0 @@
|
||||||
# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
|
|
||||||
|
|
||||||
# Number of days of inactivity before a closed issue or pull request is locked
|
|
||||||
daysUntilLock: 90
|
|
||||||
|
|
||||||
# Skip issues and pull requests created before a given timestamp. Timestamp must
|
|
||||||
# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
|
|
||||||
skipCreatedBefore: false
|
|
||||||
|
|
||||||
# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
|
|
||||||
exemptLabels: []
|
|
||||||
|
|
||||||
# Label to add before locking, such as `outdated`. Set to `false` to disable
|
|
||||||
lockLabel: ':lock:'
|
|
||||||
|
|
||||||
# Comment to post before locking. Set to `false` to disable
|
|
||||||
lockComment: >
|
|
||||||
This thread has been automatically locked since there has not been
|
|
||||||
any recent activity after it was closed. Please open a new issue for
|
|
||||||
related bugs. You can link back here from your new issue to continue
|
|
||||||
the conversation.
|
|
||||||
|
|
||||||
# Assign `resolved` as the reason for locking. Set to `false` to disable
|
|
||||||
setLockReason: true
|
|
||||||
|
|
||||||
# Limit to only `issues` or `pulls`
|
|
||||||
# only: issues
|
|
||||||
|
|
||||||
# Optionally, specify configuration settings just for `issues` or `pulls`
|
|
||||||
# issues:
|
|
||||||
# exemptLabels:
|
|
||||||
# - help-wanted
|
|
||||||
# lockLabel: outdated
|
|
||||||
|
|
||||||
# pulls:
|
|
||||||
# daysUntilLock: 30
|
|
||||||
|
|
||||||
# Repository to extend settings from
|
|
||||||
# _extends: repo
|
|
14
.github/renovate.json
vendored
|
@ -1,14 +0,0 @@
|
||||||
{
|
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
|
||||||
"extends": [
|
|
||||||
"config:base"
|
|
||||||
],
|
|
||||||
"schedule": [ "at any time" ],
|
|
||||||
"prConcurrentLimit": 10,
|
|
||||||
"prHourlyLimit": 10,
|
|
||||||
"reviewers": [
|
|
||||||
"wren",
|
|
||||||
"micahellison"
|
|
||||||
],
|
|
||||||
"labels": [ "packaging" ]
|
|
||||||
}
|
|
17
.github/stale.yml
vendored
|
@ -1,17 +0,0 @@
|
||||||
# Number of days of inactivity before an issue becomes stale
|
|
||||||
daysUntilStale: 60
|
|
||||||
# Number of days of inactivity before a stale issue is closed
|
|
||||||
daysUntilClose: 7
|
|
||||||
# Issues with these labels will never be considered stale
|
|
||||||
exemptLabels:
|
|
||||||
- ':pushpin:'
|
|
||||||
- critical
|
|
||||||
# Label to use when marking an issue as stale
|
|
||||||
staleLabel: stale
|
|
||||||
# Comment to post when marking an issue as stale. Set to `false` to disable
|
|
||||||
markComment: >
|
|
||||||
This issue has been automatically marked as stale because it has not had
|
|
||||||
recent activity. It will be closed if no further activity occurs. Thank you
|
|
||||||
for your contributions.
|
|
||||||
# Comment to post when closing a stale issue. Set to `false` to disable
|
|
||||||
closeComment: false
|
|
170
.github/workflows/changelog.yaml
vendored
|
@ -1,170 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
name: Changelog
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
tags:
|
|
||||||
- 'v*'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
generate:
|
|
||||||
if: >
|
|
||||||
! contains(github.event.head_commit.message, '[ci skip]') &&
|
|
||||||
! (
|
|
||||||
startsWith(github.event.head_commit.message, 'Increment version to v') &&
|
|
||||||
startsWith(github.ref, 'refs/heads/')
|
|
||||||
)
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.JRNL_BOT_TOKEN }}
|
|
||||||
|
|
||||||
- name: Check branch for new commits, and env vars
|
|
||||||
run: |
|
|
||||||
echo "::group::git fetch origin --tags --force"
|
|
||||||
git fetch origin --tags --force
|
|
||||||
echo "::endgroup::"
|
|
||||||
|
|
||||||
TAG_REGEX='include-all'
|
|
||||||
echo "::debug::GITHUB_REF: $GITHUB_REF"
|
|
||||||
BRANCH="${GITHUB_REF##*/}"
|
|
||||||
|
|
||||||
if [[ $GITHUB_REF =~ ^refs/tags/ ]]; then
|
|
||||||
# This is a tag build (i.e. a release)
|
|
||||||
echo '::debug::Release build'
|
|
||||||
if [[ ! $BRANCH =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)([0-9]+)?)?$ ]]; then
|
|
||||||
echo "::error::Invalid tag format: ${BRANCH}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
RELEASE=1
|
|
||||||
BRANCH=develop
|
|
||||||
git checkout $BRANCH
|
|
||||||
|
|
||||||
# if actual release (not pre), then changelog should exclude prereleases on update
|
|
||||||
prerelease_regex='(alpha|beta)'
|
|
||||||
if [[ ! ${GITHUB_REF##*/} =~ $prerelease_regex ]]; then
|
|
||||||
echo '::debug::Actual release (not a prerelease)'
|
|
||||||
TAG_REGEX="$prerelease_regex"
|
|
||||||
echo "FULL_RELEASE=true" >> "$GITHUB_ENV"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
echo "::debug::TAG_REGEX: $TAG_REGEX"
|
|
||||||
|
|
||||||
if [[ "$(git rev-parse "origin/$BRANCH")" != "$GITHUB_SHA" ]]; then
|
|
||||||
# Normal build on a branch (no tag)
|
|
||||||
echo "::debug::BRANCH: $BRANCH $(git rev-parse origin/$BRANCH)"
|
|
||||||
echo "::debug::GITHUB_SHA: $GITHUB_SHA"
|
|
||||||
echo "::error::$BRANCH has been updated since build started. Aborting changelog."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
SINCE_TAG=$(git tag --sort=-creatordate | grep -Ev "$TAG_REGEX" | awk "NR==$(( 1 + ${RELEASE:-0} ))")
|
|
||||||
|
|
||||||
echo "::debug::BRANCH: $BRANCH"
|
|
||||||
echo "::debug::TAG_REGEX: $TAG_REGEX"
|
|
||||||
echo "::debug::FILENAME: CHANGELOG.md"
|
|
||||||
echo "::debug::SINCE_TAG: $SINCE_TAG"
|
|
||||||
|
|
||||||
{
|
|
||||||
echo "BRANCH=$BRANCH"
|
|
||||||
echo "TAG_REGEX=$TAG_REGEX"
|
|
||||||
echo "FILENAME=CHANGELOG.md"
|
|
||||||
echo "SINCE_TAG=$SINCE_TAG"
|
|
||||||
} >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
- name: Prep changelog file (clear out old lines)
|
|
||||||
run: |
|
|
||||||
# delete the top of the changelog up to the correct tag
|
|
||||||
tagline=$(grep -n "^## \[${SINCE_TAG}\]" "$FILENAME" | awk '{print $1}' FS=':' | head -1)
|
|
||||||
echo "tagline: ${tagline}"
|
|
||||||
|
|
||||||
if [[ -z $tagline ]]; then
|
|
||||||
echo "::error::Something is wrong. ${SINCE_TAG} isn't in the changelog."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ $tagline == 1 ]]; then
|
|
||||||
echo "::error::Something is wrong."
|
|
||||||
echo "::error::The latest release ${SINCE_TAG} is the first line in the changelog,"
|
|
||||||
echo "::error::but the h1 '# Changelog' should always be the first line."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
sed -i "1,$(( tagline - 1 ))d" "$FILENAME"
|
|
||||||
# delete generated line (or it will be added multiple times)
|
|
||||||
sed -i '/This Changelog was automatically generated by/d' "$FILENAME"
|
|
||||||
# delete trailing empty lines
|
|
||||||
sed -i -e :a -e '/^\n*$/{$d;N;};/\n$/ba' "$FILENAME"
|
|
||||||
|
|
||||||
- name: Generate changelog
|
|
||||||
uses: heinrichreimer/action-github-changelog-generator@v2.1.1
|
|
||||||
with:
|
|
||||||
# see: https://github.com/heinrichreimer/action-github-changelog-generator
|
|
||||||
repo: jrnl-org/jrnl
|
|
||||||
token: ${{ secrets.JRNL_BOT_TOKEN }}
|
|
||||||
base: CHANGELOG.md
|
|
||||||
addSections: '{"build":{"prefix":"**Build:**","labels":["build"]},"docs":{"prefix":"**Documentation:**","labels":["documentation"]},"packaging":{"prefix":"**Packaging:**","labels":["packaging"]}}'
|
|
||||||
issues: true
|
|
||||||
pullRequests: true
|
|
||||||
issuesWoLabels: false
|
|
||||||
unreleased: true
|
|
||||||
compareLink: true
|
|
||||||
includeLabels: bug,enhancement,documentation,build,packaging,deprecated
|
|
||||||
excludeLabels: stale,wontfix
|
|
||||||
excludeTagsRegex: ${{ env.TAG_REGEX }}
|
|
||||||
sinceTag: ${{ env.SINCE_TAG }}
|
|
||||||
maxIssues: 150
|
|
||||||
releaseUrl: https://pypi.org/project/jrnl/%s/
|
|
||||||
releaseBranch: develop
|
|
||||||
verbose: false
|
|
||||||
author: true
|
|
||||||
|
|
||||||
- name: Small fixes
|
|
||||||
run: |
|
|
||||||
# Change unreleased link to correct url
|
|
||||||
sed -i 's!https://pypi.org/project/jrnl/HEAD/!https://github.com/jrnl-org/jrnl/!' "$FILENAME"
|
|
||||||
|
|
||||||
- name: Diff and consistency check
|
|
||||||
run: |
|
|
||||||
git diff
|
|
||||||
if [[ $(grep -c '^# Changelog$' "$FILENAME") != 1 ]]; then
|
|
||||||
echo '::error::Something is wrong with the changelog.'
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
SOMETHING_CHANGED=false
|
|
||||||
git diff --exit-code || SOMETHING_CHANGED=true
|
|
||||||
echo "::debug::SOMETHING_CHANGED: $SOMETHING_CHANGED"
|
|
||||||
echo "SOMETHING_CHANGED=$SOMETHING_CHANGED" >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
- name: Commit
|
|
||||||
if: env.SOMETHING_CHANGED == 'true'
|
|
||||||
run: |
|
|
||||||
git config --global user.name "${{ secrets.JRNL_BOT_NAME }}"
|
|
||||||
git config --global user.email "${{ secrets.JRNL_BOT_EMAIL }}"
|
|
||||||
git add "$FILENAME"
|
|
||||||
git commit -m "Update changelog [ci skip]"
|
|
||||||
git push origin "$BRANCH"
|
|
||||||
|
|
||||||
- name: Update tag to include changelog
|
|
||||||
if: startsWith(env.GITHUB_REF, 'refs/tags/')
|
|
||||||
run: |
|
|
||||||
# This is a tag build (releases and prereleases)
|
|
||||||
# update the tag to include the changelog
|
|
||||||
git tag -fam "$GITHUB_REF_NAME" "$GITHUB_REF_NAME"
|
|
||||||
git push --tags --force
|
|
||||||
|
|
||||||
- name: Merge to Release branch
|
|
||||||
if: env.FULL_RELEASE == 'true'
|
|
||||||
run: |
|
|
||||||
git fetch --unshallow origin
|
|
||||||
git checkout release
|
|
||||||
git merge --ff-only "$BRANCH"
|
|
||||||
git push origin release
|
|
||||||
|
|
76
.github/workflows/docs.yaml
vendored
|
@ -1,76 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
name: Docs
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ develop, release ]
|
|
||||||
paths:
|
|
||||||
- 'docs/**'
|
|
||||||
- 'docs_theme/**'
|
|
||||||
- 'mkdocs.yml'
|
|
||||||
- 'readthedocs.yml'
|
|
||||||
- '.github/workflows/docs.yaml'
|
|
||||||
- 'tasks.py'
|
|
||||||
- 'pyproject.toml'
|
|
||||||
pull_request:
|
|
||||||
branches: [ develop ]
|
|
||||||
paths:
|
|
||||||
- 'docs/**'
|
|
||||||
- 'docs_theme/**'
|
|
||||||
- 'mkdocs.yml'
|
|
||||||
- 'readthedocs.yml'
|
|
||||||
- '.github/workflows/docs.yaml'
|
|
||||||
- 'tasks.py'
|
|
||||||
- 'pyproject.toml'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
accessibility:
|
|
||||||
if: contains(toJson(github.event.commits), '[ci skip]') == false
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
fail-fast: true
|
|
||||||
matrix:
|
|
||||||
python-version: [ '3.11' ]
|
|
||||||
os: [ ubuntu-latest ]
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v4
|
|
||||||
with:
|
|
||||||
python-version: ${{ matrix.python-version }}
|
|
||||||
|
|
||||||
- name: Setup Node.js environment
|
|
||||||
uses: actions/setup-node@main
|
|
||||||
|
|
||||||
- name: Capture full Python version in env
|
|
||||||
run: echo "PYTHON_FULL_VERSION=$(python --version)" >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
- name: poetry cache
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: .venv
|
|
||||||
key: ${{ runner.os }}-${{ hashFiles('poetry.lock') }}-${{ env.PYTHON_FULL_VERSION }}-${{ secrets.CACHE_STRING }}
|
|
||||||
|
|
||||||
- name: npm cache
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: node_modules
|
|
||||||
key: ${{ runner.os }}-pa11y-v3
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
pip install poetry
|
|
||||||
poetry config --local virtualenvs.in-project true
|
|
||||||
poetry install --no-root --remove-untracked
|
|
||||||
npm install
|
|
||||||
echo "node_modules/.bin" >> "$GITHUB_PATH"
|
|
||||||
|
|
||||||
- name: Start docs server
|
|
||||||
run: poetry run poe docs-run &
|
|
||||||
|
|
||||||
- name: Accessibility testing (Pa11y)
|
|
||||||
run: poetry run poe docs-check
|
|
222
.github/workflows/release.yaml
vendored
|
@ -1,222 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
name: Release
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
version:
|
|
||||||
description: 'Version (e.g. v2.5, v2.5.1-beta, v2.6-beta2)'
|
|
||||||
type: string
|
|
||||||
required: true
|
|
||||||
include_repo_version:
|
|
||||||
description: 'Update version in repo?'
|
|
||||||
type: boolean
|
|
||||||
required: true
|
|
||||||
default: true
|
|
||||||
include_pypi:
|
|
||||||
description: 'Publish to PyPI?'
|
|
||||||
type: boolean
|
|
||||||
required: true
|
|
||||||
default: true
|
|
||||||
include_brew:
|
|
||||||
description: 'Publish to Homebrew?'
|
|
||||||
type: boolean
|
|
||||||
required: true
|
|
||||||
default: true
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
validate:
|
|
||||||
name: "Validate version string"
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Validate version
|
|
||||||
run: |
|
|
||||||
JRNL_VERSION="${{ github.event.inputs.version }}"
|
|
||||||
echo "::debug::version: $JRNL_VERSION"
|
|
||||||
if [[ ! $JRNL_VERSION =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)([0-9]+)?)?$ ]]; then
|
|
||||||
echo
|
|
||||||
echo "::error::Bad version"
|
|
||||||
echo
|
|
||||||
echo "Version string should match pattern above."
|
|
||||||
echo "Here are some examples of valid version numbers:"
|
|
||||||
echo
|
|
||||||
echo " v2.5"
|
|
||||||
echo " v2.5-alpha"
|
|
||||||
echo " v2.5-beta"
|
|
||||||
echo " v2.5.1"
|
|
||||||
echo " v2.5.1-alpha"
|
|
||||||
echo " v2.5.1-beta"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
release_pypi:
|
|
||||||
needs: validate
|
|
||||||
name: "Release to PyPI"
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
outputs:
|
|
||||||
pypi_version: ${{ steps.pypi-version-getter.outputs.pypi_version }}
|
|
||||||
env:
|
|
||||||
HOME_REPO: ${{ secrets.HOME_REPO }}
|
|
||||||
steps:
|
|
||||||
- name: Get version
|
|
||||||
run: |
|
|
||||||
JRNL_VERSION="${{ github.event.inputs.version }}"
|
|
||||||
echo "::debug::version: $JRNL_VERSION"
|
|
||||||
echo "JRNL_VERSION=$JRNL_VERSION" >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v4
|
|
||||||
with:
|
|
||||||
python-version: '3.11'
|
|
||||||
|
|
||||||
- name: Checkout repo
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.JRNL_BOT_TOKEN }}
|
|
||||||
|
|
||||||
- name: Config git user
|
|
||||||
run: |
|
|
||||||
git config --global user.name "${{ secrets.JRNL_BOT_NAME }}"
|
|
||||||
git config --global user.email "${{ secrets.JRNL_BOT_EMAIL }}"
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: pip install poetry
|
|
||||||
|
|
||||||
- name: Update version in files
|
|
||||||
if: ${{ github.event.inputs.include_repo_version == 'true' }}
|
|
||||||
run: |
|
|
||||||
poetry version "$JRNL_VERSION"
|
|
||||||
echo "__version__ = \"$JRNL_VERSION\"" > jrnl/__version__.py
|
|
||||||
|
|
||||||
- name: Commit updated files
|
|
||||||
if: ${{ github.event.inputs.include_repo_version == 'true' && github.repository == env.HOME_REPO }}
|
|
||||||
run: |
|
|
||||||
git add pyproject.toml jrnl/__version__.py
|
|
||||||
git commit -m "Increment version to ${JRNL_VERSION}"
|
|
||||||
git tag -a -m "$JRNL_VERSION" "$JRNL_VERSION"
|
|
||||||
git push
|
|
||||||
git push --tags
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: poetry build
|
|
||||||
|
|
||||||
- name: Deploy to PyPI
|
|
||||||
if: ${{ github.event.inputs.include_pypi == 'true' && github.repository == env.HOME_REPO }}
|
|
||||||
env:
|
|
||||||
POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
|
|
||||||
run: poetry publish
|
|
||||||
|
|
||||||
- name: Get PyPI version
|
|
||||||
id: pypi-version-getter
|
|
||||||
run: |
|
|
||||||
pypi_version="$(find dist/jrnl-*.tar.gz | sed -r 's!dist/jrnl-(.*)\.tar\.gz!\1!')"
|
|
||||||
echo "pypi_version=$pypi_version" >> "$GITHUB_OUTPUT"
|
|
||||||
|
|
||||||
release_homebrew:
|
|
||||||
if: ${{ github.event.inputs.include_brew == 'true' }}
|
|
||||||
needs: release_pypi
|
|
||||||
name: "Release to Homebrew"
|
|
||||||
runs-on: macos-latest
|
|
||||||
env:
|
|
||||||
HOMEBREW_NO_AUTO_UPDATE: 1
|
|
||||||
HOMEBREW_NO_INSTALL_CLEANUP: 1
|
|
||||||
HOME_REPO: ${{ secrets.HOME_REPO }}
|
|
||||||
steps:
|
|
||||||
- name: Get version
|
|
||||||
run: |
|
|
||||||
JRNL_VERSION="${{ github.event.inputs.version }}"
|
|
||||||
PYPI_VERSION="${{ needs.release_pypi.outputs.pypi_version }}"
|
|
||||||
|
|
||||||
echo "::debug::jrnl version: $JRNL_VERSION"
|
|
||||||
echo "::debug::pypi version: $PYPI_VERSION"
|
|
||||||
|
|
||||||
echo "JRNL_VERSION=$JRNL_VERSION" >> "$GITHUB_ENV"
|
|
||||||
echo "PYPI_VERSION=$PYPI_VERSION" >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
- name: Set env variables
|
|
||||||
env:
|
|
||||||
REPO_OWNER: ${{ github.repository_owner }}
|
|
||||||
run: |
|
|
||||||
if [[ $JRNL_VERSION =~ (alpha|beta) ]]; then
|
|
||||||
echo '::debug::Prerelease (not a full release)'
|
|
||||||
{
|
|
||||||
echo "RELEASE_TYPE=pre"
|
|
||||||
echo "FORMULA_REPO=${REPO_OWNER}/homebrew-prerelease"
|
|
||||||
echo "BOT_REPO=jrnl-bot/homebrew-prerelease"
|
|
||||||
echo "FORMULA_NAME=jrnl-beta"
|
|
||||||
} >> "$GITHUB_ENV"
|
|
||||||
else
|
|
||||||
echo '::debug::Full release (not a prerelease)'
|
|
||||||
if [[ "${{ github.repository }}" == "${HOME_REPO}" ]]; then
|
|
||||||
REPO_OWNER="homebrew"
|
|
||||||
fi
|
|
||||||
{
|
|
||||||
echo "RELEASE_TYPE=full"
|
|
||||||
echo "FORMULA_REPO=${REPO_OWNER}/homebrew-core"
|
|
||||||
echo "BOT_REPO=jrnl-bot/homebrew-core"
|
|
||||||
echo "FORMULA_NAME=jrnl"
|
|
||||||
} >> "$GITHUB_ENV"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Tap formula
|
|
||||||
run: |
|
|
||||||
brew tap "${FORMULA_REPO}"
|
|
||||||
echo '::debug::Set tap directory'
|
|
||||||
echo "BREW_TAP_DIRECTORY=$(brew --repo "${FORMULA_REPO}")" >> "$GITHUB_ENV"
|
|
||||||
- name: Install dependencies
|
|
||||||
run: brew install pipgrip
|
|
||||||
|
|
||||||
- name: Query PyPI API
|
|
||||||
uses: nick-invision/retry@v2
|
|
||||||
with:
|
|
||||||
timeout_seconds: 10
|
|
||||||
max_attempts: 30
|
|
||||||
retry_wait_seconds: 10
|
|
||||||
command: |
|
|
||||||
curl -Ls https://pypi.org/pypi/jrnl/json > api_response.json
|
|
||||||
# if query doesn't have our version yet, give it some time before trying again
|
|
||||||
if [[ "null" == "$(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json)" ]]; then
|
|
||||||
echo "::debug::PYPI_VERSION: $PYPI_VERSION"
|
|
||||||
echo "::debug::JQ VALUE: $(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json)"
|
|
||||||
echo "::group::cat api_response.json"
|
|
||||||
cat api_response.json
|
|
||||||
echo "::endgroup::"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Update Homebrew Formula
|
|
||||||
uses: nick-invision/retry@v2
|
|
||||||
with:
|
|
||||||
timeout_minutes: 8
|
|
||||||
max_attempts: 6
|
|
||||||
retry_wait_seconds: 30
|
|
||||||
command: >
|
|
||||||
brew bump-formula-pr "${FORMULA_NAME}"
|
|
||||||
--url $(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json)
|
|
||||||
--sha256 $(jq ".releases[\"${PYPI_VERSION}\"][1].digests.sha256" -r api_response.json)
|
|
||||||
--no-audit
|
|
||||||
--write-only
|
|
||||||
--force
|
|
||||||
|
|
||||||
- name: Create Pull Request
|
|
||||||
uses: peter-evans/create-pull-request@v4
|
|
||||||
with:
|
|
||||||
path: ${{ env.BREW_TAP_DIRECTORY }}
|
|
||||||
token: ${{ secrets.JRNL_BOT_TOKEN }}
|
|
||||||
push-to-fork: ${{ env.BOT_REPO }}
|
|
||||||
|
|
||||||
committer: ${{ secrets.JRNL_BOT_NAME }} <${{ secrets.JRNL_BOT_EMAIL }}>
|
|
||||||
author: ${{ secrets.JRNL_BOT_NAME }} <${{ secrets.JRNL_BOT_EMAIL }}>
|
|
||||||
|
|
||||||
title: jrnl ${{ env.JRNL_VERSION }}
|
|
||||||
body: Created with `brew bump-formula-pr`
|
|
||||||
|
|
||||||
branch: jrnl-${{ env.JRNL_VERSION }}--
|
|
||||||
branch-suffix: random
|
|
||||||
commit-message: |
|
|
||||||
jrnl ${{ env.JRNL_VERSION }}
|
|
||||||
|
|
||||||
Update jrnl to ${{ env.JRNL_VERSION }}
|
|
||||||
|
|
||||||
${{ secrets.RELEASE_COAUTHORS }}
|
|
33
.github/workflows/testing_pipelines.yaml
vendored
|
@ -1,33 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
name: Testing Pipeline Files
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ develop, release ]
|
|
||||||
paths:
|
|
||||||
- '.github/workflows/**'
|
|
||||||
- '.github/actions/**'
|
|
||||||
pull_request:
|
|
||||||
branches: [ develop ]
|
|
||||||
paths:
|
|
||||||
- '.github/workflows/**'
|
|
||||||
- '.github/actions/**'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
if: >
|
|
||||||
! contains(github.event.head_commit.message, '[ci skip]')
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
os: [ ubuntu-latest ]
|
|
||||||
steps:
|
|
||||||
- run: git config --global core.autocrlf false
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
- name: Check workflow files
|
|
||||||
uses: docker://rhysd/actionlint:latest
|
|
||||||
with:
|
|
||||||
args: -color
|
|
48
.github/workflows/testing_prs.yaml
vendored
|
@ -1,48 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
name: Testing
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ develop, release ]
|
|
||||||
paths:
|
|
||||||
- 'jrnl/**'
|
|
||||||
- 'features/**'
|
|
||||||
- 'tests/**'
|
|
||||||
- 'poetry.lock'
|
|
||||||
- 'pyproject.toml'
|
|
||||||
- '.github/workflows/testing_prs.yaml'
|
|
||||||
- 'tasks.py'
|
|
||||||
pull_request:
|
|
||||||
branches: [ develop ]
|
|
||||||
paths:
|
|
||||||
- 'jrnl/**'
|
|
||||||
- 'features/**'
|
|
||||||
- 'tests/**'
|
|
||||||
- 'poetry.lock'
|
|
||||||
- 'pyproject.toml'
|
|
||||||
- '.github/workflows/testing_prs.yaml'
|
|
||||||
- 'tasks.py'
|
|
||||||
|
|
||||||
defaults:
|
|
||||||
run:
|
|
||||||
shell: bash # needed to prevent Windows from using PowerShell
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
if: >
|
|
||||||
! contains(github.event.head_commit.message, '[ci skip]')
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
python-version: [ '3.10', '3.11' ]
|
|
||||||
os: [ ubuntu-latest, macos-latest, windows-latest ]
|
|
||||||
steps:
|
|
||||||
- run: git config --global core.autocrlf false
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
- name: Run tests
|
|
||||||
uses: ./.github/actions/run_tests
|
|
||||||
with:
|
|
||||||
cache-string: ${{ secrets.CACHE_STRING }}
|
|
28
.github/workflows/testing_schedule.yaml
vendored
|
@ -1,28 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
name: Testing
|
|
||||||
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: '0 0 * * SAT'
|
|
||||||
|
|
||||||
defaults:
|
|
||||||
run:
|
|
||||||
shell: bash # needed to prevent Windows from using PowerShell
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test_all:
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
python-version: [ '3.10', '3.11' ]
|
|
||||||
os: [ ubuntu-latest, macos-latest, windows-latest ]
|
|
||||||
steps:
|
|
||||||
- run: git config --global core.autocrlf false
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
- name: Run tests
|
|
||||||
uses: ./.github/actions/run_tests
|
|
||||||
with:
|
|
||||||
cache-string: ${{ secrets.CACHE_STRING }}
|
|
62
.gitignore
vendored
|
@ -1,62 +0,0 @@
|
||||||
# Byte-compiled DLL and Shared Library files
|
|
||||||
*.py[cod]
|
|
||||||
*.so
|
|
||||||
|
|
||||||
# Packages
|
|
||||||
*.egg
|
|
||||||
*.egg-info/
|
|
||||||
.installed.cfg
|
|
||||||
bin/
|
|
||||||
build/
|
|
||||||
develop-eggs/
|
|
||||||
dist/
|
|
||||||
eggs/
|
|
||||||
lib64/
|
|
||||||
parts/
|
|
||||||
sdist/
|
|
||||||
.tox/
|
|
||||||
var/
|
|
||||||
node_modules/
|
|
||||||
__pycache__/
|
|
||||||
.pytest_cache/
|
|
||||||
|
|
||||||
# Versioning
|
|
||||||
.python-version
|
|
||||||
.tool-versions
|
|
||||||
|
|
||||||
# Installer logs
|
|
||||||
.DS_Store
|
|
||||||
.travis-solo
|
|
||||||
Icon
|
|
||||||
pip-log.txt
|
|
||||||
|
|
||||||
# Documentation
|
|
||||||
_build
|
|
||||||
_sources
|
|
||||||
_static
|
|
||||||
coverage.xml
|
|
||||||
exp/
|
|
||||||
objects.inv
|
|
||||||
searchindex.js
|
|
||||||
|
|
||||||
# virtaulenv
|
|
||||||
.venv*/
|
|
||||||
env/
|
|
||||||
env*/
|
|
||||||
venv*/
|
|
||||||
|
|
||||||
# Editor and IDE specific files
|
|
||||||
# Since contributors may want to user a variety of development tools it is
|
|
||||||
# recommended that editor specific file types be ignored globally by each
|
|
||||||
# contributor via a global gitignore. Instructions for setting up a global
|
|
||||||
# ignore file can be found here:
|
|
||||||
# https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files
|
|
||||||
# (Configuring ignored files for all repositories on your computer)
|
|
||||||
# Examples of such files are:
|
|
||||||
# MS Visual Studio (PyTools)
|
|
||||||
# obj
|
|
||||||
# *.suo
|
|
||||||
# PyCharm
|
|
||||||
# .idea/
|
|
||||||
# VS Code
|
|
||||||
# .vscode/settings.json
|
|
1007
CHANGELOG.md
|
@ -1,127 +0,0 @@
|
||||||
# Contributor Covenant Code of Conduct
|
|
||||||
|
|
||||||
## Our Pledge
|
|
||||||
|
|
||||||
We as members, contributors, and leaders pledge to make participation in our
|
|
||||||
community a harassment-free experience for everyone, regardless of age, body
|
|
||||||
size, visible or invisible disability, ethnicity, sex characteristics, gender
|
|
||||||
identity and expression, level of experience, education, socio-economic status,
|
|
||||||
nationality, personal appearance, race, religion, or sexual identity
|
|
||||||
and orientation.
|
|
||||||
|
|
||||||
We pledge to act and interact in ways that contribute to an open, welcoming,
|
|
||||||
diverse, inclusive, and healthy community.
|
|
||||||
|
|
||||||
## Our Standards
|
|
||||||
|
|
||||||
Examples of behavior that contributes to a positive environment for our
|
|
||||||
community include:
|
|
||||||
|
|
||||||
* Demonstrating empathy and kindness toward other people
|
|
||||||
* Being respectful of differing opinions, viewpoints, and experiences
|
|
||||||
* Giving and gracefully accepting constructive feedback
|
|
||||||
* Accepting responsibility and apologizing to those affected by our mistakes,
|
|
||||||
and learning from the experience
|
|
||||||
* Focusing on what is best not just for us as individuals, but for the
|
|
||||||
overall community
|
|
||||||
|
|
||||||
Examples of unacceptable behavior include:
|
|
||||||
|
|
||||||
* The use of sexualized language or imagery, and sexual attention or
|
|
||||||
advances of any kind
|
|
||||||
* Trolling, insulting or derogatory comments, and personal or political attacks
|
|
||||||
* Public or private harassment
|
|
||||||
* Publishing others' private information, such as a physical or email
|
|
||||||
address, without their explicit permission
|
|
||||||
* Other conduct which could reasonably be considered inappropriate in a
|
|
||||||
professional setting
|
|
||||||
|
|
||||||
## Enforcement Responsibilities
|
|
||||||
|
|
||||||
Community leaders are responsible for clarifying and enforcing our standards of
|
|
||||||
acceptable behavior and will take appropriate and fair corrective action in
|
|
||||||
response to any behavior that they deem inappropriate, threatening, offensive,
|
|
||||||
or harmful.
|
|
||||||
|
|
||||||
Community leaders have the right and responsibility to remove, edit, or reject
|
|
||||||
comments, commits, code, wiki edits, issues, and other contributions that are
|
|
||||||
not aligned to this Code of Conduct, and will communicate reasons for moderation
|
|
||||||
decisions when appropriate.
|
|
||||||
|
|
||||||
## Scope
|
|
||||||
|
|
||||||
This Code of Conduct applies within all community spaces, and also applies when
|
|
||||||
an individual is officially representing the community in public spaces.
|
|
||||||
Examples of representing our community include using an official e-mail address,
|
|
||||||
posting via an official social media account, or acting as an appointed
|
|
||||||
representative at an online or offline event.
|
|
||||||
|
|
||||||
## Enforcement
|
|
||||||
|
|
||||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
|
||||||
reported by [emailing the maintainers](mailto:maintainers@jrnl.sh).
|
|
||||||
All complaints will be reviewed and investigated promptly and fairly.
|
|
||||||
|
|
||||||
All community leaders are obligated to respect the privacy and security of the
|
|
||||||
reporter of any incident.
|
|
||||||
|
|
||||||
## Enforcement Guidelines
|
|
||||||
|
|
||||||
Community leaders will follow these Community Impact Guidelines in determining
|
|
||||||
the consequences for any action they deem in violation of this Code of Conduct:
|
|
||||||
|
|
||||||
### 1. Correction
|
|
||||||
|
|
||||||
**Community Impact**: Use of inappropriate language or other behavior deemed
|
|
||||||
unprofessional or unwelcome in the community.
|
|
||||||
|
|
||||||
**Consequence**: A private, written warning from community leaders, providing
|
|
||||||
clarity around the nature of the violation and an explanation of why the
|
|
||||||
behavior was inappropriate. A public apology may be requested.
|
|
||||||
|
|
||||||
### 2. Warning
|
|
||||||
|
|
||||||
**Community Impact**: A violation through a single incident or series
|
|
||||||
of actions.
|
|
||||||
|
|
||||||
**Consequence**: A warning with consequences for continued behavior. No
|
|
||||||
interaction with the people involved, including unsolicited interaction with
|
|
||||||
those enforcing the Code of Conduct, for a specified period of time. This
|
|
||||||
includes avoiding interactions in community spaces as well as external channels
|
|
||||||
like social media. Violating these terms may lead to a temporary or
|
|
||||||
permanent ban.
|
|
||||||
|
|
||||||
### 3. Temporary Ban
|
|
||||||
|
|
||||||
**Community Impact**: A serious violation of community standards, including
|
|
||||||
sustained inappropriate behavior.
|
|
||||||
|
|
||||||
**Consequence**: A temporary ban from any sort of interaction or public
|
|
||||||
communication with the community for a specified period of time. No public or
|
|
||||||
private interaction with the people involved, including unsolicited interaction
|
|
||||||
with those enforcing the Code of Conduct, is allowed during this period.
|
|
||||||
Violating these terms may lead to a permanent ban.
|
|
||||||
|
|
||||||
### 4. Permanent Ban
|
|
||||||
|
|
||||||
**Community Impact**: Demonstrating a pattern of violation of community
|
|
||||||
standards, including sustained inappropriate behavior, harassment of an
|
|
||||||
individual, or aggression toward or disparagement of classes of individuals.
|
|
||||||
|
|
||||||
**Consequence**: A permanent ban from any sort of public interaction within
|
|
||||||
the community.
|
|
||||||
|
|
||||||
## Attribution
|
|
||||||
|
|
||||||
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
|
|
||||||
version 2.0, available at
|
|
||||||
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
|
|
||||||
|
|
||||||
Community Impact Guidelines were inspired by [Mozilla's code of conduct
|
|
||||||
enforcement ladder](https://github.com/mozilla/diversity).
|
|
||||||
|
|
||||||
[homepage]: https://www.contributor-covenant.org
|
|
||||||
|
|
||||||
For answers to common questions about this code of conduct, see the FAQ at
|
|
||||||
https://www.contributor-covenant.org/faq. Translations are available at
|
|
||||||
https://www.contributor-covenant.org/translations.
|
|
|
@ -1,8 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Contributing
|
|
||||||
|
|
||||||
See "[Contributing](docs/contributing.md)" in the `docs` directory.
|
|
675
LICENSE.md
|
@ -1,675 +0,0 @@
|
||||||
### GNU GENERAL PUBLIC LICENSE
|
|
||||||
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc.
|
|
||||||
<https://fsf.org/>
|
|
||||||
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies of this
|
|
||||||
license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
### Preamble
|
|
||||||
|
|
||||||
The GNU General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
the GNU General Public License is intended to guarantee your freedom
|
|
||||||
to share and change all versions of a program--to make sure it remains
|
|
||||||
free software for all its users. We, the Free Software Foundation, use
|
|
||||||
the GNU General Public License for most of our software; it applies
|
|
||||||
also to any other work released this way by its authors. You can apply
|
|
||||||
it to your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to prevent others from denying you
|
|
||||||
these rights or asking you to surrender the rights. Therefore, you
|
|
||||||
have certain responsibilities if you distribute copies of the
|
|
||||||
software, or if you modify it: responsibilities to respect the freedom
|
|
||||||
of others.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must pass on to the recipients the same
|
|
||||||
freedoms that you received. You must make sure that they, too, receive
|
|
||||||
or can get the source code. And you must show them these terms so they
|
|
||||||
know their rights.
|
|
||||||
|
|
||||||
Developers that use the GNU GPL protect your rights with two steps:
|
|
||||||
(1) assert copyright on the software, and (2) offer you this License
|
|
||||||
giving you legal permission to copy, distribute and/or modify it.
|
|
||||||
|
|
||||||
For the developers' and authors' protection, the GPL clearly explains
|
|
||||||
that there is no warranty for this free software. For both users' and
|
|
||||||
authors' sake, the GPL requires that modified versions be marked as
|
|
||||||
changed, so that their problems will not be attributed erroneously to
|
|
||||||
authors of previous versions.
|
|
||||||
|
|
||||||
Some devices are designed to deny users access to install or run
|
|
||||||
modified versions of the software inside them, although the
|
|
||||||
manufacturer can do so. This is fundamentally incompatible with the
|
|
||||||
aim of protecting users' freedom to change the software. The
|
|
||||||
systematic pattern of such abuse occurs in the area of products for
|
|
||||||
individuals to use, which is precisely where it is most unacceptable.
|
|
||||||
Therefore, we have designed this version of the GPL to prohibit the
|
|
||||||
practice for those products. If such problems arise substantially in
|
|
||||||
other domains, we stand ready to extend this provision to those
|
|
||||||
domains in future versions of the GPL, as needed to protect the
|
|
||||||
freedom of users.
|
|
||||||
|
|
||||||
Finally, every program is threatened constantly by software patents.
|
|
||||||
States should not allow patents to restrict development and use of
|
|
||||||
software on general-purpose computers, but in those that do, we wish
|
|
||||||
to avoid the special danger that patents applied to a free program
|
|
||||||
could make it effectively proprietary. To prevent this, the GPL
|
|
||||||
assures that patents cannot be used to render the program non-free.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
### TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
#### 0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds
|
|
||||||
of works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of
|
|
||||||
an exact copy. The resulting work is called a "modified version" of
|
|
||||||
the earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user
|
|
||||||
through a computer network, with no transfer of a copy, is not
|
|
||||||
conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices" to
|
|
||||||
the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
#### 1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work for
|
|
||||||
making modifications to it. "Object code" means any non-source form of
|
|
||||||
a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users can
|
|
||||||
regenerate automatically from other parts of the Corresponding Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that same
|
|
||||||
work.
|
|
||||||
|
|
||||||
#### 2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not convey,
|
|
||||||
without conditions so long as your license otherwise remains in force.
|
|
||||||
You may convey covered works to others for the sole purpose of having
|
|
||||||
them make modifications exclusively for you, or provide you with
|
|
||||||
facilities for running those works, provided that you comply with the
|
|
||||||
terms of this License in conveying all material for which you do not
|
|
||||||
control copyright. Those thus making or running the covered works for
|
|
||||||
you must do so exclusively on your behalf, under your direction and
|
|
||||||
control, on terms that prohibit them from making any copies of your
|
|
||||||
copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under the
|
|
||||||
conditions stated below. Sublicensing is not allowed; section 10 makes
|
|
||||||
it unnecessary.
|
|
||||||
|
|
||||||
#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such
|
|
||||||
circumvention is effected by exercising rights under this License with
|
|
||||||
respect to the covered work, and you disclaim any intention to limit
|
|
||||||
operation or modification of the work as a means of enforcing, against
|
|
||||||
the work's users, your or third parties' legal rights to forbid
|
|
||||||
circumvention of technological measures.
|
|
||||||
|
|
||||||
#### 4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
#### 5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these
|
|
||||||
conditions:
|
|
||||||
|
|
||||||
- a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
- b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under
|
|
||||||
section 7. This requirement modifies the requirement in section 4
|
|
||||||
to "keep intact all notices".
|
|
||||||
- c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
- d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
#### 6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms of
|
|
||||||
sections 4 and 5, provided that you also convey the machine-readable
|
|
||||||
Corresponding Source under the terms of this License, in one of these
|
|
||||||
ways:
|
|
||||||
|
|
||||||
- a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
- b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the Corresponding
|
|
||||||
Source from a network server at no charge.
|
|
||||||
- c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
- d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
- e) Convey the object code using peer-to-peer transmission,
|
|
||||||
provided you inform other peers where the object code and
|
|
||||||
Corresponding Source of the work are being offered to the general
|
|
||||||
public at no charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal,
|
|
||||||
family, or household purposes, or (2) anything designed or sold for
|
|
||||||
incorporation into a dwelling. In determining whether a product is a
|
|
||||||
consumer product, doubtful cases shall be resolved in favor of
|
|
||||||
coverage. For a particular product received by a particular user,
|
|
||||||
"normally used" refers to a typical or common use of that class of
|
|
||||||
product, regardless of the status of the particular user or of the way
|
|
||||||
in which the particular user actually uses, or expects or is expected
|
|
||||||
to use, the product. A product is a consumer product regardless of
|
|
||||||
whether the product has substantial commercial, industrial or
|
|
||||||
non-consumer uses, unless such uses represent the only significant
|
|
||||||
mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to
|
|
||||||
install and execute modified versions of a covered work in that User
|
|
||||||
Product from a modified version of its Corresponding Source. The
|
|
||||||
information must suffice to ensure that the continued functioning of
|
|
||||||
the modified object code is in no case prevented or interfered with
|
|
||||||
solely because modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or
|
|
||||||
updates for a work that has been modified or installed by the
|
|
||||||
recipient, or for the User Product in which it has been modified or
|
|
||||||
installed. Access to a network may be denied when the modification
|
|
||||||
itself materially and adversely affects the operation of the network
|
|
||||||
or violates the rules and protocols for communication across the
|
|
||||||
network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
#### 7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders
|
|
||||||
of that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
- a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
- b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
- c) Prohibiting misrepresentation of the origin of that material,
|
|
||||||
or requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
- d) Limiting the use for publicity purposes of names of licensors
|
|
||||||
or authors of the material; or
|
|
||||||
- e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
- f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions
|
|
||||||
of it) with contractual assumptions of liability to the recipient,
|
|
||||||
for any liability that these contractual assumptions directly
|
|
||||||
impose on those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions; the
|
|
||||||
above requirements apply either way.
|
|
||||||
|
|
||||||
#### 8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your license
|
|
||||||
from a particular copyright holder is reinstated (a) provisionally,
|
|
||||||
unless and until the copyright holder explicitly and finally
|
|
||||||
terminates your license, and (b) permanently, if the copyright holder
|
|
||||||
fails to notify you of the violation by some reasonable means prior to
|
|
||||||
60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
#### 9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or run
|
|
||||||
a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
#### 10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
#### 11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims owned
|
|
||||||
or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within the
|
|
||||||
scope of its coverage, prohibits the exercise of, or is conditioned on
|
|
||||||
the non-exercise of one or more of the rights that are specifically
|
|
||||||
granted under this License. You may not convey a covered work if you
|
|
||||||
are a party to an arrangement with a third party that is in the
|
|
||||||
business of distributing software, under which you make payment to the
|
|
||||||
third party based on the extent of your activity of conveying the
|
|
||||||
work, and under which the third party grants, to any of the parties
|
|
||||||
who would receive the covered work from you, a discriminatory patent
|
|
||||||
license (a) in connection with copies of the covered work conveyed by
|
|
||||||
you (or copies made from those copies), or (b) primarily for and in
|
|
||||||
connection with specific products or compilations that contain the
|
|
||||||
covered work, unless you entered into that arrangement, or that patent
|
|
||||||
license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
#### 12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under
|
|
||||||
this License and any other pertinent obligations, then as a
|
|
||||||
consequence you may not convey it at all. For example, if you agree to
|
|
||||||
terms that obligate you to collect a royalty for further conveying
|
|
||||||
from those to whom you convey the Program, the only way you could
|
|
||||||
satisfy both those terms and this License would be to refrain entirely
|
|
||||||
from conveying the Program.
|
|
||||||
|
|
||||||
#### 13. Use with the GNU Affero General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU Affero General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the special requirements of the GNU Affero General Public License,
|
|
||||||
section 13, concerning interaction through a network will apply to the
|
|
||||||
combination as such.
|
|
||||||
|
|
||||||
#### 14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions
|
|
||||||
of the GNU General Public License from time to time. Such new versions
|
|
||||||
will be similar in spirit to the present version, but may differ in
|
|
||||||
detail to address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the Program
|
|
||||||
specifies that a certain numbered version of the GNU General Public
|
|
||||||
License "or any later version" applies to it, you have the option of
|
|
||||||
following the terms and conditions either of that numbered version or
|
|
||||||
of any later version published by the Free Software Foundation. If the
|
|
||||||
Program does not specify a version number of the GNU General Public
|
|
||||||
License, you may choose any version ever published by the Free
|
|
||||||
Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future versions
|
|
||||||
of the GNU General Public License can be used, that proxy's public
|
|
||||||
statement of acceptance of a version permanently authorizes you to
|
|
||||||
choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
#### 15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
|
|
||||||
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
|
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
|
|
||||||
PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
|
|
||||||
DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
|
|
||||||
CORRECTION.
|
|
||||||
|
|
||||||
#### 16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
|
|
||||||
CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
|
||||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
|
|
||||||
ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
|
|
||||||
NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
|
|
||||||
LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
|
|
||||||
TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
|
|
||||||
PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
|
||||||
|
|
||||||
#### 17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
### How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these
|
|
||||||
terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest to
|
|
||||||
attach them to the start of each source file to most effectively state
|
|
||||||
the exclusion of warranty; and each file should have at least the
|
|
||||||
"copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper
|
|
||||||
mail.
|
|
||||||
|
|
||||||
If the program does terminal interaction, make it output a short
|
|
||||||
notice like this when it starts in an interactive mode:
|
|
||||||
|
|
||||||
<program> Copyright (C) <year> <name of author>
|
|
||||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands \`show w' and \`show c' should show the
|
|
||||||
appropriate parts of the General Public License. Of course, your
|
|
||||||
program's commands might be different; for a GUI interface, you would
|
|
||||||
use an "about box".
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or
|
|
||||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
|
||||||
necessary. For more information on this, and how to apply and follow
|
|
||||||
the GNU GPL, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
The GNU General Public License does not permit incorporating your
|
|
||||||
program into proprietary programs. If your program is a subroutine
|
|
||||||
library, you may consider it more useful to permit linking proprietary
|
|
||||||
applications with the library. If this is what you want to do, use the
|
|
||||||
GNU Lesser General Public License instead of this License. But first,
|
|
||||||
please read <https://www.gnu.org/licenses/why-not-lgpl.html>.
|
|
85
README.md
|
@ -1,85 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
<p align="center">
|
|
||||||
<a href="https://jrnl.sh">
|
|
||||||
<img align="center" src="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/docs_theme/assets/readme-header.png"/>
|
|
||||||
</a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
jrnl
|
|
||||||
[](https://github.com/jrnl-org/jrnl/actions?query=workflow%3ATesting)
|
|
||||||
[](https://pepy.tech/project/jrnl)
|
|
||||||
[](https://pypi.python.org/pypi/jrnl/)
|
|
||||||
[](https://formulae.brew.sh/formula/jrnl)
|
|
||||||
[](https://gitter.im/jrnl-org/jrnl)
|
|
||||||
[](https://github.com/jrnl-org/jrnl/blob/develop/CHANGELOG.md)
|
|
||||||
====
|
|
||||||
|
|
||||||
_To get help, [submit an issue](https://github.com/jrnl-org/jrnl/issues/new/choose) on
|
|
||||||
GitHub._
|
|
||||||
|
|
||||||
`jrnl` is a simple journal application for the command line.
|
|
||||||
|
|
||||||
You can use it to easily create, search, and view journal entries. Journals are
|
|
||||||
stored as human-readable plain text, and can also be encrypted using [AES
|
|
||||||
encryption](http://en.wikipedia.org/wiki/Advanced_Encryption_Standard).
|
|
||||||
|
|
||||||
## In a Nutshell
|
|
||||||
|
|
||||||
To make a new entry, just enter
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
jrnl yesterday: Called in sick. Used the time to clean the house and write my
|
|
||||||
book.
|
|
||||||
```
|
|
||||||
|
|
||||||
`yesterday:` is interpreted by `jrnl` as a timestamp. Everything until the
|
|
||||||
first sentence ending (either `.`, `?`, or `!`) is interpreted as the title, and
|
|
||||||
the rest as the body. In your journal file, the result will look like this:
|
|
||||||
|
|
||||||
[2012-03-29 09:00] Called in sick.
|
|
||||||
Used the time to clean the house and write my book.
|
|
||||||
|
|
||||||
If you just call `jrnl`, you will be prompted to compose your entry - but you
|
|
||||||
can also configure _jrnl_ to use your external editor.
|
|
||||||
|
|
||||||
For more information, please read the
|
|
||||||
[documentation](https://jrnl.sh).
|
|
||||||
|
|
||||||
## Contributors
|
|
||||||
|
|
||||||
### Maintainers
|
|
||||||
|
|
||||||
Our maintainers help keep the lights on for the project:
|
|
||||||
|
|
||||||
* Jonathan Wren ([wren](https://github.com/wren))
|
|
||||||
* Micah Ellison ([micahellison](https://github.com/micahellison))
|
|
||||||
|
|
||||||
Please thank them if you like `jrnl`!
|
|
||||||
|
|
||||||
### Code Contributors
|
|
||||||
|
|
||||||
This project is made with love by the many fabulous people who have contributed.
|
|
||||||
`jrnl` couldn't exist without each and every one of you!
|
|
||||||
|
|
||||||
<a href="https://github.com/jrnl-org/jrnl/graphs/contributors"><img
|
|
||||||
src="https://opencollective.com/jrnl/contributors.svg?width=890&button=false"
|
|
||||||
/></a>
|
|
||||||
|
|
||||||
If you'd also like to help make `jrnl` better, please see our [contributing
|
|
||||||
documentation](docs/contributing.md).
|
|
||||||
|
|
||||||
### Financial Backers
|
|
||||||
|
|
||||||
Another way show support is through direct financial contributions. These funds
|
|
||||||
go to covering our costs, and are a quick way to show your appreciation for
|
|
||||||
`jrnl`.
|
|
||||||
|
|
||||||
[Become a financial contributor](https://opencollective.com/jrnl/contribute)
|
|
||||||
and help us sustain our community.
|
|
||||||
|
|
||||||
<a href="https://opencollective.com/jrnl"><img
|
|
||||||
src="https://opencollective.com/jrnl/individuals.svg?width=890"></a>
|
|
|
@ -1,7 +0,0 @@
|
||||||
# Security
|
|
||||||
|
|
||||||
If you've discovered a potential security issue in jrnl, please contact the maintainers at [maintainers@jrnl.sh](mailto:maintainers@jrnl.sh).
|
|
||||||
|
|
||||||
You can also feel free to [open an issue](https://github.com/jrnl-org/jrnl/issues/new/choose) (but please don't disclose the vulnerability) in case the email goes to spam.
|
|
||||||
|
|
||||||
You can find [known privacy and security issues in our documentation](https://jrnl.sh/en/stable/privacy-and-security/).
|
|
117
docs/advanced.md
|
@ -1,117 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Advanced Usage
|
|
||||||
|
|
||||||
## Configuration File
|
|
||||||
|
|
||||||
`jrnl` has a wide variety of options that can be customized through the config file,
|
|
||||||
including templates, formats, multiple journals, and more. See
|
|
||||||
the [configuration file reference](./reference-config-file.md) for details
|
|
||||||
or read on for some common use cases.
|
|
||||||
|
|
||||||
### Multiple journal files
|
|
||||||
|
|
||||||
You can configure `jrnl`to use with multiple journals (eg.
|
|
||||||
`private` and `work`) by defining more journals in your [config file](./reference-config-file.md),
|
|
||||||
for example:
|
|
||||||
|
|
||||||
``` yaml
|
|
||||||
journals:
|
|
||||||
default: ~/journal.txt
|
|
||||||
work: ~/work.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
The `default` journal gets created the first time you start `jrnl`
|
|
||||||
Now you can access the `work` journal by using `jrnl work` instead of
|
|
||||||
`jrnl`, eg.
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
jrnl work at 10am: Meeting with @Steve
|
|
||||||
jrnl work -n 3
|
|
||||||
```
|
|
||||||
|
|
||||||
will both use `~/work.txt`, while `jrnl -n 3` will display the last
|
|
||||||
three entries from `~/journal.txt` (and so does `jrnl default -n 3`).
|
|
||||||
|
|
||||||
You can also override the default options for each individual journal.
|
|
||||||
If your `jrnl.yaml` looks like this:
|
|
||||||
|
|
||||||
``` yaml
|
|
||||||
encrypt: false
|
|
||||||
journals:
|
|
||||||
default: ~/journal.txt
|
|
||||||
work:
|
|
||||||
journal: ~/work.txt
|
|
||||||
encrypt: true
|
|
||||||
food: ~/my_recipes.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
Your `default` and your `food` journals won't be encrypted, however your
|
|
||||||
`work` journal will!
|
|
||||||
|
|
||||||
You can override all options that are present at
|
|
||||||
the top level of `jrnl.yaml`, just make sure that at the very least
|
|
||||||
you specify a `journal: ...` key that points to the journal file of
|
|
||||||
that journal.
|
|
||||||
|
|
||||||
Consider the following example configuration
|
|
||||||
|
|
||||||
``` yaml
|
|
||||||
editor: vi -c startinsert
|
|
||||||
journals:
|
|
||||||
default: ~/journal.txt
|
|
||||||
work:
|
|
||||||
journal: ~/work.txt
|
|
||||||
encrypt: true
|
|
||||||
display_format: json
|
|
||||||
editor: code -rw
|
|
||||||
food:
|
|
||||||
display_format: markdown
|
|
||||||
journal: ~/recipes.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
The `work` journal is encrypted, prints to `json` by default, and is edited using an existing window of VSCode. Similarly, the `food` journal prints to markdown by default, but uses all the other defaults.
|
|
||||||
|
|
||||||
### Modifying Configurations from the Command line
|
|
||||||
|
|
||||||
You can override a configuration field for the current instance of `jrnl` using `--config-override CONFIG_KEY CONFIG_VALUE` where `CONFIG_KEY` is a valid configuration field, specified in dot notation and `CONFIG_VALUE` is the (valid) desired override value. The dot notation can be used to change config keys within other keys, such as `colors.title` for the `title` key within the `colors` key.
|
|
||||||
|
|
||||||
You can specify multiple overrides as multiple calls to `--config-override`.
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
These overrides allow you to modify ***any*** field of your jrnl configuration. We trust that you know what you are doing.
|
|
||||||
|
|
||||||
#### Examples:
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
# Create an entry using the `stdin` prompt, for rapid logging
|
|
||||||
jrnl --config-override editor ""
|
|
||||||
|
|
||||||
# Populate a project's log
|
|
||||||
jrnl --config-override journals.todo "$(git rev-parse --show-toplevel)/todo.txt" todo find my towel
|
|
||||||
|
|
||||||
# Pass multiple overrides
|
|
||||||
jrnl --config-override display_format fancy --config-override linewrap 20 \
|
|
||||||
--config-override colors.title green
|
|
||||||
```
|
|
||||||
|
|
||||||
### Using an alternate config
|
|
||||||
|
|
||||||
You can specify an alternate configuration file for the current instance of `jrnl` using `--config-file CONFIG_FILE_PATH` where
|
|
||||||
`CONFIG_FILE_PATH` is a path to an alternate `jrnl` configuration file.
|
|
||||||
|
|
||||||
#### Examples:
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
# Use personalised configuration file for personal journal entries
|
|
||||||
jrnl --config-file ~/foo/jrnl/personal-config.yaml
|
|
||||||
|
|
||||||
# Use alternate configuration file for work-related entries
|
|
||||||
jrnl --config-file ~/foo/jrnl/work-config.yaml
|
|
||||||
|
|
||||||
# Use default configuration file (created on first run)
|
|
||||||
jrnl
|
|
||||||
```
|
|
|
@ -1,132 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Contributing to jrnl
|
|
||||||
|
|
||||||
We welcome contributions to jrnl, whether it's through reporting bugs, improving the documentation, testing releases, engaging in discussion on features and bugs, or writing code.
|
|
||||||
|
|
||||||
## Table of Contents
|
|
||||||
* [Code of Conduct](#code-of-conduct)
|
|
||||||
* [Reporting Bugs](#reporting-bugs)
|
|
||||||
* [Editing Documentation](#editing-documentation)
|
|
||||||
* [Testing](#testing)
|
|
||||||
* [Submitting feature requests and ideas](#submitting-feature-requests-and-ideas)
|
|
||||||
* [Developing jrnl](#developing)
|
|
||||||
|
|
||||||
## Code of Conduct
|
|
||||||
|
|
||||||
Before starting, please read the [Code of Conduct](https://github.com/jrnl-org/jrnl/blob/develop/CODE_OF_CONDUCT.md).
|
|
||||||
|
|
||||||
## Reporting Bugs
|
|
||||||
|
|
||||||
Please report bugs by [opening a new issue](https://github.com/jrnl-org/jrnl/issues/new/choose) and describing it as well as possible. Many bugs are specific to a particular operating system and Python version, so please include that information!
|
|
||||||
|
|
||||||
## Editing Documentation
|
|
||||||
|
|
||||||
If you find a typo or a mistake in the docs, please fix it right away and send a pull request. If you're unsure what to change but still see a problem, you can [open a new issue](https://github.com/jrnl-org/jrnl/issues/new/choose) with the "Documentation change" type.
|
|
||||||
|
|
||||||
To edit the documentation, edit the `docs/*.md` files on the **develop** branch. You can see the result by running `poe docs-run` inside the project's root directory, then navigating your browser to [localhost:8000](http://localhost:8000).
|
|
||||||
|
|
||||||
### External editors and tips and tricks
|
|
||||||
|
|
||||||
If you'd like to share a jrnl command line trick that you find useful, you may find it worthwhile to add it to the ["Tips and Tricks" section](tips-and-tricks.md). For advice on how to integrate a particular external editor, you can add to the ["External Editors" section](external-editors.md).
|
|
||||||
|
|
||||||
## Testing
|
|
||||||
|
|
||||||
Much of the work of maintaining jrnl involves testing rather than coding.
|
|
||||||
|
|
||||||
The nature of jrnl means we deal with extremely sensitive data, and can't risk data loss. While jrnl does have a comprehensive automated testing suite, user testing is crucial to mitigating this risk.
|
|
||||||
|
|
||||||
### Prereleases
|
|
||||||
|
|
||||||
[Prereleases are deployed through PyPi much like normal releases](https://pypi.org/project/jrnl/#history). You can use [pipx](https://pypi.org/project/pipx/) to fetch them and test them. See the [changelog](https://github.com/jrnl-org/jrnl/blob/develop/CHANGELOG.md) for information on what has changed with each release.
|
|
||||||
|
|
||||||
### Pull requests
|
|
||||||
|
|
||||||
If you are comfortable enough with git, feel free to fetch particular [pull requests](https://github.com/jrnl-org/jrnl/pulls), test them yourself, and report back your findings. Bonus points if you can add a screencast of how the new feature works.
|
|
||||||
|
|
||||||
### Confirm bug reports
|
|
||||||
|
|
||||||
There are always [open bugs among our GitHub issues](https://github.com/jrnl-org/jrnl/issues?q=is%3Aissue+is%3Aopen+label%3Abug) and many are specific to a particular OS, Python version, or jrnl version. A simple comment like "Confirmed on jrnl v2.2, MacOS 10.15, Python 3.8.1" would be extremely helpful in tracking down bugs.
|
|
||||||
|
|
||||||
### Automate tests
|
|
||||||
|
|
||||||
See the develop section below for information on how to contribute new automated tests.
|
|
||||||
|
|
||||||
## Submitting feature requests and ideas
|
|
||||||
|
|
||||||
If you have a feature request or idea for jrnl, please [open a new issue](https://github.com/jrnl-org/jrnl/issues/new/choose) and describe the goal of the feature, and any relevant use cases. We'll discuss the issue with you, and decide if it's a good fit for the project.
|
|
||||||
|
|
||||||
When discussing new features, please keep in mind our design goals. jrnl strives to
|
|
||||||
[do one thing well](https://en.wikipedia.org/wiki/Unix_philosophy). To us, that means:
|
|
||||||
|
|
||||||
* being _nimble_
|
|
||||||
* having a simple interface
|
|
||||||
* avoiding duplicating functionality
|
|
||||||
|
|
||||||
## Developing
|
|
||||||
|
|
||||||
### Getting your environment set up
|
|
||||||
|
|
||||||
You will need to install [poetry](https://python-poetry.org/) to develop jrnl. It will take care of all of the project's other dependencies.
|
|
||||||
|
|
||||||
### Understanding the branches
|
|
||||||
|
|
||||||
jrnl uses two primary branches:
|
|
||||||
|
|
||||||
* `develop` - for ongoing development
|
|
||||||
* `release` - for releases
|
|
||||||
|
|
||||||
In general, pull requests should be made on the `develop` branch.
|
|
||||||
|
|
||||||
### Common development commands
|
|
||||||
|
|
||||||
You can find an inventory of commands in the `pyproject.toml`. Users can run the commands by typing `poe` followed by the name of the command ([Poe the Poet](https://github.com/nat-n/poethepoet) can be installed on its own, or as part of `poetry install`).
|
|
||||||
|
|
||||||
A typical development workflow includes:
|
|
||||||
|
|
||||||
* Installing dependencies:
|
|
||||||
* `poetry install`
|
|
||||||
* Activate virtual environment:
|
|
||||||
* `poetry shell`
|
|
||||||
* Running the source in a virtual environment:
|
|
||||||
* `jrnl` (with or without arguments as necessary)
|
|
||||||
* Running tests:
|
|
||||||
* `poe test`
|
|
||||||
* Formatting the code to standardize its style:
|
|
||||||
* `poe format`
|
|
||||||
|
|
||||||
### Updating automated tests
|
|
||||||
|
|
||||||
When resolving bugs or adding new functionality, please add tests to prevent that functionality from breaking in the future. If you notice any functionality that isn't covered in the tests, feel free to submit a test-only pull request as well.
|
|
||||||
|
|
||||||
For testing, jrnl uses [pytest](https://docs.pytest.org) for unit tests, and [pytest-bdd](https://pytest-bdd.readthedocs.io/) for integration testing. All tests are in the `tests` folder.
|
|
||||||
|
|
||||||
Many tests can be created by only editing `*.feature` files with the same format as other tests. For more complicated functionality, you may need to implement steps in `tests/lib/` which are then executed by your tests in the `feature` files.
|
|
||||||
|
|
||||||
### Submitting pull requests
|
|
||||||
|
|
||||||
When you're ready, feel free to submit a pull request (PR). The jrnl maintainers generally review the pull requests every two weeks, but the continuous integration pipeline will run on automated tests on it within a matter of minutes and will report back any issues it has found with your code across a variety of environments.
|
|
||||||
|
|
||||||
The pull request template contains a checklist full of housekeeping items. Please fill them out as necessary when you submit.
|
|
||||||
|
|
||||||
If a pull request contains failing tests, it probably will not be reviewed, and it definitely will not be approved. However, if you need help resolving a failing test, please mention that in your PR.
|
|
||||||
|
|
||||||
### Finding things to work on
|
|
||||||
|
|
||||||
You can search the [jrnl GitHub issues](https://github.com/jrnl-org/jrnl/issues) by [label](https://github.com/jrnl-org/jrnl/labels) for things to work on. Here are some labels worth searching:
|
|
||||||
|
|
||||||
* [critical](https://github.com/jrnl-org/jrnl/labels/critical)
|
|
||||||
* [help wanted](https://github.com/jrnl-org/jrnl/labels/help%20wanted)
|
|
||||||
* [bug](https://github.com/jrnl-org/jrnl/labels/bug)
|
|
||||||
* [enhancement](https://github.com/jrnl-org/jrnl/labels/enhancement)
|
|
||||||
|
|
||||||
You can also get a feel for the project's priorities by reviewing the [milestones](https://github.com/jrnl-org/jrnl/milestones).
|
|
||||||
|
|
||||||
### A note for new programmers and programmers new to python
|
|
||||||
|
|
||||||
Although jrnl has grown quite a bit since its inception, the overall complexity (for an end-user program) is fairly low, and we hope you'll find the code easy enough to understand.
|
|
||||||
|
|
||||||
If you have a question, please don't hesitate to ask! Python is known for its welcoming community and openness to novice programmers, so feel free to fork the code and play around with it! If you create something you want to share with us, please create a pull request. We never expect pull requests to be perfect, idiomatic, instantly mergeable code. We can work through it together!
|
|
|
@ -1,160 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Encryption
|
|
||||||
|
|
||||||
## A Note on Security
|
|
||||||
|
|
||||||
While `jrnl` follows best practices, total security is never possible in the
|
|
||||||
real world. There are a number of ways that people can at least partially
|
|
||||||
compromise your `jrnl` data. See the [Privacy and Security](./privacy-and-security.md) page
|
|
||||||
for more information.
|
|
||||||
|
|
||||||
## Encrypting and Decrypting
|
|
||||||
|
|
||||||
Existing plain text journal files can be encrypted using the `--encrypt`
|
|
||||||
command:
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
jrnl --encrypt [FILENAME]
|
|
||||||
```
|
|
||||||
|
|
||||||
You can then enter a new password, and the unencrypted file will replaced with
|
|
||||||
the new encrypted file.
|
|
||||||
|
|
||||||
This command also works to change the password for a journal file that is
|
|
||||||
already encrypted. `jrnl` will prompt you for the current password and then new
|
|
||||||
password.
|
|
||||||
|
|
||||||
Conversely,
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
jrnl --decrypt [FILENAME]
|
|
||||||
```
|
|
||||||
|
|
||||||
replaces the encrypted journal file with a plain text file. You can also specify
|
|
||||||
a filename, e.g., `jrnl --decrypt plain_text_copy.txt`, to leave the original
|
|
||||||
encrypted file untouched and create a new plain text file next to it.
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
Changing `encrypt` in your [config file](./reference-config-file.md) to
|
|
||||||
a different value will not encrypt or decrypt your
|
|
||||||
journal file. It merely says whether or not your journal
|
|
||||||
is encrypted. Hence manually changing
|
|
||||||
this option will most likely result in your journal file being
|
|
||||||
impossible to load. This is why the above commands are necessary.
|
|
||||||
|
|
||||||
## Storing Passwords in Your Keychain
|
|
||||||
|
|
||||||
Nobody can recover or reset your `jrnl` password. If you lose it,
|
|
||||||
your data will be inaccessible forever.
|
|
||||||
|
|
||||||
For this reason, when encrypting a journal, `jrnl` asks whether you would like
|
|
||||||
to store the password in your system's keychain. An added benefit is that you
|
|
||||||
will not need to enter the password when interacting with the journal file.
|
|
||||||
|
|
||||||
If you don't initially store the password in your keychain but decide to do so
|
|
||||||
later---or if you want to store it in one computer's keychain but not in another
|
|
||||||
computer's---you can run `jrnl --encrypt` on an encrypted journal and use the
|
|
||||||
same password again. This will trigger the keychain storage prompt.
|
|
||||||
|
|
||||||
## Manual Decryption
|
|
||||||
|
|
||||||
The easiest way to decrypt your journal is with `jrnl --decrypt`, but you could
|
|
||||||
also decrypt your journal manually if needed. To do this, you can use any
|
|
||||||
program that supports the AES algorithm (specifically AES-CBC), and you'll need
|
|
||||||
the following relevant information for decryption:
|
|
||||||
|
|
||||||
- **Key:** The key used for encryption is the
|
|
||||||
[SHA-256](https://en.wikipedia.org/wiki/SHA-2) hash of your password.
|
|
||||||
- **Initialization vector (IV):** The IV is stored in the first 16 bytes of
|
|
||||||
your encrypted journal file.
|
|
||||||
- **The actual text of the journal** (everything after the first 16 bytes in
|
|
||||||
the encrypted journal file) is encoded in
|
|
||||||
[UTF-8](https://en.wikipedia.org/wiki/UTF-8) and padded according to
|
|
||||||
[PKCS\#7](https://en.wikipedia.org/wiki/PKCS_7) before being encrypted.
|
|
||||||
|
|
||||||
If you'd like an example of what this might look like in script form, please
|
|
||||||
see below for some examples of Python scripts that you could use to manually
|
|
||||||
decrypt your journal.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
These are only examples, and are only here to illustrate that your journal files
|
|
||||||
will still be recoverable even if `jrnl` isn't around anymore. Please use
|
|
||||||
`jrnl --decrypt` if available.
|
|
||||||
|
|
||||||
**Example for jrnl v2 files**:
|
|
||||||
``` python
|
|
||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Decrypt a jrnl v2 encrypted journal.
|
|
||||||
|
|
||||||
Note: the `cryptography` module must be installed (you can do this with
|
|
||||||
something like `pip3 install crytography`)
|
|
||||||
"""
|
|
||||||
|
|
||||||
import base64
|
|
||||||
import getpass
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
from cryptography.fernet import Fernet
|
|
||||||
from cryptography.hazmat.backends import default_backend
|
|
||||||
from cryptography.hazmat.primitives import hashes
|
|
||||||
from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
|
|
||||||
|
|
||||||
filepath = input("journal file path: ")
|
|
||||||
password = getpass.getpass("Password: ")
|
|
||||||
|
|
||||||
with open(Path(filepath), "rb") as f:
|
|
||||||
ciphertext = f.read()
|
|
||||||
|
|
||||||
password = password.encode("utf-8")
|
|
||||||
kdf = PBKDF2HMAC(
|
|
||||||
algorithm=hashes.SHA256(),
|
|
||||||
length=32,
|
|
||||||
salt=b"\xf2\xd5q\x0e\xc1\x8d.\xde\xdc\x8e6t\x89\x04\xce\xf8",
|
|
||||||
iterations=100_000,
|
|
||||||
backend=default_backend(),
|
|
||||||
)
|
|
||||||
|
|
||||||
key = base64.urlsafe_b64encode(kdf.derive(password))
|
|
||||||
|
|
||||||
print(Fernet(key).decrypt(ciphertext).decode("utf-8"))
|
|
||||||
```
|
|
||||||
|
|
||||||
**Example for jrnl v1 files**:
|
|
||||||
``` python
|
|
||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Decrypt a jrnl v1 encrypted journal.
|
|
||||||
|
|
||||||
Note: the `pycrypto` module must be installed (you can do this with something
|
|
||||||
like `pip3 install pycrypto`)
|
|
||||||
"""
|
|
||||||
|
|
||||||
import argparse
|
|
||||||
import getpass
|
|
||||||
import hashlib
|
|
||||||
|
|
||||||
from Crypto.Cipher import AES
|
|
||||||
|
|
||||||
parser = argparse.ArgumentParser()
|
|
||||||
parser.add_argument("filepath", help="journal file to decrypt")
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
pwd = getpass.getpass()
|
|
||||||
key = hashlib.sha256(pwd.encode("utf-8")).digest()
|
|
||||||
|
|
||||||
with open(args.filepath, "rb") as f:
|
|
||||||
ciphertext = f.read()
|
|
||||||
|
|
||||||
crypto = AES.new(key, AES.MODE_CBC, ciphertext[:16])
|
|
||||||
plain = crypto.decrypt(ciphertext[16:])
|
|
||||||
plain = plain.strip(plain[-1:])
|
|
||||||
plain = plain.decode("utf-8")
|
|
||||||
print(plain)
|
|
||||||
```
|
|
|
@ -1,137 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
# External editors
|
|
||||||
|
|
||||||
Configure your preferred external editor by updating the `editor` option
|
|
||||||
in your [configuration file](./reference-config-file.md#editor). If your editor is not
|
|
||||||
in your operating system's `PATH` environment variable, then you will have to
|
|
||||||
enter the full path of your editor.
|
|
||||||
|
|
||||||
Once it's configured, you can create an entry as a new document in your editor using the `jrnl`
|
|
||||||
command by itself:
|
|
||||||
|
|
||||||
``` text
|
|
||||||
jrnl
|
|
||||||
```
|
|
||||||
|
|
||||||
You can specify the time and title of the entry as usual on the first line of the document.
|
|
||||||
|
|
||||||
If you want, you can skip the editor by including a quick entry with the `jrnl` command:
|
|
||||||
|
|
||||||
``` text
|
|
||||||
jrnl yesterday: All my troubles seemed so far away.
|
|
||||||
```
|
|
||||||
|
|
||||||
If you want to start the entry on the command line and continue writing in your chosen editor,
|
|
||||||
use the `--edit` flag. For example:
|
|
||||||
|
|
||||||
``` text
|
|
||||||
jrnl yesterday: All my troubles seemed so far away. --edit
|
|
||||||
```
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
To save and log any entry edits, save and close the file.
|
|
||||||
|
|
||||||
All editors must be [blocking processes](https://en.wikipedia.org/wiki/Blocking_(computing)) to work with jrnl. Some editors, such as [micro](https://micro-editor.github.io/), are blocking by default, though others can be made to block with additional arguments, such as many of those documented below. If jrnl opens your editor but finishes running immediately, then your editor is not a blocking process, and you may be able to correct that with one of the suggestions below.
|
|
||||||
|
|
||||||
Please see [this section](./privacy-and-security.md#editor-history) about how
|
|
||||||
your editor might leak sensitive information and how to mitigate that risk.
|
|
||||||
|
|
||||||
## Sublime Text
|
|
||||||
|
|
||||||
To use [Sublime Text](https://www.sublimetext.com/), install the command line
|
|
||||||
tools for Sublime Text and configure your `jrnl.yaml` like this:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
editor: "subl -w"
|
|
||||||
```
|
|
||||||
|
|
||||||
Note the `-w` flag to make sure `jrnl` waits for Sublime Text to close the
|
|
||||||
file before writing into the journal.
|
|
||||||
|
|
||||||
## Visual Studio Code
|
|
||||||
|
|
||||||
[Visual Studio Code](https://code.visualstudio.com) also requires a flag
|
|
||||||
that tells the process to wait until the file is closed before exiting:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
editor: "code --wait"
|
|
||||||
```
|
|
||||||
|
|
||||||
On Windows, `code` is not added to the path by default, so you'll need to
|
|
||||||
enter the full path to your `code.exe` file, or add it to the `PATH` variable.
|
|
||||||
|
|
||||||
## MacVim
|
|
||||||
|
|
||||||
Also similar to Sublime Text, MacVim must be started with a flag that tells
|
|
||||||
the the process to wait until the file is closed before passing control
|
|
||||||
back to journal. In the case of MacVim, this is `-f`:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
editor: "mvim -f"
|
|
||||||
```
|
|
||||||
|
|
||||||
## Vim/Neovim
|
|
||||||
|
|
||||||
To use any of the Vim derivatives as editor in Linux, simply set the `editor`
|
|
||||||
to the executable:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
editor: "vim"
|
|
||||||
# or
|
|
||||||
editor: "nvim"
|
|
||||||
```
|
|
||||||
|
|
||||||
## iA Writer
|
|
||||||
|
|
||||||
On OS X, you can use the fabulous [iA
|
|
||||||
Writer](http://www.iawriter.com/mac) to write entries. Configure your
|
|
||||||
`jrnl.yaml` like this:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
editor: "open -b pro.writer.mac -Wn"
|
|
||||||
```
|
|
||||||
|
|
||||||
What does this do? `open -b ...` opens a file using the application
|
|
||||||
identified by the bundle identifier (a unique string for every app out
|
|
||||||
there). `-Wn` tells the application to wait until it's closed before
|
|
||||||
passing back control, and to use a new instance of the application.
|
|
||||||
|
|
||||||
If the `pro.writer.mac` bundle identifier is not found on your system,
|
|
||||||
you can find the right string to use by inspecting iA Writer's
|
|
||||||
`Info.plist` file in your shell:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
grep -A 1 CFBundleIdentifier /Applications/iA\ Writer.app/Contents/Info.plist
|
|
||||||
```
|
|
||||||
|
|
||||||
## Notepad++ on Windows
|
|
||||||
|
|
||||||
To set [Notepad++](http://notepad-plus-plus.org/) as your editor, edit
|
|
||||||
the `jrnl` config file (`jrnl.yaml`) like this:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
editor: "C:\\Program Files (x86)\\Notepad++\\notepad++.exe -multiInst -nosession"
|
|
||||||
```
|
|
||||||
|
|
||||||
The double backslashes are needed so `jrnl` can read the file path
|
|
||||||
correctly. The `-multiInst -nosession` options will cause `jrnl` to open
|
|
||||||
its own Notepad++ window.
|
|
||||||
|
|
||||||
|
|
||||||
## emacs
|
|
||||||
|
|
||||||
To use `emacs` as your editor, edit the `jrnl` config file (`jrnl.yaml`) like this:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
editor: emacsclient -a "" -c
|
|
||||||
```
|
|
||||||
|
|
||||||
When you're done editing the message, save and `C-x #` to close the buffer and stop the emacsclient process.
|
|
||||||
|
|
||||||
## Other editors
|
|
||||||
|
|
||||||
If you're using another editor and would like to share, feel free to [contribute documentation](./contributing.md#editing-documentation) on it.
|
|
349
docs/formats.md
|
@ -1,349 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Formats
|
|
||||||
|
|
||||||
`jrnl` supports a variety of alternate formats. These can be used to display your
|
|
||||||
journal in a different manner than the `jrnl` default, and can even be used to pipe data
|
|
||||||
from your journal for use in another program to create reports, or do whatever you want
|
|
||||||
with your `jrnl` data.
|
|
||||||
|
|
||||||
Any of these formats can be used with a search (e.g. `jrnl -contains "lorem ipsum"
|
|
||||||
--format json`) to display the results of that search in the given format, or can be
|
|
||||||
used alone (e.g. `jrnl --format json`) to display all entries from the selected journal.
|
|
||||||
|
|
||||||
This page shows examples of all the built-in formats, but since `jrnl` supports adding
|
|
||||||
more formats through plugins, you may have more available on your system. Please see
|
|
||||||
`jrnl --help` for a list of which formats are available on your system.
|
|
||||||
|
|
||||||
Any of these formats can be used interchangeably, and are only grouped into "display",
|
|
||||||
"data", and "report" formats below for convenience.
|
|
||||||
|
|
||||||
## Display Formats
|
|
||||||
These formats are mainly intended for displaying your journal in the terminal. Even so,
|
|
||||||
they can still be used in the same way as any other format (like written to a file, if
|
|
||||||
you choose).
|
|
||||||
|
|
||||||
### Pretty
|
|
||||||
``` sh
|
|
||||||
jrnl --format pretty
|
|
||||||
# or
|
|
||||||
jrnl -1 # any search
|
|
||||||
```
|
|
||||||
|
|
||||||
This is the default format in `jrnl`. If no `--format` is given, `pretty` will be used.
|
|
||||||
|
|
||||||
It displays the timestamp of each entry formatted to by the user config followed by the
|
|
||||||
title on the same line. Then the body of the entry is shown below.
|
|
||||||
|
|
||||||
This format is configurable through these values from your config file (see
|
|
||||||
[Advanced Usage](./advanced.md) for more details):
|
|
||||||
|
|
||||||
- `colors`
|
|
||||||
- `body`
|
|
||||||
- `date`
|
|
||||||
- `tags`
|
|
||||||
- `title`
|
|
||||||
- `indent_character`
|
|
||||||
- `linewrap`
|
|
||||||
- `timeformat`
|
|
||||||
|
|
||||||
**Example output**:
|
|
||||||
``` sh
|
|
||||||
2020-06-28 18:22 This is the first sample entry
|
|
||||||
| This is the sample body text of the first sample entry.
|
|
||||||
|
|
||||||
2020-07-01 20:00 This is the second sample entry
|
|
||||||
| This is the sample body text of the second sample entry, but
|
|
||||||
| this one has a @tag.
|
|
||||||
|
|
||||||
2020-07-02 09:00 This is the third sample entry
|
|
||||||
| This is the sample body text of the third sample entry.
|
|
||||||
```
|
|
||||||
|
|
||||||
### Short
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
jrnl --format short
|
|
||||||
# or
|
|
||||||
jrnl --short
|
|
||||||
```
|
|
||||||
|
|
||||||
This will shorten entries to display only the date and title. It is essentially the
|
|
||||||
`pretty` format but without the body of each entry. This can be useful if you have long
|
|
||||||
journal entries and only want to see a list of entries that match your search.
|
|
||||||
|
|
||||||
**Example output**:
|
|
||||||
``` sh
|
|
||||||
2020-06-28 18:22 This is the first sample entry
|
|
||||||
2020-07-01 20:00 This is the second sample entry
|
|
||||||
2020-07-02 09:00 This is the third sample entry
|
|
||||||
```
|
|
||||||
|
|
||||||
### Fancy (or Boxed)
|
|
||||||
``` sh
|
|
||||||
jrnl --format fancy
|
|
||||||
# or
|
|
||||||
jrnl --format boxed
|
|
||||||
```
|
|
||||||
|
|
||||||
This format outlines each entry with a border. This makes it much easier to tell where
|
|
||||||
each entry starts and ends. It's an example of how free-form the formats can be, and also
|
|
||||||
just looks kinda ~*~fancy~*~, if you're into that kind of thing.
|
|
||||||
|
|
||||||
**Example output**:
|
|
||||||
``` sh
|
|
||||||
┎──────────────────────────────────────────────────────────────────────╮2020-06-28 18:22
|
|
||||||
┃ This is the first sample entry ╘═══════════════╕
|
|
||||||
┠╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┤
|
|
||||||
┃ This is the sample body text of the first sample entry. │
|
|
||||||
┖──────────────────────────────────────────────────────────────────────────────────────┘
|
|
||||||
┎──────────────────────────────────────────────────────────────────────╮2020-07-01 20:00
|
|
||||||
┃ This is the second sample entry ╘═══════════════╕
|
|
||||||
┠╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┤
|
|
||||||
┃ This is the sample body text of the second sample entry, but this one has a @tag. │
|
|
||||||
┖──────────────────────────────────────────────────────────────────────────────────────┘
|
|
||||||
┎──────────────────────────────────────────────────────────────────────╮2020-07-02 09:00
|
|
||||||
┃ This is the third sample entry ╘═══════════════╕
|
|
||||||
┠╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┤
|
|
||||||
┃ This is the sample body text of the third sample entry. │
|
|
||||||
┖──────────────────────────────────────────────────────────────────────────────────────┘
|
|
||||||
```
|
|
||||||
|
|
||||||
## Data Formats
|
|
||||||
These formats are mainly intended for piping or exporting your journal to other
|
|
||||||
programs. Even so, they can still be used in the same way as any other format (like
|
|
||||||
written to a file, or displayed in your terminal, if you want).
|
|
||||||
|
|
||||||
### JSON
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
jrnl --format json
|
|
||||||
```
|
|
||||||
|
|
||||||
JSON is a very handy format used by many programs and has support in nearly every
|
|
||||||
programming language. There are many things you could do with JSON data. Maybe you could
|
|
||||||
use `jq` ([project page](https://github.com/stedolan/jq)) to filter through the fields in your journal.
|
|
||||||
Like this:
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
$ j -3 --format json | jq '.entries[].date' jrnl-GFqVlfgP-py3.8
|
|
||||||
"2020-06-28"
|
|
||||||
"2020-07-01"
|
|
||||||
"2020-07-02"
|
|
||||||
```
|
|
||||||
|
|
||||||
Or why not create a [beautiful timeline](http://timeline.knightlab.com/) of your journal?
|
|
||||||
|
|
||||||
**Example output**:
|
|
||||||
``` json
|
|
||||||
{
|
|
||||||
"tags": {
|
|
||||||
"@tag": 1
|
|
||||||
},
|
|
||||||
"entries": [
|
|
||||||
{
|
|
||||||
"title": "This is the first sample entry",
|
|
||||||
"body": "This is the sample body text of the first sample entry.",
|
|
||||||
"date": "2020-06-28",
|
|
||||||
"time": "18:22",
|
|
||||||
"tags": [],
|
|
||||||
"starred": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "This is the second sample entry",
|
|
||||||
"body": "This is the sample body text of the second sample entry, but this one has a @tag.",
|
|
||||||
"date": "2020-07-01",
|
|
||||||
"time": "20:00",
|
|
||||||
"tags": [
|
|
||||||
"@tag"
|
|
||||||
],
|
|
||||||
"starred": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "This is the third sample entry",
|
|
||||||
"body": "This is the sample body text of the third sample entry.",
|
|
||||||
"date": "2020-07-02",
|
|
||||||
"time": "09:00",
|
|
||||||
"tags": [],
|
|
||||||
"starred": false
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Markdown
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
jrnl --format markdown
|
|
||||||
# or
|
|
||||||
jrnl --format md
|
|
||||||
```
|
|
||||||
|
|
||||||
Markdown is a simple markup language that is human readable and can be used to be
|
|
||||||
rendered to other formats (html, pdf). `jrnl`'s
|
|
||||||
[README](https://github.com/jrnl-org/jrnl/blob/develop/README.md) for example is
|
|
||||||
formatted in markdown, then Github adds some formatting to make it look nice.
|
|
||||||
|
|
||||||
The markdown format groups entries by date (first by year, then by month), and adds
|
|
||||||
header markings as needed (e.g. `#`, `##`, etc). If you already have markdown header
|
|
||||||
markings in your journal, they will be incremented as necessary to make them fit under
|
|
||||||
these new headers (i.e. `#` will become `##`).
|
|
||||||
|
|
||||||
This format can be very useful, for example, to export a journal to a program that
|
|
||||||
converts markdown to html to make a website or a blog from your journal.
|
|
||||||
|
|
||||||
**Example output**:
|
|
||||||
``` markdown
|
|
||||||
# 2020
|
|
||||||
|
|
||||||
## June
|
|
||||||
|
|
||||||
### 2020-06-28 18:22 This is the first sample entry
|
|
||||||
|
|
||||||
This is the sample body text of the first sample entry.
|
|
||||||
|
|
||||||
## July
|
|
||||||
|
|
||||||
### 2020-07-01 20:00 This is the second sample entry
|
|
||||||
|
|
||||||
This is the sample body text of the second sample entry, but this one has a @tag.
|
|
||||||
|
|
||||||
### 2020-07-02 09:00 This is the third sample entry
|
|
||||||
|
|
||||||
This is the sample body text of the third sample entry.
|
|
||||||
```
|
|
||||||
|
|
||||||
### Plain Text
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
jrnl --format text
|
|
||||||
# or
|
|
||||||
jrnl --format txt
|
|
||||||
```
|
|
||||||
|
|
||||||
This outputs your journal in the same plain-text format that `jrnl` uses to store your
|
|
||||||
journal on disk. This format is particularly useful for importing and exporting journals
|
|
||||||
within `jrnl`.
|
|
||||||
|
|
||||||
You can use it, for example, to move entries from one journal to another, or to create a
|
|
||||||
new journal with search results from another journal.
|
|
||||||
|
|
||||||
**Example output**:
|
|
||||||
``` sh
|
|
||||||
[2020-06-28 18:22] This is the first sample entry
|
|
||||||
This is the sample body text of the first sample entry.
|
|
||||||
|
|
||||||
[2020-07-01 20:00] This is the second sample entry
|
|
||||||
This is the sample body text of the second sample entry, but this one has a @tag.
|
|
||||||
|
|
||||||
[2020-07-02 09:00] This is the third sample entry
|
|
||||||
This is the sample body text of the third sample entry.
|
|
||||||
```
|
|
||||||
|
|
||||||
### XML
|
|
||||||
``` sh
|
|
||||||
jrnl --format xml
|
|
||||||
```
|
|
||||||
|
|
||||||
This outputs your journal into XML format. XML is a commonly used data format and is
|
|
||||||
supported by many programs and programming languages.
|
|
||||||
|
|
||||||
**Example output**:
|
|
||||||
``` xml
|
|
||||||
<?xml version="1.0" ?>
|
|
||||||
<journal>
|
|
||||||
<entries>
|
|
||||||
<entry date="2020-06-28T18:22:00" starred="">This is the first sample entry This is the sample body text of the first sample entry.</entry>
|
|
||||||
<entry date="2020-07-01T20:00:00" starred="">
|
|
||||||
<tag name="@tag"/>
|
|
||||||
This is the second sample entry This is the sample body text of the second sample entry, but this one has a @tag.
|
|
||||||
</entry>
|
|
||||||
<entry date="2020-07-02T09:00:00" starred="">*This is the third sample entry, and is starred This is the sample body text of the third sample entry.</entry>
|
|
||||||
</entries>
|
|
||||||
<tags>
|
|
||||||
<tag name="@tag">1</tag>
|
|
||||||
</tags>
|
|
||||||
</journal>
|
|
||||||
```
|
|
||||||
|
|
||||||
### YAML
|
|
||||||
``` sh
|
|
||||||
jrnl --format yaml --file 'my_directory/'
|
|
||||||
```
|
|
||||||
|
|
||||||
This outputs your journal into YAML format. YAML is a commonly used data format and is
|
|
||||||
supported by many programs and programming languages. [Exporting to directories](#exporting-to-directories) is the
|
|
||||||
only supported YAML export option and each entry will be written to a separate file.
|
|
||||||
|
|
||||||
**Example file**:
|
|
||||||
``` yaml
|
|
||||||
title: This is the second sample entry
|
|
||||||
date: 2020-07-01 20:00
|
|
||||||
starred: False
|
|
||||||
tags: tag
|
|
||||||
|
|
||||||
This is the sample body text of the second sample entry, but this one has a @tag.
|
|
||||||
```
|
|
||||||
|
|
||||||
## Report formats
|
|
||||||
Since formats use your journal data and display it in different ways, they can also be
|
|
||||||
used to create reports.
|
|
||||||
|
|
||||||
### Tags
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
jrnl --format tags
|
|
||||||
# or
|
|
||||||
jrnl --tags
|
|
||||||
```
|
|
||||||
|
|
||||||
This format is a simple example of how formats can be used to create reports. It
|
|
||||||
displays each tag, and a count of how many entries in which tag appears in your journal
|
|
||||||
(or in the search results), sorted by most frequent.
|
|
||||||
|
|
||||||
Example output:
|
|
||||||
``` sh
|
|
||||||
@one : 32
|
|
||||||
@two : 17
|
|
||||||
@three : 4
|
|
||||||
```
|
|
||||||
|
|
||||||
## Options
|
|
||||||
|
|
||||||
### Exporting with `--file`
|
|
||||||
|
|
||||||
Example: `jrnl --format json --file /some/path/to/a/file.txt`
|
|
||||||
|
|
||||||
By default, `jrnl` will output entries to your terminal. But if you provide `--file`
|
|
||||||
along with a filename, the same output that would have been to your terminal will be
|
|
||||||
written to the file instead. This is the same as piping the output to a file.
|
|
||||||
|
|
||||||
So, in bash for example, the following two statements are equivalent:
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
jrnl --format json --file myjournal.json
|
|
||||||
```
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
jrnl --format json > myjournal.json
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Exporting to directories
|
|
||||||
|
|
||||||
If the `--file` argument is a directory, jrnl will export each entry into an individual file:
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
jrnl --format yaml --file my_entries/
|
|
||||||
```
|
|
||||||
|
|
||||||
The contents of `my_entries/` will then look like this:
|
|
||||||
|
|
||||||
``` output
|
|
||||||
my_entries/
|
|
||||||
|- 2013_06_03_a-beautiful-day.yaml
|
|
||||||
|- 2013_06_07_dinner-with-gabriel.yaml
|
|
||||||
|- ...
|
|
||||||
```
|
|
|
@ -1,53 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Getting started
|
|
||||||
|
|
||||||
## Installation
|
|
||||||
|
|
||||||
On Mac and Linux, the easiest way to install `jrnl` is using
|
|
||||||
[Homebrew](http://brew.sh/):
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
brew install jrnl
|
|
||||||
```
|
|
||||||
|
|
||||||
On other platforms, install `jrnl` using [Python](https://www.python.org/) 3.10+ and [pipx](https://pipxproject.github.io/pipx/):
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
pipx install jrnl
|
|
||||||
```
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
`pipx` should be installed through either `brew` or `pip`. Missing dependencies and other issues
|
|
||||||
may occur when installing `pipx` through `apt` or another package manager. Further installation
|
|
||||||
instructions can be found in [pipx's documentation](https://pipxproject.github.io/pipx/installation/).
|
|
||||||
|
|
||||||
!!! tip
|
|
||||||
Do not use `sudo` while installing `jrnl`. This may lead to path issues.
|
|
||||||
|
|
||||||
The first time you run `jrnl` you will be asked where your journal file
|
|
||||||
should be created and whether you wish to encrypt it.
|
|
||||||
|
|
||||||
## Quickstart
|
|
||||||
|
|
||||||
To make a new entry, just type
|
|
||||||
|
|
||||||
``` text
|
|
||||||
jrnl yesterday: Called in sick. Used the time to clean, and spent 4h on writing my book.
|
|
||||||
```
|
|
||||||
|
|
||||||
and hit return. `yesterday:` will be interpreted as a time stamp.
|
|
||||||
Everything until the first sentence mark (`.?!:`) will be interpreted as
|
|
||||||
the title, the rest as the body. In your journal file, the result will
|
|
||||||
look like this:
|
|
||||||
|
|
||||||
``` output
|
|
||||||
2012-03-29 09:00 Called in sick.
|
|
||||||
Used the time to clean the house and spent 4h on writing my book.
|
|
||||||
```
|
|
||||||
|
|
||||||
If you just call `jrnl`, you will be prompted to compose your entry -
|
|
||||||
but you can also [configure](advanced.md) *jrnl* to use your external editor.
|
|
|
@ -1,65 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Journal Types
|
|
||||||
`jrnl` can store your journal in a few different ways:
|
|
||||||
|
|
||||||
- a single text file (encrypted or otherwise)
|
|
||||||
- a folder structure organized by date containing unencrypted text files
|
|
||||||
- the DayOne Classic format
|
|
||||||
|
|
||||||
There is no need to specify what type of journal you'd like to use. Instead,
|
|
||||||
`jrnl` will automatically detect the journal type based on whether you're
|
|
||||||
referencing a file or a folder in your [config file](advanced.md),
|
|
||||||
and if it's a folder, whether or not DayOne Classic content exists in it.
|
|
||||||
|
|
||||||
## Single File
|
|
||||||
The single file format is the most flexible, as it can be [encrypted](encryption.md).
|
|
||||||
To use it, enter any path that is a file or does not already exist. You can
|
|
||||||
use any extension. `jrnl` will automatically create the file when you save
|
|
||||||
your first entry.
|
|
||||||
|
|
||||||
## Folder
|
|
||||||
The folder journal format organizes your entries into subfolders for the year
|
|
||||||
and month and `.txt` files for each day. If there are multiple entries in a day,
|
|
||||||
they all appear in the same `.txt` file.
|
|
||||||
|
|
||||||
The directory tree structure is in this format: `YYYY/MM/DD.txt`. For instance, if
|
|
||||||
you have an entry on May 5th, 2021 in a folder journal at `~/folderjournal`, it will
|
|
||||||
be located in: `~/folderjournal/2021/05/05.txt`
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
Creating a new folder journal can be done in two ways:
|
|
||||||
|
|
||||||
* Create a folder with the name of the journal before running `jrnl`. Otherwise, when you run `jrnl` for the first time, it will assume that you are creating a single file journal instead, and it will create a file at that path.
|
|
||||||
* Create a new journal in your [config_file](advanced.md) and end the path with a ``/`` (on a POSIX system like Linux or MacOSX) or a ``\`` (on a Windows system). The folder will be created automatically if it doesn't exist.
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
Folder journals can't be encrypted.
|
|
||||||
|
|
||||||
## Day One Classic
|
|
||||||
`jrnl` supports the original data format used by DayOne. It's similar to the folder
|
|
||||||
journal format, except it's identified by either of these characteristics:
|
|
||||||
|
|
||||||
* the folder has a `.dayone` extension
|
|
||||||
* the folder has a subfolder named `entries`
|
|
||||||
|
|
||||||
This is not to be confused with the DayOne 2.0 format, [which is very different](https://help.dayoneapp.com/en/articles/1187337-day-one-classic-is-retired).
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
DayOne Classic journals can't be encrypted.
|
|
||||||
|
|
||||||
## Changing your journal type
|
|
||||||
You can't simply modify a journal's configuration to change its type. Instead,
|
|
||||||
define a new journal as the type you'd like, and use
|
|
||||||
[piping](https://en.wikipedia.org/wiki/Redirection_(computing)#Piping)
|
|
||||||
to export your old journal as `txt` to an import command on your new journal.
|
|
||||||
|
|
||||||
For instance, if you have a `projects` journal you would like to import into
|
|
||||||
a `new` journal, you would run the following after setting up the configuration
|
|
||||||
for your `new` journal:
|
|
||||||
```
|
|
||||||
jrnl projects --format txt | jrnl new --import
|
|
||||||
```
|
|
|
@ -1,64 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Overview
|
|
||||||
|
|
||||||
`jrnl` is a simple journal application for the command line.
|
|
||||||
|
|
||||||
You can use it to easily create, search, and view journal entries. Journals are
|
|
||||||
stored as human-readable plain text, and can also be encrypted using [AES
|
|
||||||
encryption](http://en.wikipedia.org/wiki/Advanced_Encryption_Standard).
|
|
||||||
|
|
||||||
`jrnl` has most of the features you need, and few of the ones you don't.
|
|
||||||
|
|
||||||
## Plain Text
|
|
||||||
|
|
||||||
`jrnl` stores each journal in plain text. You can store `jrnl` files anywhere,
|
|
||||||
including in shared folders to keep them synchronized between devices. Journal
|
|
||||||
files are compact (thousands of entries take up less than 1 MiB) and can be read
|
|
||||||
by almost any electronic device, now and for the foreseeable future.
|
|
||||||
|
|
||||||
## Tags
|
|
||||||
|
|
||||||
To make it easier to find entries later, `jrnl` includes support for inline tags
|
|
||||||
(the default tag symbol is `@`). You can find and filter entries by using tags
|
|
||||||
along with other search criteria.
|
|
||||||
|
|
||||||
## Support for Multiple Journals
|
|
||||||
|
|
||||||
`jrnl` includes support for the creation of multiple journals, each of which
|
|
||||||
can be stored as a single file or as a set of files. Entries are automatically
|
|
||||||
timestamped in a human-readable format that makes it easy to view multiple
|
|
||||||
entries at a time. `jrnl` can easily find the entries you want so that you can
|
|
||||||
read them or edit them.
|
|
||||||
|
|
||||||
## Support for External Editors
|
|
||||||
|
|
||||||
`jrnl` plays nicely with your favorite text editor. You may prefer to write
|
|
||||||
journal entries in an editor. Or you may want to make changes that require a
|
|
||||||
more comprehensive application. `jrnl` can filter specific entries and pass them
|
|
||||||
to the [external editor](./external-editors.md) of your choice.
|
|
||||||
|
|
||||||
## Encryption
|
|
||||||
|
|
||||||
`jrnl` includes support for [AES
|
|
||||||
encryption](http://en.wikipedia.org/wiki/Advanced_Encryption_Standard). See the
|
|
||||||
[encryption page](./encryption.md) for more information.
|
|
||||||
|
|
||||||
## Import and Export
|
|
||||||
|
|
||||||
`jrnl` makes it easy to import entries from other sources. Existing entries can
|
|
||||||
be exported in a variety of [formats](./formats.md).
|
|
||||||
|
|
||||||
## Multi-Platform Support
|
|
||||||
|
|
||||||
`jrnl` is compatible with most operating systems. You can [download](./installation.md) it using one
|
|
||||||
of a variety of package managers, or you can build from source.
|
|
||||||
|
|
||||||
## Open-Source
|
|
||||||
|
|
||||||
`jrnl` is written in [Python](https://www.python.org) and maintained by a
|
|
||||||
[friendly community](https://github.com/jrnl-org/jrnl) of open-source software
|
|
||||||
enthusiasts.
|
|
|
@ -1,222 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Privacy and Security
|
|
||||||
|
|
||||||
`jrnl` is designed with privacy and security in mind, but like any other
|
|
||||||
program there are some limitations to be aware of.
|
|
||||||
|
|
||||||
## Password strength
|
|
||||||
|
|
||||||
`jrnl` doesn't enforce password strength requirements. Short or commonly-used
|
|
||||||
passwords can be easily circumvented by someone with basic security skills
|
|
||||||
to access to your encrypted `jrnl` file.
|
|
||||||
|
|
||||||
## Shell history
|
|
||||||
|
|
||||||
Since you can enter entries from the command line, any tool that logs command
|
|
||||||
line actions is a potential security risk. See below for how to deal with this
|
|
||||||
problem in various shells.
|
|
||||||
|
|
||||||
### bash
|
|
||||||
|
|
||||||
You can disable history logging for jrnl by adding this line into your
|
|
||||||
`~/.bashrc` file:
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
HISTIGNORE="$HISTIGNORE:jrnl *"
|
|
||||||
```
|
|
||||||
|
|
||||||
To delete existing `jrnl` commands from `bash` history, simply delete them from
|
|
||||||
your bash history file. The default location of this file is `~/.bash_history`,
|
|
||||||
but you can run `echo "$HISTFILE"` to find it if needed. Also, you can run
|
|
||||||
`history -c` to delete all commands from your history.
|
|
||||||
|
|
||||||
### zsh
|
|
||||||
|
|
||||||
You can disable history logging for jrnl by adding this to your `~/.zshrc`
|
|
||||||
file:
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
setopt HIST_IGNORE_SPACE
|
|
||||||
alias jrnl=" jrnl"
|
|
||||||
```
|
|
||||||
|
|
||||||
To delete existing `jrnl` commands from `zsh` history, simply remove them from
|
|
||||||
your zsh history file. The default location of this file is `~/.zsh_history`,
|
|
||||||
but you can run `echo "$HISTFILE"` to find it if needed. Also, you can run
|
|
||||||
`history -c` to delete all commands from your history.
|
|
||||||
|
|
||||||
### fish
|
|
||||||
|
|
||||||
By default `fish` will not log any command that starts with a space. If you
|
|
||||||
want to always run jrnl with a space before it, then you can add this to your
|
|
||||||
`~/.config/fish/config.fish` file:
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
abbr --add jrnl " jrnl"
|
|
||||||
```
|
|
||||||
|
|
||||||
To delete existing jrnl commands from `fish` history, run `history delete --prefix 'jrnl '`.
|
|
||||||
|
|
||||||
### Windows Command Prompt
|
|
||||||
|
|
||||||
Windows doesn't log history to disk, but it does keep it in your command prompt
|
|
||||||
session. Close the command prompt or press `Alt`+`F7` to clear your history
|
|
||||||
after journaling.
|
|
||||||
|
|
||||||
## Files in transit from editor to jrnl
|
|
||||||
|
|
||||||
When creating or editing an entry, `jrnl` uses a unencrypted temporary file on
|
|
||||||
disk in order to give your editor access to your journal. After you close your
|
|
||||||
editor, `jrnl` then deletes this temporary file.
|
|
||||||
|
|
||||||
So, if you have saved a journal entry but haven't closed your editor yet, the
|
|
||||||
unencrypted temporary remains on your disk. If your computer were to shut off
|
|
||||||
during this time, or the `jrnl` process were killed unexpectedly, then the
|
|
||||||
unencrypted temporary file will remain on your disk. You can mitigate this
|
|
||||||
issue by only saving with your editor right before closing it. You can also
|
|
||||||
manually delete these files from your temporary folder. By default, they
|
|
||||||
are named `jrnl*.jrnl`, but if you use a
|
|
||||||
[template](reference-config-file.md#template), they will have the same
|
|
||||||
extension as the template.
|
|
||||||
|
|
||||||
## Editor history
|
|
||||||
|
|
||||||
Some editors keep usage history stored on disk for future use. This can be a
|
|
||||||
security risk in the sense that sensitive information can leak via recent
|
|
||||||
search patterns or editor commands.
|
|
||||||
|
|
||||||
### Visual Studio Code
|
|
||||||
|
|
||||||
Visual Studio Code stores the contents of saved files to allow you to restore or
|
|
||||||
review the contents later. You can disable this feature for all files by unchecking
|
|
||||||
the `workbench.localHistory.enabled` setting in the
|
|
||||||
[Settings editor](https://code.visualstudio.com/docs/getstarted/settings#_settings-editor).
|
|
||||||
|
|
||||||
Alternatively, you can disable this feature for specific files by configuring a
|
|
||||||
[pattern](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options)
|
|
||||||
in the `workbench.localHistory.exclude` setting. To exclude unencrypted temporary files generated
|
|
||||||
by `jrnl`, you can set the `**/jrnl*.jrnl` (unless you are using a
|
|
||||||
[template](reference-config-file.md#template)) pattern for the `workbench.localHistory.exclude` setting
|
|
||||||
in the [Settings editor](https://code.visualstudio.com/docs/getstarted/settings#_settings-editor).
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
On Windows, the history location is typically found at
|
|
||||||
`%APPDATA%\Code\User\History`.
|
|
||||||
|
|
||||||
Visual Studio Code also creates a copy of all unsaved files that are open.
|
|
||||||
It stores these copies in a backup location that's automatically cleaned when
|
|
||||||
you save the file. However, if your computer shuts off before you save the file,
|
|
||||||
or the Visual Studio Code process stops unexpectedly, then an unencrypted
|
|
||||||
temporary file may remain on your disk. You can manually delete these files
|
|
||||||
from the backup location.
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
On Windows, the backup location is typically found at
|
|
||||||
`%APPDATA%\Code\Backups`.
|
|
||||||
|
|
||||||
### Vim
|
|
||||||
|
|
||||||
Vim stores progress data in a so called Viminfo file located at `~/.viminfo`
|
|
||||||
which contains all sorts of user data including command line history, search
|
|
||||||
string history, search/substitute patterns, contents of register etc. Also to
|
|
||||||
be able to recover opened files after an unexpected application close Vim uses
|
|
||||||
swap files.
|
|
||||||
|
|
||||||
These options as well as other leaky features can be disabled by setting the
|
|
||||||
`editor` key in the Jrnl settings like this:
|
|
||||||
|
|
||||||
``` yaml
|
|
||||||
editor: "vim -c 'set viminfo= noswapfile noundofile nobackup nowritebackup noshelltemp history=0 nomodeline secure'"
|
|
||||||
```
|
|
||||||
|
|
||||||
To disable all plugins and custom configurations and start Vim with the default
|
|
||||||
configuration `-u NONE` can be passed on the command line as well. This will
|
|
||||||
ensure that any rogue plugins or other difficult to catch information leaks are
|
|
||||||
eliminated. The downside to this is that the editor experience will decrease
|
|
||||||
quite a bit.
|
|
||||||
|
|
||||||
To instead let Vim automatically detect when a Jrnl file is being edited an
|
|
||||||
autocommand can be used. Place this in your `~/.vimrc`:
|
|
||||||
|
|
||||||
``` vim
|
|
||||||
autocmd BufNewFile,BufReadPre *.jrnl setlocal viminfo= noswapfile noundofile nobackup nowritebackup noshelltemp history=0 nomodeline secure
|
|
||||||
```
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
If you're using a [template](reference-config-file.md#template), you will
|
|
||||||
have to use the template's file extension instead of `.jrnl`.
|
|
||||||
|
|
||||||
See `:h <option>` in Vim for more information about the options mentioned.
|
|
||||||
|
|
||||||
### Neovim
|
|
||||||
|
|
||||||
Neovim strives to be mostly compatible with Vim and has therefore similar
|
|
||||||
functionality as Vim. One difference in Neovim is that the Viminfo file is
|
|
||||||
instead called the ShaDa ("shared data") file which resides in
|
|
||||||
`~/.local/state/nvim` (`~/.local/share/nvim` pre Neovim v0.8.0). The ShaDa file
|
|
||||||
can be disabled in the same way as for Vim.
|
|
||||||
|
|
||||||
``` yaml
|
|
||||||
editor: "nvim -c 'set shada= noswapfile noundofile nobackup nowritebackup noshelltemp history=0 nomodeline secure'"
|
|
||||||
```
|
|
||||||
|
|
||||||
`-u NONE` can be passed here as well to start a session with the default configs.
|
|
||||||
|
|
||||||
As for Vim above we can create an autocommand in Vimscript:
|
|
||||||
|
|
||||||
``` vim
|
|
||||||
autocmd BufNewFile,BufReadPre *.jrnl setlocal shada= noswapfile noundofile nobackup nowritebackup noshelltemp history=0 nomodeline secure
|
|
||||||
```
|
|
||||||
|
|
||||||
or the same but in Lua:
|
|
||||||
|
|
||||||
``` lua
|
|
||||||
vim.api.nvim_create_autocmd( {"BufNewFile","BufReadPre" }, {
|
|
||||||
group = vim.api.nvim_create_augroup("PrivateJrnl", {}),
|
|
||||||
pattern = "*.jrnl",
|
|
||||||
callback = function()
|
|
||||||
vim.o.shada = ""
|
|
||||||
vim.o.swapfile = false
|
|
||||||
vim.o.undofile = false
|
|
||||||
vim.o.backup = false
|
|
||||||
vim.o.writebackup = false
|
|
||||||
vim.o.shelltemp = false
|
|
||||||
vim.o.history = 0
|
|
||||||
vim.o.modeline = false
|
|
||||||
vim.o.secure = true
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
If you're using a [template](reference-config-file.md#template), you will
|
|
||||||
have to use the template's file extension instead of `.jrnl`.
|
|
||||||
|
|
||||||
Please see `:h <option>` in Neovim for more information about the options mentioned.
|
|
||||||
|
|
||||||
## Plausible deniability
|
|
||||||
|
|
||||||
You may be able to hide the contents of your journal behind a layer of encryption,
|
|
||||||
but if someone has access to your configuration file, then they can figure out that
|
|
||||||
you have a journal, where that journal file is, and when you last edited it.
|
|
||||||
With a sufficient power imbalance, someone may be able to force you to unencrypt
|
|
||||||
it through non-technical means.
|
|
||||||
|
|
||||||
## Saved Passwords
|
|
||||||
|
|
||||||
When creating an encrypted journal, you'll be prompted as to whether or not you
|
|
||||||
want to "store the password in your keychain." This keychain is accessed using
|
|
||||||
the [Python keyring library](https://pypi.org/project/keyring/), which has different
|
|
||||||
behavior depending on your operating system.
|
|
||||||
|
|
||||||
In Windows, the keychain is the Windows Credential Manager (WCM), which can't be locked
|
|
||||||
and can be accessed by any other application running under your username. If this is
|
|
||||||
a concern for you, you may not want to store your password.
|
|
||||||
|
|
||||||
## Notice any other risks?
|
|
||||||
|
|
||||||
Please let the maintainers know by [filing an issue on GitHub](https://github.com/jrnl-org/jrnl/issues).
|
|
|
@ -1,141 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Command Line Reference
|
|
||||||
|
|
||||||
## Synopsis
|
|
||||||
```
|
|
||||||
usage: jrnl [--debug] [--help] [--version] [--list] [--encrypt] [--decrypt]
|
|
||||||
[--import] [-on DATE] [-today-in-history] [-month DATE]
|
|
||||||
[-day DATE] [-year DATE] [-from DATE] [-to DATE] [-contains TEXT]
|
|
||||||
[-and] [-starred] [-n [NUMBER]] [-not [TAG]] [--edit] [--delete]
|
|
||||||
[--format TYPE] [--tags] [--short]
|
|
||||||
[--config-override CONFIG_KEY CONFIG_VALUE]
|
|
||||||
[--config-file CONFIG_FILE_PATH]
|
|
||||||
[[...]]
|
|
||||||
```
|
|
||||||
|
|
||||||
## Standalone Commands
|
|
||||||
|
|
||||||
These commands will exit after they complete. You may only run one at a time.
|
|
||||||
|
|
||||||
### --help
|
|
||||||
Show a help message.
|
|
||||||
|
|
||||||
### --version
|
|
||||||
Print version and license information.
|
|
||||||
|
|
||||||
### --list
|
|
||||||
List the config file location, all configured journals, and their locations.
|
|
||||||
|
|
||||||
### ---encrypt
|
|
||||||
Encrypt a journal. See [encryption](encryption.md) for more information.
|
|
||||||
|
|
||||||
### --decrypt
|
|
||||||
Decrypt a journal. See [encryption](encryption.md) for more information.
|
|
||||||
|
|
||||||
|
|
||||||
### --import
|
|
||||||
Import entries from another journal. If any entries have the exact same content
|
|
||||||
and timestamp, they will be deduplicated.
|
|
||||||
|
|
||||||
Optional parameters:
|
|
||||||
```sh
|
|
||||||
--file FILENAME
|
|
||||||
```
|
|
||||||
Specify a file to import. If not provided, `jrnl` will use STDIN as the data source.
|
|
||||||
|
|
||||||
```sh
|
|
||||||
--format TYPE
|
|
||||||
```
|
|
||||||
Specify the format of the file that is being imported. Defaults to the same data
|
|
||||||
storage method that jrnl uses. See [formats](formats.md) for more information.
|
|
||||||
|
|
||||||
## Writing new entries
|
|
||||||
See [Basic Usage](usage.md).
|
|
||||||
|
|
||||||
## Searching
|
|
||||||
|
|
||||||
To find entries from your journal, use any combination of the below filters.
|
|
||||||
Only entries that match all the filters will be displayed.
|
|
||||||
|
|
||||||
When specifying dates, you can use the same kinds of dates you use for new
|
|
||||||
entries, such as `yesterday`, `today`, `Tuesday`, or `2021-08-01`.
|
|
||||||
|
|
||||||
| Search Argument | Description |
|
|
||||||
| --- | --- |
|
|
||||||
| -on DATE | Show entries on this date |
|
|
||||||
| -today-in-history | Show entries of today over the years |
|
|
||||||
| -month DATE | Show entries on this month of any year |
|
|
||||||
| -day DATE | Show entries on this day of any month |
|
|
||||||
| -year DATE | Show entries of a specific year |
|
|
||||||
| -from DATE | Show entries after, or on, this date |
|
|
||||||
| -to DATE | Show entries before, or on, this date (alias: -until) |
|
|
||||||
| -contains TEXT | Show entries containing specific text (put quotes around text with spaces) |
|
|
||||||
| -and | Show only entries that match all conditions, like saying "x AND y" (default: OR) |
|
|
||||||
| -starred | Show only starred entries (marked with *) |
|
|
||||||
| -tagged | Show only tagged entries (marked with the [configured tagsymbols](reference-config-file.md#tagsymbols)) |
|
|
||||||
| -n [NUMBER] | Show a maximum of NUMBER entries (note: '-n 3' and '-3' have the same effect) |
|
|
||||||
| -not [TAG] | Exclude entries with this tag |
|
|
||||||
| -not -starred | Exclude entries that are starred |
|
|
||||||
| -not -tagged | Exclude entries that are tagged |
|
|
||||||
|
|
||||||
## Searching Options
|
|
||||||
These help you do various tasks with the selected entries from your search.
|
|
||||||
If used on their own (with no search), they will act on your entire journal.
|
|
||||||
|
|
||||||
### --edit
|
|
||||||
Opens the selected entries in your configured editor. It will fail if the
|
|
||||||
`editor` key is not set in your config file.
|
|
||||||
|
|
||||||
Once you begin editing, you can add multiple entries and delete entries
|
|
||||||
by modifying the text in your editor. When your editor closes, jrnl reads
|
|
||||||
the temporary file you were editing and makes the changes to your journal.
|
|
||||||
|
|
||||||
### --delete
|
|
||||||
Interactively deletes selected entries. You'll be asked to confirm deletion of
|
|
||||||
each entry.
|
|
||||||
|
|
||||||
### --change-time DATE
|
|
||||||
Interactively changes the time of the selected entries to the date specified,
|
|
||||||
or to right now if no date is specified. You'll be asked to confirm each entry,
|
|
||||||
unless you are using this with `--edit` on a single entry.
|
|
||||||
|
|
||||||
### --format TYPE
|
|
||||||
Display selected entries in an alternate format. See [formats](formats.md).
|
|
||||||
|
|
||||||
#### Optional parameters
|
|
||||||
```sh
|
|
||||||
--file FILENAME
|
|
||||||
```
|
|
||||||
Write output to file instead of STDOUT. In most shells, the
|
|
||||||
same effect can be achieved using `>`.
|
|
||||||
|
|
||||||
### --tags
|
|
||||||
|
|
||||||
Alias for '--format tags'. Returns a list of all tags and the number of times
|
|
||||||
they occur within the searched entries. If there are no tags found, `jrnl` will output a message saying so.
|
|
||||||
|
|
||||||
### --short
|
|
||||||
Only shows the date and titles of the searched entries.
|
|
||||||
|
|
||||||
## Configuration arguments
|
|
||||||
|
|
||||||
### --config-override CONFIG_KEY CONFIG_VALUE
|
|
||||||
|
|
||||||
Override configured key-value pair with CONFIG_KV_PAIR for this command invocation only. To access config keys that aren't at the top level, separate the keys with a dot, such as `colors.title` to access the `title` key within the `colors` key. Read [advanced usage](./advanced.md) for examples.
|
|
||||||
|
|
||||||
### --config-file CONFIG_FILE_PATH
|
|
||||||
|
|
||||||
Use the config file at CONFIG_FILE_PATH for this command invocation only.
|
|
||||||
Read [advanced usage](./advanced.md) for examples.
|
|
||||||
|
|
||||||
## Other Arguments
|
|
||||||
|
|
||||||
### --debug
|
|
||||||
Prints information useful for troubleshooting while `jrnl` executes.
|
|
||||||
|
|
||||||
### --diagnostic
|
|
||||||
Prints diagnostic information useful for [reporting issues](https://github.com/jrnl-org/jrnl/issues).
|
|
|
@ -1,123 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Configuration File Reference
|
|
||||||
|
|
||||||
`jrnl` stores its information in a YAML configuration file.
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
Backup your journal and config file before editing. Changes to the config file
|
|
||||||
can have destructive effects on your journal!
|
|
||||||
|
|
||||||
## Config location
|
|
||||||
You can find your configuration file location by running:
|
|
||||||
`jrnl --list`
|
|
||||||
|
|
||||||
By default, the configuration file is `~/.config/jrnl/jrnl.yaml`.
|
|
||||||
If you have the `XDG_CONFIG_HOME` variable set, the configuration
|
|
||||||
file will be saved as `$XDG_CONFIG_HOME/jrnl/jrnl.yaml`.
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
On Windows, the configuration file is typically found at
|
|
||||||
`%USERPROFILE%\.config\jrnl\jrnl.yaml`.
|
|
||||||
|
|
||||||
|
|
||||||
## Config format
|
|
||||||
The configuration file is a [YAML](https://yaml.org/) file and can be edited with
|
|
||||||
a text editor.
|
|
||||||
|
|
||||||
## Config keys
|
|
||||||
|
|
||||||
### journals
|
|
||||||
|
|
||||||
Describes each journal used by `jrnl`. Each indented key after this key is
|
|
||||||
the name of a journal.
|
|
||||||
|
|
||||||
If a journal key has a value, that value will be interpreted as the path
|
|
||||||
to the journal. Otherwise, the journal needs the additional indented key
|
|
||||||
`journal` to specify its path.
|
|
||||||
|
|
||||||
All keys below can be specified for each journal at the same level as the
|
|
||||||
`journal` key. If a key conflicts with a top-level key, the journal-specific
|
|
||||||
key will be used instead.
|
|
||||||
|
|
||||||
### editor
|
|
||||||
If set, executes this command to launch an external editor for
|
|
||||||
writing and editing your entries. The path to a temporary file
|
|
||||||
is passed after it, and `jrnl` processes the file once
|
|
||||||
the editor returns control to `jrnl`.
|
|
||||||
|
|
||||||
Some editors require special options to work properly, since they must be
|
|
||||||
blocking processes to work with `jrnl`. See [External Editors](external-editors.md)
|
|
||||||
for details.
|
|
||||||
|
|
||||||
### encrypt
|
|
||||||
If `true`, encrypts your journal using AES. Do not change this
|
|
||||||
value for journals that already have data in them.
|
|
||||||
|
|
||||||
### template
|
|
||||||
The path to a text file to use as a template for new entries. Only works when you
|
|
||||||
have the `editor` field configured. If you use a template, the editor's
|
|
||||||
[temporary files](privacy-and-security.md#files-in-transit-from-editor-to-jrnl)
|
|
||||||
will have the same extension as the template.
|
|
||||||
|
|
||||||
### tagsymbols
|
|
||||||
Symbols to be interpreted as tags.
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
Although it seems intuitive to use the `#`
|
|
||||||
character for tags, there's a drawback: on most shells, this is
|
|
||||||
interpreted as a meta-character starting a comment. This means that if
|
|
||||||
you type
|
|
||||||
|
|
||||||
> `jrnl Implemented endless scrolling on the #frontend of our website.`
|
|
||||||
|
|
||||||
your bash will chop off everything after the `#` before passing it to
|
|
||||||
`jrnl`. To avoid this, wrap your input into quotation marks like
|
|
||||||
this:
|
|
||||||
|
|
||||||
> `jrnl "Implemented endless scrolling on the #frontend of our website."`
|
|
||||||
|
|
||||||
Or use the built-in prompt or an external editor to compose your
|
|
||||||
entries.
|
|
||||||
|
|
||||||
### default_hour and default_minute
|
|
||||||
Entries will be created at this time if you supply a date but no specific time (for example, `last thursday`).
|
|
||||||
|
|
||||||
### timeformat
|
|
||||||
Defines how to format the timestamps as they are stored in your journal.
|
|
||||||
See the [python docs](http://docs.python.org/library/time.html#time.strftime) for reference.
|
|
||||||
|
|
||||||
Do not change this for an existing journal, since that might lead
|
|
||||||
to data loss.
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
`jrnl` doesn't support the `%z` or `%Z` time zone identifiers.
|
|
||||||
|
|
||||||
### highlight
|
|
||||||
If `true`, tags will be highlighted in cyan.
|
|
||||||
|
|
||||||
### linewrap
|
|
||||||
Controls the width of the output. Set to `false` if you don't want to
|
|
||||||
wrap long lines. Set to `auto` to let `jrnl` automatically determine
|
|
||||||
the terminal width.
|
|
||||||
|
|
||||||
### colors
|
|
||||||
A dictionary that controls the colors used to display journal entries.
|
|
||||||
It has four subkeys, which are: `body`, `date`, `tags`, and `title`.
|
|
||||||
|
|
||||||
Current valid values are: `BLACK`, `RED`, `GREEN`, `YELLOW`, `BLUE`,
|
|
||||||
`MAGENTA`, `CYAN`, `WHITE`, and `NONE`.
|
|
||||||
|
|
||||||
`colorama.Fore` is used for colorization, and you can find the [docs here](https://github.com/tartley/colorama#colored-output).
|
|
||||||
|
|
||||||
To disable colored output, set the value to `NONE`.
|
|
||||||
|
|
||||||
### display_format
|
|
||||||
Specifies formatter to use by default. See [formats](formats.md).
|
|
||||||
|
|
||||||
### version
|
|
||||||
`jrnl` automatically updates this field to the version that it is running.
|
|
||||||
There is no need to change this field manually.
|
|
|
@ -1,224 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Tips and Tricks
|
|
||||||
|
|
||||||
This page contains tips and tricks for using `jrnl`, often in conjunction
|
|
||||||
with other tools, including external editors.
|
|
||||||
|
|
||||||
## Co-occurrence of tags
|
|
||||||
|
|
||||||
If I want to find out how often I mentioned my flatmates Alberto and
|
|
||||||
Melo in the same entry, I run
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl @alberto --tags | grep @melo
|
|
||||||
```
|
|
||||||
|
|
||||||
And will get something like `@melo: 9`, meaning there are 9 entries
|
|
||||||
where both `@alberto` and `@melo` are tagged. How does this work? First,
|
|
||||||
`jrnl @alberto` will filter the journal to only entries containing the
|
|
||||||
tag `@alberto`, and then the `--tags` option will print out how often
|
|
||||||
each tag occurred in this filtered journal. Finally, we pipe this to
|
|
||||||
`grep` which will only display the line containing `@melo`.
|
|
||||||
|
|
||||||
## Combining filters
|
|
||||||
|
|
||||||
You can do things like
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl @fixed -starred -n 10 -to "jan 2013" --short
|
|
||||||
```
|
|
||||||
|
|
||||||
To get a short summary of the 10 most recent, favourite entries before
|
|
||||||
January 1, 2013 that are tagged with `@fixed`.
|
|
||||||
|
|
||||||
## Statistics
|
|
||||||
|
|
||||||
How much did I write last year?
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl -from "jan 1 2013" -to "dec 31 2013" | wc -w
|
|
||||||
```
|
|
||||||
|
|
||||||
Will give you the number of words you wrote in 2013. How long is my
|
|
||||||
average entry?
|
|
||||||
|
|
||||||
```sh
|
|
||||||
expr $(jrnl --export text | wc -w) / $(jrnl --short | wc -l)
|
|
||||||
```
|
|
||||||
|
|
||||||
This will first get the total number of words in the journal and divide
|
|
||||||
it by the number of entries (this works because `jrnl --short` will
|
|
||||||
print exactly one line per entry).
|
|
||||||
|
|
||||||
## Importing older files
|
|
||||||
|
|
||||||
If you want to import a file as an entry to `jrnl`, you can just do `jrnl < entry.ext`. But what if you want the modification date of the file to
|
|
||||||
be the date of the entry in `jrnl`? Try this
|
|
||||||
|
|
||||||
```sh
|
|
||||||
echo `stat -f %Sm -t '%d %b %Y at %H:%M: ' entry.txt` `cat entry.txt` | jrnl
|
|
||||||
```
|
|
||||||
|
|
||||||
The first part will format the modification date of `entry.txt`, and
|
|
||||||
then combine it with the contents of the file before piping it to jrnl.
|
|
||||||
If you do that often, consider creating a function in your `.bashrc` or
|
|
||||||
`.bash_profile`
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnlimport () {
|
|
||||||
echo `stat -f %Sm -t '%d %b %Y at %H:%M: ' $1` `cat $1` | jrnl
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Using Templates
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
Templates require an [external editor](./advanced.md) be configured.
|
|
||||||
|
|
||||||
Templates are text files that are used for creating structured journals.
|
|
||||||
There are three ways you can use templates:
|
|
||||||
|
|
||||||
### 1. Use the `--template` command line argument and the default $XDG_DATA_HOME/jrnl/templates directory
|
|
||||||
|
|
||||||
`$XDG_DATA_HOME/jrnl/templates` is created by default to store your templates! Create a template (like `default.md`) in this directory and pass `--template FILE_IN_DIR`.
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl --template default.md
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Use the `--template` command line argument with a local / absolute path
|
|
||||||
|
|
||||||
You can create a template file with any text. Here is an example:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
# /tmp/template.txt
|
|
||||||
My Personal Journal
|
|
||||||
Title:
|
|
||||||
|
|
||||||
Body:
|
|
||||||
```
|
|
||||||
|
|
||||||
Then, pass the absolute or relative path to the template file as an argument, and your external
|
|
||||||
editor will open and have your template pre-populated.
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl --template /tmp/template.md
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3. Set a default template file in `jrnl.yaml`
|
|
||||||
|
|
||||||
If you want a template by default, change the value of `template` in the [config file](./reference-config-file.md)
|
|
||||||
from `false` to the template file's path, wrapped in double quotes:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
...
|
|
||||||
template: "/path/to/template.txt"
|
|
||||||
...
|
|
||||||
```
|
|
||||||
|
|
||||||
!!! tip
|
|
||||||
To read your journal entry or to verify the entry saved, you can use this
|
|
||||||
command: `jrnl -n 1` (Check out [Formats](./formats.md) for more options).
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl -n 1
|
|
||||||
```
|
|
||||||
|
|
||||||
## Prompts on shell reload
|
|
||||||
|
|
||||||
If you'd like to be prompted each time you refresh your shell, you can include
|
|
||||||
this in your `.bash_profile`:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
function log_question()
|
|
||||||
{
|
|
||||||
echo $1
|
|
||||||
read
|
|
||||||
jrnl today: ${1}. $REPLY
|
|
||||||
}
|
|
||||||
log_question 'What did I achieve today?'
|
|
||||||
log_question 'What did I make progress with?'
|
|
||||||
```
|
|
||||||
|
|
||||||
Whenever your shell is reloaded, you will be prompted to answer each of the
|
|
||||||
questions in the example above. Each answer will be logged as a separate
|
|
||||||
journal entry at the `default_hour` and `default_minute` listed in your
|
|
||||||
`jrnl.yaml` [config file](../advanced/#configuration-file).
|
|
||||||
|
|
||||||
## Display random entry
|
|
||||||
|
|
||||||
You can use this to select one title at random and then display the whole
|
|
||||||
entry. The invocation of `cut` needs to match the format of the timestamp.
|
|
||||||
For timestamps that have a space between data and time components, select
|
|
||||||
fields 1 and 2 as shown. For timestamps that have no whitespace, select
|
|
||||||
only field 1.
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl -on "$(jrnl --short | shuf -n 1 | cut -d' ' -f1,2)"
|
|
||||||
```
|
|
||||||
|
|
||||||
|
|
||||||
## Launch a terminal for rapid logging
|
|
||||||
You can use this to launch a terminal that is the `jrnl` stdin prompt so you can start typing away immediately.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
jrnl --config-override editor ""
|
|
||||||
```
|
|
||||||
|
|
||||||
Bind this to a keyboard shortcut.
|
|
||||||
|
|
||||||
Map `Super+Alt+J` to launch the terminal with `jrnl` prompt
|
|
||||||
|
|
||||||
- **xbindkeys**
|
|
||||||
In your `.xbindkeysrc`
|
|
||||||
|
|
||||||
```ini
|
|
||||||
Mod4+Mod1+j
|
|
||||||
alacritty -t floating-jrnl -e jrnl --config-override editor "",
|
|
||||||
```
|
|
||||||
|
|
||||||
- **I3 WM** Launch a floating terminal with the `jrnl` prompt
|
|
||||||
|
|
||||||
```ini
|
|
||||||
bindsym Mod4+Mod1+j exec --no-startup-id alacritty -t floating-jrnl -e jrnl --config-override editor ""
|
|
||||||
for_window[title="floating *"] floating enable
|
|
||||||
```
|
|
||||||
## Visualize Formatted Markdown in the CLI
|
|
||||||
|
|
||||||
Out of the box, `jrnl` can output journal entries in Markdown. To visualize it, you can pipe to [mdless](https://github.com/ttscoff/mdless), which is a [less](https://en.wikipedia.org/wiki/Less_(Unix))-like tool that allows you to visualize your Markdown text with formatting and syntax highlighting from the CLI. You can use this in any shell that supports piping.
|
|
||||||
|
|
||||||
The simplest way to visualize your Markdown output with `mdless` is as follows:
|
|
||||||
```sh
|
|
||||||
jrnl --export md | mdless
|
|
||||||
```
|
|
||||||
|
|
||||||
This will render your Markdown output in the whole screen.
|
|
||||||
|
|
||||||
Fortunately, `mdless` has an option that allows you to adjust the screen width by using the `-w` option as follows:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl --export md | mdless -w 70
|
|
||||||
```
|
|
||||||
|
|
||||||
If you want Markdown to be your default display format, you can define this in your config file as follows:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
display_format: md
|
|
||||||
# or
|
|
||||||
display_format: markdown
|
|
||||||
```
|
|
||||||
|
|
||||||
For more information on how `jrnl` outputs your entries in Markdown, please visit the [Formats](./formats.md) section.
|
|
||||||
|
|
||||||
|
|
||||||
## Jump to end of buffer (with vi)
|
|
||||||
|
|
||||||
To cause vi to jump to the end of the last line of the entry you edit, in your config file set:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
editor: vi + -c "call cursor('.',strwidth(getline('.')))"
|
|
||||||
```
|
|
256
docs/usage.md
|
@ -1,256 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Basic Usage #
|
|
||||||
|
|
||||||
`jrnl` has two modes: **composing** and **viewing**. Whenever you don't enter
|
|
||||||
any arguments that start with a dash (`-`) or double-dash (`--`), you're in
|
|
||||||
composing mode, meaning that you can write your entry on the command line.
|
|
||||||
|
|
||||||
We intentionally break a convention on command line arguments: all arguments
|
|
||||||
starting with a _single dash_ (`-`) will _filter_ your journal before viewing
|
|
||||||
it. Filter arguments can be combined arbitrarily. Arguments with a _double dash_
|
|
||||||
(`--`) will _control_ how your journal is displayed or exported. Control
|
|
||||||
arguments are mutually exclusive (i.e., you can only specify one way to display
|
|
||||||
or export your journal at a time).
|
|
||||||
|
|
||||||
For a list of commands, enter `jrnl --help`.
|
|
||||||
|
|
||||||
## Composing Entries ##
|
|
||||||
|
|
||||||
Composing mode is entered by either starting `jrnl` without any arguments --
|
|
||||||
which will launch an external editor -- or by just writing an entry on the
|
|
||||||
command line:
|
|
||||||
|
|
||||||
```text
|
|
||||||
jrnl today at 3am: I just met Steve Buscemi in a bar! What a nice guy.
|
|
||||||
```
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
Most shells contain a certain number of reserved characters, such as `#` and
|
|
||||||
`*`. These characters, as well as unbalanced single or double quotation
|
|
||||||
marks, parentheses, and others, likely will cause problems. Although
|
|
||||||
reserved characters can be escaped using `\`, this is not ideal for
|
|
||||||
long-form writing. The solution: first enter `jrnl` and hit `return`. You
|
|
||||||
can then enter the text of your journal entry. Alternatively, you can [use
|
|
||||||
an external editor](./advanced.md).
|
|
||||||
|
|
||||||
You can also import an entry directly from a file:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl < my_entry.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
### Specifying Date and Time ###
|
|
||||||
|
|
||||||
If you don't specify a date and time (e.g., `jrnl finished writing letter to brother`), `jrnl` will create an entry using the current date and time. For retrospective entries, you can use a timestamp to tell `jrnl` where to put the entry. Timestamps can be entered using a variety of formats. Here are some that work:
|
|
||||||
|
|
||||||
- at 6am
|
|
||||||
- yesterday
|
|
||||||
- last monday
|
|
||||||
- sunday at noon
|
|
||||||
- 2 march 2012
|
|
||||||
- 7 apr
|
|
||||||
- 5/20/1998 at 23:42
|
|
||||||
- 2020-05-22T15:55-04:00
|
|
||||||
|
|
||||||
If you don't use a timestamp, `jrnl` will create an entry using the current
|
|
||||||
time. If you use a date only (no time), `jrnl` will use the default time
|
|
||||||
specified in your [configuration file](./reference-config-file.md#default_hour-and-default_minute).
|
|
||||||
Behind the scenes, `jrnl` reorganizes entries in chronological order.
|
|
||||||
|
|
||||||
### Using Tags ###
|
|
||||||
|
|
||||||
`jrnl` supports tags. The default tag symbol is `@` (largely because `#` is a
|
|
||||||
reserved character). You can specify your own tag symbol in the
|
|
||||||
[configuration file](./reference-config-file.md#tagsymbols). To use tags, preface the
|
|
||||||
desired tag with the symbol:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl Had a wonderful day at the @beach with @Tom and @Anna.
|
|
||||||
```
|
|
||||||
|
|
||||||
Although you can use capitals while tagging an entry, searches by tag are
|
|
||||||
case-insensitive.
|
|
||||||
|
|
||||||
There is no limit to how many tags you can use in an entry.
|
|
||||||
|
|
||||||
### Starring Entries ###
|
|
||||||
|
|
||||||
To mark an entry as a favorite, simply "star" it using an asterisk (`*`):
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl last sunday *: Best day of my life.
|
|
||||||
```
|
|
||||||
|
|
||||||
If you don't want to add a date (i.e., you want the date to be entered as
|
|
||||||
_now_), the following options are equivalent:
|
|
||||||
|
|
||||||
- `jrnl *: Best day of my life.`
|
|
||||||
- `jrnl *Best day of my life.`
|
|
||||||
- `jrnl Best day of my life.*`
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
Make sure that the asterisk (`*`) is **not** surrounded by whitespaces.
|
|
||||||
`jrnl Best day of my life! *` will not work because the `*` character has a
|
|
||||||
special meaning in most shells.
|
|
||||||
|
|
||||||
## Viewing and Searching Entries ##
|
|
||||||
|
|
||||||
`jrnl` can display entries in a variety of ways.
|
|
||||||
|
|
||||||
To view all entries, enter:
|
|
||||||
```sh
|
|
||||||
jrnl -to today
|
|
||||||
```
|
|
||||||
|
|
||||||
`jrnl` provides several filtering commands, prefaced by a single dash (`-`), that
|
|
||||||
allow you to find a more specific range of entries. For example,
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl -n 10
|
|
||||||
```
|
|
||||||
|
|
||||||
lists the ten most recent entries. `jrnl -10` is even more concise and works the
|
|
||||||
same way. If you want to see all of the entries you wrote from the beginning of
|
|
||||||
last year until the end of this past March, you would enter
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl -from "last year" -to march
|
|
||||||
```
|
|
||||||
|
|
||||||
Filter criteria that use more than one word require surrounding quotes (`""`).
|
|
||||||
|
|
||||||
To see entries on a particular date, use `-on`:
|
|
||||||
```sh
|
|
||||||
jrnl -on yesterday
|
|
||||||
```
|
|
||||||
|
|
||||||
### Text Search ###
|
|
||||||
|
|
||||||
The `-contains` command displays all entries containing the text you enter after it.
|
|
||||||
This may be helpful when you're searching for entries and you can't remember if you
|
|
||||||
tagged any words when you wrote them.
|
|
||||||
|
|
||||||
You may realize that you use a word a lot and want to turn it into a tag in all
|
|
||||||
of your previous entries.
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl -contains "dogs" --edit
|
|
||||||
```
|
|
||||||
|
|
||||||
opens your external editor so that you can add a tag symbol (`@` by default) to
|
|
||||||
all instances of the word "dogs."
|
|
||||||
|
|
||||||
### Filtering by Tag ###
|
|
||||||
|
|
||||||
You can filter your journal entries by tag. For example,
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl @pinkie @WorldDomination
|
|
||||||
```
|
|
||||||
|
|
||||||
displays all entries in which either `@pinkie` or `@WorldDomination`
|
|
||||||
occurred. Tag filters can be combined with other filters:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl -n 5 @pinkie -and @WorldDomination
|
|
||||||
```
|
|
||||||
|
|
||||||
displays the last five entries containing _both_ `@pinkie` _and_
|
|
||||||
`@worldDomination`. You can change which symbols you'd like to use for tagging
|
|
||||||
in the [configuration file](./reference-config-file.md#tagsymbols).
|
|
||||||
|
|
||||||
!!! note
|
|
||||||
Entering `jrnl @pinkie @WorldDomination` will display entries in which both
|
|
||||||
tags are present because, although no command line arguments are given, all
|
|
||||||
of the input strings look like tags. `jrnl` will assume you want to filter
|
|
||||||
by tag, rather than create a new entry that consists only of tags.
|
|
||||||
|
|
||||||
To view a list of all tags in the journal, enter:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl --tags
|
|
||||||
```
|
|
||||||
|
|
||||||
### Viewing Starred Entries ###
|
|
||||||
|
|
||||||
To display only your favorite (starred) entries, enter
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl -starred
|
|
||||||
```
|
|
||||||
|
|
||||||
## Editing Entries ##
|
|
||||||
|
|
||||||
You can edit entries after writing them. This is particularly useful when your
|
|
||||||
journal file is encrypted. To use this feature, you need to have an external
|
|
||||||
editor configured in your [configuration file](./reference-config-file.md#editor). You
|
|
||||||
can also edit only the entries that match specific search criteria. For example,
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl -to 1950 @texas -and @history --edit
|
|
||||||
```
|
|
||||||
|
|
||||||
opens your external editor displaying all entries tagged with `@texas` and
|
|
||||||
`@history` that were written before 1950. After making changes, save and close
|
|
||||||
the file, and only those entries will be modified (and encrypted, if
|
|
||||||
applicable).
|
|
||||||
|
|
||||||
If you are using multiple journals, it's easy to edit specific entries from
|
|
||||||
specific journals. Simply prefix the filter string with the name of the journal.
|
|
||||||
For example,
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl work -n 1 --edit
|
|
||||||
```
|
|
||||||
|
|
||||||
opens the most recent entry in the 'work' journal in your external editor.
|
|
||||||
|
|
||||||
## Deleting Entries ##
|
|
||||||
|
|
||||||
The `--delete` command opens an interactive interface for deleting entries. The
|
|
||||||
date and title of each entry in the journal are presented one at a time, and you
|
|
||||||
can choose whether to keep or delete each entry.
|
|
||||||
|
|
||||||
If no filters are specified, `jrnl` will ask you to keep or delete each entry in
|
|
||||||
the entire journal, one by one. If there are a lot of entries in the journal, it
|
|
||||||
may be more efficient to filter entries before passing the `--delete` command.
|
|
||||||
|
|
||||||
Here's an example. Say you have a journal into which you've imported the last 12
|
|
||||||
years of blog posts. You use the `@book` tag a lot, and for some reason you want
|
|
||||||
to delete some, but not all, of the entries in which you used that tag, but only
|
|
||||||
the ones you wrote at some point in 2004 or earlier. You're not sure which
|
|
||||||
entries you want to keep, and you want to look through them before deciding.
|
|
||||||
This is what you might enter:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl -to 2004 @book --delete
|
|
||||||
```
|
|
||||||
|
|
||||||
`jrnl` will show you only the relevant entries, and you can choose the ones you
|
|
||||||
want to delete.
|
|
||||||
|
|
||||||
You may want to delete _all_ of the entries containing `@book` that you wrote in
|
|
||||||
2004 or earlier. If there are dozens or hundreds, the easiest way would be to
|
|
||||||
use an external editor. Open an editor with the entries you want to delete...
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl -to 2004 @book --edit
|
|
||||||
```
|
|
||||||
|
|
||||||
...select everything, delete it, save and close, and all of those entries are
|
|
||||||
removed from the journal.
|
|
||||||
|
|
||||||
## Listing Journals ##
|
|
||||||
|
|
||||||
To list all of your journals:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
jrnl --list
|
|
||||||
```
|
|
||||||
|
|
||||||
The journals displayed correspond to those specified in the `jrnl`
|
|
||||||
[configuration file](./reference-config-file.md#journals).
|
|
|
@ -1,34 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
*/
|
|
||||||
|
|
||||||
:root {
|
|
||||||
/* For dark bg */
|
|
||||||
--white: #fcfcfc;
|
|
||||||
--off-white: #f4f0ff;
|
|
||||||
--purple: #7e57c2;
|
|
||||||
--light-purple: #cf93e6;
|
|
||||||
--blue: #61aeee;
|
|
||||||
--green: #a6e22e;
|
|
||||||
--orange: #fd971f;
|
|
||||||
--red: #eb5567;
|
|
||||||
--pink: #d57699;
|
|
||||||
--yellow: #e2b93d;
|
|
||||||
|
|
||||||
/* For light bg */
|
|
||||||
--black: #404040;
|
|
||||||
--teal: #2a8068;
|
|
||||||
--dark-blue: #356eb7;
|
|
||||||
--mid-purple: #846392;
|
|
||||||
--bright-purple: #af27ad;
|
|
||||||
--dark-purple: #604385;
|
|
||||||
--darkest-purple: #251A32;
|
|
||||||
--grey: #3b3b4a;
|
|
||||||
|
|
||||||
--black-shadow: #0000001A;
|
|
||||||
--blacker-shadow: #00000059;
|
|
||||||
|
|
||||||
/* Special cases */
|
|
||||||
--terminal: #1b1c2e;
|
|
||||||
}
|
|
|
@ -1,141 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Atom One Dark With support for ReasonML by Gidi Morris, based off work by
|
|
||||||
Daniel Gamage
|
|
||||||
|
|
||||||
Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
|
|
||||||
*/
|
|
||||||
|
|
||||||
.hljs {
|
|
||||||
display: block;
|
|
||||||
overflow-x: auto;
|
|
||||||
padding: 0.5em;
|
|
||||||
line-height: 1.3em;
|
|
||||||
color: var(--off-white);
|
|
||||||
background: #383e49;
|
|
||||||
border-radius: 5px;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
line-height: 1.3rem;
|
|
||||||
}
|
|
||||||
.hljs-keyword,
|
|
||||||
.hljs-operator {
|
|
||||||
color: var(--pink);
|
|
||||||
}
|
|
||||||
.hljs-pattern-match {
|
|
||||||
color: var(--pink);
|
|
||||||
}
|
|
||||||
.hljs-pattern-match .hljs-constructor {
|
|
||||||
color: var(--blue);
|
|
||||||
}
|
|
||||||
.hljs-function {
|
|
||||||
color: var(--blue);
|
|
||||||
}
|
|
||||||
.hljs-function .hljs-params {
|
|
||||||
color: var(--green);
|
|
||||||
}
|
|
||||||
.hljs-function .hljs-params .hljs-typing {
|
|
||||||
color: var(--orange);
|
|
||||||
}
|
|
||||||
.hljs-module-access .hljs-module {
|
|
||||||
color: var(--purple);
|
|
||||||
}
|
|
||||||
.hljs-constructor {
|
|
||||||
color: var(--yellow);
|
|
||||||
}
|
|
||||||
.hljs-constructor .hljs-string {
|
|
||||||
color: var(--green);
|
|
||||||
}
|
|
||||||
.hljs-comment,
|
|
||||||
.hljs-quote {
|
|
||||||
color: var(--light-purple);
|
|
||||||
font-style: italic;
|
|
||||||
}
|
|
||||||
.hljs-doctag,
|
|
||||||
.hljs-formula {
|
|
||||||
color: var(--purple);
|
|
||||||
}
|
|
||||||
.hljs-section,
|
|
||||||
.hljs-name,
|
|
||||||
.hljs-selector-tag,
|
|
||||||
.hljs-deletion,
|
|
||||||
.hljs-subst {
|
|
||||||
color: var(--yellow);
|
|
||||||
}
|
|
||||||
.hljs-literal {
|
|
||||||
color: var(--blue);
|
|
||||||
}
|
|
||||||
.hljs-string,
|
|
||||||
.hljs-regexp,
|
|
||||||
.hljs-addition,
|
|
||||||
.hljs-attribute,
|
|
||||||
.hljs-meta-string {
|
|
||||||
color: var(--green);
|
|
||||||
}
|
|
||||||
.hljs-built_in,
|
|
||||||
.hljs-class .hljs-title {
|
|
||||||
color: var(--orange);
|
|
||||||
}
|
|
||||||
.hljs-attr,
|
|
||||||
.hljs-variable,
|
|
||||||
.hljs-template-variable,
|
|
||||||
.hljs-type,
|
|
||||||
.hljs-selector-class,
|
|
||||||
.hljs-selector-attr,
|
|
||||||
.hljs-selector-pseudo,
|
|
||||||
.hljs-number {
|
|
||||||
color: var(--orange);
|
|
||||||
}
|
|
||||||
|
|
||||||
.rst-content a tt,
|
|
||||||
.rst-content a tt,
|
|
||||||
.rst-content a code {
|
|
||||||
color: var(--blue);
|
|
||||||
}
|
|
||||||
|
|
||||||
.hljs-number,
|
|
||||||
.hljs-literal,
|
|
||||||
.hljs-variable,
|
|
||||||
.hljs-template-variable,
|
|
||||||
.hljs-tag .hljs-attr {
|
|
||||||
color: var(--blue);
|
|
||||||
}
|
|
||||||
|
|
||||||
.hljs-tag {
|
|
||||||
color: var(--pink)
|
|
||||||
}
|
|
||||||
|
|
||||||
.hljs-symbol,
|
|
||||||
.hljs-bullet,
|
|
||||||
.hljs-link,
|
|
||||||
.hljs-meta,
|
|
||||||
.hljs-selector-id,
|
|
||||||
.hljs-title {
|
|
||||||
color: var(--blue);
|
|
||||||
}
|
|
||||||
.hljs-emphasis {
|
|
||||||
font-style: italic;
|
|
||||||
}
|
|
||||||
.hljs-strong {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
.hljs-link {
|
|
||||||
text-decoration: underline;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rst-content .note .admonition-title {
|
|
||||||
background: var(--dark-blue);
|
|
||||||
}
|
|
||||||
|
|
||||||
.rst-content .note.admonition {
|
|
||||||
background: var(--light-blue);
|
|
||||||
}
|
|
||||||
|
|
||||||
.rst-content .tip .admonition-title {
|
|
||||||
background: var(--teal);
|
|
||||||
}
|
|
||||||
|
|
||||||
.rst-content .tip .admonition {
|
|
||||||
background: var(--light-blue);
|
|
||||||
}
|
|
|
@ -1,325 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* reset */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}
|
|
||||||
|
|
||||||
body {
|
|
||||||
background-color: var(--white);
|
|
||||||
font-family: "Open Sans", "Helvetica Neue", sans-serif;
|
|
||||||
font-weight: 300;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon {
|
|
||||||
background-image: url("../img/sprites.svg");
|
|
||||||
width: 32px;
|
|
||||||
height: 32px;
|
|
||||||
display: inline-block;
|
|
||||||
font-size: 40px;
|
|
||||||
background-size: 200px 80px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h3 {
|
|
||||||
font-weight: 400;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon.secure {
|
|
||||||
background-position: 0em 0em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon.future {
|
|
||||||
background-position: -1em 0em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon.search {
|
|
||||||
background-position: -2em 0em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon.nli {
|
|
||||||
background-position: -3em 0em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon.share {
|
|
||||||
background-position: 0em -1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon.sync {
|
|
||||||
background-position: 0 -1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon.dayone {
|
|
||||||
background-position: -1em -1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon.github {
|
|
||||||
background-position: -2em -1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon.search {
|
|
||||||
background-position: -2em 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon.folders {
|
|
||||||
background-position: -3em -1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon.twitter {
|
|
||||||
background-position: -4em -1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
header {
|
|
||||||
background-color: var(--mid-purple);
|
|
||||||
background-image: linear-gradient(211deg, var(--mid-purple) 0%, var(--dark-purple) 100%);
|
|
||||||
color: var(--white);
|
|
||||||
border: 0px solid transparent;
|
|
||||||
display: relative;
|
|
||||||
padding-top: 150px;
|
|
||||||
overflow: visible;
|
|
||||||
}
|
|
||||||
|
|
||||||
#terminal {
|
|
||||||
background: var(--terminal);
|
|
||||||
max-width: 520px;
|
|
||||||
box-shadow: 0 -2px 16px 0 var(--black-shadow);
|
|
||||||
border-radius: 6px;
|
|
||||||
min-height: 120px;
|
|
||||||
margin: 0px auto;
|
|
||||||
position: relative;
|
|
||||||
transform: translateY(75px);
|
|
||||||
color: var(--off-white);
|
|
||||||
font-family: "Monaco", "Courier New";
|
|
||||||
font-size: 18px;
|
|
||||||
padding: 45px 20px 0px 20px;
|
|
||||||
line-height: 165%;
|
|
||||||
}
|
|
||||||
|
|
||||||
#terminal b {
|
|
||||||
font-weight: normal;
|
|
||||||
color: var(--off-white);
|
|
||||||
}
|
|
||||||
|
|
||||||
#terminal i {
|
|
||||||
font-style: normal;
|
|
||||||
color: var(--light-purple);
|
|
||||||
}
|
|
||||||
|
|
||||||
#terminal:before {
|
|
||||||
content: "";
|
|
||||||
position: absolute;
|
|
||||||
top: 15px;
|
|
||||||
left: 15px;
|
|
||||||
display: inline-block;
|
|
||||||
width: 15px;
|
|
||||||
height: 15px;
|
|
||||||
border-radius: 50%;
|
|
||||||
background: var(--grey);
|
|
||||||
box-shadow: 25px 0 0 var(--grey), 50px 0 0 var(--grey);
|
|
||||||
}
|
|
||||||
|
|
||||||
#typed:before {
|
|
||||||
content: "$ ";
|
|
||||||
color: var(--mid-purple);
|
|
||||||
}
|
|
||||||
|
|
||||||
#twitter {
|
|
||||||
display: block;
|
|
||||||
position: absolute;
|
|
||||||
text-decoration: none;
|
|
||||||
top: 20px;
|
|
||||||
right: 20px;
|
|
||||||
border: 1px solid var(--white);
|
|
||||||
padding: 5px 10px;
|
|
||||||
color: var(--white);
|
|
||||||
border-radius: 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#twitter .icon {
|
|
||||||
transform: scale(0.5);
|
|
||||||
vertical-align: -18%;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#twitter:hover,
|
|
||||||
#twitter:active {
|
|
||||||
text-decoration: none;
|
|
||||||
box-shadow: 0 2px 25px 0 var(--blacker-shadow);
|
|
||||||
transition: all .5s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
#title {
|
|
||||||
max-width: 630px;
|
|
||||||
margin: 0 auto;
|
|
||||||
padding: 0px 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#prompt {
|
|
||||||
max-width: 700px;
|
|
||||||
margin: 25px auto 100px auto;
|
|
||||||
padding: 0px 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
header img {
|
|
||||||
float: left;
|
|
||||||
margin-right: 30px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
color: var(--white);
|
|
||||||
font-weight: 300;
|
|
||||||
}
|
|
||||||
|
|
||||||
a,
|
|
||||||
a:visited {
|
|
||||||
color: var(--dark-purple);
|
|
||||||
}
|
|
||||||
|
|
||||||
a:hover {
|
|
||||||
color: var(--bright-purple);
|
|
||||||
}
|
|
||||||
|
|
||||||
nav {
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
nav a#twitter-nav {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
nav a, nav a:visited {
|
|
||||||
color: var(--dark-purple);
|
|
||||||
font-size: 20px;
|
|
||||||
line-height: 2.5em;
|
|
||||||
margin: 0 40px;
|
|
||||||
font-weight: 400;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
nav a:hover,
|
|
||||||
nav a:visited:hover {
|
|
||||||
color: var(--bright-purple);
|
|
||||||
text-decoration: underline;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
nav a.cta {
|
|
||||||
display: inline-block;
|
|
||||||
color: var(--white);
|
|
||||||
background-color: var(--mid-purple);
|
|
||||||
background-image: linear-gradient(259deg, var(--mid-purple) 0%, var(--dark-purple) 100%);
|
|
||||||
box-shadow: 0 2px 8px 0 var(--blacker-shadow);
|
|
||||||
border-radius: 50px;
|
|
||||||
padding: 0 2em;
|
|
||||||
white-space: nowrap;
|
|
||||||
transition: all 0.1s ease;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
nav a.cta:hover {
|
|
||||||
text-decoration: none;
|
|
||||||
background-color: var(--mid-purple);
|
|
||||||
background-image: linear-gradient(259deg, var(--bright-purple) 0%, var(--dark-purple) 100%);
|
|
||||||
box-shadow: 0 4px 16px 0 var(--black-shadow);
|
|
||||||
color: var(--off-white);
|
|
||||||
}
|
|
||||||
|
|
||||||
main {
|
|
||||||
padding: 60px 0 0 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.flex {
|
|
||||||
display: flex;
|
|
||||||
margin: 0 auto;
|
|
||||||
max-width: 920px;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
padding: 20px 20px;
|
|
||||||
padding-top: 30px;
|
|
||||||
justify-content: space-between;
|
|
||||||
}
|
|
||||||
|
|
||||||
.flex section {
|
|
||||||
/*margin: 20px;*/
|
|
||||||
margin-top: 40px;
|
|
||||||
width: 32%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.flex section:first-child {
|
|
||||||
margin-left: 0px;
|
|
||||||
}
|
|
||||||
.flex section:last-child {
|
|
||||||
margin-right: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.flex section i {
|
|
||||||
float: left;
|
|
||||||
left: 0;
|
|
||||||
display: block;
|
|
||||||
margin: 0px auto 10px auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.flex section h3 {
|
|
||||||
margin-top: 0;
|
|
||||||
font-size: 18px;
|
|
||||||
color: var(--dark-purple);
|
|
||||||
margin-bottom: 0.5em;
|
|
||||||
font-weight: 300;
|
|
||||||
margin-left: 40px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.flex section p {
|
|
||||||
padding-left: 40px;
|
|
||||||
color: var(--grey);
|
|
||||||
font-size: 16px;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
footer {
|
|
||||||
color: var(--grey);
|
|
||||||
max-width: 700px;
|
|
||||||
margin: 70px auto 20px;
|
|
||||||
padding: 0 20px 20px 20px;
|
|
||||||
font-size: 16px;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (max-width: 680px) {
|
|
||||||
.flex {
|
|
||||||
display: block;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
.flex section {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
main {
|
|
||||||
padding: 20px;
|
|
||||||
margin: 0;
|
|
||||||
width: calc(100% - 40px);
|
|
||||||
}
|
|
||||||
|
|
||||||
nav a,
|
|
||||||
nav a#twitter-nav {
|
|
||||||
display: inline-block;
|
|
||||||
margin: 0px 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
nav a.cta {
|
|
||||||
display: block;
|
|
||||||
margin: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
header #twitter {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
header #logo {
|
|
||||||
display: block;
|
|
||||||
float: none;
|
|
||||||
margin: 0px auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
header #title br {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
Before Width: | Height: | Size: 43 KiB |
|
@ -1,378 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* ------------------------------------------------------------ */
|
|
||||||
/* Overrides for jrnl theme */
|
|
||||||
/* ------------------------------------------------------------ */
|
|
||||||
|
|
||||||
body.wy-body-for-nav,
|
|
||||||
section.wy-nav-content-wrap {
|
|
||||||
background-color: var(--white);
|
|
||||||
color: var(--black);
|
|
||||||
}
|
|
||||||
|
|
||||||
.rst-content pre {
|
|
||||||
background-color: transparent;
|
|
||||||
border: none;
|
|
||||||
margin: 1em -1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rst-content code {
|
|
||||||
color: var(--darkest-purple);
|
|
||||||
background-color: var(--off-white);
|
|
||||||
font-size: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rst-content pre code {
|
|
||||||
color: var(--off-white);
|
|
||||||
background: var(--darkest-purple);
|
|
||||||
padding: 1em 1.5em;
|
|
||||||
border-radius: 15px;
|
|
||||||
border: none;
|
|
||||||
font-size: 16px;
|
|
||||||
line-height: 1.5em;
|
|
||||||
font-weight: 200 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1,
|
|
||||||
h2,
|
|
||||||
h3,
|
|
||||||
h4,
|
|
||||||
h5,
|
|
||||||
h6 {
|
|
||||||
font-family: "Open Sans", "Helvetica Neue", Helvetica, sans-serif;
|
|
||||||
font-weight: 600;
|
|
||||||
margin-top: 2rem;
|
|
||||||
margin-bottom: 0.2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
h2 {
|
|
||||||
font-size: 1.2em;
|
|
||||||
margin-top: 40px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h3 {
|
|
||||||
font-size: 1.1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
h4 {
|
|
||||||
font-size: 1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
p,
|
|
||||||
td,
|
|
||||||
tr,
|
|
||||||
div,
|
|
||||||
li {
|
|
||||||
font-family: "Open Sans", "Helvetica Neue", Helvetica, sans-serif;
|
|
||||||
font-weight: 00;
|
|
||||||
font-size: 18px;
|
|
||||||
line-height: 1.5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
p {
|
|
||||||
margin: 1em 0em;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* No-one likes lines that are 400 characters long. */
|
|
||||||
div.rst-content {
|
|
||||||
max-width: 54em;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.wy-side-nav-search,
|
|
||||||
.wy-menu-vertical li.current,
|
|
||||||
.wy-menu-vertical li.toctree-l1.current > a,
|
|
||||||
.wy-menu-vertical li.toctree-l2.current > a,
|
|
||||||
.wy-menu-vertical li.toctree-l3.current > a {
|
|
||||||
background-color: transparent;
|
|
||||||
border: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-menu-vertical li.toctree-l2.current li.toctree-l3,
|
|
||||||
.wy-menu-vertical li.toctree-l2.current li.toctree-l3 > a {
|
|
||||||
background: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-menu-vertical li.toctree-l4,
|
|
||||||
.wy-menu-vertical li.toctree-l5,
|
|
||||||
.wy-menu-vertical li.toctree-l6,
|
|
||||||
.wy-menu-vertical li.toctree-l7 {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-nav-top {
|
|
||||||
background-color: var(--mid-purple);
|
|
||||||
background-image: linear-gradient(-211deg, var(--mid-purple) 0%, var(--dark-purple) 100%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-nav-top .fa-bars {
|
|
||||||
line-height: 50px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-side-nav-search a.icon-home {
|
|
||||||
width: 100%;
|
|
||||||
max-width: 250px;
|
|
||||||
background-size: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-side-nav-search a.icon-home:before {
|
|
||||||
display: block;
|
|
||||||
width: 84px;
|
|
||||||
height: 70px;
|
|
||||||
content: "";
|
|
||||||
background: url(../img/logo_white.svg) center center no-repeat;
|
|
||||||
margin: 10px auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-menu-vertical a,
|
|
||||||
.wy-menu-vertical li ul li a {
|
|
||||||
font-size: 16px;
|
|
||||||
color: var(--white);
|
|
||||||
line-height: 2em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-menu-vertical a:hover,
|
|
||||||
.wy-menu-vertical li.toctree-l2.current li.toctree-l3 > a:hover,
|
|
||||||
.wy-menu-vertical li.current a:hover {
|
|
||||||
background-color: var(--black-shadow);
|
|
||||||
color: var(--white);
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-menu-vertical li.on a {
|
|
||||||
transition: all .25s ease;
|
|
||||||
background: var(--dark-purple);
|
|
||||||
color: var(--white);
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-menu-vertical li.toctree-l1.current > a {
|
|
||||||
background: var(--darkest-purple);
|
|
||||||
border: none !important;
|
|
||||||
pointer-events: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-menu-vertical li.on a,
|
|
||||||
.wy-menu-vertical li.current a {
|
|
||||||
border-right: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-menu-vertical li.on a,
|
|
||||||
.wy-menu-vertical li > a.current:after {
|
|
||||||
position: absolute;
|
|
||||||
right: 0em;
|
|
||||||
z-index: 999;
|
|
||||||
content: "";
|
|
||||||
width: 0;
|
|
||||||
height: 0;
|
|
||||||
border-top: 1em solid transparent;
|
|
||||||
border-bottom: 1em solid transparent;
|
|
||||||
border-right: 1em solid var(--white);
|
|
||||||
}
|
|
||||||
|
|
||||||
.toctree-expand:before {
|
|
||||||
display: none !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rst-versions,
|
|
||||||
.rst-versions .rst-current-version {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-menu-vertical p.caption {
|
|
||||||
margin-top: 2em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-menu-vertical span {
|
|
||||||
color: var(--white);
|
|
||||||
font-size: 1.2em;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-menu-vertical li a {
|
|
||||||
color: var(--white) !important;
|
|
||||||
font-weight: 300;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.wy-nav-side {
|
|
||||||
background-color: var(--mid-purple);
|
|
||||||
font-weight: 300;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
footer {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-side-nav-search input[type=text],
|
|
||||||
.mkdocs-search input[type=text],
|
|
||||||
form .search-query {
|
|
||||||
background-color: var(--off-white);
|
|
||||||
border: none;
|
|
||||||
margin-bottom: 1em;
|
|
||||||
color: var(--black);
|
|
||||||
font-weight: 500;
|
|
||||||
box-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-side-nav-search input[type=text]::placeholder,
|
|
||||||
.mkdocs-search input[type=text]::placeholder,
|
|
||||||
form .search-query::placeholder {
|
|
||||||
color: var(--dark-purple);
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-side-nav-search > a:hover {
|
|
||||||
background: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-menu-vertical li.current ul {
|
|
||||||
background-color: var(--mid-purple);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* ------------------------------------------------------------ */
|
|
||||||
/* Logo: ; */
|
|
||||||
/* ------------------------------------------------------------ */
|
|
||||||
|
|
||||||
.logo {
|
|
||||||
width: 128px;
|
|
||||||
height: 128px;
|
|
||||||
vertical-align: middle;
|
|
||||||
margin-right: 1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ------------------------------------------------------------ */
|
|
||||||
/* Code blocks in callouts */
|
|
||||||
/* ------------------------------------------------------------ */
|
|
||||||
|
|
||||||
div.admonition {
|
|
||||||
border-radius: 5px;
|
|
||||||
margin: 1em -1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.admonition p.admonition-title {
|
|
||||||
border-top-left-radius: 5px;
|
|
||||||
border-top-right-radius: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.admonition>p {
|
|
||||||
padding: 0em .5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
div.admonition div.highlight {
|
|
||||||
background: none !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ------------------------------------------------------------ */
|
|
||||||
/* Fancy ordered lists. */
|
|
||||||
/* ------------------------------------------------------------ */
|
|
||||||
|
|
||||||
ol {
|
|
||||||
counter-reset: li;
|
|
||||||
margin-left: 0px;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
ol li {
|
|
||||||
list-style: none !important;
|
|
||||||
margin-bottom: 1.5em;
|
|
||||||
margin-left: 3em !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
ol>li:before {
|
|
||||||
content: counter(li);
|
|
||||||
counter-increment: li;
|
|
||||||
background-color: var(--sidebar);
|
|
||||||
border-radius: 50%;
|
|
||||||
display: block;
|
|
||||||
float: left;
|
|
||||||
margin-left: -3em;
|
|
||||||
margin-top: -.3em;
|
|
||||||
width: 2em;
|
|
||||||
height: 2em;
|
|
||||||
color: var(--dark-purple);
|
|
||||||
text-align: center;
|
|
||||||
line-height: 2em;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* ------------------------------------------------------------ */
|
|
||||||
/* Accessibility-related changes */
|
|
||||||
/* ------------------------------------------------------------ */
|
|
||||||
.rst-content div[role="main"] a,
|
|
||||||
.rst-content div[role="main"] a:visited {
|
|
||||||
color: var(--mid-purple);
|
|
||||||
text-decoration: underline;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rst-content div[role="main"] a:hover {
|
|
||||||
color: var(--bright-purple);
|
|
||||||
}
|
|
||||||
|
|
||||||
.rst-content div[role="navigation"] a,
|
|
||||||
.rst-content div[role="navigation"] a:visited {
|
|
||||||
color: var(--mid-purple);
|
|
||||||
}
|
|
||||||
|
|
||||||
.mkdocs-search {
|
|
||||||
display: flex;
|
|
||||||
margin-top: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wy-side-nav-search input[type="text"],
|
|
||||||
.mkdocs-search input[type=text] {
|
|
||||||
border-radius: 50px 0 0 50px;
|
|
||||||
height: 32px;
|
|
||||||
border-right: none;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mkdocs-search button {
|
|
||||||
background-color: var(--off-white);
|
|
||||||
border: none;
|
|
||||||
box-shadow: none;
|
|
||||||
color: var(--mid-purple);
|
|
||||||
border-radius: 0 50px 50px 0;
|
|
||||||
height: 32px;
|
|
||||||
width: 2.5em;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mkdocs-search {
|
|
||||||
border-radius: 50px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mkdocs-search:focus-within {
|
|
||||||
box-shadow: 0 2px 25px 0 var(--blacker-shadow);
|
|
||||||
transition: all .5s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rst-content div[role="main"] .mkdocs-search input[type="text"] {
|
|
||||||
border-right: none;
|
|
||||||
font-size: 100%;
|
|
||||||
height: 48px;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rst-content div[role="main"] .mkdocs-search button {
|
|
||||||
border-left: none;
|
|
||||||
font-size: 100%;
|
|
||||||
height: 48px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rst-content div[role="main"] .mkdocs-search button:before {
|
|
||||||
font-size: 140%;
|
|
||||||
position: relative;
|
|
||||||
left: -7px;
|
|
||||||
top: -1px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.search-results {
|
|
||||||
margin-top: 0;
|
|
||||||
}
|
|
|
@ -1,49 +0,0 @@
|
||||||
<!--
|
|
||||||
Copied from https://github.com/mkdocs/mkdocs/blob/master/mkdocs/themes/readthedocs/breadcrumbs.html
|
|
||||||
Then lightly modified for accessibility
|
|
||||||
-->
|
|
||||||
|
|
||||||
<div role="navigation" aria-label="breadcrumbs navigation">
|
|
||||||
<ul class="wy-breadcrumbs">
|
|
||||||
<li><a href="{{ nav.homepage.url|url }}" class="icon icon-home" aria-label="{% trans %}Docs{% endtrans %}"></a> »</li>
|
|
||||||
{%- if page %}
|
|
||||||
{%- for doc in page.ancestors[::-1] %}
|
|
||||||
{%- if doc.link %}
|
|
||||||
<li><a href="{{ doc.link|e }}">{{ doc.title }}</a> »</li>
|
|
||||||
{%- else %}
|
|
||||||
<li>{{ doc.title }} »</li>
|
|
||||||
{%- endif %}
|
|
||||||
{%- endfor %}
|
|
||||||
<li>{{ page.title }}</li>
|
|
||||||
{%- endif %}
|
|
||||||
<li class="wy-breadcrumbs-aside">
|
|
||||||
{%- block repo %}
|
|
||||||
{%- if page and page.edit_url %}
|
|
||||||
{%- if config.repo_name|lower == 'github' %}
|
|
||||||
<a href="{{ page.edit_url }}" class="icon icon-github"> {% trans repo_name=config.repo_name %}Edit on {{ repo_name }}{% endtrans %}</a>
|
|
||||||
{%- elif config.repo_name|lower == 'bitbucket' %}
|
|
||||||
<a href="{{ page.edit_url }}" class="icon icon-bitbucket"> {% trans repo_name=config.repo_name %}Edit on {{ repo_name }}{% endtrans %}</a>
|
|
||||||
{%- elif config.repo_name|lower == 'gitlab' %}
|
|
||||||
<a href="{{ page.edit_url }}" class="icon icon-gitlab"> {% trans repo_name=config.repo_name %}Edit on {{ repo_name }}{% endtrans %}</a>
|
|
||||||
{%- elif config.repo_name %}
|
|
||||||
<a href="{{ page.edit_url }}">{% trans repo_name=config.repo_name %}Edit on {{ repo_name }}{% endtrans %}</a>
|
|
||||||
{%- else %}
|
|
||||||
<a href="{{ page.edit_url }}">{% trans %}Edit{% endtrans %}</a>
|
|
||||||
{%- endif %}
|
|
||||||
{%- endif %}
|
|
||||||
{%- endblock %}
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
{%- if config.theme.prev_next_buttons_location|lower in ['top', 'both']
|
|
||||||
and page and (page.next_page or page.previous_page) %}
|
|
||||||
<div class="rst-breadcrumbs-buttons" role="navigation" aria-label="{% trans %}Breadcrumb Navigation{% endtrans %}">
|
|
||||||
{%- if page.previous_page %}
|
|
||||||
<a href="{{ page.previous_page.url|url }}" class="btn btn-neutral float-left" title="{{ page.previous_page.title }}"><span class="icon icon-circle-arrow-left" aria-hidden="true"></span> {% trans %}Previous{% endtrans %}</a>
|
|
||||||
{%- endif %}
|
|
||||||
{%- if page.next_page %}
|
|
||||||
<a href="{{ page.next_page.url|url }}" class="btn btn-neutral float-right" title="{{ page.next_page.title }}">{% trans %}Next{% endtrans %} <span class="icon icon-circle-arrow-right" aria-hidden="true"></span></a>
|
|
||||||
{%- endif %}
|
|
||||||
</div>
|
|
||||||
{%- endif %}
|
|
||||||
<hr/>
|
|
||||||
</div>
|
|
Before Width: | Height: | Size: 224 KiB |
Before Width: | Height: | Size: 175 KiB |
Before Width: | Height: | Size: 17 KiB |
|
@ -1,15 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
|
||||||
<!-- Generator: Sketch 55 (78076) - https://sketchapp.com -->
|
|
||||||
<title>favicon</title>
|
|
||||||
<desc>Created with Sketch.</desc>
|
|
||||||
<defs>
|
|
||||||
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
|
|
||||||
<stop stop-color="#986B9D" offset="0%"></stop>
|
|
||||||
<stop stop-color="#664C8B" offset="100%"></stop>
|
|
||||||
</linearGradient>
|
|
||||||
</defs>
|
|
||||||
<g id="favicon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
|
||||||
<path d="M47,9.75231557 L47,37 L42,32 L37,37 L37,7 L25,7 C17.8202983,7 12,12.8202983 12,20 L12,44 C12,51.1797017 17.8202983,57 25,57 L32,57 L32,7 L34,7 L34,57 L39,57 C46.1797017,57 52,51.1797017 52,44 L52,20 C52,15.8373552 50.0435392,12.1316662 47,9.75231557 Z M47.097641,7.37132944 C51.2495133,10.039075 54,14.6983322 54,20 L54,44 C54,49.3016678 51.2495133,53.960925 47.097641,56.6286706 C52.7817736,55.2392133 57,50.1122164 57,44 L57,20 C57,13.8877836 52.7817736,8.76078667 47.097641,7.37132944 Z M16.902359,56.6286706 C12.7504867,53.960925 10,49.3016678 10,44 L10,20 C10,14.6983322 12.7504867,10.039075 16.902359,7.37132944 C11.2182264,8.76078667 7,13.8877836 7,20 L7,44 C7,50.1122164 11.2182264,55.2392133 16.902359,56.6286706 Z M52.097641,7.37132944 C56.2495133,10.039075 59,14.6983322 59,20 L59,44 C59,49.3016678 56.2495133,53.960925 52.097641,56.6286706 C57.7817736,55.2392133 62,50.1122164 62,44 L62,20 C62,13.8877836 57.7817736,8.76078667 52.097641,7.37132944 Z M11.902359,56.6286706 C7.7504867,53.960925 5,49.3016678 5,44 L5,20 C5,14.6983322 7.7504867,10.039075 11.902359,7.37132944 C6.21822638,8.76078667 2,13.8877836 2,20 L2,44 C2,50.1122164 6.21822638,55.2392133 11.902359,56.6286706 Z M15,5 L49,5 C57.2842712,5 64,11.7157288 64,20 L64,44 C64,52.2842712 57.2842712,59 49,59 L15,59 C6.71572875,59 0,52.2842712 0,44 L0,20 C2.0539126e-15,11.7157288 6.71572875,5 15,5 Z" id="Combined-Shape" fill="url(#linearGradient-1)" fill-rule="nonzero"></path>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
Before Width: | Height: | Size: 2.1 KiB |
|
@ -1,10 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<svg width="90px" height="98px" viewBox="0 0 90 98" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
|
||||||
<!-- Generator: Sketch 55 (78076) - https://sketchapp.com -->
|
|
||||||
<title>jrnl_white</title>
|
|
||||||
<desc>Created with Sketch.</desc>
|
|
||||||
<g id="jrnl_white" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
|
||||||
<path d="M63,5.34786368 L63,43 L58,38 L53,43 L53,5 L30,5 C22.8202983,5 17,10.8202983 17,18 L17,58 C17,65.1797017 22.8202983,71 30,71 L45,71 L45,5 L47,5 L47,71 L60,71 C67.1797017,71 73,65.1797017 73,58 L73,18 C73,11.8528367 68.7334,6.70219128 63,5.34786368 Z M67.6693542,5.10618565 C72.0593056,7.72299627 75,12.5180801 75,18 L75,58 C75,63.4819199 72.0593056,68.2770037 67.6693542,70.8938143 C74.060623,70.0745197 79,64.6140865 79,58 L79,18 C79,11.3859135 74.060623,5.92548026 67.6693542,5.10618565 Z M22.3306458,70.8938143 C17.9406944,68.2770037 15,63.4819199 15,58 L15,18 C15,12.5180801 17.9406944,7.72299627 22.3306458,5.10618565 C15.939377,5.92548026 11,11.3859135 11,18 L11,58 C11,64.6140865 15.939377,70.0745197 22.3306458,70.8938143 Z M73.6693542,5.10618565 C78.0593056,7.72299627 81,12.5180801 81,18 L81,58 C81,63.4819199 78.0593056,68.2770037 73.6693542,70.8938143 C80.060623,70.0745197 85,64.6140865 85,58 L85,18 C85,11.3859135 80.060623,5.92548026 73.6693542,5.10618565 Z M16.3306458,70.8938143 C11.9406944,68.2770037 9,63.4819199 9,58 L9,18 C9,12.5180801 11.9406944,7.72299627 16.3306458,5.10618565 C9.93937703,5.92548026 5,11.3859135 5,18 L5,58 C5,64.6140865 9.93937703,70.0745197 16.3306458,70.8938143 Z M18,3 L72,3 C80.2842712,3 87,9.71572875 87,18 L87,58 C87,66.2842712 80.2842712,73 72,73 L18,73 C9.71572875,73 3,66.2842712 3,58 L3,18 C3,9.71572875 9.71572875,3 18,3 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
|
|
||||||
<path d="M24.22,95.092 C24.0293324,95.092 23.7616684,95.0736668 23.417,95.037 C23.0723316,95.0003332 22.7680013,94.9306672 22.504,94.828 L22.856,92.65 C23.1786683,92.7526672 23.5673311,92.804 24.022,92.804 C24.6380031,92.804 25.0706654,92.6243351 25.32,92.265 C25.5693346,91.9056649 25.694,91.3666703 25.694,90.648 L25.694,82.642 L28.356,82.285 L28.356,90.692 C28.356,92.1880075 28.0003369,93.2953297 27.289,94.014 C26.5776631,94.7326703 25.5546733,95.092 24.22,95.092 Z M41.4,84.892 C41.1799989,84.8186663 40.8756686,84.7416671 40.487,84.661 C40.0983314,84.5803329 39.6473359,84.54 39.134,84.54 C38.8406652,84.54 38.5290017,84.569333 38.199,84.628 C37.8689984,84.686667 37.6380007,84.7379998 37.506,84.782 L37.506,94 L34.844,94 L34.844,83.044 C35.3573359,82.8533324 35.9989962,82.6736675 36.769,82.505 C37.5390039,82.3363325 38.3933286,82.252 39.332,82.252 C39.5080009,82.252 39.7133322,82.2629999 39.948,82.285 C40.1826678,82.3070001 40.4173322,82.3363332 40.652,82.373 C40.8866678,82.4096669 41.1139989,82.4536664 41.334,82.505 C41.5540011,82.5563336 41.7299993,82.6039998 41.862,82.648 L41.4,84.892 Z M46.81,82.868 C47.3233359,82.7213326 47.9906626,82.5820007 48.812,82.45 C49.6333374,82.3179993 50.5426617,82.252 51.54,82.252 C52.4786714,82.252 53.2633302,82.3803321 53.894,82.637 C54.5246698,82.893668 55.0269981,83.2529977 55.401,83.715 C55.7750019,84.1770023 56.0389992,84.7343301 56.193,85.387 C56.3470008,86.0396699 56.424,86.7546628 56.424,87.532 L56.424,94 L53.762,94 L53.762,87.95 C53.762,87.3339969 53.7216671,86.8096688 53.641,86.377 C53.5603329,85.9443312 53.4283342,85.5923347 53.245,85.321 C53.0616658,85.0496653 52.8123349,84.8516673 52.497,84.727 C52.1816651,84.6023327 51.7966689,84.54 51.342,84.54 C51.004665,84.54 50.6526685,84.5619998 50.286,84.606 C49.9193315,84.6500002 49.6480009,84.6866665 49.472,84.716 L49.472,94 L46.81,94 L46.81,82.868 Z M66.784,94.22 C65.991996,94.2053333 65.3356693,94.1173341 64.815,93.956 C64.2943307,93.7946659 63.8800015,93.5636682 63.572,93.263 C63.2639985,92.9623318 63.0476673,92.5883356 62.923,92.141 C62.7983327,91.6936644 62.736,91.1840029 62.736,90.612 L62.736,82.692 L65.398,82.252 L65.398,90.106 C65.398,90.4286683 65.4236664,90.6999989 65.475,90.92 C65.5263336,91.1400011 65.6179993,91.3269992 65.75,91.481 C65.8820007,91.6350008 66.0616655,91.7523329 66.289,91.833 C66.5163345,91.9136671 66.8059982,91.9759998 67.158,92.02 L66.784,94.22 Z" id="jrnl" fill="#FFFFFF" fill-rule="nonzero"></path>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
Before Width: | Height: | Size: 4.2 KiB |
|
@ -1,16 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<svg width="90px" height="98px" viewBox="0 0 90 98" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
|
||||||
<!-- Generator: Sketch 55 (78076) - https://sketchapp.com -->
|
|
||||||
<title>logo</title>
|
|
||||||
<desc>Created with Sketch.</desc>
|
|
||||||
<defs>
|
|
||||||
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
|
|
||||||
<stop stop-color="#986B9D" offset="0%"></stop>
|
|
||||||
<stop stop-color="#664C8B" offset="100%"></stop>
|
|
||||||
</linearGradient>
|
|
||||||
</defs>
|
|
||||||
<g id="logo" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
|
||||||
<path d="M63,5.34786368 L63,43 L58,38 L53,43 L53,5 L30,5 C22.8202983,5 17,10.8202983 17,18 L17,58 C17,65.1797017 22.8202983,71 30,71 L45,71 L45,5 L47,5 L47,71 L60,71 C67.1797017,71 73,65.1797017 73,58 L73,18 C73,11.8528367 68.7334,6.70219128 63,5.34786368 Z M67.6693542,5.10618565 C72.0593056,7.72299627 75,12.5180801 75,18 L75,58 C75,63.4819199 72.0593056,68.2770037 67.6693542,70.8938143 C74.060623,70.0745197 79,64.6140865 79,58 L79,18 C79,11.3859135 74.060623,5.92548026 67.6693542,5.10618565 Z M22.3306458,70.8938143 C17.9406944,68.2770037 15,63.4819199 15,58 L15,18 C15,12.5180801 17.9406944,7.72299627 22.3306458,5.10618565 C15.939377,5.92548026 11,11.3859135 11,18 L11,58 C11,64.6140865 15.939377,70.0745197 22.3306458,70.8938143 Z M73.6693542,5.10618565 C78.0593056,7.72299627 81,12.5180801 81,18 L81,58 C81,63.4819199 78.0593056,68.2770037 73.6693542,70.8938143 C80.060623,70.0745197 85,64.6140865 85,58 L85,18 C85,11.3859135 80.060623,5.92548026 73.6693542,5.10618565 Z M16.3306458,70.8938143 C11.9406944,68.2770037 9,63.4819199 9,58 L9,18 C9,12.5180801 11.9406944,7.72299627 16.3306458,5.10618565 C9.93937703,5.92548026 5,11.3859135 5,18 L5,58 C5,64.6140865 9.93937703,70.0745197 16.3306458,70.8938143 Z M18,3 L72,3 C80.2842712,3 87,9.71572875 87,18 L87,58 C87,66.2842712 80.2842712,73 72,73 L18,73 C9.71572875,73 3,66.2842712 3,58 L3,18 C3,9.71572875 9.71572875,3 18,3 Z" id="Combined-Shape" fill="url(#linearGradient-1)" fill-rule="nonzero"></path>
|
|
||||||
<path d="M24.22,95.092 C24.0293324,95.092 23.7616684,95.0736668 23.417,95.037 C23.0723316,95.0003332 22.7680013,94.9306672 22.504,94.828 L22.856,92.65 C23.1786683,92.7526672 23.5673311,92.804 24.022,92.804 C24.6380031,92.804 25.0706654,92.6243351 25.32,92.265 C25.5693346,91.9056649 25.694,91.3666703 25.694,90.648 L25.694,82.642 L28.356,82.285 L28.356,90.692 C28.356,92.1880075 28.0003369,93.2953297 27.289,94.014 C26.5776631,94.7326703 25.5546733,95.092 24.22,95.092 Z M41.4,84.892 C41.1799989,84.8186663 40.8756686,84.7416671 40.487,84.661 C40.0983314,84.5803329 39.6473359,84.54 39.134,84.54 C38.8406652,84.54 38.5290017,84.569333 38.199,84.628 C37.8689984,84.686667 37.6380007,84.7379998 37.506,84.782 L37.506,94 L34.844,94 L34.844,83.044 C35.3573359,82.8533324 35.9989962,82.6736675 36.769,82.505 C37.5390039,82.3363325 38.3933286,82.252 39.332,82.252 C39.5080009,82.252 39.7133322,82.2629999 39.948,82.285 C40.1826678,82.3070001 40.4173322,82.3363332 40.652,82.373 C40.8866678,82.4096669 41.1139989,82.4536664 41.334,82.505 C41.5540011,82.5563336 41.7299993,82.6039998 41.862,82.648 L41.4,84.892 Z M46.81,82.868 C47.3233359,82.7213326 47.9906626,82.5820007 48.812,82.45 C49.6333374,82.3179993 50.5426617,82.252 51.54,82.252 C52.4786714,82.252 53.2633302,82.3803321 53.894,82.637 C54.5246698,82.893668 55.0269981,83.2529977 55.401,83.715 C55.7750019,84.1770023 56.0389992,84.7343301 56.193,85.387 C56.3470008,86.0396699 56.424,86.7546628 56.424,87.532 L56.424,94 L53.762,94 L53.762,87.95 C53.762,87.3339969 53.7216671,86.8096688 53.641,86.377 C53.5603329,85.9443312 53.4283342,85.5923347 53.245,85.321 C53.0616658,85.0496653 52.8123349,84.8516673 52.497,84.727 C52.1816651,84.6023327 51.7966689,84.54 51.342,84.54 C51.004665,84.54 50.6526685,84.5619998 50.286,84.606 C49.9193315,84.6500002 49.6480009,84.6866665 49.472,84.716 L49.472,94 L46.81,94 L46.81,82.868 Z M66.784,94.22 C65.991996,94.2053333 65.3356693,94.1173341 64.815,93.956 C64.2943307,93.7946659 63.8800015,93.5636682 63.572,93.263 C63.2639985,92.9623318 63.0476673,92.5883356 62.923,92.141 C62.7983327,91.6936644 62.736,91.1840029 62.736,90.612 L62.736,82.692 L65.398,82.252 L65.398,90.106 C65.398,90.4286683 65.4236664,90.6999989 65.475,90.92 C65.5263336,91.1400011 65.6179993,91.3269992 65.75,91.481 C65.8820007,91.6350008 66.0616655,91.7523329 66.289,91.833 C66.5163345,91.9136671 66.8059982,91.9759998 67.158,92.02 L66.784,94.22 Z" id="jrnl" fill="#674C8B" fill-rule="nonzero"></path>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
Before Width: | Height: | Size: 4.5 KiB |
|
@ -1,9 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<svg width="84px" height="70px" viewBox="0 0 84 70" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
|
||||||
<!-- Generator: Sketch 55 (78076) - https://sketchapp.com -->
|
|
||||||
<title>logo_white</title>
|
|
||||||
<desc>Created with Sketch.</desc>
|
|
||||||
<g id="logo_white" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
|
||||||
<path d="M60,2.34786368 L60,40 L55,35 L50,40 L50,2 L27,2 C19.8202983,2 14,7.82029825 14,15 L14,55 C14,62.1797017 19.8202983,68 27,68 L42,68 L42,2 L44,2 L44,68 L57,68 C64.1797017,68 70,62.1797017 70,55 L70,15 C70,8.85283673 65.7334,3.70219128 60,2.34786368 Z M64.6693542,2.10618565 C69.0593056,4.72299627 72,9.51808015 72,15 L72,55 C72,60.4819199 69.0593056,65.2770037 64.6693542,67.8938143 C71.060623,67.0745197 76,61.6140865 76,55 L76,15 C76,8.38591347 71.060623,2.92548026 64.6693542,2.10618565 Z M19.3306458,67.8938143 C14.9406944,65.2770037 12,60.4819199 12,55 L12,15 C12,9.51808015 14.9406944,4.72299627 19.3306458,2.10618565 C12.939377,2.92548026 8,8.38591347 8,15 L8,55 C8,61.6140865 12.939377,67.0745197 19.3306458,67.8938143 Z M70.6693542,2.10618565 C75.0593056,4.72299627 78,9.51808015 78,15 L78,55 C78,60.4819199 75.0593056,65.2770037 70.6693542,67.8938143 C77.060623,67.0745197 82,61.6140865 82,55 L82,15 C82,8.38591347 77.060623,2.92548026 70.6693542,2.10618565 Z M13.3306458,67.8938143 C8.94069436,65.2770037 6,60.4819199 6,55 L6,15 C6,9.51808015 8.94069436,4.72299627 13.3306458,2.10618565 C6.93937703,2.92548026 2,8.38591347 2,15 L2,55 C2,61.6140865 6.93937703,67.0745197 13.3306458,67.8938143 Z M15,0 L69,0 C77.2842712,-1.33226763e-15 84,6.71572875 84,15 L84,55 C84,63.2842712 77.2842712,70 69,70 L15,70 C6.71572875,70 2.66453526e-15,63.2842712 0,55 L0,15 C-8.8817842e-16,6.71572875 6.71572875,1.33226763e-15 15,0 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 10 KiB |
|
@ -1,127 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<title>jrnl - The Command Line Journal</title>
|
|
||||||
<meta name="description" content="Collect your thoughts and notes without leaving the command line.">
|
|
||||||
<meta name="image" content="https://jrnl.sh/en/stable/img/banner_og.png">
|
|
||||||
<meta itemprop="name" content="jrnl - The Command Line Journal">
|
|
||||||
<meta itemprop="description" content="Collect your thoughts and notes without leaving the command line.">
|
|
||||||
<meta itemprop="image" content="https://jrnl.sh/en/stable/img/banner_og.png">
|
|
||||||
<meta name="twitter:card" content="summary">
|
|
||||||
<meta name="twitter:title" content="jrnl - The Command Line Journal">
|
|
||||||
<meta name="twitter:description" content="Collect your thoughts and notes without leaving the command line.">
|
|
||||||
<meta name="twitter:creator" content="jrnl">
|
|
||||||
<meta name="twitter:image:src" content="https://jrnl.sh/en/stable/img/banner_twitter.png">
|
|
||||||
<meta name="og:title" content="jrnl - The Command Line Journal">
|
|
||||||
<meta name="og:description" content="Collect your thoughts and notes without leaving the command line.">
|
|
||||||
<meta name="og:image" content="https://jrnl.sh/en/stable/img/banner_og.png">
|
|
||||||
<meta name="og:url" content="https://jrnl.sh">
|
|
||||||
<meta name="og:site_name" content="jrnl - The Command Line Journal">
|
|
||||||
<meta name="og:type" content="website">
|
|
||||||
<meta name="viewport" content="width=device-width">
|
|
||||||
<link href='http://fonts.googleapis.com/css?family=Open+Sans:300,400' rel='stylesheet' type='text/css'>
|
|
||||||
<link rel="stylesheet" href="assets/colors.css">
|
|
||||||
<link rel="stylesheet" href="assets/index.css">
|
|
||||||
<link rel="shortcut icon" href="img/favicon.ico">
|
|
||||||
<script type="application/ld+json">
|
|
||||||
{
|
|
||||||
"@context": "https://schema.org",
|
|
||||||
"@type": "SoftwareApplication",
|
|
||||||
"applicationCategory": "https://schema.org/LifestyleApplication",
|
|
||||||
"name": "jrnl",
|
|
||||||
"description": "Collect your thoughts and notes without leaving the command line.",
|
|
||||||
"operatingSystem": ["macOS", "Windows", "Linux"],
|
|
||||||
"thumbnailUrl": "https://jrnl.sh/en/stable/img/banner_og.png",
|
|
||||||
"installUrl": "https://jrnl.sh/en/stable/installation",
|
|
||||||
"softwareVersion": "2.5"
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<header>
|
|
||||||
<aside>
|
|
||||||
<a id="twitter" href="https://twitter.com/intent/tweet?text=Collect+your+thoughts+and+notes+without+leaving+the+command+line.+https%3A%2F%2Fjrnl.sh+via+@JrnlSh"><i class="icon twitter"></i>Tell your friends</a>
|
|
||||||
</aside>
|
|
||||||
<div id="title">
|
|
||||||
<img id="logo" src="img/jrnl_white.svg" width="90px" height="98px" title="jrnl" alt="jrnl logo" />
|
|
||||||
<h1>Collect your thoughts and notes <br />without leaving the command line.</h1>
|
|
||||||
</div>
|
|
||||||
<div id="prompt">
|
|
||||||
<div id="terminal">
|
|
||||||
<div id="typed"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
<main>
|
|
||||||
<nav>
|
|
||||||
<a href="overview">Documentation</a>
|
|
||||||
<a href="installation" class="cta">Get Started</a>
|
|
||||||
<a href="http://github.com/jrnl-org/jrnl" title="View on Github">Fork on GitHub</a>
|
|
||||||
<a id="twitter-nav" href="https://twitter.com/intent/tweet?text=Collect+your+thoughts+and+notes+without+leaving+the+command+line.+https%3A%2F%2Fjrnl.sh+via+@JrnlSh"><i class="icon twitter"></i>Tell your friends on Twitter</a>
|
|
||||||
</nav>
|
|
||||||
<div class="flex">
|
|
||||||
<section>
|
|
||||||
<i class="icon nli"></i>
|
|
||||||
<h3>Human friendly.</h3>
|
|
||||||
<p>jrnl has a natural-language interface so you don't have to remember cryptic shortcuts when you're writing down your thoughts.</p>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<i class="icon future"></i>
|
|
||||||
<h3>Future-proof.</h3>
|
|
||||||
<p>Your journals are stored in plain-text files that will still be readable in 50 years when your fancy proprietary apps will have gone the way of the dodo.</p>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<i class="icon secure"></i>
|
|
||||||
<h3>Secure.</h3>
|
|
||||||
<p>Encrypt your journals with industry-strength AES encryption. Nobody will be able to read your dirty secrets—not even you, if you lose your password!</p>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<i class="icon sync"></i>
|
|
||||||
<h3>Accessible anywhere.</h3>
|
|
||||||
<p>Sync your journal files with other tools like Dropbox to capture your thoughts wherever you are.</p>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<i class="icon github"></i>
|
|
||||||
<h3>Free & Open Source.</h3>
|
|
||||||
<p>jrnl is made by a bunch of really friendly and remarkably amazing people. Maybe even <a href="https://www.github.com/jrnl-org/jrnl" title="Fork jrnl on GitHub">you</a>?</p>
|
|
||||||
</section>
|
|
||||||
<section>
|
|
||||||
<i class="icon folders"></i>
|
|
||||||
<h3>For work and play.</h3>
|
|
||||||
<p>Effortlessly access several journals for all parts of your life.</p>
|
|
||||||
</section>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
<footer>
|
|
||||||
jrnl is made with love by <a href="https://github.com/jrnl-org/jrnl/graphs/contributors" title="Contributors">many fabulous people</a>. If you need help, <a href="https://github.com/jrnl-org/jrnl/issues/new/choose" title="Open a new issue on Github">submit an issue</a> on Github.
|
|
||||||
</footer>
|
|
||||||
<script src="//cdnjs.cloudflare.com/ajax/libs/typed.js/2.0.12/typed.min.js"></script>
|
|
||||||
<script>
|
|
||||||
new Typed("#typed", {
|
|
||||||
strings: [
|
|
||||||
"jrnl Started writing my memoirs on the command line. 🎉🔥💻🔥🎉",
|
|
||||||
"jrnl yesterday 2pm: used jrnl to keep track of accomplished tasks. The done.txt for my todo.txt",
|
|
||||||
"jrnl <b>-from</b> 2019 <b>-until</b> may<br /><i>`(displays all entries from January 2019 to last May)`</i>",
|
|
||||||
"jrnl A day on the beach with @beth and @frank. Tagging them so I can easily look this up later.",
|
|
||||||
"jrnl <b>--tags</b><br /><i>`@frank 7<br />@beth 5</i>`",
|
|
||||||
"jrnl <b>--format</b> json<br /><i>`(Outputs your entire journal as json)</i>`",
|
|
||||||
"jrnl <b>--encrypt</b><br /><i>`(AES encryption. Don't lose your password!)</i>`"
|
|
||||||
],
|
|
||||||
typeSpeed: 20, // less is faster
|
|
||||||
backSpeed: 10,
|
|
||||||
backDelay: 2500,
|
|
||||||
loop: true,
|
|
||||||
showCursor: false
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
|
@ -1 +0,0 @@
|
||||||
var typed2 =
|
|
|
@ -1,17 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
{% extends "base.html" %}
|
|
||||||
|
|
||||||
{%- block search_button %}
|
|
||||||
{% if 'search' in config['plugins'] %}
|
|
||||||
<div role="search">
|
|
||||||
<form id ="rtd-search-form" class="wy-form mkdocs-search" action="{{ base_url }}/search.html" method="get">
|
|
||||||
<input type="text" name="q" placeholder="Search docs" title="Type search term here" />
|
|
||||||
<button class="icon icon-search" aria-label="submit"></button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{%- endblock %}
|
|
|
@ -1,2 +0,0 @@
|
||||||
mkdocs>=1.4
|
|
||||||
jinja2==3.1.2
|
|
|
@ -1,34 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright © 2012-2023 jrnl contributors
|
|
||||||
License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
{% extends "main.html" %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
|
|
||||||
<div role="search">
|
|
||||||
<form id ="content_search" class="wy-form mkdocs-search" action="{{ base_url }}/search.html" method="get">
|
|
||||||
|
|
||||||
<span role="status" aria-live="polite" class="ui-helper-hidden-accessible"></span>
|
|
||||||
<input
|
|
||||||
name="q"
|
|
||||||
id="mkdocs-search-query"
|
|
||||||
type="text"
|
|
||||||
class="search_input search-query ui-autocomplete-input"
|
|
||||||
placeholder="Search the Docs"
|
|
||||||
autocomplete="off"
|
|
||||||
autofocus
|
|
||||||
title="Type search term here"
|
|
||||||
>
|
|
||||||
<button class="icon icon-search" aria-label="submit"></button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h1 id="search">Results</h1>
|
|
||||||
|
|
||||||
<div id="mkdocs-search-results" class="search-results">
|
|
||||||
Searching...
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% endblock %}
|
|
|
@ -1,8 +0,0 @@
|
||||||
# Stop
|
|
||||||
|
|
||||||
Please don't file a blank issue.
|
|
||||||
|
|
||||||
Fill out one of the templates from the link below and we'll be better able to
|
|
||||||
help you.
|
|
||||||
|
|
||||||
https://github.com/jrnl-org/jrnl/issues/new/choose
|
|
89
jrnl/main.py
|
@ -1,88 +1,7 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
# Copyright © 2012-2023 jrnl contributors
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
from ruamel import yaml
|
||||||
|
|
||||||
import logging
|
def run():
|
||||||
import sys
|
my_dict = dict(a='a' * 80, b=dict(c=1, d=2))
|
||||||
import traceback
|
return yaml.dump(my_dict)
|
||||||
|
|
||||||
from rich.logging import RichHandler
|
|
||||||
|
|
||||||
from jrnl import controller
|
|
||||||
from jrnl.args import parse_args
|
|
||||||
from jrnl.exception import JrnlException
|
|
||||||
from jrnl.messages import Message
|
|
||||||
from jrnl.messages import MsgStyle
|
|
||||||
from jrnl.messages import MsgText
|
|
||||||
from jrnl.output import print_msg
|
|
||||||
|
|
||||||
|
|
||||||
def configure_logger(debug: bool = False) -> None:
|
|
||||||
if not debug:
|
|
||||||
logging.disable()
|
|
||||||
return
|
|
||||||
|
|
||||||
logging.basicConfig(
|
|
||||||
level=logging.DEBUG,
|
|
||||||
datefmt="[%X]",
|
|
||||||
format="%(message)s",
|
|
||||||
handlers=[RichHandler()],
|
|
||||||
)
|
|
||||||
logging.getLogger("parsedatetime").setLevel(logging.INFO)
|
|
||||||
logging.getLogger("keyring.backend").setLevel(logging.ERROR)
|
|
||||||
logging.debug("Logging start")
|
|
||||||
|
|
||||||
|
|
||||||
def run(manual_args: list[str] | None = None) -> int:
|
|
||||||
try:
|
|
||||||
if manual_args is None:
|
|
||||||
manual_args = sys.argv[1:]
|
|
||||||
|
|
||||||
args = parse_args(manual_args)
|
|
||||||
configure_logger(args.debug)
|
|
||||||
logging.debug("Parsed args:\n%s", args)
|
|
||||||
|
|
||||||
status_code = controller.run(args)
|
|
||||||
|
|
||||||
except JrnlException as e:
|
|
||||||
status_code = 1
|
|
||||||
e.print()
|
|
||||||
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
status_code = 1
|
|
||||||
|
|
||||||
print_msg(
|
|
||||||
Message(
|
|
||||||
MsgText.KeyboardInterruptMsg,
|
|
||||||
MsgStyle.ERROR_ON_NEW_LINE,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
# uncaught exception
|
|
||||||
status_code = 1
|
|
||||||
debug = False
|
|
||||||
try:
|
|
||||||
if args.debug: # type: ignore
|
|
||||||
debug = True
|
|
||||||
except NameError:
|
|
||||||
# This should only happen when the exception
|
|
||||||
# happened before the args were parsed
|
|
||||||
if "--debug" in sys.argv:
|
|
||||||
debug = True
|
|
||||||
|
|
||||||
if debug:
|
|
||||||
from rich.console import Console
|
|
||||||
|
|
||||||
traceback.print_tb(sys.exc_info()[2])
|
|
||||||
Console(stderr=True).print_exception(extra_lines=1)
|
|
||||||
|
|
||||||
print_msg(
|
|
||||||
Message(
|
|
||||||
MsgText.UncaughtException,
|
|
||||||
MsgStyle.ERROR,
|
|
||||||
{"name": type(e).__name__, "exception": e},
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
# This should be the only exit point
|
|
||||||
return status_code
|
|
||||||
|
|
39
mkdocs.yml
|
@ -1,39 +0,0 @@
|
||||||
site_name: jrnl
|
|
||||||
site_url: https://jrnl.sh
|
|
||||||
theme:
|
|
||||||
name: readthedocs
|
|
||||||
custom_dir: docs_theme
|
|
||||||
static_templates:
|
|
||||||
- index.html
|
|
||||||
watch:
|
|
||||||
- docs
|
|
||||||
- docs_theme
|
|
||||||
extra_css:
|
|
||||||
- https://fonts.googleapis.com/css?family=Open+Sans:300,600
|
|
||||||
- assets/colors.css
|
|
||||||
- assets/theme.css
|
|
||||||
- assets/highlight.css
|
|
||||||
markdown_extensions:
|
|
||||||
- admonition
|
|
||||||
repo_url: https://github.com/jrnl-org/jrnl/
|
|
||||||
edit_uri: edit/develop/docs/
|
|
||||||
site_author: jrnl contributors
|
|
||||||
site_description: Collect your thoughts and notes without leaving the command line.
|
|
||||||
nav:
|
|
||||||
- Overview: overview.md
|
|
||||||
- 'User Guide':
|
|
||||||
- Quickstart: installation.md
|
|
||||||
- Basic Usage: usage.md
|
|
||||||
- Encryption: encryption.md
|
|
||||||
- Journal Types: journal-types.md
|
|
||||||
- Privacy and Security: privacy-and-security.md
|
|
||||||
- Formats: formats.md
|
|
||||||
- Advanced Usage: advanced.md
|
|
||||||
- 'External Editors': external-editors.md
|
|
||||||
- 'Tips and Tricks': tips-and-tricks.md
|
|
||||||
- 'Reference':
|
|
||||||
- Command Line: reference-command-line.md
|
|
||||||
- Configuration File: reference-config-file.md
|
|
||||||
- 'Contributing':
|
|
||||||
- Contributing to jrnl: contributing.md
|
|
||||||
|
|
2173
package-lock.json
generated
|
@ -1,5 +0,0 @@
|
||||||
{
|
|
||||||
"devDependencies": {
|
|
||||||
"pa11y-ci": "3.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
164
pyproject.toml
|
@ -1,165 +1,19 @@
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "jrnl"
|
name = "jrnl"
|
||||||
version = "v4.0-beta3"
|
|
||||||
description = "Collect your thoughts and notes without leaving the command line."
|
|
||||||
authors = [
|
|
||||||
"jrnl contributors <maintainers@jrnl.sh>",
|
|
||||||
"Manuel Ebert <manuel@1450.me>",
|
|
||||||
"Jonathan Wren <jonathan@nowandwren.com>",
|
|
||||||
"Micah Ellison <micahellison@gmail.com>"
|
|
||||||
]
|
|
||||||
maintainers = [
|
|
||||||
"Jonathan Wren and Micah Ellison <maintainers@jrnl.sh>",
|
|
||||||
]
|
|
||||||
license = "GPL-3.0-only"
|
|
||||||
readme = "README.md"
|
|
||||||
homepage = "https://jrnl.sh"
|
|
||||||
repository = "https://github.com/jrnl-org/jrnl"
|
|
||||||
classifiers = [
|
|
||||||
"Topic :: Office/Business :: News/Diary",
|
|
||||||
"Environment :: Console",
|
|
||||||
"Operating System :: OS Independent"
|
|
||||||
]
|
|
||||||
|
|
||||||
[tool.poetry.urls]
|
|
||||||
"Documentation" = "https://jrnl.sh"
|
|
||||||
"Issue Tracker" = "https://github.com/jrnl-org/jrnl/issues"
|
|
||||||
"Funding" = "https://opencollective.com/jrnl"
|
|
||||||
|
|
||||||
[tool.poetry.dependencies]
|
|
||||||
python = ">=3.10.0, <3.13"
|
|
||||||
|
|
||||||
ansiwrap = "^0.8.4"
|
|
||||||
colorama = ">=0.4" # https://github.com/tartley/colorama/blob/master/CHANGELOG.rst
|
|
||||||
cryptography = ">=3.0" # https://cryptography.io/en/latest/api-stability.html
|
|
||||||
keyring = ">=21.0" # https://github.com/jaraco/keyring#integration
|
|
||||||
parsedatetime = ">=2.6"
|
|
||||||
python-dateutil = "^2.8" # https://github.com/dateutil/dateutil/blob/master/RELEASING
|
|
||||||
pyxdg = ">=0.27.0"
|
|
||||||
"ruamel.yaml" = "^0.17.21"
|
|
||||||
rich = ">=12.2.0, <14.0.0"
|
|
||||||
|
|
||||||
# dayone-only deps
|
|
||||||
tzlocal = ">=4.0" # https://github.com/regebro/tzlocal/blob/master/CHANGES.txt
|
|
||||||
|
|
||||||
[tool.poetry.dev-dependencies]
|
|
||||||
black = { version = ">=21.5b2", allow-prereleases = true }
|
|
||||||
flakeheaven = ">=3.0"
|
|
||||||
flake8-black = ">=0.3.3"
|
|
||||||
flake8-isort = ">=5.0.0"
|
|
||||||
flake8-type-checking = ">=2.2.0"
|
|
||||||
flake8-simplify = ">=0.19"
|
|
||||||
ipdb = "*"
|
|
||||||
isort = ">=5.10"
|
|
||||||
mkdocs = ">=1.4"
|
|
||||||
parse-type = ">=0.6.0"
|
|
||||||
poethepoet = "*"
|
|
||||||
pytest = ">=6.2"
|
|
||||||
pytest-bdd = ">=6.0"
|
|
||||||
pytest-clarity = "*"
|
|
||||||
pytest-xdist = ">=2.5.0"
|
|
||||||
requests = "*"
|
|
||||||
toml = ">=0.10"
|
|
||||||
tox = "*"
|
|
||||||
xmltodict = "*"
|
|
||||||
|
|
||||||
[tool.poetry.scripts]
|
[tool.poetry.scripts]
|
||||||
jrnl = 'jrnl.main:run'
|
jrnl = 'jrnl.main:run'
|
||||||
|
|
||||||
[tool.poe.tasks]
|
[tool.poetry.dependencies]
|
||||||
docs-check.default_item_type = "script"
|
python = ">=3.10.0, <3.13"
|
||||||
docs-check.sequence = [
|
"ruamel.yaml" = "^0.17.21"
|
||||||
"tasks:delete_files(['sitemap.xml', 'config.json'])",
|
|
||||||
"tasks:generate_sitemap",
|
|
||||||
"tasks:output_file('sitemap.xml')",
|
|
||||||
"tasks:generate_pa11y_config_from_sitemap",
|
|
||||||
"tasks:output_file('config.json')",
|
|
||||||
"tasks:run_shell('npx pa11y-ci -c config.json')",
|
|
||||||
"tasks:delete_files(['sitemap.xml', 'config.json'])",
|
|
||||||
]
|
|
||||||
docs-run = [
|
|
||||||
{cmd = "mkdocs serve"},
|
|
||||||
]
|
|
||||||
|
|
||||||
test-run = [
|
[tool.poetry.dev-dependencies]
|
||||||
{cmd = "tox -q -e py --"},
|
pytest = ">=6.2"
|
||||||
]
|
tox = "*"
|
||||||
|
|
||||||
# Groups of tasks
|
|
||||||
format.default_item_type = "cmd"
|
|
||||||
format.sequence = [
|
|
||||||
"isort .",
|
|
||||||
"black .",
|
|
||||||
]
|
|
||||||
|
|
||||||
lint.env = { FLAKEHEAVEN_CACHE_TIMEOUT = "0" }
|
|
||||||
lint.default_item_type = "cmd"
|
|
||||||
lint.sequence = [
|
|
||||||
"poetry --version",
|
|
||||||
"poetry check",
|
|
||||||
"flakeheaven --version",
|
|
||||||
"flakeheaven plugins",
|
|
||||||
"flakeheaven lint",
|
|
||||||
]
|
|
||||||
|
|
||||||
test = [
|
|
||||||
"lint",
|
|
||||||
"test-run",
|
|
||||||
]
|
|
||||||
|
|
||||||
[tool.isort]
|
|
||||||
profile = "black"
|
|
||||||
force_single_line = true
|
|
||||||
known_first_party = ["jrnl", "tests"]
|
|
||||||
|
|
||||||
[tool.pytest.ini_options]
|
[tool.pytest.ini_options]
|
||||||
minversion = "6.0"
|
minversion = "6.0"
|
||||||
required_plugins = [
|
|
||||||
"pytest-bdd"
|
|
||||||
]
|
|
||||||
markers = [
|
|
||||||
"todo",
|
|
||||||
"skip_win",
|
|
||||||
"skip_posix",
|
|
||||||
"on_win",
|
|
||||||
"on_posix",
|
|
||||||
]
|
|
||||||
addopts = [
|
|
||||||
"--pdbcls=IPython.terminal.debugger:Pdb",
|
|
||||||
"--tb=native",
|
|
||||||
"-n=auto",
|
|
||||||
]
|
|
||||||
|
|
||||||
filterwarnings = [
|
|
||||||
"ignore::DeprecationWarning",
|
|
||||||
"ignore:Flag style will be deprecated in.*",
|
|
||||||
"ignore:[WinError 32].*",
|
|
||||||
"ignore:[WinError 5].*"
|
|
||||||
]
|
|
||||||
|
|
||||||
[tool.flakeheaven]
|
|
||||||
max_line_length = 88
|
|
||||||
exclude = [".git", ".tox", ".venv", "node_modules"]
|
|
||||||
|
|
||||||
[tool.flakeheaven.plugins]
|
|
||||||
"py*" = ["+*"]
|
|
||||||
pycodestyle = [
|
|
||||||
"-E101",
|
|
||||||
"-E111", "-E114", "-E115", "-E116", "-E117",
|
|
||||||
"-E12*",
|
|
||||||
"-E13*",
|
|
||||||
"-E2*",
|
|
||||||
"-E3*",
|
|
||||||
"-E401",
|
|
||||||
"-E5*",
|
|
||||||
"-E70",
|
|
||||||
"-W1*", "-W2*", "-W3*", "-W5*",
|
|
||||||
]
|
|
||||||
"flake8-*" = ["+*"]
|
|
||||||
flake8-black = ["-BLK901"]
|
|
||||||
|
|
||||||
[tool.flakeheaven.exceptions."jrnl/journals/__init__.py"]
|
|
||||||
pyflakes = ["-F401"]
|
|
||||||
|
|
||||||
[build-system]
|
[build-system]
|
||||||
requires = ["poetry-core>=1.0.0"]
|
requires = ["poetry-core>=1.0.0"]
|
||||||
|
@ -175,11 +29,7 @@ isolated_build = True
|
||||||
[testenv]
|
[testenv]
|
||||||
deps =
|
deps =
|
||||||
pytest >= 6.2
|
pytest >= 6.2
|
||||||
pytest-bdd >=6.0
|
|
||||||
pytest-xdist >=2.5.0
|
|
||||||
parse-type >=0.6.0
|
|
||||||
toml >=0.10
|
|
||||||
|
|
||||||
commands = pytest {posargs}
|
commands = pytest -vvv {posargs}
|
||||||
passenv = HOME
|
passenv = HOME
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
# readthedocs.yml
|
|
||||||
# Read the Docs configuration file
|
|
||||||
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
|
|
||||||
|
|
||||||
# Required
|
|
||||||
version: 2
|
|
||||||
|
|
||||||
# Build documentation in the docs/ directory
|
|
||||||
mkdocs:
|
|
||||||
configuration: mkdocs.yml
|
|
||||||
fail_on_warning: false
|
|
||||||
|
|
||||||
# Optionally build your docs in additional formats such as PDF
|
|
||||||
formats:
|
|
||||||
- pdf
|
|
||||||
- epub
|
|
||||||
|
|
||||||
# Optionally set the version of Python and requirements required to build your docs
|
|
||||||
python:
|
|
||||||
install:
|
|
||||||
- requirements: docs_theme/requirements.txt
|
|
56
tasks.py
|
@ -1,56 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
import pathlib
|
|
||||||
import subprocess
|
|
||||||
|
|
||||||
import requests
|
|
||||||
import xmltodict
|
|
||||||
|
|
||||||
DOCS_URL = "http://127.0.0.1:8000"
|
|
||||||
SITEMAP_FILENAME = "sitemap.xml"
|
|
||||||
CONFIG_FILENAME = "config.json"
|
|
||||||
|
|
||||||
|
|
||||||
def delete_files(files):
|
|
||||||
for file in files:
|
|
||||||
pathlib.Path(file).unlink(missing_ok=True)
|
|
||||||
|
|
||||||
|
|
||||||
def run_shell(command):
|
|
||||||
# Required to run NPM commands in Windows and *nix
|
|
||||||
subprocess.run(command, check=True, shell=True)
|
|
||||||
|
|
||||||
|
|
||||||
def generate_sitemap():
|
|
||||||
sitemap = requests.get(f"{DOCS_URL}/{SITEMAP_FILENAME}")
|
|
||||||
with open(SITEMAP_FILENAME, "wb") as f:
|
|
||||||
f.write(sitemap.content)
|
|
||||||
|
|
||||||
|
|
||||||
def generate_pa11y_config_from_sitemap():
|
|
||||||
with open(SITEMAP_FILENAME) as f:
|
|
||||||
xml_sitemap = xmltodict.parse(f.read())
|
|
||||||
|
|
||||||
urls = [
|
|
||||||
f"{DOCS_URL}/",
|
|
||||||
f"{DOCS_URL}/search.html?q=jrnl",
|
|
||||||
]
|
|
||||||
urls += [url["loc"] for url in xml_sitemap["urlset"]["url"]]
|
|
||||||
|
|
||||||
with open(CONFIG_FILENAME, "w") as f:
|
|
||||||
f.write(json.dumps({"urls": urls}))
|
|
||||||
|
|
||||||
|
|
||||||
def output_file(file):
|
|
||||||
if not os.getenv("CI", False):
|
|
||||||
return
|
|
||||||
|
|
||||||
print(f"::group::{file}")
|
|
||||||
|
|
||||||
with open(file) as f:
|
|
||||||
print(f.read())
|
|
||||||
|
|
||||||
print("::endgroup::")
|
|
|
@ -1,108 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Test combinations of edit, change-time, and delete
|
|
||||||
|
|
||||||
Scenario Outline: --change-time with --edit modifies selected entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we write nothing to the editor if opened
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --change-time '2022-04-23 10:30' --edit" and enter
|
|
||||||
Y
|
|
||||||
N
|
|
||||||
Y
|
|
||||||
Then the error output should contain "No text received from editor. Were you trying to delete all the entries?"
|
|
||||||
And the editor should have been called
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2022-04-23 10:30 Entry the first.
|
|
||||||
2022-04-23 10:30 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
Scenario Outline: --delete with --edit deletes selected entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we append to the editor if opened
|
|
||||||
[2023-02-21 10:32] Here is a new entry
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --delete --edit" and enter
|
|
||||||
Y
|
|
||||||
N
|
|
||||||
Y
|
|
||||||
Then the editor should have been called
|
|
||||||
And the error output should contain "3 entries found"
|
|
||||||
And the error output should contain "2 entries deleted"
|
|
||||||
And the error output should contain "1 entry added"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the error output should contain "2 entries found"
|
|
||||||
And the output should be
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2023-02-21 10:32 Here is a new entry
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
Scenario Outline: --change-time with --delete affects appropriate entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
# --change-time is asked first, then --delete
|
|
||||||
When we run "jrnl --change-time '2022-04-23 10:30' --delete" and enter
|
|
||||||
N
|
|
||||||
N
|
|
||||||
Y
|
|
||||||
Y
|
|
||||||
N
|
|
||||||
N
|
|
||||||
Then the error output should contain "3 entries found"
|
|
||||||
And the error output should contain "1 entry deleted"
|
|
||||||
And the error output should contain "1 entry modified"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2022-04-23 10:30 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
Scenario Outline: Combining --change-time and --delete and --edit affects appropriate entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we append to the editor if opened
|
|
||||||
[2023-02-21 10:32] Here is a new entry
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
# --change-time is asked first, then --delete, then --edit
|
|
||||||
When we run "jrnl --change-time '2022-04-23 10:30' --delete --edit" and enter
|
|
||||||
N
|
|
||||||
Y
|
|
||||||
Y
|
|
||||||
Y
|
|
||||||
Y
|
|
||||||
N
|
|
||||||
Then the error output should contain "3 entries found"
|
|
||||||
And the error output should contain "2 entries deleted"
|
|
||||||
And the error output should contain "1 entry modified" # only 1, because the other was deleted
|
|
||||||
And the error output should contain "1 entry added" # by edit
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2022-04-23 10:30 The third entry finally after weeks without writing.
|
|
||||||
2023-02-21 10:32 Here is a new entry
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
|
@ -1,10 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Build process
|
|
||||||
|
|
||||||
Scenario: Version numbers should stay in sync
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl --version"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain pyproject.toml version
|
|
|
@ -1,273 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Change entry times in journal
|
|
||||||
Scenario Outline: Change time flag changes single entry timestamp
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the output should contain "2020-09-24 09:14 The third entry finally"
|
|
||||||
When we run "jrnl -1 --change-time '2022-04-23 10:30'" and enter
|
|
||||||
Y
|
|
||||||
Then the error output should contain "1 entry modified"
|
|
||||||
And the error output should not contain "deleted"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2022-04-23 10:30 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
Scenario Outline: Change flag changes prompted entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
When we run "jrnl --change-time '2022-04-23 10:30'" and enter
|
|
||||||
Y
|
|
||||||
N
|
|
||||||
Y
|
|
||||||
Then the error output should contain "3 entries found"
|
|
||||||
And the error output should contain "2 entries modified"
|
|
||||||
When we run "jrnl --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2022-04-23 10:30 Entry the first.
|
|
||||||
2022-04-23 10:30 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Answering "N" to change-time prompt deletes no entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the output should contain "2020-09-24 09:14 The third entry finally"
|
|
||||||
When we run "jrnl -1 --change-time '2023-02-21 10:30'" and enter
|
|
||||||
N
|
|
||||||
Then the error output should not contain "modified"
|
|
||||||
And the error output should not contain "deleted"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
Scenario Outline: Change time flag with nonsense input changes nothing
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --change-time now asdfasdf"
|
|
||||||
Then the output should contain "No entries to modify"
|
|
||||||
And the error output should not contain "entries modified"
|
|
||||||
And the error output should not contain "entries deleted"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Change time flag with tag only changes tagged entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --change-time '2022-04-23 10:30' @ipsum" and enter
|
|
||||||
Y
|
|
||||||
Then the error output should contain "1 entry found"
|
|
||||||
And the error output should contain "1 entry modified"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
2022-04-23 10:30 Entry the first.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Change time flag with multiple tags changes all entries matching any of the tags
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --change-time '2022-04-23 10:30' @ipsum @tagthree" and enter
|
|
||||||
Y
|
|
||||||
Y
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2022-04-23 10:30 Entry the first.
|
|
||||||
2022-04-23 10:30 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Change time flag with -and changes boolean AND of tagged entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --change-time '2022-04-23 10:30' -and @tagone @tagtwo" and enter
|
|
||||||
Y
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
2022-04-23 10:30 Entry the first.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Change time flag with -not does not change entries from given tag
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --change-time '2022-04-23 10:30' @tagone -not @ipsum" and enter
|
|
||||||
Y
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2022-04-23 10:30 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Change time flag with -from search operator only changes entries since that date
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --change-time '2022-04-23 10:30' -from 2020-09-01" and enter
|
|
||||||
Y
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2022-04-23 10:30 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Change time flag with -to only changes entries up to specified date
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --change-time '2022-04-23 10:30' -to 2020-08-31" and enter
|
|
||||||
Y
|
|
||||||
Y
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
2022-04-23 10:30 Entry the first.
|
|
||||||
2022-04-23 10:30 A second entry in what I hope to be a long series.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Change time flag with -starred only changes starred entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --change-time '2022-04-23 10:30' -starred" and enter
|
|
||||||
Y
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
2022-04-23 10:30 A second entry in what I hope to be a long series.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Change time flag with -contains only changes entries containing expression
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --change-time '2022-04-23 10:30' -contains dignissim" and enter
|
|
||||||
Y
|
|
||||||
Then the error output should contain "1 entry modified"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
2022-04-23 10:30 Entry the first.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Change time flag with no entries specified changes nothing
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --change-time" and enter
|
|
||||||
N
|
|
||||||
N
|
|
||||||
N
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
|
@ -1,141 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Multiple journals
|
|
||||||
|
|
||||||
Scenario: Read a journal from an alternate config
|
|
||||||
Given the config "basic_onefile.yaml" exists
|
|
||||||
And we use the config "multiple.yaml"
|
|
||||||
When we run "jrnl --cf basic_onefile.yaml -999"
|
|
||||||
Then the output should not contain "My first entry" # from multiple.yaml
|
|
||||||
And the output should contain "Lorem ipsum" # from basic_onefile.yaml
|
|
||||||
|
|
||||||
Scenario: Write to default journal by default using an alternate config
|
|
||||||
Given the config "multiple.yaml" exists
|
|
||||||
And we use the config "basic_onefile.yaml"
|
|
||||||
When we run "jrnl --cf multiple.yaml this goes to default"
|
|
||||||
And we run "jrnl -1"
|
|
||||||
Then the output should not contain "this goes to default"
|
|
||||||
When we run "jrnl --cf multiple.yaml -1"
|
|
||||||
Then the output should contain "this goes to default"
|
|
||||||
|
|
||||||
Scenario: Write to specified journal using an alternate config
|
|
||||||
Given the config "multiple.yaml" exists
|
|
||||||
And we use the config "basic_onefile.yaml"
|
|
||||||
When we run "jrnl work --cf multiple.yaml a long day in the office"
|
|
||||||
And we run "jrnl default --cf multiple.yaml -1"
|
|
||||||
Then the output should contain "But I'm better"
|
|
||||||
When we run "jrnl work --cf multiple.yaml -1"
|
|
||||||
Then the output should contain "a long day in the office"
|
|
||||||
|
|
||||||
Scenario: Tell user which journal was used while using an alternate config
|
|
||||||
Given the config "multiple.yaml" exists
|
|
||||||
And we use the config "basic_onefile.yaml"
|
|
||||||
When we run "jrnl --cf multiple.yaml work a long day in the office"
|
|
||||||
Then the output should contain "Entry added to work journal"
|
|
||||||
|
|
||||||
Scenario: Write to specified journal with a timestamp using an alternate config
|
|
||||||
Given the config "multiple.yaml" exists
|
|
||||||
And we use the config "basic_onefile.yaml"
|
|
||||||
When we run "jrnl work --cf multiple.yaml 23 july 2012: a long day in the office"
|
|
||||||
And we run "jrnl --cf multiple.yaml -1"
|
|
||||||
Then the output should contain "But I'm better"
|
|
||||||
When we run "jrnl --cf multiple.yaml work -1"
|
|
||||||
Then the output should contain "a long day in the office"
|
|
||||||
And the output should contain "2012-07-23"
|
|
||||||
|
|
||||||
Scenario: Write to specified journal without a timestamp but with colon using an alternate config
|
|
||||||
Given the config "multiple.yaml" exists
|
|
||||||
And we use the config "basic_onefile.yaml"
|
|
||||||
When we run "jrnl work --cf multiple.yaml : a long day in the office"
|
|
||||||
And we run "jrnl --cf multiple.yaml -1"
|
|
||||||
Then the output should contain "But I'm better"
|
|
||||||
When we run "jrnl --cf multiple.yaml work -1"
|
|
||||||
Then the output should contain "a long day in the office"
|
|
||||||
|
|
||||||
Scenario: Create new journals as required using an alternate config
|
|
||||||
Given the config "multiple.yaml" exists
|
|
||||||
And we use the config "basic_onefile.yaml"
|
|
||||||
When we run "jrnl ideas -1"
|
|
||||||
Then the output should be empty
|
|
||||||
When we run "jrnl ideas --cf multiple.yaml 23 july 2012: sell my junk on ebay and make lots of money"
|
|
||||||
Then the output should contain "Journal 'ideas' created"
|
|
||||||
When we run "jrnl ideas --cf multiple.yaml -1"
|
|
||||||
Then the output should contain "sell my junk on ebay and make lots of money"
|
|
||||||
|
|
||||||
Scenario: Don't crash if no default journal is specified using an alternate config
|
|
||||||
Given the config "no_default_journal.yaml" exists
|
|
||||||
And we use the config "basic_onefile.yaml"
|
|
||||||
When we run "jrnl --cf no_default_journal.yaml a long day in the office"
|
|
||||||
Then the output should contain "No 'default' journal configured"
|
|
||||||
|
|
||||||
Scenario: Don't crash if no file exists for a configured encrypted journal using an alternate config
|
|
||||||
Given the config "multiple.yaml" exists
|
|
||||||
And we use the config "basic_onefile.yaml"
|
|
||||||
When we run "jrnl new_encrypted --cf multiple.yaml Adding first entry" and enter
|
|
||||||
these three eyes
|
|
||||||
these three eyes
|
|
||||||
n
|
|
||||||
Then the output should contain "Journal 'new_encrypted' created at "
|
|
||||||
|
|
||||||
Scenario: Don't overwrite main config when encrypting a journal in an alternate config
|
|
||||||
Given the config "basic_onefile.yaml" exists
|
|
||||||
And we use the config "multiple.yaml"
|
|
||||||
When we run "jrnl --cf basic_onefile.yaml --encrypt" and enter
|
|
||||||
these three eyes
|
|
||||||
these three eyes
|
|
||||||
n
|
|
||||||
Then the output should contain "Journal encrypted to features/journals/basic_onefile.journal"
|
|
||||||
And the config should contain "encrypt: false"
|
|
||||||
|
|
||||||
Scenario: Don't overwrite main config when decrypting a journal in an alternate config
|
|
||||||
Given the config "editor_encrypted.yaml" exists
|
|
||||||
And we use the password "bad doggie no biscuit" if prompted
|
|
||||||
And we use the config "basic_encrypted.yaml"
|
|
||||||
When we run "jrnl --cf editor_encrypted.yaml --decrypt"
|
|
||||||
Then the config should contain "encrypt: true"
|
|
||||||
And the output should not contain "Wrong password"
|
|
||||||
|
|
||||||
Scenario: Show an error message when the config file is empty
|
|
||||||
Given we use the config "empty_file.yaml"
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the error output should contain "Unable to parse config file"
|
|
||||||
|
|
||||||
Scenario: Show an error message when using --config-file with empty file
|
|
||||||
Given the config "empty_file.yaml" exists
|
|
||||||
And we use the config "basic_onefile.yaml"
|
|
||||||
When we run "jrnl --cf empty_file.yaml"
|
|
||||||
Then the error output should contain "Unable to parse config file"
|
|
||||||
|
|
||||||
Scenario: Use a config file with linewrap set to 'auto'
|
|
||||||
Given we use the config "linewrap_auto.yaml"
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the output should contain "Life is good."
|
|
||||||
|
|
||||||
Scenario: Use a config file with linewrap set to 'auto' and use format 'fancy'
|
|
||||||
Given we use the config "linewrap_auto.yaml"
|
|
||||||
When we run "jrnl -1 --format fancy"
|
|
||||||
Then the output should contain "Life is good."
|
|
||||||
|
|
||||||
Scenario: Show a warning message when the config file contains duplicate keys at the same level
|
|
||||||
Given the config "duplicate_keys.yaml" exists
|
|
||||||
And we use the config "duplicate_keys.yaml"
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the output should contain "There is at least one duplicate key in your configuration file"
|
|
||||||
|
|
||||||
Scenario: Show a warning message when using --config-file with duplicate keys
|
|
||||||
Given the config "duplicate_keys.yaml" exists
|
|
||||||
And we use the config "multiple.yaml"
|
|
||||||
When we run "jrnl --cf duplicate_keys.yaml -1"
|
|
||||||
Then the output should contain "There is at least one duplicate key in your configuration file"
|
|
||||||
|
|
||||||
Scenario: Don't show a duplicate keys warning message when using --config-override on an existing value
|
|
||||||
Given we use the config "multiple.yaml"
|
|
||||||
When we run "jrnl --config-override highlight false"
|
|
||||||
Then the output should not contain "There is at least one duplicate key in your configuration file"
|
|
||||||
|
|
||||||
Scenario: Update version number in config file when running newer version
|
|
||||||
Given we use the config "format_md.yaml"
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the output should contain "Configuration updated to newest version at"
|
|
||||||
And the version in the config file should be up-to-date
|
|
|
@ -1,21 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Functionality of jrnl outside of actually handling journals
|
|
||||||
|
|
||||||
Scenario: Displaying the version number
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl --version"
|
|
||||||
Then we should get no error
|
|
||||||
Then the output should match "^jrnl v\d+\.\d+(\.\d+)?(-(alpha|beta)\d*)?"
|
|
||||||
|
|
||||||
Scenario: Running the diagnostic command
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl --diagnostic"
|
|
||||||
Then the output should contain "jrnl"
|
|
||||||
And the output should contain "Python"
|
|
||||||
And the output should contain "OS"
|
|
||||||
|
|
||||||
@todo
|
|
||||||
Scenario: Listing available journals
|
|
||||||
|
|
|
@ -1,203 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Reading and writing to journal with custom date formats
|
|
||||||
|
|
||||||
Scenario: Dates can include a time
|
|
||||||
# https://github.com/jrnl-org/jrnl/issues/117
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl 2013-11-30 15:42: Project Started."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -999"
|
|
||||||
Then the output should contain "2013-11-30 15:42 Project Started."
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Dates can be in the future
|
|
||||||
# https://github.com/jrnl-org/jrnl/issues/185
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl 26/06/2099: Planet? Earth. Year? 2099."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -999"
|
|
||||||
Then the output should contain "2099-06-26 09:00 Planet?"
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Loading a sample journal with custom date
|
|
||||||
Given we use the config "little_endian_dates.yaml"
|
|
||||||
When we run "jrnl -n 2"
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -n 999"
|
|
||||||
Then the output should be
|
|
||||||
09.06.2013 15:39 My first entry.
|
|
||||||
| Everything is alright
|
|
||||||
|
|
||||||
10.07.2013 15:40 Life is good.
|
|
||||||
| But I'm better.
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Writing an entry from command line with custom date
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl <command>"
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -n 1"
|
|
||||||
Then the output should contain "<expected_output>"
|
|
||||||
|
|
||||||
Examples: Day-first Dates
|
|
||||||
| config_file | command | expected_output |
|
|
||||||
| little_endian_dates.yaml | 2020-09-19: My first entry. | 19.09.2020 09:00 My first entry. |
|
|
||||||
| little_endian_dates.yaml | 2020-08-09: My second entry. | 09.08.2020 09:00 My second entry. |
|
|
||||||
| little_endian_dates.yaml | 2020-02-29: Test. | 29.02.2020 09:00 Test. |
|
|
||||||
| little_endian_dates.yaml | 2019-02-29: Test. | 2019-02-29: Test. |
|
|
||||||
| little_endian_dates.yaml | 2020-08-32: Test. | 2020-08-32: Test. |
|
|
||||||
| little_endian_dates.yaml | 2032-02-01: Test. | 01.02.2032 09:00 Test. |
|
|
||||||
| little_endian_dates.yaml | 2020-01-01: Test. | 01.01.2020 09:00 Test. |
|
|
||||||
| little_endian_dates.yaml | 2020-12-31: Test. | 31.12.2020 09:00 Test. |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Searching for dates with custom date
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl <command>"
|
|
||||||
Then the output should be "<expected_output>"
|
|
||||||
|
|
||||||
Examples: Day-first Dates
|
|
||||||
| config_file | command | expected_output |
|
|
||||||
| little_endian_dates.yaml | -on '2013-07-10' --short | 10.07.2013 15:40 Life is good. |
|
|
||||||
| little_endian_dates.yaml | -on 'june 9 2013' --short | 09.06.2013 15:39 My first entry. |
|
|
||||||
| little_endian_dates.yaml | -on 'july 10 2013' --short | 10.07.2013 15:40 Life is good. |
|
|
||||||
| little_endian_dates.yaml | -on 'june 2013' --short | 09.06.2013 15:39 My first entry. |
|
|
||||||
| little_endian_dates.yaml | -on 'july 2013' --short | 10.07.2013 15:40 Life is good. |
|
|
||||||
# @todo month alone with no year should work
|
|
||||||
# | little_endian_dates.yaml | -on 'june' --short | 09.06.2013 15:39 My first entry. |
|
|
||||||
# | little_endian_dates.yaml | -on 'july' --short | 10.07.2013 15:40 Life is good. |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Writing an entry at the prompt with custom date
|
|
||||||
Given we use the config "little_endian_dates.yaml"
|
|
||||||
When we run "jrnl" and type "2013-05-10: I saw Elvis. He's alive."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -999"
|
|
||||||
Then the output should contain "10.05.2013 09:00 I saw Elvis."
|
|
||||||
And the output should contain "He's alive."
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Viewing today's entries does not print the entire journal
|
|
||||||
# see: https://github.com/jrnl-org/jrnl/issues/741
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl -on today"
|
|
||||||
Then the output should not contain "Life is good"
|
|
||||||
And the output should not contain "But I'm better."
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Create entry using day of the week as entry date one.
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
And now is "2019-03-12 01:30:32 PM"
|
|
||||||
When we run "jrnl <command>"
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the output should contain "<expected_output>"
|
|
||||||
Then the output should contain the date "<date>"
|
|
||||||
|
|
||||||
Examples: Days of the week
|
|
||||||
| command | expected_output | date |
|
|
||||||
| Monday: entry on a monday | entry on a monday | 2019-03-11 09:00 |
|
|
||||||
| Tuesday: entry on a tuesday | entry on a tuesday | 2019-03-05 09:00 |
|
|
||||||
| Wednesday: entry on a wednesday | entry on a wednesday | 2019-03-06 09:00 |
|
|
||||||
| Thursday: entry on a thursday | entry on a thursday | 2019-03-07 09:00 |
|
|
||||||
| Friday: entry on a friday | entry on a friday | 2019-03-08 09:00 |
|
|
||||||
| Saturday: entry on a saturday | entry on a saturday | 2019-03-09 09:00 |
|
|
||||||
| Sunday: entry on a sunday | entry on a sunday | 2019-03-10 09:00 |
|
|
||||||
| sunday: entry on a sunday | entry on a sunday | 2019-03-10 09:00 |
|
|
||||||
| sUndAy: entry on a sunday | entry on a sunday | 2019-03-10 09:00 |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Create entry using day of the week as entry date two.
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
And now is "2019-03-12 01:30:32 PM"
|
|
||||||
When we run "jrnl <command>"
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the output should contain "<expected_output>"
|
|
||||||
Then the output should contain the date "<date>"
|
|
||||||
|
|
||||||
Examples: Days of the week
|
|
||||||
| command | expected_output | date |
|
|
||||||
| Mon: entry on a monday | entry on a monday | 2019-03-11 09:00 |
|
|
||||||
| Tue: entry on a tuesday | entry on a tuesday | 2019-03-05 09:00 |
|
|
||||||
| Wed: entry on a wednesday | entry on a wednesday | 2019-03-06 09:00 |
|
|
||||||
| Thu: entry on a thursday | entry on a thursday | 2019-03-07 09:00 |
|
|
||||||
| Fri: entry on a friday | entry on a friday | 2019-03-08 09:00 |
|
|
||||||
| Sat: entry on a saturday | entry on a saturday | 2019-03-09 09:00 |
|
|
||||||
| Sun: entry on a sunday | entry on a sunday | 2019-03-10 09:00 |
|
|
||||||
| sun: entry on a sunday | entry on a sunday | 2019-03-10 09:00 |
|
|
||||||
| sUn: entry on a sunday | entry on a sunday | 2019-03-10 09:00 |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Journals with unreadable dates should still be loaded
|
|
||||||
Given we use the config "unreadabledates.yaml"
|
|
||||||
When we run "jrnl -2"
|
|
||||||
Then the output should contain "I've lost track of time."
|
|
||||||
And the output should contain "Time has no meaning."
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Journals with readable dates AND unreadable dates should still contain all data.
|
|
||||||
Given we use the config "mostlyreadabledates.yaml"
|
|
||||||
When we run "jrnl --short"
|
|
||||||
Then the output should be
|
|
||||||
2019-07-01 14:23 The third entry
|
|
||||||
2019-07-18 14:23 The first entry
|
|
||||||
2019-07-19 14:23 The second entry
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Update near-valid dates after journal is edited
|
|
||||||
Given we use the config "mostlyreadabledates.yaml"
|
|
||||||
When we run "jrnl 2222-08-19: I have made it exactly one month into the future."
|
|
||||||
When we run "jrnl -2"
|
|
||||||
Then the output should contain "2019-07-19 14:23 The second entry"
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Integers in square brackets should not be read as dates
|
|
||||||
Given we use the config "brackets.yaml"
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the output should contain "[1] line starting with 1"
|
|
||||||
|
|
||||||
|
|
||||||
# broken still
|
|
||||||
@skip
|
|
||||||
Scenario: Dayone entries without timezone information are interpreted in current timezone
|
|
||||||
Given we use the config "dayone.yaml"
|
|
||||||
When we run "jrnl -until 'feb 2013'"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "2013-01-17T18:37Z" in the local time
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Loading entry with ambiguous time stamp in timezone-aware journal (like Dayone)
|
|
||||||
#https://github.com/jrnl-org/jrnl/issues/153
|
|
||||||
Given we use the config "bug153.yaml"
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should be
|
|
||||||
2013-10-27 04:27 Some text.
|
|
||||||
|
|
||||||
|
|
||||||
@skip #1422
|
|
||||||
Scenario Outline: Using "tomorrow" near daylight savings works in Dayone journals
|
|
||||||
Given we use the config "dayone.yaml"
|
|
||||||
And now is "<date>"
|
|
||||||
When we run "jrnl yesterday: This thing happened yesterday"
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl today at 11:59pm: Adding an entry right now."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl tomorrow: A future entry."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -from yesterday -to today"
|
|
||||||
Then the output should contain "This thing happened yesterday"
|
|
||||||
And the output should contain "Adding an entry right now."
|
|
||||||
And the output should not contain "A future entry."
|
|
||||||
|
|
||||||
Examples: Dates
|
|
||||||
| date |
|
|
||||||
| 2022-02-10 01:00:00 PM |
|
|
||||||
| 2021-03-13 01:00:00 PM |
|
|
||||||
| 2021-11-06 01:00:00 PM |
|
|
||||||
| 2022-03-12 01:00:00 PM |
|
|
||||||
| 2022-11-05 01:00:00 PM |
|
|
||||||
|
|
|
@ -1,204 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Delete entries from journal
|
|
||||||
Scenario Outline: Delete flag allows deletion of single entry
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the output should contain "2020-09-24 09:14 The third entry finally"
|
|
||||||
When we run "jrnl --delete" and enter
|
|
||||||
N
|
|
||||||
N
|
|
||||||
Y
|
|
||||||
Then the error output should contain "3 entries found"
|
|
||||||
And the error output should contain "1 entry deleted"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Backing out of interactive delete does not change journal
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --delete -n 1" and enter
|
|
||||||
N
|
|
||||||
Then the error output should not contain "deleted"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Delete flag with nonsense input deletes nothing (issue #932)
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --delete asdfasdf"
|
|
||||||
Then the error output should contain "No entries to delete"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Delete flag with tag only deletes tagged entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --delete @ipsum" and enter
|
|
||||||
Y
|
|
||||||
Then the error output should contain "1 entry found"
|
|
||||||
Then the error output should contain "1 entry deleted"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Delete flag with multiple tags deletes all entries matching any of the tags
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --delete @ipsum @tagthree" and enter
|
|
||||||
Y
|
|
||||||
Y
|
|
||||||
Then the error output should contain "2 entries found"
|
|
||||||
And the error output should contain "2 entries deleted"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Delete flag with -and deletes boolean AND of tagged entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --delete -and @tagone @tagtwo" and enter
|
|
||||||
Y
|
|
||||||
Then the error output should contain "1 entry found"
|
|
||||||
And the error output should contain "1 entry deleted"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Delete flag with -not does not delete entries from given tag
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --delete @tagone -not @ipsum" and enter
|
|
||||||
Y
|
|
||||||
Then the error output should contain "1 entry found"
|
|
||||||
And the error output should contain "1 entry deleted"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Delete flag with -from search operator only deletes entries since that date
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --delete -from 2020-09-01" and enter
|
|
||||||
Y
|
|
||||||
Then the error output should contain "1 entry found"
|
|
||||||
And the error output should contain "1 entry deleted"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Delete flag with -to only deletes entries up to specified date
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --delete -to 2020-08-31" and enter
|
|
||||||
Y
|
|
||||||
Y
|
|
||||||
Then the error output should contain "2 entries found"
|
|
||||||
And the error output should contain "2 entries deleted"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Delete flag with -starred only deletes starred entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --delete -starred" and enter
|
|
||||||
Y
|
|
||||||
Then the error output should contain "1 entry deleted"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Delete flag with -contains only entries containing expression
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --delete -contains dignissim" and enter
|
|
||||||
Y
|
|
||||||
Then the error output should contain "1 entry found"
|
|
||||||
And the error output should contain "1 entry deleted"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
|
@ -1,105 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Encrypting and decrypting journals
|
|
||||||
|
|
||||||
Scenario: Decrypting a journal
|
|
||||||
Given we use the config "encrypted.yaml"
|
|
||||||
And we use the password "bad doggie no biscuit" if prompted
|
|
||||||
When we run "jrnl --decrypt"
|
|
||||||
Then the output should contain "Journal decrypted"
|
|
||||||
And the config for journal "default" should contain "encrypt: false"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2013-06-09 15:39 My first entry.
|
|
||||||
2013-06-10 15:40 Life is good.
|
|
||||||
|
|
||||||
|
|
||||||
@todo
|
|
||||||
Scenario: Trying to decrypt an already unencrypted journal
|
|
||||||
# This should warn the user that the journal is already encrypted
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl --decrypt"
|
|
||||||
Then the config for journal "default" should contain "encrypt: false"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2013-06-09 15:39 My first entry.
|
|
||||||
2013-06-10 15:40 Life is good.
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Trying to encrypt an already encrypted journal
|
|
||||||
Given we use the config "encrypted.yaml"
|
|
||||||
When we run "jrnl --encrypt" and enter "bad doggie no biscuit"
|
|
||||||
Then the output should contain "already encrypted. Create a new password."
|
|
||||||
Then we should be prompted for a password
|
|
||||||
|
|
||||||
Scenario Outline: Encrypting a journal
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl --encrypt" and enter
|
|
||||||
swordfish
|
|
||||||
swordfish
|
|
||||||
n
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "Journal encrypted"
|
|
||||||
And the config for journal "default" should contain "encrypt: true"
|
|
||||||
When we run "jrnl -n 1" and enter "swordfish"
|
|
||||||
Then we should be prompted for a password
|
|
||||||
And the output should contain "2013-06-10 15:40 Life is good"
|
|
||||||
|
|
||||||
Scenario: Encrypt journal twice and get prompted each time
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
And we don't have a keyring
|
|
||||||
When we run "jrnl --encrypt" and enter
|
|
||||||
swordfish
|
|
||||||
swordfish
|
|
||||||
y
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "Journal encrypted"
|
|
||||||
When we run "jrnl --encrypt" and enter
|
|
||||||
swordfish
|
|
||||||
tuna
|
|
||||||
tuna
|
|
||||||
y
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "Journal default is already encrypted. Create a new password."
|
|
||||||
And we should be prompted for a password
|
|
||||||
And the config for journal "default" should contain "encrypt: true"
|
|
||||||
|
|
||||||
Scenario: Encrypt journal twice and get prompted each time with keyring
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
And we have a keyring
|
|
||||||
When we run "jrnl --encrypt" and enter
|
|
||||||
swordfish
|
|
||||||
swordfish
|
|
||||||
y
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "Journal encrypted"
|
|
||||||
When we run "jrnl --encrypt" and enter
|
|
||||||
tuna
|
|
||||||
tuna
|
|
||||||
y
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "Journal default is already encrypted. Create a new password."
|
|
||||||
And we should be prompted for a password
|
|
||||||
And the config for journal "default" should contain "encrypt: true"
|
|
||||||
|
|
||||||
Scenario Outline: Running jrnl with encrypt: true on unencryptable journals
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --config-override encrypt true here is a new entry"
|
|
||||||
Then the error output should contain "journal can't be encrypted"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Attempt to encrypt a folder or DayOne journal should result in an error
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --encrypt"
|
|
||||||
Then the error output should contain "can't be encrypted"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
|
@ -1,75 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Journals iteracting with the file system in a way that users can see
|
|
||||||
|
|
||||||
Scenario: Adding entries to a Folder journal should generate date files
|
|
||||||
Given we use the config "empty_folder.yaml"
|
|
||||||
When we run "jrnl 23 July 2013: Testing folder journal."
|
|
||||||
Then we should get no error
|
|
||||||
And the journal directory should contain
|
|
||||||
2013/07/23.txt
|
|
||||||
|
|
||||||
Scenario: Adding multiple entries to a Folder journal should generate multiple date files
|
|
||||||
Given we use the config "empty_folder.yaml"
|
|
||||||
When we run "jrnl 23 July 2013: Testing folder journal."
|
|
||||||
And we run "jrnl 3/7/2014: Second entry of journal."
|
|
||||||
Then we should get no error
|
|
||||||
And the journal directory should contain
|
|
||||||
2013/07/23.txt
|
|
||||||
|
|
||||||
Scenario: If the journal and its parent directory don't exist, they should be created
|
|
||||||
Given we use the config "missing_directory.yaml"
|
|
||||||
Then the journal should not exist
|
|
||||||
When we run "jrnl This is a new entry in my journal"
|
|
||||||
Then the journal should exist
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should contain "This is a new entry in my journal"
|
|
||||||
|
|
||||||
Scenario: If the journal file doesn't exist, then it should be created
|
|
||||||
Given we use the config "missing_journal.yaml"
|
|
||||||
Then the journal should not exist
|
|
||||||
When we run "jrnl This is a new entry in my journal"
|
|
||||||
Then the journal should exist
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should contain "This is a new entry in my journal"
|
|
||||||
|
|
||||||
@on_posix
|
|
||||||
Scenario: If the directory for a Folder journal ending in a slash ('/') doesn't exist, then it should be created
|
|
||||||
Given we use the config "missing_directory.yaml"
|
|
||||||
Then the journal "endslash" directory should not exist
|
|
||||||
When we run "jrnl endslash This is a new entry in my journal"
|
|
||||||
Then the journal "endslash" directory should exist
|
|
||||||
When we run "jrnl endslash -1"
|
|
||||||
Then the output should contain "This is a new entry in my journal"
|
|
||||||
|
|
||||||
@on_win
|
|
||||||
Scenario: If the directory for a Folder journal ending in a backslash ('\') doesn't exist, then it should be created
|
|
||||||
Given we use the config "missing_directory.yaml"
|
|
||||||
Then the journal "endbackslash" directory should not exist
|
|
||||||
When we run "jrnl endbackslash This is a new entry in my journal"
|
|
||||||
Then the journal "endbackslash" directory should exist
|
|
||||||
When we run "jrnl endbackslash -1"
|
|
||||||
Then the output should contain "This is a new entry in my journal"
|
|
||||||
|
|
||||||
Scenario: Creating journal with relative path should update to absolute path
|
|
||||||
Given we use no config
|
|
||||||
When we run "jrnl hello world" and enter
|
|
||||||
test.txt
|
|
||||||
n
|
|
||||||
\n
|
|
||||||
Then the output should contain "Journal 'default' created"
|
|
||||||
When we change directory to "subfolder"
|
|
||||||
And we run "jrnl -n 1"
|
|
||||||
Then the output should contain "hello world"
|
|
||||||
|
|
||||||
Scenario: the temporary filename suffix should default to ".jrnl"
|
|
||||||
Given we use the config "editor.yaml"
|
|
||||||
When we run "jrnl --edit"
|
|
||||||
Then the editor should have been called
|
|
||||||
Then the editor filename should end with ".jrnl"
|
|
||||||
|
|
||||||
Scenario: the temporary filename suffix should be "-{template_filename}"
|
|
||||||
Given we use the config "editor_markdown_extension.yaml"
|
|
||||||
When we run "jrnl --edit"
|
|
||||||
Then the editor filename should end with "-extension.md"
|
|
|
@ -1,631 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Custom formats
|
|
||||||
|
|
||||||
Scenario Outline: Short printing via --format flag
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --format short -3"
|
|
||||||
Then we should get no error
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Pretty Printing aka the Default
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --format pretty -3"
|
|
||||||
Then we should get no error
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: JSON format
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --format json"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should be valid JSON
|
|
||||||
Given we parse the output as JSON
|
|
||||||
Then "entries" in the parsed output should have 3 elements
|
|
||||||
And "tags" in the parsed output should be
|
|
||||||
@ipsum
|
|
||||||
@tagone
|
|
||||||
@tagtwo
|
|
||||||
@tagthree
|
|
||||||
And "entries.0.tags" in the parsed output should have 3 elements
|
|
||||||
And "entries.1.tags" in the parsed output should have 1 elements
|
|
||||||
And "entries.2.tags" in the parsed output should have 2 elements
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario: Exporting dayone to json should include UUID
|
|
||||||
Given we use the config "dayone.yaml"
|
|
||||||
When we run "jrnl --export json"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should be valid JSON
|
|
||||||
Given we parse the output as JSON
|
|
||||||
Then "entries.0.uuid" in the parsed output should be
|
|
||||||
4BB1F46946AD439996C9B59DE7C4DDC1
|
|
||||||
|
|
||||||
Scenario Outline: Printing a journal that has multiline entries with tags
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -n 1 @ipsum"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
| Lorem @ipsum dolor sit amet, consectetur adipiscing elit. Praesent malesuada
|
|
||||||
| quis est ac dignissim. Aliquam dignissim rutrum pretium. Phasellus
|
|
||||||
| pellentesque
|
|
||||||
| augue et venenatis facilisis. Suspendisse potenti. Sed dignissim sed nisl eu
|
|
||||||
| consequat. Aenean ante ex, elementum ut interdum et, mattis eget lacus. In
|
|
||||||
| commodo nulla nec tellus placerat, sed ultricies metus bibendum. Duis eget
|
|
||||||
| venenatis erat. In at dolor dui. @tagone and maybe also @tagtwo.
|
|
||||||
|
|
|
||||||
| Curabitur accumsan nunc ac neque tristique, eleifend faucibus justo
|
|
||||||
| ullamcorper. Suspendisse at mattis nunc. Nullam eget lacinia urna. Suspendisse
|
|
||||||
| potenti. Ut urna est, venenatis sed ante in, ultrices congue mi. Maecenas eget
|
|
||||||
| molestie metus. Mauris porttitor dui ornare gravida porta. Quisque sed lectus
|
|
||||||
| hendrerit, lacinia ante eget, vulputate ante. Aliquam vitae erat non felis
|
|
||||||
| feugiat sagittis. Phasellus quis arcu fringilla, mattis ligula id, vestibulum
|
|
||||||
| urna. Vivamus facilisis leo a mi tincidunt condimentum. Donec eu euismod enim.
|
|
||||||
| Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam eu ligula eget
|
|
||||||
| velit scelerisque fringilla. Phasellus pharetra justo et nulla fringilla, ac
|
|
||||||
| porta sapien accumsan. Class aptent taciti sociosqu ad litora torquent per
|
|
||||||
| conubia nostra, per inceptos himenaeos.
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Exporting using filters should only export parts of the journal
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -until 'August 2020' --format json"
|
|
||||||
Then the output should be valid JSON
|
|
||||||
Then we should get no error
|
|
||||||
And the output should be valid JSON
|
|
||||||
Given we parse the output as JSON
|
|
||||||
Then "entries" in the parsed output should have 2 elements
|
|
||||||
And "tags" in the parsed output should be
|
|
||||||
@ipsum
|
|
||||||
@tagone
|
|
||||||
@tagtwo
|
|
||||||
And "entries.0.tags" in the parsed output should have 3 elements
|
|
||||||
And "entries.1.tags" in the parsed output should have 1 elements
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Increasing Headings on Markdown export
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
Given we append to the editor if opened
|
|
||||||
[2021-10-14 13:23] Heading Test
|
|
||||||
|
|
||||||
H1-1
|
|
||||||
=
|
|
||||||
|
|
||||||
H1-2
|
|
||||||
===
|
|
||||||
|
|
||||||
H1-3
|
|
||||||
============================
|
|
||||||
|
|
||||||
H2-1
|
|
||||||
-
|
|
||||||
|
|
||||||
H2-2
|
|
||||||
---
|
|
||||||
|
|
||||||
H2-3
|
|
||||||
----------------------------------
|
|
||||||
|
|
||||||
Horizontal Rules (ignore)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
===
|
|
||||||
|
|
||||||
# ATX H1
|
|
||||||
|
|
||||||
## ATX H2
|
|
||||||
|
|
||||||
### ATX H3
|
|
||||||
|
|
||||||
#### ATX H4
|
|
||||||
|
|
||||||
##### ATX H5
|
|
||||||
|
|
||||||
###### ATX H6
|
|
||||||
|
|
||||||
Stuff
|
|
||||||
|
|
||||||
More stuff
|
|
||||||
more stuff again
|
|
||||||
When we run "jrnl --edit -1"
|
|
||||||
Then the editor should have been called
|
|
||||||
When we run "jrnl -1 --export markdown"
|
|
||||||
Then the output should be
|
|
||||||
# 2021
|
|
||||||
|
|
||||||
## October
|
|
||||||
|
|
||||||
### 2021-10-14 13:23 Heading Test
|
|
||||||
|
|
||||||
#### H1-1
|
|
||||||
|
|
||||||
#### H1-2
|
|
||||||
|
|
||||||
#### H1-3
|
|
||||||
|
|
||||||
##### H2-1
|
|
||||||
|
|
||||||
##### H2-2
|
|
||||||
|
|
||||||
##### H2-3
|
|
||||||
|
|
||||||
Horizontal Rules (ignore)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
===
|
|
||||||
|
|
||||||
#### ATX H1
|
|
||||||
|
|
||||||
##### ATX H2
|
|
||||||
|
|
||||||
###### ATX H3
|
|
||||||
|
|
||||||
####### ATX H4
|
|
||||||
|
|
||||||
######## ATX H5
|
|
||||||
|
|
||||||
######### ATX H6
|
|
||||||
|
|
||||||
Stuff
|
|
||||||
|
|
||||||
More stuff
|
|
||||||
more stuff again
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
@skip
|
|
||||||
Scenario Outline: Exporting to XML
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --export xml"
|
|
||||||
Then the output should be a valid XML string
|
|
||||||
And "entries" in the xml output should have 3 elements
|
|
||||||
And "tags" in the xml output should contain
|
|
||||||
@ipsum
|
|
||||||
@tagone
|
|
||||||
@tagtwo
|
|
||||||
@tagthree
|
|
||||||
And there should be 10 "tag" elements
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario: Exporting to XML single
|
|
||||||
Given we use the config "tags.yaml"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --export xml"
|
|
||||||
Then the output should be valid XML
|
|
||||||
Given we parse the output as XML
|
|
||||||
Then "entries" in the parsed output should have 2 elements
|
|
||||||
And "tags" in the parsed output should be
|
|
||||||
@idea
|
|
||||||
@journal
|
|
||||||
@dan
|
|
||||||
And there should be 7 "tag" elements
|
|
||||||
|
|
||||||
Scenario Outline: Exporting tags
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --export tags"
|
|
||||||
Then the output should be
|
|
||||||
@tagtwo : 2
|
|
||||||
@tagone : 2
|
|
||||||
@tagthree : 1
|
|
||||||
@ipsum : 1
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Export fancy with small linewrap
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --config-override linewrap 35 --format fancy -3"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should be 35 columns wide
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
|
|
||||||
@todo
|
|
||||||
Scenario Outline: Exporting fancy
|
|
||||||
# Needs better emoji support
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --export fancy"
|
|
||||||
Then the output should be
|
|
||||||
┎──────────────────────────────────────────────────────────────╮2020-08-29 11:11
|
|
||||||
┃ Entry the first. ╘═══════════════╕
|
|
||||||
┠╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┤
|
|
||||||
┃ Lorem @ipsum dolor sit amet, consectetur adipiscing elit. Praesent malesuada │
|
|
||||||
┃ quis est ac dignissim. Aliquam dignissim rutrum pretium. Phasellus │
|
|
||||||
┃ pellentesque │
|
|
||||||
┃ augue et venenatis facilisis. Suspendisse potenti. Sed dignissim sed nisl eu │
|
|
||||||
┃ consequat. Aenean ante ex, elementum ut interdum et, mattis eget lacus. In │
|
|
||||||
┃ commodo nulla nec tellus placerat, sed ultricies metus bibendum. Duis eget │
|
|
||||||
┃ venenatis erat. In at dolor dui. @tagone and maybe also @tagtwo. │
|
|
||||||
┃ │
|
|
||||||
┃ Curabitur accumsan nunc ac neque tristique, eleifend faucibus justo │
|
|
||||||
┃ ullamcorper. Suspendisse at mattis nunc. Nullam eget lacinia urna. │
|
|
||||||
┃ Suspendisse │
|
|
||||||
┃ potenti. Ut urna est, venenatis sed ante in, ultrices congue mi. Maecenas │
|
|
||||||
┃ eget │
|
|
||||||
┃ molestie metus. Mauris porttitor dui ornare gravida porta. Quisque sed │
|
|
||||||
┃ lectus │
|
|
||||||
┃ hendrerit, lacinia ante eget, vulputate ante. Aliquam vitae erat non felis │
|
|
||||||
┃ feugiat sagittis. Phasellus quis arcu fringilla, mattis ligula id, │
|
|
||||||
┃ vestibulum │
|
|
||||||
┃ urna. Vivamus facilisis leo a mi tincidunt condimentum. Donec eu euismod │
|
|
||||||
┃ enim. │
|
|
||||||
┃ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam eu ligula eget │
|
|
||||||
┃ velit scelerisque fringilla. Phasellus pharetra justo et nulla fringilla, ac │
|
|
||||||
┃ porta sapien accumsan. Class aptent taciti sociosqu ad litora torquent per │
|
|
||||||
┃ conubia nostra, per inceptos himenaeos. │
|
|
||||||
┖──────────────────────────────────────────────────────────────────────────────┘
|
|
||||||
┎──────────────────────────────────────────────────────────────╮2020-08-31 14:32
|
|
||||||
┃ A second entry in what I hope to be a long series. ╘═══════════════╕
|
|
||||||
┠╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┤
|
|
||||||
┃ Sed sit amet metus et sapien feugiat elementum. Aliquam bibendum lobortis │
|
|
||||||
┃ leo │
|
|
||||||
┃ vitae tempus. Donec eleifend nec mi non volutpat. Lorem ipsum dolor sit │
|
|
||||||
┃ amet, │
|
|
||||||
┃ consectetur adipiscing elit. Praesent ut sodales libero. Maecenas nisl │
|
|
||||||
┃ lorem, │
|
|
||||||
┃ vestibulum in tempus sit amet, fermentum ut arcu. Donec vel vestibulum │
|
|
||||||
┃ lectus, │
|
|
||||||
┃ eget pretium enim. Maecenas diam nunc, imperdiet vitae pharetra sed, pretium │
|
|
||||||
┃ id │
|
|
||||||
┃ lectus. Donec eu metus et turpis tempor tristique ac non ex. In tellus arcu, │
|
|
||||||
┃ egestas at efficitur et, ultrices vel est. Sed commodo et nibh non │
|
|
||||||
┃ elementum. │
|
|
||||||
┃ Mauris tempus vitae neque vel viverra. @tagtwo all by its lonesome. │
|
|
||||||
┃ │
|
|
||||||
┃ Nulla mattis elementum magna, viverra pretium dui fermentum et. Cras vel │
|
|
||||||
┃ vestibulum odio. Quisque sit amet turpis et urna finibus maximus. Interdum │
|
|
||||||
┃ et │
|
|
||||||
┃ malesuada fames ac ante ipsum primis in faucibus. Fusce porttitor iaculis │
|
|
||||||
┃ sem, │
|
|
||||||
┃ non dictum ipsum varius nec. Nulla eu erat at risus gravida blandit non vel │
|
|
||||||
┃ ante. Nam egestas ipsum leo, eu ultricies ipsum tincidunt vel. Morbi a │
|
|
||||||
┃ commodo │
|
|
||||||
┃ eros. │
|
|
||||||
┃ │
|
|
||||||
┃ Nullam dictum, nisl ac varius tempus, ex tortor fermentum nisl, non │
|
|
||||||
┃ tempus dolor neque a lorem. Suspendisse a faucibus ex, vel ornare tortor. │
|
|
||||||
┃ Maecenas tincidunt id felis quis semper. Pellentesque enim libero, fermentum │
|
|
||||||
┃ quis metus id, rhoncus euismod magna. Nulla finibus velit eu purus bibendum │
|
|
||||||
┃ interdum. Integer id justo dui. Integer eu tellus in turpis bibendum │
|
|
||||||
┃ blandit. │
|
|
||||||
┃ Quisque auctor lacinia consectetur. │
|
|
||||||
┖──────────────────────────────────────────────────────────────────────────────┘
|
|
||||||
┎──────────────────────────────────────────────────────────────╮2020-09-24 09:14
|
|
||||||
┃ The third entry finally after weeks without writing. ╘═══════════════╕
|
|
||||||
┠╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┤
|
|
||||||
┃ I'm so excited about emojis. 💯 🎶 💩 │
|
|
||||||
┃ │
|
|
||||||
┃ Donec semper pellentesque iaculis. Nullam cursus et justo sit amet │
|
|
||||||
┃ venenatis. │
|
|
||||||
┃ Vivamus tempus ex dictum metus vehicula gravida. Aliquam sed sem dolor. │
|
|
||||||
┃ Nulla │
|
|
||||||
┃ eget ultrices purus. Quisque at nunc at quam pharetra consectetur vitae quis │
|
|
||||||
┃ dolor. Fusce ultricies purus eu est feugiat, quis scelerisque nibh │
|
|
||||||
┃ malesuada. │
|
|
||||||
┃ Quisque egestas semper nibh in hendrerit. Nam finibus ex in mi mattis │
|
|
||||||
┃ vulputate. Sed mauris urna, consectetur in justo eu, volutpat accumsan │
|
|
||||||
┃ justo. │
|
|
||||||
┃ Phasellus aliquam lacus placerat convallis vestibulum. Curabitur maximus at │
|
|
||||||
┃ ante eget fringilla. @tagthree and also @tagone │
|
|
||||||
┖──────────────────────────────────────────────────────────────────────────────┘
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
@skip_win
|
|
||||||
Scenario Outline: Export to yaml
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
And we create a cache directory
|
|
||||||
When we run "jrnl --format yaml --file {cache_dir}"
|
|
||||||
Then the cache directory should contain the files
|
|
||||||
2020-08-29_entry-the-first.md
|
|
||||||
2020-08-31_a-second-entry-in-what-i-hope-to-be-a-long-series.md
|
|
||||||
2020-09-24_the-third-entry-finally-after-weeks-without-writing.md
|
|
||||||
|
|
||||||
And the content of file "2020-08-29_entry-the-first.md" in the cache should be
|
|
||||||
---
|
|
||||||
title: Entry the first.
|
|
||||||
date: 2020-08-29 11:11
|
|
||||||
starred: False
|
|
||||||
tags: tagone, ipsum, tagtwo
|
|
||||||
body: |
|
|
||||||
Lorem @ipsum dolor sit amet, consectetur adipiscing elit. Praesent malesuada
|
|
||||||
quis est ac dignissim. Aliquam dignissim rutrum pretium. Phasellus pellentesque
|
|
||||||
augue et venenatis facilisis. Suspendisse potenti. Sed dignissim sed nisl eu
|
|
||||||
consequat. Aenean ante ex, elementum ut interdum et, mattis eget lacus. In
|
|
||||||
commodo nulla nec tellus placerat, sed ultricies metus bibendum. Duis eget
|
|
||||||
venenatis erat. In at dolor dui. @tagone and maybe also @tagtwo.
|
|
||||||
|
|
||||||
Curabitur accumsan nunc ac neque tristique, eleifend faucibus justo
|
|
||||||
ullamcorper. Suspendisse at mattis nunc. Nullam eget lacinia urna. Suspendisse
|
|
||||||
potenti. Ut urna est, venenatis sed ante in, ultrices congue mi. Maecenas eget
|
|
||||||
molestie metus. Mauris porttitor dui ornare gravida porta. Quisque sed lectus
|
|
||||||
hendrerit, lacinia ante eget, vulputate ante. Aliquam vitae erat non felis
|
|
||||||
feugiat sagittis. Phasellus quis arcu fringilla, mattis ligula id, vestibulum
|
|
||||||
urna. Vivamus facilisis leo a mi tincidunt condimentum. Donec eu euismod enim.
|
|
||||||
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam eu ligula eget
|
|
||||||
velit scelerisque fringilla. Phasellus pharetra justo et nulla fringilla, ac
|
|
||||||
porta sapien accumsan. Class aptent taciti sociosqu ad litora torquent per
|
|
||||||
conubia nostra, per inceptos himenaeos.
|
|
||||||
...
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Exporting YAML to nonexistent directory leads to user-friendly error with no traceback
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --export yaml --file nonexistent_dir"
|
|
||||||
Then the output should contain "YAML export must be to a directory"
|
|
||||||
And the output should not contain "Traceback"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
@skip_win # @todo YAML exporter does not correctly export emoji on Windows
|
|
||||||
Scenario Outline: Add a blank line to YAML export if there isn't one already
|
|
||||||
# https://github.com/jrnl-org/jrnl/issues/768
|
|
||||||
# https://github.com/jrnl-org/jrnl/issues/881
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
And we create a cache directory
|
|
||||||
When we run "jrnl --export yaml -o {cache_dir}"
|
|
||||||
Then the cache should contain the files
|
|
||||||
2020-08-29_entry-the-first.md
|
|
||||||
2020-08-31_a-second-entry-in-what-i-hope-to-be-a-long-series.md
|
|
||||||
2020-09-24_the-third-entry-finally-after-weeks-without-writing.md
|
|
||||||
And the content of file "2020-09-24_the-third-entry-finally-after-weeks-without-writing.md" in the cache should be
|
|
||||||
---
|
|
||||||
title: The third entry finally after weeks without writing.
|
|
||||||
date: 2020-09-24 09:14
|
|
||||||
starred: False
|
|
||||||
tags: tagone, tagthree
|
|
||||||
body: |
|
|
||||||
I'm so excited about emojis. 💯 🎶 💩
|
|
||||||
|
|
||||||
Donec semper pellentesque iaculis. Nullam cursus et justo sit amet venenatis.
|
|
||||||
Vivamus tempus ex dictum metus vehicula gravida. Aliquam sed sem dolor. Nulla
|
|
||||||
eget ultrices purus. Quisque at nunc at quam pharetra consectetur vitae quis
|
|
||||||
dolor. Fusce ultricies purus eu est feugiat, quis scelerisque nibh malesuada.
|
|
||||||
Quisque egestas semper nibh in hendrerit. Nam finibus ex in mi mattis
|
|
||||||
vulputate. Sed mauris urna, consectetur in justo eu, volutpat accumsan justo.
|
|
||||||
Phasellus aliquam lacus placerat convallis vestibulum. Curabitur maximus at
|
|
||||||
ante eget fringilla. @tagthree and also @tagone
|
|
||||||
...
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
Scenario: Empty DayOne entry bodies should not error
|
|
||||||
# https://github.com/jrnl-org/jrnl/issues/780
|
|
||||||
Given we use the config "bug780.yaml"
|
|
||||||
When we run "jrnl --short"
|
|
||||||
Then we should get no error
|
|
||||||
|
|
||||||
Scenario Outline: --short displays the short version of entries (only the title)
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -on 2020-08-31 --short"
|
|
||||||
Then the output should be "2020-08-31 14:32 A second entry in what I hope to be a long series."
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: -s displays the short version of entries (only the title)
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -on 2020-08-31 -s"
|
|
||||||
Then the output should be "2020-08-31 14:32 A second entry in what I hope to be a long series."
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario: Markdown Support from config file
|
|
||||||
Given we use the config "format_md.yaml"
|
|
||||||
When we run "jrnl -n 1"
|
|
||||||
Then the output should be
|
|
||||||
# 2013
|
|
||||||
|
|
||||||
## June
|
|
||||||
|
|
||||||
### 2013-06-10 15:40 Life is good.
|
|
||||||
|
|
||||||
But I'm better.
|
|
||||||
|
|
||||||
Scenario: Text Formatter from config file
|
|
||||||
Given we use the config "format_text.yaml"
|
|
||||||
When we run "jrnl -n 1"
|
|
||||||
Then the output should be
|
|
||||||
[2013-06-10 15:40] Life is good.
|
|
||||||
But I'm better.
|
|
||||||
|
|
||||||
Scenario Outline: Exporting entries with Cyrillic characters to directory should not fail
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
And we create a cache directory
|
|
||||||
When we run "jrnl 2020-11-21: Первая"
|
|
||||||
When we run "jrnl --format md --file {cache_dir} -on 2020-11-21"
|
|
||||||
Then the cache should contain the files
|
|
||||||
2020-11-21_первая.md
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Export date counts
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl 2020-08-31 01:01: Hi."
|
|
||||||
And we run "jrnl --format dates"
|
|
||||||
Then the output should be
|
|
||||||
2020-08-29, 1
|
|
||||||
2020-08-31, 2
|
|
||||||
2020-09-24, 1
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: display_format short and pretty do not crash if specified as config values
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --config-override display_format short -1"
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl --config-override display_format pretty -1"
|
|
||||||
Then we should get no error
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario: Export entries in markdown format with a title longer than max file name length.
|
|
||||||
Given we use the config "basic_onefile.yaml"
|
|
||||||
And we create a cache directory
|
|
||||||
When we run "jrnl 2022-07-31 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua Laoreet id donec ultrices tincidunt arcu Dolor sit amet consectetur adipiscing elit duis tristique sollicitudin Ut pharetra sit amet aliquam id diam maecenas Habitasse platea dictumst quisque sagittis Aliquam purus sit amet luctus venenatis lectus magna Aenean sed adipiscing diam donec adipiscing tristique risus nec feugiat Diam vel quam elementum pulvinar etiam non Odio ut enim blandit volutpat maecenas volutpat Lacus vestibulum sed arcu non odio euismod lacinia at quis. Pretium nibh ipsum consequat nisl."
|
|
||||||
When we run "jrnl 2022-07-31 Magna fermentum iaculis eu non diam phasellus Non pulvinar neque laoreet suspendisse interdum consectetur libero id Scelerisque felis imperdiet proin fermentum leo Eu ultrices vitae auctor eu augue ut lectus Bibendum arcu vitae elementum curabitur vitae nunc sed Tincidunt tortor aliquam nulla facilisi cras fermentum Malesuada nunc vel risus commodo viverra maecenas accumsan lacus vel Non sodales neque sodales ut Enim nulla aliquet porttitor lacus luctus accumsan Volutpat blandit aliquam etiam erat velit scelerisque in dictum non Egestas fringilla phasellus faucibus scelerisque At risus viverra adipiscing at in tellus integer feugiat scelerisque Eget velit aliquet sagittis id consectetur purus ut Imperdiet nulla malesuada pellentesque elit eget gravida cum sociis Lacus vestibulum sed arcu non odio euismod lacinia at Elit pellentesque habitant morbi tristique Vestibulum lorem sed risus ultricies Integer eget aliquet nibh praesent tristique magna sit amet purus Quisque id diam vel quam elementum pulvinar etiam non quam Nisi scelerisque eu ultrices vitae auctor eu augue. Malesuada fames ac turpis egestas integer eget aliquet."
|
|
||||||
When we run "jrnl --format markdown --file {cache_dir}"
|
|
||||||
Then the cache directory should contain 5 files
|
|
||||||
And we should get no error
|
|
||||||
|
|
||||||
Scenario: Export entries in text format with a title longer than max file name length.
|
|
||||||
Given we use the config "basic_onefile.yaml"
|
|
||||||
And we create a cache directory
|
|
||||||
When we run "jrnl 2022-07-31 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua Laoreet id donec ultrices tincidunt arcu Dolor sit amet consectetur adipiscing elit duis tristique sollicitudin Ut pharetra sit amet aliquam id diam maecenas Habitasse platea dictumst quisque sagittis Aliquam purus sit amet luctus venenatis lectus magna Aenean sed adipiscing diam donec adipiscing tristique risus nec feugiat Diam vel quam elementum pulvinar etiam non Odio ut enim blandit volutpat maecenas volutpat Lacus vestibulum sed arcu non odio euismod lacinia at quis. Pretium nibh ipsum consequat nisl."
|
|
||||||
When we run "jrnl 2022-07-31 Magna fermentum iaculis eu non diam phasellus Non pulvinar neque laoreet suspendisse interdum consectetur libero id Scelerisque felis imperdiet proin fermentum leo Eu ultrices vitae auctor eu augue ut lectus Bibendum arcu vitae elementum curabitur vitae nunc sed Tincidunt tortor aliquam nulla facilisi cras fermentum Malesuada nunc vel risus commodo viverra maecenas accumsan lacus vel Non sodales neque sodales ut Enim nulla aliquet porttitor lacus luctus accumsan Volutpat blandit aliquam etiam erat velit scelerisque in dictum non Egestas fringilla phasellus faucibus scelerisque At risus viverra adipiscing at in tellus integer feugiat scelerisque Eget velit aliquet sagittis id consectetur purus ut Imperdiet nulla malesuada pellentesque elit eget gravida cum sociis Lacus vestibulum sed arcu non odio euismod lacinia at Elit pellentesque habitant morbi tristique Vestibulum lorem sed risus ultricies Integer eget aliquet nibh praesent tristique magna sit amet purus Quisque id diam vel quam elementum pulvinar etiam non quam Nisi scelerisque eu ultrices vitae auctor eu augue. Malesuada fames ac turpis egestas integer eget aliquet."
|
|
||||||
When we run "jrnl --format text --file {cache_dir}"
|
|
||||||
Then the cache directory should contain 5 files
|
|
||||||
And we should get no error
|
|
||||||
|
|
||||||
Scenario: Export journal list to multiple formats.
|
|
||||||
Given we use the config "basic_onefile.yaml"
|
|
||||||
When we run "jrnl --list"
|
|
||||||
Then the output should match
|
|
||||||
Journals defined in config \(.+basic_onefile\.yaml\)
|
|
||||||
\* default -> features/journals/basic_onefile\.journal
|
|
||||||
When we run "jrnl --list --format json"
|
|
||||||
Then the output should match
|
|
||||||
{"config_path": ".+basic_onefile\.yaml", "journals": {"default": "features/journals/basic_onefile\.journal"}}
|
|
||||||
When we run "jrnl --list --format yaml"
|
|
||||||
Then the output should match
|
|
||||||
config_path: .+basic_onefile\.yaml
|
|
||||||
journals:
|
|
||||||
default: features/journals/basic_onefile\.journal
|
|
||||||
|
|
||||||
Scenario: Export journal list to formats with no default journal
|
|
||||||
Given we use the config "no_default_journal.yaml"
|
|
||||||
When we run "jrnl --list"
|
|
||||||
Then the output should match
|
|
||||||
Journals defined in config \(.+no_default_journal\.yaml\)
|
|
||||||
\* simple -> features/journals/simple\.journal
|
|
||||||
\* work -> features/journals/work\.journal
|
|
||||||
When we run "jrnl --list --format json"
|
|
||||||
Then the output should match
|
|
||||||
{"config_path": ".+no_default_journal\.yaml", "journals": {"simple": "features/journals/simple\.journal", "work": "features/journals/work\.journal"}}
|
|
||||||
When we run "jrnl --list --format yaml"
|
|
||||||
Then the output should match
|
|
||||||
config_path: .+no_default_journal\.yaml
|
|
||||||
journals:
|
|
||||||
simple: features/journals/simple\.journal
|
|
||||||
work: features/journals/work\.journal
|
|
|
@ -1,91 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Importing data
|
|
||||||
|
|
||||||
Scenario Outline: --import allows new entry from stdin
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --import" and pipe "[2020-07-05 15:00] Observe and import."
|
|
||||||
When we run "jrnl -9 --short"
|
|
||||||
Then the output should contain "Observe and import"
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
Scenario Outline: --import allows new large entry from stdin
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --import" and pipe
|
|
||||||
[2020-07-05 15:00] Observe and import.
|
|
||||||
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent malesuada quis
|
|
||||||
est ac dignissim. Aliquam dignissim rutrum pretium. Phasellus pellentesque augue
|
|
||||||
et venenatis facilisis. Suspendisse potenti. Sed dignissim sed nisl eu consequat.
|
|
||||||
Aenean ante ex, elementum ut interdum et, mattis eget lacus. In commodo nulla nec
|
|
||||||
tellus placerat, sed ultricies metus bibendum. Duis eget venenatis erat. In at
|
|
||||||
dolor dui end of entry.
|
|
||||||
When we run "jrnl -on 2020-07-05"
|
|
||||||
Then the output should contain "2020-07-05 15:00 Observe and import."
|
|
||||||
And the output should contain "Lorem ipsum"
|
|
||||||
And the output should contain "end of entry."
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
Scenario Outline: --import allows multiple new entries from stdin
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --import" and pipe
|
|
||||||
[2020-07-05 15:00] Observe and import.
|
|
||||||
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
|
|
||||||
|
|
||||||
[2020-07-05 15:01] Twice as nice.
|
|
||||||
Sed dignissim sed nisl eu consequat.
|
|
||||||
When we run "jrnl -on 2020-07-05"
|
|
||||||
Then the output should contain "2020-07-05 15:00 Observe and import."
|
|
||||||
And the output should contain "Lorem ipsum"
|
|
||||||
And the output should contain "2020-07-05 15:01 Twice as nice."
|
|
||||||
And the output should contain "Sed dignissim"
|
|
||||||
|
|
||||||
Examples: Configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
# | basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
Scenario: --import allows import new entries from file
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl -99"
|
|
||||||
Then the output should contain "My first entry."
|
|
||||||
And the output should contain "Life is good."
|
|
||||||
But the output should not contain "I have an @idea"
|
|
||||||
And the output should not contain "I met with"
|
|
||||||
When we run "jrnl --import --file features/journals/tags.journal"
|
|
||||||
And we run "jrnl -99"
|
|
||||||
Then the output should contain "My first entry."
|
|
||||||
And the output should contain "Life is good."
|
|
||||||
And the output should contain "PROFIT!"
|
|
||||||
|
|
||||||
Scenario: --import prioritizes --file over pipe data if both are given
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl -99"
|
|
||||||
Then the output should contain "My first entry."
|
|
||||||
And the output should contain "Life is good."
|
|
||||||
But the output should not contain "I have an @idea"
|
|
||||||
And the output should not contain "I met with"
|
|
||||||
When we run "jrnl --import --file features/journals/tags.journal" and pipe
|
|
||||||
[2020-07-05 15:00] I should not exist!
|
|
||||||
And we run "jrnl -99"
|
|
||||||
Then the output should contain "My first entry."
|
|
||||||
And the output should contain "PROFIT!"
|
|
||||||
But the output should not contain "I should not exist!"
|
|
||||||
|
|
|
@ -1,97 +0,0 @@
|
||||||
Feature: Installing jrnl
|
|
||||||
|
|
||||||
Scenario: Install jrnl with default options
|
|
||||||
Given we use no config
|
|
||||||
When we run "jrnl hello world" and enter
|
|
||||||
\n
|
|
||||||
\n
|
|
||||||
\n
|
|
||||||
Then the output should contain "jrnl configuration created at"
|
|
||||||
And the output should contain "For advanced features, read the docs at https://jrnl.sh"
|
|
||||||
And the output should contain "Journal 'default' created"
|
|
||||||
And the default journal "journal.txt" should be in the "." directory
|
|
||||||
And the config should contain "encrypt: false"
|
|
||||||
And the version in the config file should be up-to-date
|
|
||||||
|
|
||||||
Scenario: Install jrnl with custom relative default journal path
|
|
||||||
Given we use no config
|
|
||||||
When we run "jrnl hello world" and enter
|
|
||||||
default/custom.txt
|
|
||||||
n
|
|
||||||
\n
|
|
||||||
Then the output should contain "Journal 'default' created"
|
|
||||||
And the default journal "custom.txt" should be in the "default" directory
|
|
||||||
And the config should contain "encrypt: false"
|
|
||||||
And the version in the config file should be up-to-date
|
|
||||||
|
|
||||||
Scenario: Install jrnl with custom expanded default journal path
|
|
||||||
Given we use no config
|
|
||||||
And the home directory is called "home"
|
|
||||||
When we run "jrnl hello world" and enter
|
|
||||||
~/custom.txt
|
|
||||||
n
|
|
||||||
\n
|
|
||||||
Then the output should contain "Journal 'default' created"
|
|
||||||
And the default journal "custom.txt" should be in the "home" directory
|
|
||||||
And the config should contain "encrypt: false"
|
|
||||||
And the version in the config file should be up-to-date
|
|
||||||
|
|
||||||
Scenario: Install jrnl with encrypted default journal
|
|
||||||
Given we use no config
|
|
||||||
When we run "jrnl hello world" and enter
|
|
||||||
encrypted.txt
|
|
||||||
y
|
|
||||||
\n
|
|
||||||
Then the output should contain "Journal will be encrypted"
|
|
||||||
And the default journal "encrypted.txt" should be in the "." directory
|
|
||||||
And the config should contain "encrypt: true"
|
|
||||||
And the version in the config file should be up-to-date
|
|
||||||
When we run "jrnl"
|
|
||||||
Then we should be prompted for a password
|
|
||||||
|
|
||||||
Scenario: Install jrnl with colors by default
|
|
||||||
Given we use no config
|
|
||||||
When we run "jrnl hello world" and enter
|
|
||||||
\n
|
|
||||||
\n
|
|
||||||
\n
|
|
||||||
Then the output should contain "Journal 'default' created"
|
|
||||||
And the config should contain
|
|
||||||
colors:
|
|
||||||
body: none
|
|
||||||
date: black
|
|
||||||
tags: yellow
|
|
||||||
title: cyan
|
|
||||||
|
|
||||||
Scenario: Install jrnl without colors
|
|
||||||
Given we use no config
|
|
||||||
When we run "jrnl hello world" and enter
|
|
||||||
\n
|
|
||||||
\n
|
|
||||||
N
|
|
||||||
Then the output should contain "Journal 'default' created"
|
|
||||||
And the config should contain
|
|
||||||
colors:
|
|
||||||
body: none
|
|
||||||
date: none
|
|
||||||
tags: none
|
|
||||||
title: none
|
|
||||||
|
|
||||||
Scenario: Install jrnl with encrypted default journal with no entries
|
|
||||||
Given we use no config
|
|
||||||
When we run "jrnl -1" and enter
|
|
||||||
encrypted.txt
|
|
||||||
y
|
|
||||||
n
|
|
||||||
test
|
|
||||||
test
|
|
||||||
n
|
|
||||||
Then the error output should contain "Journal will be encrypted"
|
|
||||||
And the default journal "encrypted.txt" should be in the "." directory
|
|
||||||
And the config should contain "encrypt: true"
|
|
||||||
And the version in the config file should be up-to-date
|
|
||||||
When we run "jrnl -1" and enter
|
|
||||||
test
|
|
||||||
Then we should be prompted for a password
|
|
||||||
And the error output should contain "no entries found"
|
|
||||||
And the error output should not contain "Wrong password, try again"
|
|
|
@ -1,99 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Multiple journals
|
|
||||||
|
|
||||||
Scenario: Loading a config with two journals
|
|
||||||
Given we use the config "multiple.yaml"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2013-06-09 15:39 My first entry.
|
|
||||||
2013-06-10 15:40 Life is good.
|
|
||||||
When we run "jrnl work -99 --short"
|
|
||||||
Then the output should be empty
|
|
||||||
|
|
||||||
Scenario: Write to default config by default
|
|
||||||
Given we use the config "multiple.yaml"
|
|
||||||
When we run "jrnl this goes to default"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should contain
|
|
||||||
2013-06-09 15:39 My first entry.
|
|
||||||
2013-06-10 15:40 Life is good.
|
|
||||||
Then the output should contain
|
|
||||||
this goes to default
|
|
||||||
When we run "jrnl work -99 --short"
|
|
||||||
Then the output should be empty
|
|
||||||
|
|
||||||
Scenario: Write to specified journal
|
|
||||||
Given we use the config "multiple.yaml"
|
|
||||||
When we run "jrnl work a long day in the office"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2013-06-09 15:39 My first entry.
|
|
||||||
2013-06-10 15:40 Life is good.
|
|
||||||
When we run "jrnl work -99 --short"
|
|
||||||
Then the output should contain "a long day in the office"
|
|
||||||
|
|
||||||
Scenario: Tell user which journal was used
|
|
||||||
Given we use the config "multiple.yaml"
|
|
||||||
When we run "jrnl work a long day in the office"
|
|
||||||
Then the output should contain "Entry added to work journal"
|
|
||||||
|
|
||||||
Scenario: Write to specified journal with a timestamp
|
|
||||||
Given we use the config "multiple.yaml"
|
|
||||||
When we run "jrnl work 23 july 2012: a long day in the office"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2013-06-09 15:39 My first entry.
|
|
||||||
2013-06-10 15:40 Life is good.
|
|
||||||
When we run "jrnl work -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2012-07-23 09:00 a long day in the office
|
|
||||||
|
|
||||||
Scenario: Write to specified journal without a timestamp but with colon
|
|
||||||
Given we use the config "multiple.yaml"
|
|
||||||
When we run "jrnl work : a long day in the office"
|
|
||||||
Then the output should be
|
|
||||||
2013-06-09 15:39 My first entry.
|
|
||||||
2013-06-10 15:40 Life is good.
|
|
||||||
When we run "jrnl work -99 --short"
|
|
||||||
Then the output should be contain
|
|
||||||
a long day in the office
|
|
||||||
|
|
||||||
Scenario: Write to specified journal without a timestamp but with colon
|
|
||||||
Given we use the config "multiple.yaml"
|
|
||||||
When we run "jrnl work: a long day in the office"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2013-06-09 15:39 My first entry.
|
|
||||||
2013-06-10 15:40 Life is good.
|
|
||||||
When we run "jrnl work -99 --short"
|
|
||||||
Then the output should contain
|
|
||||||
a long day in the office
|
|
||||||
|
|
||||||
Scenario: Create new journals as required
|
|
||||||
Given we use the config "multiple.yaml"
|
|
||||||
Then journal "ideas" should not exist
|
|
||||||
When we run "jrnl ideas 23 july 2012: sell my junk on ebay and make lots of money"
|
|
||||||
When we run "jrnl ideas -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2012-07-23 09:00 sell my junk on ebay and make lots of money
|
|
||||||
|
|
||||||
Scenario: Don't crash if no default journal is specified
|
|
||||||
Given we use the config "no_default_journal.yaml"
|
|
||||||
When we run "jrnl a long day in the office"
|
|
||||||
Then the output should contain "No 'default' journal configured"
|
|
||||||
|
|
||||||
Scenario: Don't crash if no file exists for a configured encrypted journal
|
|
||||||
Given we use the config "multiple.yaml"
|
|
||||||
When we run "jrnl new_encrypted Adding first entry" and enter
|
|
||||||
these three eyes
|
|
||||||
these three eyes
|
|
||||||
n
|
|
||||||
Then the output should contain "Journal 'new_encrypted' created at"
|
|
||||||
|
|
||||||
Scenario: Read and write to journal with emoji name
|
|
||||||
Given we use the config "multiple.yaml"
|
|
||||||
When we run "jrnl ✨ Adding entry to sparkly journal"
|
|
||||||
When we run "jrnl ✨ -1"
|
|
||||||
Then the output should contain "Adding entry to sparkly journal"
|
|
|
@ -1,100 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Implementing Runtime Overrides for Select Configuration Keys
|
|
||||||
|
|
||||||
Scenario: Override configured editor with built-in input === editor:''
|
|
||||||
Given we use the config "basic_encrypted.yaml"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --config-override editor ''" and type
|
|
||||||
This is a journal entry
|
|
||||||
Then the stdin prompt should have been called
|
|
||||||
And the editor should not have been called
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the output should contain "This is a journal entry"
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Postconfig commands with overrides
|
|
||||||
Given we use the config "basic_encrypted.yaml"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --decrypt --config-override highlight false --config-override editor nano"
|
|
||||||
Then the config in memory should contain "highlight: false"
|
|
||||||
Then the editor should not have been called
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Override configured linewrap with a value of 23
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -2 --config-override linewrap 23 --format fancy"
|
|
||||||
Then the output should be
|
|
||||||
┎─────╮2013-06-09 15:39
|
|
||||||
┃ My ╘═══════════════╕
|
|
||||||
┃ fir st ent ry. │
|
|
||||||
┠╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┤
|
|
||||||
┃ Everything is │
|
|
||||||
┃ alright │
|
|
||||||
┖─────────────────────┘
|
|
||||||
┎─────╮2013-06-10 15:40
|
|
||||||
┃ Lif ╘═══════════════╕
|
|
||||||
┃ e is goo d. │
|
|
||||||
┠╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┤
|
|
||||||
┃ But I'm better. │
|
|
||||||
┖─────────────────────┘
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Override color selections with runtime overrides
|
|
||||||
Given we use the config "basic_encrypted.yaml"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -1 --config-override colors.body blue"
|
|
||||||
Then the config in memory should contain "colors.body: blue"
|
|
||||||
|
|
||||||
Scenario: Override color selections with --co alias
|
|
||||||
Given we use the config "basic_encrypted.yaml"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -1 --co colors.body blue"
|
|
||||||
Then the config in memory should contain "colors.body: blue"
|
|
||||||
|
|
||||||
Scenario: Apply multiple config overrides
|
|
||||||
Given we use the config "basic_encrypted.yaml"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -1 --config-override colors.body green --config-override editor 'nano'"
|
|
||||||
Then the config in memory should contain
|
|
||||||
editor: nano
|
|
||||||
colors:
|
|
||||||
title: none
|
|
||||||
body: green
|
|
||||||
tags: none
|
|
||||||
date: none
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Override default journal
|
|
||||||
Given we use the config "basic_dayone.yaml"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --config-override journals.default features/journals/simple.journal 20 Mar 2000: The rain in Spain comes from clouds"
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -3 --config-override journals.default features/journals/simple.journal"
|
|
||||||
Then the output should be
|
|
||||||
2000-03-20 09:00 The rain in Spain comes from clouds
|
|
||||||
|
|
||||||
2013-06-09 15:39 My first entry.
|
|
||||||
| Everything is alright
|
|
||||||
|
|
||||||
2013-06-10 15:40 Life is good.
|
|
||||||
| But I'm better.
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Make an entry into an overridden journal
|
|
||||||
Given we use the config "basic_dayone.yaml"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --config-override journals.temp features/journals/simple.journal temp Sep 06 1969: @say Ni"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "Entry added"
|
|
||||||
When we run "jrnl --config-override journals.temp features/journals/simple.journal temp -3"
|
|
||||||
Then the output should be
|
|
||||||
1969-09-06 09:00 @say Ni
|
|
||||||
|
|
||||||
2013-06-09 15:39 My first entry.
|
|
||||||
| Everything is alright
|
|
||||||
|
|
||||||
2013-06-10 15:40 Life is good.
|
|
||||||
| But I'm better.
|
|
|
@ -1,125 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Using the installed keyring
|
|
||||||
|
|
||||||
Scenario: Storing a password in keyring
|
|
||||||
Given we use the config "multiple.yaml"
|
|
||||||
And we have a keyring
|
|
||||||
When we run "jrnl simple --encrypt" and enter
|
|
||||||
sabertooth
|
|
||||||
sabertooth
|
|
||||||
Y
|
|
||||||
Then the config for journal "simple" should contain "encrypt: true"
|
|
||||||
When we run "jrnl simple -n 1"
|
|
||||||
Then the output should contain "2013-06-10 15:40 Life is good"
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Encrypt journal with no keyring backend and do not store in keyring
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl test entry"
|
|
||||||
And we run "jrnl --encrypt" and enter
|
|
||||||
password
|
|
||||||
password
|
|
||||||
n
|
|
||||||
Then we should get no error
|
|
||||||
And the output should not contain "Failed to retrieve keyring"
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Encrypt journal with no keyring backend and do store in keyring
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl test entry"
|
|
||||||
And we run "jrnl --encrypt" and enter
|
|
||||||
password
|
|
||||||
password
|
|
||||||
y
|
|
||||||
Then we should get no error
|
|
||||||
And the output should not contain "Failed to retrieve keyring"
|
|
||||||
# @todo add step to check contents of keyring
|
|
||||||
|
|
||||||
|
|
||||||
@todo
|
|
||||||
Scenario: Open an encrypted journal with wrong password in keyring
|
|
||||||
# This should ask the user for the password after the keyring fails
|
|
||||||
|
|
||||||
|
|
||||||
@todo
|
|
||||||
Scenario: Decrypt journal with password in keyring
|
|
||||||
|
|
||||||
|
|
||||||
@todo
|
|
||||||
Scenario: Decrypt journal without a keyring
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Encrypt journal when keyring exists but fails
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
And we have a failed keyring
|
|
||||||
When we run "jrnl --encrypt" and enter
|
|
||||||
this password will not be saved in keyring
|
|
||||||
this password will not be saved in keyring
|
|
||||||
y
|
|
||||||
Then the output should contain "Failed to retrieve keyring"
|
|
||||||
And we should get no error
|
|
||||||
And we should be prompted for a password
|
|
||||||
And the config for journal "default" should contain "encrypt: true"
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Decrypt journal when keyring exists but fails
|
|
||||||
Given we use the config "encrypted.yaml"
|
|
||||||
And we have a failed keyring
|
|
||||||
And we use the password "bad doggie no biscuit" if prompted
|
|
||||||
When we run "jrnl --decrypt"
|
|
||||||
Then the error output should contain "Failed to retrieve keyring"
|
|
||||||
And we should get no error
|
|
||||||
And we should be prompted for a password
|
|
||||||
And the output should contain "Journal decrypted"
|
|
||||||
And the config for journal "default" should contain "encrypt: false"
|
|
||||||
When we run "jrnl --short"
|
|
||||||
Then we should not be prompted for a password
|
|
||||||
And the output should be
|
|
||||||
2013-06-09 15:39 My first entry.
|
|
||||||
2013-06-10 15:40 Life is good.
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Open encrypted journal when keyring exists but fails
|
|
||||||
# This should ask the user for the password after the keyring fails
|
|
||||||
Given we use the config "encrypted.yaml"
|
|
||||||
And we have a failed keyring
|
|
||||||
And we use the password "bad doggie no biscuit" if prompted
|
|
||||||
When we run "jrnl -n 1"
|
|
||||||
Then we should get no error
|
|
||||||
And we should be prompted for a password
|
|
||||||
And the output should contain "Failed to retrieve keyring"
|
|
||||||
And the output should contain "2013-06-10 15:40 Life is good"
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Mistyping your password
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl --encrypt" and enter
|
|
||||||
swordfish
|
|
||||||
sordfish
|
|
||||||
Then we should be prompted for a password
|
|
||||||
And the output should contain "Passwords did not match"
|
|
||||||
And the config for journal "default" should not contain "encrypt: true"
|
|
||||||
When we run "jrnl --short"
|
|
||||||
Then the output should be
|
|
||||||
2013-06-09 15:39 My first entry.
|
|
||||||
2013-06-10 15:40 Life is good.
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Mistyping your password, then getting it right
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl --encrypt" and enter
|
|
||||||
swordfish
|
|
||||||
sordfish
|
|
||||||
swordfish
|
|
||||||
swordfish
|
|
||||||
n
|
|
||||||
Then we should be prompted for a password
|
|
||||||
And the output should contain "Passwords did not match"
|
|
||||||
And the output should contain "Journal encrypted"
|
|
||||||
And the config for journal "default" should contain "encrypt: true"
|
|
||||||
When we run "jrnl -1" and enter "swordfish"
|
|
||||||
Then we should be prompted for a password
|
|
||||||
And the output should contain "2013-06-10 15:40 Life is good"
|
|
||||||
|
|
|
@ -1,400 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Searching in a journal
|
|
||||||
|
|
||||||
Scenario Outline: Displaying entries using -on today should display entries created today
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl today: Adding an entry right now."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -on today"
|
|
||||||
Then the output should contain "Adding an entry right now."
|
|
||||||
But the output should not contain "Everything is alright"
|
|
||||||
And the output should not contain "Life is good"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| simple.yaml |
|
|
||||||
| empty_folder.yaml |
|
|
||||||
| dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Displaying entries using -from day should display correct entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl yesterday: This thing happened yesterday"
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl today at 11:59pm: Adding an entry right now."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl tomorrow: A future entry."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -from today"
|
|
||||||
Then the output should contain "2 entries found"
|
|
||||||
And the output should contain "Adding an entry right now."
|
|
||||||
And the output should contain "A future entry."
|
|
||||||
And the output should not contain "This thing happened yesterday"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| simple.yaml |
|
|
||||||
| empty_folder.yaml |
|
|
||||||
| dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Displaying entries using -from and -to day should display correct entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And now is "2022-03-10 02:32:00 PM"
|
|
||||||
When we run "jrnl yesterday: This thing happened yesterday"
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl today at 11:59pm: Adding an entry right now."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl tomorrow: A future entry."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -from yesterday -to today"
|
|
||||||
Then the output should contain "2 entries found"
|
|
||||||
And the output should contain "This thing happened yesterday"
|
|
||||||
And the output should contain "Adding an entry right now."
|
|
||||||
And the output should not contain "A future entry."
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| simple.yaml |
|
|
||||||
| empty_folder.yaml |
|
|
||||||
| dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Searching for a string
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl -contains first --short"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "1 entry found"
|
|
||||||
And the output should be
|
|
||||||
2020-08-29 11:11 Entry the first.
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Searching for an unknown string
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl -contains slkdfsdkfjsd"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "no entries found"
|
|
||||||
And the output should not contain "slkdfsdkfjsd"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Searching for a string within tag results
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl @tagone -contains maybe"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "maybe"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Searching for a string within AND tag results
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl -and @tagone @tagtwo -contains maybe"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "1 entry found"
|
|
||||||
And the output should contain "maybe"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Searching for a string within NOT tag results
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl -not @tagone -contains lonesome"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "1 entry found"
|
|
||||||
And the output should contain "lonesome"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Searching for unstarred entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -not -starred"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "2 entries found"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Searching for tagged entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -tagged"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "3 entries found"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Searching for untagged entries
|
|
||||||
Given we use the config "empty_folder.yaml"
|
|
||||||
When we run "jrnl Tagged entry. This one has a @tag."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl Untagged entry. This one has no tag."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -not -tagged"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "1 entry found"
|
|
||||||
And the output should contain "This one has no tag"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Searching for dates
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl -on 2020-08-31 --short"
|
|
||||||
Then the output should be "2020-08-31 14:32 A second entry in what I hope to be a long series."
|
|
||||||
When we run "jrnl -on 'august 31 2020' --short"
|
|
||||||
Then the output should be "2020-08-31 14:32 A second entry in what I hope to be a long series."
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario: Out of order entries to a Folder journal should be listed in date order
|
|
||||||
Given we use the config "empty_folder.yaml"
|
|
||||||
When we run "jrnl 3/7/2014 4:37pm: Second entry of journal."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl 23 July 2013: Testing folder journal."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -2"
|
|
||||||
Then the output should be
|
|
||||||
2013-07-23 09:00 Testing folder journal.
|
|
||||||
|
|
||||||
2014-03-07 16:37 Second entry of journal.
|
|
||||||
|
|
||||||
Scenario Outline: Searching for all tags should show counts of each tag
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --tags"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should be
|
|
||||||
@tagtwo : 2
|
|
||||||
@tagone : 2
|
|
||||||
@tagthree : 1
|
|
||||||
@ipsum : 1
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Filtering journals should also filter tags
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl -from 'september 2020' --tags"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should be
|
|
||||||
@tagthree : 1
|
|
||||||
@tagone : 1
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Excluding a tag should filter out all entries with that tag
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --tags -not @tagtwo"
|
|
||||||
Then the output should be
|
|
||||||
@tagthree : 1
|
|
||||||
@tagone : 1
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Excluding multiple tags should filter out all entries with those tags
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl --tags -not @tagone -not @tagthree"
|
|
||||||
Then the output should be
|
|
||||||
@tagtwo : 1
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Using -not should exclude all entries with that tag
|
|
||||||
# https://github.com/jrnl-org/jrnl/issues/1472
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl -not @tagtwo"
|
|
||||||
Then the output should not contain "@tagtwo"
|
|
||||||
And the editor should not have been called
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario: DayOne tag searching should work with tags containing a mixture of upper and lower case.
|
|
||||||
# https://github.com/jrnl-org/jrnl/issues/354
|
|
||||||
Given we use the config "dayone.yaml"
|
|
||||||
When we run "jrnl @plAy"
|
|
||||||
Then the output should contain "2013-05-17 11:39 This entry has tags!"
|
|
||||||
|
|
||||||
Scenario: Loading a sample journal
|
|
||||||
Given we use the config "simple.yaml"
|
|
||||||
When we run "jrnl -2"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should be
|
|
||||||
2013-06-09 15:39 My first entry.
|
|
||||||
| Everything is alright
|
|
||||||
|
|
||||||
2013-06-10 15:40 Life is good.
|
|
||||||
| But I'm better.
|
|
||||||
|
|
||||||
Scenario Outline: Searching by month
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -month 9 --short"
|
|
||||||
Then the output should be "2020-09-24 09:14 The third entry finally after weeks without writing."
|
|
||||||
When we run "jrnl -month Sept --short"
|
|
||||||
Then the output should be "2020-09-24 09:14 The third entry finally after weeks without writing."
|
|
||||||
When we run "jrnl -month September --short"
|
|
||||||
Then the output should be "2020-09-24 09:14 The third entry finally after weeks without writing."
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Searching by day
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -day 31 --short"
|
|
||||||
Then the output should be "2020-08-31 14:32 A second entry in what I hope to be a long series."
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Searching by year
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl 2019-01-01 01:01: I like this year."
|
|
||||||
And we run "jrnl -year 2019 --short"
|
|
||||||
Then the output should be "2019-01-01 01:01 I like this year."
|
|
||||||
When we run "jrnl -year 19 --short"
|
|
||||||
Then the output should be "2019-01-01 01:01 I like this year."
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Combining month, day, and year search terms
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -month 08 -day 29 --short"
|
|
||||||
Then the output should be "2020-08-29 11:11 Entry the first."
|
|
||||||
When we run "jrnl -day 29 -year 2020 --short"
|
|
||||||
Then the output should be "2020-08-29 11:11 Entry the first."
|
|
||||||
When we run "jrnl -month 09 -year 2020 --short"
|
|
||||||
Then the output should be "2020-09-24 09:14 The third entry finally after weeks without writing."
|
|
||||||
When we run "jrnl -month 08 -day 29 -year 2020 --short"
|
|
||||||
Then the output should be "2020-08-29 11:11 Entry the first."
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Searching today in history
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
And now is "2020-08-31 02:32:00 PM"
|
|
||||||
When we run "jrnl 2019-08-31 01:01: Hi, from last year."
|
|
||||||
And we run "jrnl -today-in-history --short"
|
|
||||||
Then the output should contain "2 entries found"
|
|
||||||
And the output should be
|
|
||||||
2019-08-31 01:01 Hi, from last year.
|
|
||||||
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario: Loading a DayOne Journal
|
|
||||||
Given we use the config "dayone.yaml"
|
|
||||||
When we run "jrnl -from 'feb 2013'"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should contain "3 entries found"
|
|
||||||
And the output should be
|
|
||||||
2013-05-17 11:39 This entry has tags!
|
|
||||||
|
|
||||||
2013-06-17 20:38 This entry has a location.
|
|
||||||
|
|
||||||
2013-07-17 11:38 This entry is starred!
|
|
||||||
|
|
||||||
Scenario Outline: Searching the most recent entry should not show found count
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the error output should not contain "1 entry found"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Searching for more entries than are in the journal should show found count
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl -4"
|
|
||||||
Then the error output should contain "3 entries found"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
|
@ -1,39 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Starring entries
|
|
||||||
|
|
||||||
Scenario Outline: Starring an entry will mark it in the journal file
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl 20 july 2013 *: Best day of my life!"
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -on 2013-07-20 -starred"
|
|
||||||
Then the output should contain "2013-07-20 09:00 Best day of my life!"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| simple.yaml |
|
|
||||||
| empty_folder.yaml |
|
|
||||||
| dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Filtering by starred entries will show only starred entries
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl -starred"
|
|
||||||
Then the output should be empty
|
|
||||||
When we run "jrnl 20 july 2013 *: Best day of my life!"
|
|
||||||
When we run "jrnl -starred"
|
|
||||||
Then the output should be "2013-07-20 09:00 Best day of my life!"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| simple.yaml |
|
|
||||||
| empty_folder.yaml |
|
|
||||||
| dayone_empty.yaml |
|
|
||||||
|
|
||||||
Scenario: Starring an entry will mark it in an encrypted journal
|
|
||||||
Given we use the config "encrypted.yaml"
|
|
||||||
And we use the password "bad doggie no biscuit" if prompted
|
|
||||||
When we run "jrnl 20 july 2013 *: Best day of my life!"
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -on 2013-07-20 -starred" and enter "bad doggie no biscuit"
|
|
||||||
Then the output should contain "2013-07-20 09:00 Best day of my life!"
|
|
|
@ -1,51 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Tagging
|
|
||||||
# See search.feature for tag-related searches
|
|
||||||
# And format.feature for tag-related output
|
|
||||||
|
|
||||||
Scenario Outline: Tags should allow certain special characters such as /, +, #
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl 2020-09-26: This is an entry about @os/2 and @c++ and @c#"
|
|
||||||
When we run "jrnl --tags -on 2020-09-26"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should be
|
|
||||||
@os/2 : 1
|
|
||||||
@c++ : 1
|
|
||||||
@c# : 1
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Emails addresses should not be parsed as tags
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl 2020-09-26: The email address test@example.com does not seem to work for me"
|
|
||||||
When we run "jrnl 2020-09-26: The email address test@example.org also does not work for me"
|
|
||||||
When we run "jrnl 2020-09-26: I tried test@example.org and test@example.edu too"
|
|
||||||
When we run "jrnl --tags -on 2020-09-26"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should be "[No tags found in journal.]"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Entry can start and end with tags
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
When we run "jrnl 2020-09-26: @foo came over, we went to a @bar"
|
|
||||||
When we run "jrnl --tags -on 2020-09-26"
|
|
||||||
Then the output should be
|
|
||||||
@foo : 1
|
|
||||||
@bar : 1
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
|
@ -1,77 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Using templates
|
|
||||||
|
|
||||||
Scenario Outline: Template contents should be used in new entry
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
And we append to the editor if opened
|
|
||||||
This is an addition to a templated entry
|
|
||||||
When we run "jrnl --config-override template features/templates/basic.template"
|
|
||||||
And we run "jrnl -1"
|
|
||||||
Then the output should contain "This text is in the basic template"
|
|
||||||
Then the output should contain "This is an addition to a templated entry"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Templated entry should not be saved if template is unchanged
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --config-override template features/templates/basic.template"
|
|
||||||
Then the output should contain "No entry to save, because the template was not changed"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: --template nonexistent_file should throw an error
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --template this_template_does_not_exist.template"
|
|
||||||
Then we should get an error
|
|
||||||
Then the error output should contain "Unable to find a template file"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: --template local_filepath should be used in new entry
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --template features/templates/basic.template"
|
|
||||||
Then the output should contain "No entry to save, because the template was not changed"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: --template file_in_XDG_templates_dir should be used in new entry
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
And we copy the template "basic.template" to the default templates folder
|
|
||||||
When we run "jrnl --template basic.template"
|
|
||||||
Then the output should contain "No entry to save, because the template was not changed"
|
|
||||||
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
|
@ -1,57 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Upgrading Journals from 1.x.x to 2.x.x
|
|
||||||
|
|
||||||
Scenario: Upgrade and parse journals with square brackets
|
|
||||||
Given we use the config "upgrade_from_195.json"
|
|
||||||
When we run "jrnl -9" and enter "Y"
|
|
||||||
When we run "jrnl -99 --short"
|
|
||||||
Then the output should be
|
|
||||||
2010-06-10 15:00 A life without chocolate is like a bad analogy.
|
|
||||||
2013-06-10 15:40 He said "[this] is the best time to be alive".Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent malesuada
|
|
||||||
And the output should contain
|
|
||||||
2010-06-10 15:00 A life without chocolate is like a bad analogy.
|
|
||||||
And the output should contain
|
|
||||||
2013-06-10 15:40 He said "[this] is the best time to be alive".
|
|
||||||
|
|
||||||
Scenario: Upgrading a journal encrypted with jrnl 1.x
|
|
||||||
Given we use the config "encrypted_old.json"
|
|
||||||
When we run "jrnl -n 1" and enter
|
|
||||||
Y
|
|
||||||
bad doggie no biscuit
|
|
||||||
bad doggie no biscuit
|
|
||||||
Then we should be prompted for a password
|
|
||||||
And the output should contain "2013-06-10 15:40 Life is good"
|
|
||||||
|
|
||||||
Scenario: Upgrading a config without colors to colors
|
|
||||||
Given we use the config "no_colors.yaml"
|
|
||||||
When we run "jrnl -n 1"
|
|
||||||
Then the config should contain
|
|
||||||
colors:
|
|
||||||
date: none
|
|
||||||
title: none
|
|
||||||
body: none
|
|
||||||
tags: none
|
|
||||||
|
|
||||||
Scenario: Upgrade and parse journals with little endian date format
|
|
||||||
Given we use the config "upgrade_from_195_little_endian_dates.json"
|
|
||||||
When we run "jrnl -9 --short" and enter "Y"
|
|
||||||
Then the output should contain
|
|
||||||
10.06.2010 15:00 A life without chocolate is like a bad analogy.
|
|
||||||
10.06.2013 15:40 He said "[this] is the best time to be alive".
|
|
||||||
|
|
||||||
Scenario: Upgrade with missing journal
|
|
||||||
Given we use the config "upgrade_from_195_with_missing_journal.json"
|
|
||||||
When we run "jrnl --list" and enter "Y"
|
|
||||||
Then the output should contain "features/journals/missing.journal does not exist"
|
|
||||||
And we should get no error
|
|
||||||
|
|
||||||
Scenario: Upgrade with missing encrypted journal
|
|
||||||
Given we use the config "upgrade_from_195_with_missing_encrypted_journal.json"
|
|
||||||
When we run "jrnl --list" and enter
|
|
||||||
Y
|
|
||||||
bad doggie no biscuit
|
|
||||||
Then the output should contain "features/journals/missing.journal does not exist"
|
|
||||||
And the output should contain "We're all done"
|
|
||||||
And we should get no error
|
|
|
@ -1,356 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
Feature: Writing new entries.
|
|
||||||
|
|
||||||
Scenario Outline: Multiline entry with punctuation should keep title punctuation
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "bad doggie no biscuit" if prompted
|
|
||||||
When we run "jrnl This is. the title\\n This is the second line"
|
|
||||||
And we run "jrnl -n 1"
|
|
||||||
Then the output should contain "This is. the title"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| simple.yaml |
|
|
||||||
| empty_folder.yaml |
|
|
||||||
| dayone.yaml |
|
|
||||||
| encrypted.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Single line entry with period should be split at period
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl This is. the title"
|
|
||||||
And we run "jrnl -1"
|
|
||||||
Then the output should contain "| the title"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: CJK entry should be split at fullwidth period without following space.
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl 七転び。八起き"
|
|
||||||
And we run "jrnl -1"
|
|
||||||
Then the output should contain "| 八起き"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Writing an entry from command line should store the entry
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "bad doggie no biscuit" if prompted
|
|
||||||
When we run "jrnl 23 july 2013: A cold and stormy day. I ate crisps on the sofa."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -n 1"
|
|
||||||
Then the output should contain "2013-07-23 09:00 A cold and stormy day."
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| simple.yaml |
|
|
||||||
| empty_folder.yaml |
|
|
||||||
| dayone.yaml |
|
|
||||||
| encrypted.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Writing a partial entry from command line with edit flag should go to the editor
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl this is a partial --edit"
|
|
||||||
Then we should get no error
|
|
||||||
Then the editor should have been called
|
|
||||||
And the editor file content should be
|
|
||||||
this is a partial
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Clearing the editor's contents should yield "No text received" message
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we write nothing to the editor if opened
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --edit"
|
|
||||||
Then the error output should contain "No text received from editor. Were you trying to delete all the entries?"
|
|
||||||
And the editor should have been called
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| editor.yaml |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Writing an empty entry from the command line should yield "No entry to save" message
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl" and enter "\x04"
|
|
||||||
Then the error output should contain "No entry to save, because no text was received"
|
|
||||||
When we run "jrnl" and enter " \t \n \x04"
|
|
||||||
Then the error output should contain "No entry to save, because no text was received"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Writing an empty entry from the command line with no editor should yield nothing
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl --config-override editor ''" and enter ""
|
|
||||||
Then the stdin prompt should have been called
|
|
||||||
And the output should be empty
|
|
||||||
And the error output should contain "To finish writing, press"
|
|
||||||
And the editor should not have been called
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Writing an entry does not print the entire journal
|
|
||||||
# https://github.com/jrnl-org/jrnl/issues/87
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "bad doggie no biscuit" if prompted
|
|
||||||
When we run "jrnl 23 july 2013: A cold and stormy day. I ate crisps on the sofa."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -n 1"
|
|
||||||
Then the output should not contain "Life is good"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| editor.yaml |
|
|
||||||
| editor_empty_folder.yaml |
|
|
||||||
| dayone.yaml |
|
|
||||||
| encrypted.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Embedded period stays in title
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "bad doggie no biscuit" if prompted
|
|
||||||
When we run "jrnl 04-24-2014: Created a new website - empty.com. Hope to get a lot of traffic."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the output should be
|
|
||||||
2014-04-24 09:00 Created a new website - empty.com.
|
|
||||||
| Hope to get a lot of traffic.
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| simple.yaml |
|
|
||||||
| empty_folder.yaml |
|
|
||||||
| dayone.yaml |
|
|
||||||
| encrypted.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Write and read emoji support
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "bad doggie no biscuit" if prompted
|
|
||||||
When we run "jrnl 23 july 2013: 🌞 sunny day. Saw an 🐘"
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -n 1"
|
|
||||||
Then the output should contain "🌞"
|
|
||||||
And the output should contain "🐘"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| simple.yaml |
|
|
||||||
| empty_folder.yaml |
|
|
||||||
| dayone.yaml |
|
|
||||||
| encrypted.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: Writing an entry at the prompt (no editor) should store the entry
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "bad doggie no biscuit" if prompted
|
|
||||||
When we run "jrnl" and type "25 jul 2013: I saw Elvis. He's alive."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -on '2013-07-25'"
|
|
||||||
Then the output should contain "2013-07-25 09:00 I saw Elvis."
|
|
||||||
And the output should contain "| He's alive."
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| simple.yaml |
|
|
||||||
| empty_folder.yaml |
|
|
||||||
| encrypted.yaml |
|
|
||||||
|
|
||||||
@todo
|
|
||||||
Scenario: Writing an entry at the prompt (no editor) in DayOne journal
|
|
||||||
# Need to test DayOne w/out an editor
|
|
||||||
|
|
||||||
Scenario: Writing into Dayone
|
|
||||||
Given we use the config "dayone.yaml"
|
|
||||||
When we run "jrnl 01 may 1979: Being born hurts."
|
|
||||||
And we run "jrnl -until 1980"
|
|
||||||
Then the output should be "1979-05-01 09:00 Being born hurts."
|
|
||||||
|
|
||||||
Scenario: Writing into Dayone adds extended metadata
|
|
||||||
Given we use the config "dayone.yaml"
|
|
||||||
When we run "jrnl 01 may 1979: Being born hurts."
|
|
||||||
And we run "jrnl --export json"
|
|
||||||
Then we should get no error
|
|
||||||
And the output should be valid JSON
|
|
||||||
Given we parse the output as JSON
|
|
||||||
Then "entries" in the parsed output should have 5 elements
|
|
||||||
And "entries.0.creator" in the parsed output should be
|
|
||||||
software_agent
|
|
||||||
os_agent
|
|
||||||
host_name
|
|
||||||
generation_date
|
|
||||||
device_agent
|
|
||||||
And "entries.0.creator.software_agent" in the parsed output should contain
|
|
||||||
jrnl
|
|
||||||
|
|
||||||
Scenario: Title with an embedded period on DayOne journal
|
|
||||||
Given we use the config "dayone.yaml"
|
|
||||||
When we run "jrnl 04-24-2014: Ran 6.2 miles today in 1:02:03. I am feeling sore because I forgot to stretch."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the output should be
|
|
||||||
2014-04-24 09:00 Ran 6.2 miles today in 1:02:03.
|
|
||||||
| I am feeling sore because I forgot to stretch.
|
|
||||||
|
|
||||||
Scenario: Opening an folder that's not a DayOne folder should treat as folder journal
|
|
||||||
Given we use the config "empty_folder.yaml"
|
|
||||||
When we run "jrnl 23 july 2013: Testing folder journal."
|
|
||||||
Then we should get no error
|
|
||||||
When we run "jrnl -1"
|
|
||||||
Then the output should be "2013-07-23 09:00 Testing folder journal."
|
|
||||||
|
|
||||||
Scenario Outline: Count when adding a single entry via --edit
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
And we append to the editor if opened
|
|
||||||
[2021-11-13] worked on jrnl tests
|
|
||||||
When we run "jrnl --edit"
|
|
||||||
Then the error output should contain "3 entries found"
|
|
||||||
And the error output should contain "1 entry added"
|
|
||||||
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
#| basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Correctly count when adding multiple entries via --edit
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
And we append to the editor if opened
|
|
||||||
[2021-11-11] worked on jrnl tests
|
|
||||||
[2021-11-12] worked on jrnl tests again
|
|
||||||
[2021-11-13] worked on jrnl tests a little bit more
|
|
||||||
When we run "jrnl --edit"
|
|
||||||
Then the error output should contain "3 entries found"
|
|
||||||
And the error output should contain "3 entries added"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
#| basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Correctly count when removing entries via --edit
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
And we write to the editor if opened
|
|
||||||
[2021-11-13] I am replacing my whole journal with this entry
|
|
||||||
When we run "jrnl --edit"
|
|
||||||
Then the output should contain "2 entries deleted"
|
|
||||||
And the output should contain "1 entry modified"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
#| basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Correctly count modification when running --edit to replace a single entry
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
And we write to the editor if opened
|
|
||||||
[2021-11-13] I am replacing the last entry with this entry
|
|
||||||
When we run "jrnl --edit -1"
|
|
||||||
Then the error output should contain "1 entry modified"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
#| basic_dayone.yaml | @todo
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Count modifications when editing whole journal and adding to last entry
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
And we append to the editor if opened
|
|
||||||
This is a small addendum to my latest entry.
|
|
||||||
When we run "jrnl --edit"
|
|
||||||
Then the error output should contain "3 entries found"
|
|
||||||
And the error output should contain "1 entry modified"
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario Outline: No "Entry added" message should appear when writing to the default journal
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl This is a new entry"
|
|
||||||
Then the output should not contain "Entry added"
|
|
||||||
And we should get no error
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
||||||
|
|
||||||
Scenario: An "Entry added" message should appear when writing to a non-default journal
|
|
||||||
Given we use the config "multiple.yaml"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
When we run "jrnl work This is a new entry"
|
|
||||||
Then the output should contain "Entry added to work journal"
|
|
||||||
And we should get no error
|
|
||||||
|
|
||||||
Scenario Outline: Tags are saved when an entry is edited with --edit and can be searched afterward
|
|
||||||
Given we use the config "<config_file>"
|
|
||||||
And we use the password "test" if prompted
|
|
||||||
And we append to the editor if opened
|
|
||||||
@newtag
|
|
||||||
When we run "jrnl --edit -1"
|
|
||||||
Then the error output should contain "1 entry modified"
|
|
||||||
When we run "jrnl --tags @newtag"
|
|
||||||
Then the output should contain
|
|
||||||
1 entry found
|
|
||||||
|
|
||||||
Examples: configs
|
|
||||||
| config_file |
|
|
||||||
| basic_onefile.yaml |
|
|
||||||
| basic_encrypted.yaml |
|
|
||||||
| basic_folder.yaml |
|
|
||||||
| basic_dayone.yaml |
|
|
|
@ -1,26 +0,0 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
||||||
|
|
||||||
from pytest_bdd import scenarios
|
|
||||||
|
|
||||||
scenarios("features/actions.feature")
|
|
||||||
scenarios("features/build.feature")
|
|
||||||
scenarios("features/config_file.feature")
|
|
||||||
scenarios("features/core.feature")
|
|
||||||
scenarios("features/datetime.feature")
|
|
||||||
scenarios("features/delete.feature")
|
|
||||||
scenarios("features/change_time.feature")
|
|
||||||
scenarios("features/encrypt.feature")
|
|
||||||
scenarios("features/file_storage.feature")
|
|
||||||
scenarios("features/format.feature")
|
|
||||||
scenarios("features/import.feature")
|
|
||||||
scenarios("features/install.feature")
|
|
||||||
scenarios("features/multiple_journals.feature")
|
|
||||||
scenarios("features/override.feature")
|
|
||||||
scenarios("features/password.feature")
|
|
||||||
scenarios("features/search.feature")
|
|
||||||
scenarios("features/star.feature")
|
|
||||||
scenarios("features/tag.feature")
|
|
||||||
scenarios("features/template.feature")
|
|
||||||
scenarios("features/upgrade.feature")
|
|
||||||
scenarios("features/write.feature")
|
|
|
@ -1,54 +1,2 @@
|
||||||
# Copyright © 2012-2023 jrnl contributors
|
# Copyright © 2012-2023 jrnl contributors
|
||||||
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
from pytest import mark
|
|
||||||
from pytest import skip
|
|
||||||
|
|
||||||
from jrnl.os_compat import on_posix
|
|
||||||
from jrnl.os_compat import on_windows
|
|
||||||
|
|
||||||
pytest_plugins = [
|
|
||||||
"tests.lib.fixtures",
|
|
||||||
"tests.lib.given_steps",
|
|
||||||
"tests.lib.when_steps",
|
|
||||||
"tests.lib.then_steps",
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def pytest_bdd_apply_tag(tag, function):
|
|
||||||
# skip markers
|
|
||||||
if tag == "skip_win":
|
|
||||||
marker = mark.skipif(on_windows(), reason="Skip test on Windows")
|
|
||||||
elif tag == "skip_posix":
|
|
||||||
marker = mark.skipif(on_posix(), reason="Skip test on Mac/Linux")
|
|
||||||
|
|
||||||
# only on OS markers
|
|
||||||
elif tag == "on_win":
|
|
||||||
marker = mark.skipif(not on_windows(), reason="Skip test not on Windows")
|
|
||||||
elif tag == "on_posix":
|
|
||||||
marker = mark.skipif(not on_posix(), reason="Skip test not on Mac/Linux")
|
|
||||||
else:
|
|
||||||
# Fall back to pytest-bdd's default behavior
|
|
||||||
return None
|
|
||||||
|
|
||||||
marker(function)
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
def pytest_runtest_setup(item):
|
|
||||||
markers = [mark.name for mark in item.iter_markers()]
|
|
||||||
|
|
||||||
on_win = on_windows()
|
|
||||||
on_nix = on_posix()
|
|
||||||
|
|
||||||
if "skip_win" in markers and on_win:
|
|
||||||
skip("Skip test on Windows")
|
|
||||||
|
|
||||||
if "skip_posix" in markers and on_nix:
|
|
||||||
skip("Skip test on Mac/Linux")
|
|
||||||
|
|
||||||
if "on_win" in markers and not on_win:
|
|
||||||
skip("Skip test not on Windows")
|
|
||||||
|
|
||||||
if "on_posix" in markers and not on_nix:
|
|
||||||
skip("Skip test not on Mac/Linux")
|
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
colors:
|
|
||||||
date: none
|
|
||||||
title: none
|
|
||||||
body: none
|
|
||||||
tags: none
|
|
||||||
default_hour: 9
|
|
||||||
default_minute: 0
|
|
||||||
editor: noop
|
|
||||||
encrypt: false
|
|
||||||
highlight: true
|
|
||||||
journals:
|
|
||||||
default: features/journals/basic_dayone.dayone
|
|
||||||
linewrap: 80
|
|
||||||
tagsymbols: "@"
|
|
||||||
template: false
|
|
||||||
timeformat: "%Y-%m-%d %H:%M"
|
|
||||||
indent_character: "|"
|
|
|
@ -1,17 +0,0 @@
|
||||||
colors:
|
|
||||||
date: none
|
|
||||||
title: none
|
|
||||||
body: none
|
|
||||||
tags: none
|
|
||||||
default_hour: 9
|
|
||||||
default_minute: 0
|
|
||||||
editor: noop
|
|
||||||
encrypt: true
|
|
||||||
highlight: true
|
|
||||||
journals:
|
|
||||||
default: features/journals/basic_encrypted.journal
|
|
||||||
linewrap: 80
|
|
||||||
tagsymbols: "@"
|
|
||||||
template: false
|
|
||||||
timeformat: "%Y-%m-%d %H:%M"
|
|
||||||
indent_character: "|"
|
|
|
@ -1,17 +0,0 @@
|
||||||
colors:
|
|
||||||
date: none
|
|
||||||
title: none
|
|
||||||
body: none
|
|
||||||
tags: none
|
|
||||||
default_hour: 9
|
|
||||||
default_minute: 0
|
|
||||||
editor: noop
|
|
||||||
encrypt: false
|
|
||||||
highlight: true
|
|
||||||
journals:
|
|
||||||
default: features/journals/basic_folder
|
|
||||||
linewrap: 80
|
|
||||||
tagsymbols: "@"
|
|
||||||
template: false
|
|
||||||
timeformat: "%Y-%m-%d %H:%M"
|
|
||||||
indent_character: "|"
|
|
|
@ -1,17 +0,0 @@
|
||||||
colors:
|
|
||||||
date: none
|
|
||||||
title: none
|
|
||||||
body: none
|
|
||||||
tags: none
|
|
||||||
default_hour: 9
|
|
||||||
default_minute: 0
|
|
||||||
editor: noop
|
|
||||||
encrypt: false
|
|
||||||
highlight: true
|
|
||||||
journals:
|
|
||||||
default: features/journals/basic_onefile.journal
|
|
||||||
linewrap: 80
|
|
||||||
tagsymbols: "@"
|
|
||||||
template: false
|
|
||||||
timeformat: "%Y-%m-%d %H:%M"
|
|
||||||
indent_character: "|"
|
|
|
@ -1,12 +0,0 @@
|
||||||
default_hour: 9
|
|
||||||
default_minute: 0
|
|
||||||
editor: ""
|
|
||||||
encrypt: false
|
|
||||||
highlight: true
|
|
||||||
journals:
|
|
||||||
default: features/journals/brackets.journal
|
|
||||||
linewrap: 80
|
|
||||||
tagsymbols: "@"
|
|
||||||
template: false
|
|
||||||
timeformat: "%Y-%m-%d %H:%M"
|
|
||||||
indent_character: "|"
|
|
|
@ -1,17 +0,0 @@
|
||||||
default_hour: 9
|
|
||||||
default_minute: 0
|
|
||||||
editor: ''
|
|
||||||
encrypt: false
|
|
||||||
highlight: true
|
|
||||||
journals:
|
|
||||||
default: features/journals/bug153.dayone
|
|
||||||
linewrap: 80
|
|
||||||
tagsymbols: '@'
|
|
||||||
template: false
|
|
||||||
timeformat: '%Y-%m-%d %H:%M'
|
|
||||||
indent_character: "|"
|
|
||||||
colors:
|
|
||||||
date: none
|
|
||||||
title: none
|
|
||||||
body: none
|
|
||||||
tags: none
|
|
|
@ -1,12 +0,0 @@
|
||||||
default_hour: 9
|
|
||||||
default_minute: 0
|
|
||||||
editor: ''
|
|
||||||
encrypt: false
|
|
||||||
highlight: true
|
|
||||||
journals:
|
|
||||||
default: features/journals/bug780.dayone
|
|
||||||
linewrap: 80
|
|
||||||
tagsymbols: '@'
|
|
||||||
template: false
|
|
||||||
timeformat: '%Y-%m-%d %H:%M'
|
|
||||||
indent_character: "|"
|
|
|
@ -1,12 +0,0 @@
|
||||||
default_hour: 9
|
|
||||||
default_minute: 0
|
|
||||||
editor: noop
|
|
||||||
template: false
|
|
||||||
encrypt: false
|
|
||||||
highlight: true
|
|
||||||
journals:
|
|
||||||
default: features/journals/dayone.dayone
|
|
||||||
linewrap: 80
|
|
||||||
tagsymbols: '@'
|
|
||||||
timeformat: '%Y-%m-%d %H:%M'
|
|
||||||
indent_character: "|"
|
|
|
@ -1,17 +0,0 @@
|
||||||
default_hour: 9
|
|
||||||
default_minute: 0
|
|
||||||
editor: noop
|
|
||||||
template: false
|
|
||||||
encrypt: false
|
|
||||||
highlight: true
|
|
||||||
journals:
|
|
||||||
default: features/journals/dayone_empty.dayone
|
|
||||||
linewrap: 80
|
|
||||||
tagsymbols: '@'
|
|
||||||
timeformat: '%Y-%m-%d %H:%M'
|
|
||||||
indent_character: "|"
|
|
||||||
colors:
|
|
||||||
date: none
|
|
||||||
title: none
|
|
||||||
body: none
|
|
||||||
tags: none
|
|
|
@ -1,12 +0,0 @@
|
||||||
default_hour: 9
|
|
||||||
default_minute: 0
|
|
||||||
editor: ""
|
|
||||||
encrypt: false
|
|
||||||
highlight: true
|
|
||||||
journals:
|
|
||||||
default: features/journals/deletion.journal
|
|
||||||
linewrap: 80
|
|
||||||
tagsymbols: "@"
|
|
||||||
template: false
|
|
||||||
timeformat: "%Y-%m-%d %H:%M"
|
|
||||||
indent_character: "|"
|
|