mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-10 16:48:31 +02:00
Compare commits
8 commits
develop
...
v2.6-beta4
Author | SHA1 | Date | |
---|---|---|---|
|
caa4df11fa | ||
|
07c9a43570 | ||
|
6dbe2a1df4 | ||
|
08fb53a6d4 | ||
|
bacab5f871 | ||
|
c5729420a4 | ||
|
a14c2c4ded | ||
|
861bf98332 |
53 changed files with 158 additions and 69 deletions
6
.github/workflows/changelog.yaml
vendored
6
.github/workflows/changelog.yaml
vendored
|
@ -35,7 +35,7 @@ jobs:
|
||||||
if [[ $GITHUB_REF =~ ^refs/tags/ ]]; then
|
if [[ $GITHUB_REF =~ ^refs/tags/ ]]; then
|
||||||
# This is a tag build (i.e. a release)
|
# This is a tag build (i.e. a release)
|
||||||
echo '::debug::Release build'
|
echo '::debug::Release build'
|
||||||
if [[ ! $BRANCH =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)(\.[0-9]+)?)?$ ]]; then
|
if [[ ! $BRANCH =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)([0-9]+)?)?$ ]]; then
|
||||||
echo "::error::Invalid tag format: ${BRANCH}"
|
echo "::error::Invalid tag format: ${BRANCH}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -56,7 +56,7 @@ jobs:
|
||||||
|
|
||||||
if [[ "$(git rev-parse "origin/$BRANCH")" != $GITHUB_SHA ]]; then
|
if [[ "$(git rev-parse "origin/$BRANCH")" != $GITHUB_SHA ]]; then
|
||||||
# Normal build on a branch (no tag)
|
# Normal build on a branch (no tag)
|
||||||
echo "::debug::BRANCH: $BRANCH"
|
echo "::debug::BRANCH: $BRANCH $(git rev-parse origin/$BRANCH)"
|
||||||
echo "::debug::GITHUB_SHA: $GITHUB_SHA"
|
echo "::debug::GITHUB_SHA: $GITHUB_SHA"
|
||||||
echo "::error::$BRANCH has been updated since build started. Aborting changelog."
|
echo "::error::$BRANCH has been updated since build started. Aborting changelog."
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -130,7 +130,7 @@ jobs:
|
||||||
echo "SOMETHING_CHANGED=$SOMETHING_CHANGED" >> $GITHUB_ENV
|
echo "SOMETHING_CHANGED=$SOMETHING_CHANGED" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Commit
|
- name: Commit
|
||||||
if: env.SOMETHING_CHANGED
|
if: env.SOMETHING_CHANGED == 'true'
|
||||||
run: |
|
run: |
|
||||||
git config user.email "jrnl.bot@gmail.com"
|
git config user.email "jrnl.bot@gmail.com"
|
||||||
git config user.name "Jrnl Bot"
|
git config user.name "Jrnl Bot"
|
||||||
|
|
22
.github/workflows/release.yaml
vendored
22
.github/workflows/release.yaml
vendored
|
@ -3,7 +3,7 @@ on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
version:
|
version:
|
||||||
description: 'Version (e.g. v2.5 or v2.5.1-beta)'
|
description: 'Version (e.g. v2.5, v2.5.1-beta, v2.6-beta2)'
|
||||||
required: true
|
required: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
@ -15,7 +15,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
JRNL_VERSION="${{ github.event.inputs.version }}"
|
JRNL_VERSION="${{ github.event.inputs.version }}"
|
||||||
echo "::debug::version: $JRNL_VERSION"
|
echo "::debug::version: $JRNL_VERSION"
|
||||||
if [[ ! $JRNL_VERSION =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)(\.[0-9]+)?)?$ ]]; then
|
if [[ ! $JRNL_VERSION =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)([0-9]+)?)?$ ]]; then
|
||||||
echo
|
echo
|
||||||
echo "::error::Bad version"
|
echo "::error::Bad version"
|
||||||
echo
|
echo
|
||||||
|
@ -75,6 +75,7 @@ jobs:
|
||||||
git add pyproject.toml jrnl/__version__.py
|
git add pyproject.toml jrnl/__version__.py
|
||||||
git commit -m "Increment version to ${JRNL_VERSION}"
|
git commit -m "Increment version to ${JRNL_VERSION}"
|
||||||
git tag -a -m "$JRNL_VERSION" "$JRNL_VERSION"
|
git tag -a -m "$JRNL_VERSION" "$JRNL_VERSION"
|
||||||
|
git push
|
||||||
git push --tags
|
git push --tags
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
|
@ -162,7 +163,22 @@ jobs:
|
||||||
run: brew install pipgrip
|
run: brew install pipgrip
|
||||||
|
|
||||||
- name: Query PyPI API
|
- name: Query PyPI API
|
||||||
run: curl -Ls https://pypi.org/pypi/jrnl/json > api_response.json
|
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
|
- name: Update Homebrew Formula
|
||||||
run: >
|
run: >
|
||||||
|
|
39
.github/workflows/testing.yaml
vendored
39
.github/workflows/testing.yaml
vendored
|
@ -9,7 +9,7 @@ on:
|
||||||
- 'tests/**'
|
- 'tests/**'
|
||||||
- 'poetry.lock'
|
- 'poetry.lock'
|
||||||
- 'pyproject.toml'
|
- 'pyproject.toml'
|
||||||
pull_request_target:
|
pull_request:
|
||||||
branches: [ develop ]
|
branches: [ develop ]
|
||||||
paths:
|
paths:
|
||||||
- 'jrnl/**'
|
- 'jrnl/**'
|
||||||
|
@ -27,6 +27,9 @@ jobs:
|
||||||
matrix:
|
matrix:
|
||||||
python-version: [ 3.7, 3.8, 3.9 ]
|
python-version: [ 3.7, 3.8, 3.9 ]
|
||||||
os: [ ubuntu-latest, macos-latest, windows-latest ]
|
os: [ ubuntu-latest, macos-latest, windows-latest ]
|
||||||
|
exclude: # Added for GitHub Actions PR problem 2020-12-19 -- remove later!
|
||||||
|
- os: windows-latest
|
||||||
|
python-version: 3.9
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
@ -40,7 +43,7 @@ jobs:
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: .venv
|
path: .venv
|
||||||
key: ${{ runner.os }}-${{ hashFiles('poetry.lock') }}-${{ matrix.python-version }}
|
key: ${{ runner.os }}-${{ hashFiles('poetry.lock') }}-${{ matrix.python-version }}-v2
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
|
@ -67,35 +70,3 @@ jobs:
|
||||||
- name: Test with behave
|
- name: Test with behave
|
||||||
if: success() || failure()
|
if: success() || failure()
|
||||||
run: poetry run behave --no-skipped --format progress2 --junit --junit-directory reports/behave
|
run: poetry run behave --no-skipped --format progress2 --junit --junit-directory reports/behave
|
||||||
|
|
||||||
- name: Upload Unit Test Results
|
|
||||||
if: success() || failure()
|
|
||||||
uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: Unit Test Results
|
|
||||||
path: reports/**/*.xml
|
|
||||||
|
|
||||||
publish-test-results:
|
|
||||||
if: success() || failure()
|
|
||||||
name: "Publish Unit Tests Results"
|
|
||||||
needs: test
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Download Artifacts
|
|
||||||
uses: actions/download-artifact@v2
|
|
||||||
with:
|
|
||||||
path: artifacts
|
|
||||||
|
|
||||||
- name: Publish Unit Test Results
|
|
||||||
uses: EnricoMi/publish-unit-test-result-action@v1.4
|
|
||||||
if: always()
|
|
||||||
with:
|
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
check_name: Unit Test Results
|
|
||||||
hide_comments: all but latest
|
|
||||||
comment_on_pr: true
|
|
||||||
files: '**/*.xml'
|
|
||||||
report_individual_runs: true
|
|
||||||
deduplicate_classes_by_file_name: false
|
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## [Unreleased](https://github.com/jrnl-org/jrnl/)
|
## [v2.6-beta3](https://pypi.org/project/jrnl/v2.6-beta3/) (2020-12-19)
|
||||||
|
|
||||||
[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.6-beta...HEAD)
|
[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.6-beta...v2.6-beta3)
|
||||||
|
|
||||||
**Fixed bugs:**
|
**Fixed bugs:**
|
||||||
|
|
||||||
|
@ -16,6 +16,8 @@
|
||||||
|
|
||||||
**Documentation:**
|
**Documentation:**
|
||||||
|
|
||||||
|
- Small accessibility fixes for docs site [\#1122](https://github.com/jrnl-org/jrnl/pull/1122)
|
||||||
|
- Comply with GPL by acknowledging all authors and including license info in each source file [\#1121](https://github.com/jrnl-org/jrnl/pull/1121)
|
||||||
- Fix lone closing parenthesis [\#1118](https://github.com/jrnl-org/jrnl/pull/1118)
|
- Fix lone closing parenthesis [\#1118](https://github.com/jrnl-org/jrnl/pull/1118)
|
||||||
|
|
||||||
## [v2.6-beta](https://pypi.org/project/jrnl/v2.6-beta/) (2020-12-12)
|
## [v2.6-beta](https://pypi.org/project/jrnl/v2.6-beta/) (2020-12-12)
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
<!-- Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
License: https://www.gnu.org/licenses/gpl-3.0.html -->
|
||||||
# Contributing
|
# Contributing
|
||||||
|
|
||||||
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.
|
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.
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
<!-- Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
License: https://www.gnu.org/licenses/gpl-3.0.html -->
|
||||||
# Advanced Usage
|
# Advanced Usage
|
||||||
|
|
||||||
## Configuration File
|
## Configuration File
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
<!-- Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
License: https://www.gnu.org/licenses/gpl-3.0.html -->
|
||||||
# Encryption
|
# Encryption
|
||||||
|
|
||||||
## A Note on Security
|
## A Note on Security
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
<!-- Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
License: https://www.gnu.org/licenses/gpl-3.0.html -->
|
||||||
# Formats
|
# Formats
|
||||||
|
|
||||||
`jrnl` supports a variety of alternate formats. These can be used to display your
|
`jrnl` supports a variety of alternate formats. These can be used to display your
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
<!-- Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
License: https://www.gnu.org/licenses/gpl-3.0.html -->
|
||||||
# Getting started
|
# Getting started
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
<!-- Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
License: https://www.gnu.org/licenses/gpl-3.0.html -->
|
||||||
# Overview
|
# Overview
|
||||||
|
|
||||||
`jrnl` is a simple journal application for the command line.
|
`jrnl` is a simple journal application for the command line.
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
<!-- Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
License: https://www.gnu.org/licenses/gpl-3.0.html -->
|
||||||
# Privacy and Security
|
# Privacy and Security
|
||||||
|
|
||||||
`jrnl` is designed with privacy and security in mind, but like any other
|
`jrnl` is designed with privacy and security in mind, but like any other
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
<!-- Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
License: https://www.gnu.org/licenses/gpl-3.0.html -->
|
||||||
# FAQ
|
# FAQ
|
||||||
|
|
||||||
## Recipes
|
## Recipes
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
<!-- Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
License: https://www.gnu.org/licenses/gpl-3.0.html -->
|
||||||
# Basic Usage #
|
# Basic Usage #
|
||||||
|
|
||||||
`jrnl` has two modes: **composing** and **viewing**. Whenever you don't enter
|
`jrnl` has two modes: **composing** and **viewing**. Whenever you don't enter
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
jrnl.sh
|
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
/* Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
License: https://www.gnu.org/licenses/gpl-3.0.html */
|
||||||
|
|
||||||
:root {
|
:root {
|
||||||
/* For dark bg */
|
/* For dark bg */
|
||||||
--white: #fcfcfc;
|
--white: #fcfcfc;
|
||||||
|
@ -14,7 +17,7 @@
|
||||||
/* For light bg */
|
/* For light bg */
|
||||||
--teal: #2a8068;
|
--teal: #2a8068;
|
||||||
--dark-blue: #356eb7;
|
--dark-blue: #356eb7;
|
||||||
--mid-purple: #92679b;
|
--mid-purple: #846392;
|
||||||
--bright-purple: #af27ad;
|
--bright-purple: #af27ad;
|
||||||
--dark-purple: #604385;
|
--dark-purple: #604385;
|
||||||
--darkest-purple: #251A32;
|
--darkest-purple: #251A32;
|
||||||
|
|
|
@ -125,6 +125,14 @@ Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
|
||||||
background: var(--dark-blue);
|
background: var(--dark-blue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.rst-content .note.admonition {
|
||||||
|
background: var(--light-blue);
|
||||||
|
}
|
||||||
|
|
||||||
.rst-content .tip .admonition-title {
|
.rst-content .tip .admonition-title {
|
||||||
background: var(--teal);
|
background: var(--teal);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.rst-content .tip .admonition {
|
||||||
|
background: var(--light-blue);
|
||||||
|
}
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
/* Copyright (C) 2012-2021 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}
|
/* 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 {
|
body {
|
||||||
|
@ -7,7 +9,7 @@ body {
|
||||||
}
|
}
|
||||||
|
|
||||||
.icon {
|
.icon {
|
||||||
background-image: url("img/sprites.svg");
|
background-image: url("/img/sprites.svg");
|
||||||
width: 32px;
|
width: 32px;
|
||||||
height: 32px;
|
height: 32px;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
@ -138,7 +140,7 @@ header {
|
||||||
#twitter:hover,
|
#twitter:hover,
|
||||||
#twitter:active {
|
#twitter:active {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
box-shadow: 0 2px 25px 0 var(--black-shadow);
|
box-shadow: 0 2px 25px 0 var(--blacker-shadow);
|
||||||
transition: all .5s ease;
|
transition: all .5s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
/* Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
License: https://www.gnu.org/licenses/gpl-3.0.html */
|
||||||
|
|
||||||
/* ------------------------------------------------------------ */
|
/* ------------------------------------------------------------ */
|
||||||
/* Overrides for jrnl theme */
|
/* Overrides for jrnl theme */
|
||||||
/* ------------------------------------------------------------ */
|
/* ------------------------------------------------------------ */
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
<!-- Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
License: https://www.gnu.org/licenses/gpl-3.0.html -->
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
|
|
||||||
|
|
|
@ -4,13 +4,13 @@ Feature: Functionality of jrnl outside of actually handling journals
|
||||||
Given we use the config "simple.yaml"
|
Given we use the config "simple.yaml"
|
||||||
When we run "jrnl --version"
|
When we run "jrnl --version"
|
||||||
Then we should get no error
|
Then we should get no error
|
||||||
Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta))?$"
|
Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta)\d*)?"
|
||||||
|
|
||||||
Scenario: Displaying the version number
|
Scenario: Displaying the version number
|
||||||
Given we use the config "simple.yaml"
|
Given we use the config "simple.yaml"
|
||||||
When we run "jrnl -v"
|
When we run "jrnl -v"
|
||||||
Then we should get no error
|
Then we should get no error
|
||||||
Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta))?$"
|
Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta)\d*)?"
|
||||||
|
|
||||||
Scenario: Running the diagnostic command
|
Scenario: Running the diagnostic command
|
||||||
When we run "jrnl --diagnostic"
|
When we run "jrnl --diagnostic"
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
import ast
|
import ast
|
||||||
from collections import defaultdict
|
from collections import defaultdict
|
||||||
import os
|
import os
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
import re
|
import re
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
|
|
||||||
import codecs
|
import codecs
|
||||||
import fnmatch
|
import fnmatch
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
import logging
|
import logging
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from .__version__ import __version__
|
from .__version__ import __version__
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from .cli import cli
|
from .cli import cli
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
__version__ = "v2.6-beta"
|
__version__ = "v2.6-beta4"
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
import re
|
import re
|
||||||
import textwrap
|
import textwrap
|
||||||
|
|
18
jrnl/cli.py
18
jrnl/cli.py
|
@ -1,21 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
"""
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
jrnl
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
license: GPLv3, see LICENSE.md for more details.
|
|
||||||
|
|
||||||
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.
|
|
||||||
|
|
||||||
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/>.
|
|
||||||
"""
|
|
||||||
import logging
|
import logging
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,13 @@ def preconfig_version(_):
|
||||||
from jrnl import __title__
|
from jrnl import __title__
|
||||||
from jrnl import __version__
|
from jrnl import __version__
|
||||||
|
|
||||||
version_str = f"{__title__} version {__version__}"
|
version_str = f"""{__title__} version {__version__}
|
||||||
|
|
||||||
|
Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
|
||||||
|
This is free software, and you are welcome to redistribute it under certain
|
||||||
|
conditions; for details, see: https://www.gnu.org/licenses/gpl-3.0.html"""
|
||||||
|
|
||||||
print(version_str)
|
print(version_str)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
|
|
||||||
class UserAbort(Exception):
|
class UserAbort(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
|
|
||||||
import glob
|
import glob
|
||||||
import logging
|
import logging
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
from sys import platform
|
from sys import platform
|
||||||
|
|
||||||
on_windows = "win32" in platform
|
on_windows = "win32" in platform
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
from .fancy_exporter import FancyExporter
|
from .fancy_exporter import FancyExporter
|
||||||
from .jrnl_importer import JRNLImporter
|
from .jrnl_importer import JRNLImporter
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
from textwrap import TextWrapper
|
from textwrap import TextWrapper
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
from .text_exporter import TextExporter
|
from .text_exporter import TextExporter
|
||||||
from .util import get_tags_count
|
from .util import get_tags_count
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
import yaml
|
import yaml
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
from glob import glob
|
from glob import glob
|
||||||
import os
|
import os
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
|
|
||||||
def get_tags_count(journal):
|
def get_tags_count(journal):
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
from xml.dom import minidom
|
from xml.dom import minidom
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
import getpass
|
import getpass
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
FAKE_YEAR = 9999
|
FAKE_YEAR = 9999
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# Copyright (C) 2012-2021 jrnl contributors
|
||||||
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ markdown_extensions:
|
||||||
- admonition
|
- admonition
|
||||||
repo_url: https://github.com/jrnl-org/jrnl/
|
repo_url: https://github.com/jrnl-org/jrnl/
|
||||||
edit_uri: edit/develop/docs/
|
edit_uri: edit/develop/docs/
|
||||||
site_author: Manuel Ebert
|
site_author: jrnl contributors
|
||||||
site_description: Collect your thoughts and notes without leaving the command line.
|
site_description: Collect your thoughts and notes without leaving the command line.
|
||||||
nav:
|
nav:
|
||||||
- Overview: overview.md
|
- Overview: overview.md
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "jrnl"
|
name = "jrnl"
|
||||||
version = "v2.6-beta"
|
version = "v2.6-beta4"
|
||||||
description = "Collect your thoughts and notes without leaving the command line."
|
description = "Collect your thoughts and notes without leaving the command line."
|
||||||
authors = [
|
authors = [
|
||||||
|
"jrnl contributors <jrnl-sh@googlegroups.com>",
|
||||||
"Manuel Ebert <manuel@1450.me>",
|
"Manuel Ebert <manuel@1450.me>",
|
||||||
"Jonathan Wren <jonathan@nowandwren.com>",
|
"Jonathan Wren <jonathan@nowandwren.com>",
|
||||||
"Micah Ellison <micahellison@gmail.com>"
|
"Micah Ellison <micahellison@gmail.com>"
|
||||||
|
|
Loading…
Add table
Reference in a new issue