Commit graph

1025 commits

Author SHA1 Message Date
Micah Jerome Ellison
5b029e6117
Documentation updates (#1032)
* Applying doc changes based on reviews of past several documentation PRs
* Update docs
  Clean up encryption docs
  Clean up security docs
  Delete export.md
  Make new formats.md and add to sidebar. Also add all of the built-in formats, and examples for each.
  Update mkdocs config for new files

* Fix broken docs links
* Correct incomplete sentences and markdown formatting issues
* Make overview a little more concise
* Update some command line arguments to latest version and make it a bit more concise
* Clean up unneeded TOML modifications and other scaffolding not needed for 3.9
* Revert "Clean up unneeded TOML modifications and other scaffolding not needed for 3.9"
  This reverts commit 13b4266ed1.
* Specify that brew is also the easiest way to install jrnl on Linux
* Update docs/security.md
* Update docs/recipes.md
* Doc updates:
- Remove import/export page, fold it into formats
- Rename security to privacy-and-security.md to avoid conflation w/ github security issues
- Various small cleanup and edits from PR review

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2020-10-24 15:41:58 -07:00
Jrnl Bot
4ee4f388f4 Update changelog [ci skip] 2020-10-18 03:00:49 +00:00
Jonathan Wren
748ad738e2
update changelog generator config to include closed issues 2020-10-17 19:30:18 -07:00
Jrnl Bot
4de3606084 Update changelog [ci skip] 2020-10-18 02:25:36 +00:00
joaquin garmendia
8c2de0e6d7
Add display format option to config file. (#1050)
* Add display format option to config file.
* Add tests.
* Fix `black` error.
* Change nested if to top level.
2020-10-17 18:53:34 -07:00
Micah Jerome Ellison
05d0a0cc83 Fix version number test failing on lack of patch version after change to 2.5 2020-10-17 15:38:06 -07:00
Jrnl Bot
93bcd9bdfe Increment version to v2.5-beta 2020-10-17 22:23:55 +00:00
Jonathan Wren
d916f66dbf
[WIP] Lots of test refactoring (#1042)
* make behave slightly less verbose for use with behave --format progress2
* standardize behave tests
* move tests around to be more behavior driven
* clean up txt file after tests
* add more tests, add more functionality to behave for calling mock editor
* move around behave tests, get rid of regression files
* clean up some code around keyrings
* add more placeholder test scenarios (marked with @todo)
  You can run just these tests with `behave --no-skipped --tags=todo`
* fix "missing_directory" test
  This test was missing the config file it was trying to use. So, it was
  really a very useless, broken test that we absolutely should not have
  approved the PR (#963) for.
* add write tests for each journal type
* update version tests, add new regex match behave step
* add config test outlines
* add journal types to some search tests
* change "basic" config reference to "simple"
* update configs
* add more journal types in search
* fix basic folder journal reference
* add flush output steps to behave, update delete flag tests
* fix failing test with a flush
* update more delete flag tests to include other journal types
* fix file cleanup after failed test with no debug on
* fix password test
* fix DayOne tag sample data, move search/format tag tests, and run them on multiple jrnl types
* added ability to auto-prompt for password for encrypted journals
  Only uses password when prompted, and doesn't get in the way of other
  input prompts. This allows us to run the same scenarios on both
  encrypted journals and other journal types.
* fold encrypted scenarios into the rest of the scenarios where possible
* remove apostrophe that is breaking tests on CI
* add more journal type tests to import feature
* standardize whitespace in behave tests, take out duplicate test
* update handling of cache directories in test suite (easier syntax)
* skip failing YAML exporter emoji test on Windows
* added @todo tags for things that need follow-up

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2020-10-17 15:17:38 -07:00
Jrnl Bot
b76a1c43da Update changelog [ci skip] 2020-10-11 00:58:55 +00:00
micahellison
ebba342779
Add support for Python 3.9 and fix 3.9 build (#1054)
* Support Python 3.9 release in build instead of using 3.9 beta
* Revert Linux and Mac 3.9 definitions since release versions are not working on either
* Run poetry update
* Try out Python 3.10 support on all platforms with allow_failures on
* Adding c:\Python310 path reference for Python 3.10 Windows build
* Clean up unnecessary TOML modification in 3.9 build and always upgrade pyenv in Mac builds
* Clean up unnecessary before_install step on Mac and change 3.9-dev->3.9 definition on Linux
* Reverting Linux Python version to 3.9-dev so that it will run
2020-10-10 17:33:08 -07:00
Jrnl Bot
169e62f1b0 Update changelog [ci skip] 2020-10-10 22:14:23 +00:00
Jonathan Wren
171ce3428d
Disable logging by default (#1053)
* disable logging by default (only enabled if --debug flag is given)

* Run make format

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2020-10-10 14:56:13 -07:00
Jrnl Bot
d20ce3d383 Update changelog [ci skip] 2020-09-11 20:15:44 +00:00
Felix Yan
9ee4c21f6b
Add Ellipsis to SENTENCE_SPLITTER (#1044)
Ellipsis is used to terminal sentences in Chinese and used a lot at end of title.
2020-09-11 12:56:46 -07:00
Jrnl Bot
12e01656f0 Update changelog [ci skip] 2020-09-09 23:58:53 +00:00
matildepark
de6e31582f
mkdocs.yml: change branch URI to develop (#1043) 2020-09-09 16:39:54 -07:00
Jrnl Bot
c93aa02036 Update changelog [ci skip] 2020-09-05 19:26:57 +00:00
Jonathan Wren
ced8d251d9
Change styling of terminal on docs site, small copy changes (#1038)
The terminal now overlaps the header (the purple area at the top of the
page) and the main area (the white area underneath). This draws more
focus to it, and quite literally puts the terminal front and center.

This also fixes a few typos, and updates the commands in the terminal to
match jrnl v2.5 updates.
2020-09-05 12:07:47 -07:00
Jrnl Bot
07f41e8cfa Update changelog [ci skip] 2020-09-05 18:10:34 +00:00
Felix Yan
c9f76e595e
Correct typos in CONTRIBUTING.md (#1040) 2020-09-05 10:53:10 -07:00
Jrnl Bot
5cb8ea2886 Update changelog [ci skip] 2020-08-22 19:32:36 +00:00
Jonathan Wren
29234ddc35
Documentation updates (Thanks @guydebros!) (#1031)
* updated README.md:

- corrected information about encryption
- made additions based on proposed changes to overview.md
- made other changes for clarity and grammar

* ongoing changes to overview.md

* added note that `pycrypto` is required

made other small changes for grammar and clarity

* added new python decryption script to encryption.md

* updated encryption.md to clarify dependencies

other relatively small changes for clarity

straightened quotes

Co-authored-by: Guy B. deBros <guydebros@users.noreply.github.com>
2020-08-22 12:13:36 -07:00
Jrnl Bot
c381d56630 Update changelog [ci skip] 2020-08-22 18:58:37 +00:00
Jonathan Wren
631e08a557
Clean up help screen, get rid of util.py (#1027)
* More refactoring of cli.py

break up code from cli.py (now in jrnl.py) up into smaller functions
get rid of export mode
move --encrypt and --decrypt to commands.py
clean up the help screen even more
update flag name for import

* reorganize code, move around lots of functions

* clean up import statements

* move run function out of cli and into jrnl

* rename confusingly named function

* move editor function into editor file

* rename parse_args.py to args.py to make room for more args functions

* Fix error in test suite for windows

I accidentally flipped the conditional, so this fixes it.

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>

* Update app description on help screen

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2020-08-22 11:40:39 -07:00
Jrnl Bot
7c3abb2625 Update changelog [ci skip] 2020-08-18 01:08:18 +00:00
micahellison
3c7dcbadbe
Add support for Python 3.9 build testing (#1018)
* First stab at adding Python 3.9 dev Travis builds
* Dynamically replace Python max version for Python 3.9 beta builds
* Fix allow_failures (3.9-dev, not 3.9) and fix Windows find-and-replace command to allow 3.9
* Fix allow_failures to allow all three Python 3.9 builds to fail
* Use platform-independent Python script to allow all Python versions for 3.9 builds
* Format changes and changing before_install to script for 3.9 builds
* Install toml module to make it possible to run version-changing script before install
* Properly populate before_install step with Mac and Windows Python 3.9, and remove extraneous unused python key
* Add refreshenv to get python3 path included in WIndows
* Ensure MacOS pyenv is up to date and attempt to reference Windows python3 directly
* Use bash-friendly paths in Windows and check to see exactly what the Python 3.9 executable is
* Confirm Python version in Windows and attempt to get pip a different way
* Fiddling with Windows python references
* Remove Python3.6 references and check for Python directory in root directory
* Add Python 3.9 path to Windows build
* Remove pip steps that should be unnecessary
* Add upgrade pip to Windows Python 3.9 build
* Attempt to resolve "access denied" error when upgrading pip on Windows
* Use allow_all_python_version TOML script in nightly build instead of sed
2020-08-17 17:46:13 -07:00
Jrnl Bot
6f71c98e13 Update changelog [ci skip] 2020-08-08 19:01:17 +00:00
Jonathan Wren
40a7fcdbeb
Update github issue templates to use new diagnostic command (#1022) 2020-08-08 11:46:16 -07:00
Dacoda Nelson
5eaf94a18f
Updated advanced.md in docs to reflect all four subkeys under colors in the config files. (#1023) 2020-08-08 11:44:50 -07:00
Jonathan Wren
32429933f9 clean up linting issue 2020-08-01 15:54:13 -07:00
Jonathan Wren
971deb387b update python deprecation message 2020-08-01 15:54:13 -07:00
Jonathan Wren
5455158ea0 remove python 3.6 from dependencies 2020-08-01 15:54:13 -07:00
Jonathan Wren
c64a17e97c disable python 3.6 tests 2020-08-01 15:54:13 -07:00
Jonathan Wren
2553c1244d fix typo in test 2020-08-01 15:54:13 -07:00
Jonathan Wren
6b1ac328fd Fix small bug related to starring an entry with a date
If a date was given with an entry, and the star was also was added, the
star wouldn't be recognized if it was at the start of the title.

Example that didn't work, but now works with this fix:
  jrnl "saturday: *Title words."

This is to be consistent in starring functionality with and without a
date in the entry.
2020-08-01 15:54:13 -07:00
Jonathan Wren
bfd1cf5eb8 Fix small bug related to starring an entry with a date
If a date was given with an entry, and the star was also was added, the
star wouldn't be recognized if it was at the start of the title.

Example that didn't work, but now works with this fix:
  jrnl "saturday: *Title words."

This is to be consistent in starring functionality with and without a
date in the entry.
2020-08-01 15:54:13 -07:00
Jonathan Wren
a54ed90259 Move import to be standalone command to reduce clutter in cli.py 2020-08-01 15:54:13 -07:00
Jonathan Wren
ce07fedc06 quick clean of arg parsing function by using default param 2020-08-01 15:54:13 -07:00
Jonathan Wren
3e22bf9292 Move journal_name out of cli and into separate function
It's now part of args, and it's parsed into a function after the config
is available
2020-08-01 15:54:13 -07:00
Jonathan Wren
4fb6263212 short isn't a filter 2020-08-01 15:54:13 -07:00
Jonathan Wren
526867bcdd small code cleanup 2020-08-01 15:54:13 -07:00
Jonathan Wren
66e23d1444 change default logging level so deprecation warnings don't spam users 2020-08-01 15:54:13 -07:00
Jonathan Wren
626a18a6ec Update more arg parsing options and handling 2020-08-01 15:54:13 -07:00
Jonathan Wren
fb184c5f5e Move standalone commands into their own file
Also, cleaned up the way the arg parser handles standalone commands.
Rather than checking individually for each command, you can now register
the command in the proper place, and it will be run with all known
arguments (and cofig if available).
2020-08-01 15:54:13 -07:00
Jonathan Wren
5922ca41ee Update arg parsing to better handle optinal journal name
Fixes #520 -and parameter seems to only work for the default journal
2020-08-01 15:54:13 -07:00
Jonathan Wren
2b2f24449f update tests 2020-08-01 15:54:13 -07:00
Jrnl Bot
0e083ad600 Update changelog [ci skip] 2020-08-01 22:12:20 +00:00
micahellison
64a31e301d
Resolve Travis/Windows/pip issues with upgrade to cryptography 3.0 (#1016)
* add missing dependency
* update cryptography dependency
* Installing poetry with pipx instead of pip
* Fix bad pipx install command
* Remove pipx commands and attempt to solve issue through poetry configuration
* Fix pip install command to include --upgrade as before

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2020-08-01 14:58:45 -07:00
Jrnl Bot
0a74fe9cef Update changelog [ci skip] 2020-07-31 16:56:22 +00:00
Jrnl Bot
888981c11e Increment version to v2.4.5 2020-07-31 16:39:22 +00:00