Commit graph

1030 commits

Author SHA1 Message Date
Micah Jerome Ellison
8c9dce4bc5 Add more journal types in search 2020-09-24 20:18:27 -07:00
Micah Jerome Ellison
56a7cc97a4 Change "basic" config reference to "simple" 2020-09-24 20:03:09 -07:00
Micah Jerome Ellison
f740145e11 Merge branch 'moar-tests' of https://github.com/wren/jrnl into moar-tests 2020-09-24 19:54:14 -07:00
Jonathan Wren
69c0f5e0a3
rename files, add some basic journals for each journal type 2020-09-24 19:50:56 -07:00
Micah Jerome Ellison
2ac8f61a75 Add journal types to some search tests 2020-09-24 19:40:08 -07:00
Micah Jerome Ellison
66b9f5a461 Standardize and clean up star and write features 2020-09-24 19:27:07 -07:00
Jonathan Wren
379a63c8f1
update datetime tests 2020-09-19 17:17:30 -07:00
Micah Jerome Ellison
e5c1114ca2
Add tests for starring with various journal types 2020-09-19 17:17:29 -07:00
Jonathan Wren
40941752fc
add config test outlines 2020-09-19 17:17:29 -07:00
Jonathan Wren
899dd5037b
update version tests, add new regex match behave step 2020-09-19 17:17:28 -07:00
Micah Jerome Ellison
a6b646bb44 Add write tests for each journal type 2020-09-19 15:29:54 -07:00
Jonathan Wren
607aa7a5a1
move tests to be more behavior driven 2020-09-19 11:51:39 -07:00
Jonathan Wren
d1692ab771
move tests to be more behavior driven 2020-09-19 11:43:18 -07:00
Jonathan Wren
80bc2ae4ae
move tests to be more behavior driven 2020-09-19 11:40:24 -07:00
Jonathan Wren
e3f3904cf7
rename files 2020-09-19 11:18:50 -07:00
Jonathan Wren
1d11f3db32
More test shuffling
- Move more tests around
- Rename some test files
- Disable one test (markdown-355)
  Not sure why it's now failing. We should come back to this.
- 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.
2020-09-05 19:05:13 -07:00
Jonathan Wren
78d362e0db
take out old test 2020-09-05 17:34:28 -07:00
Jonathan Wren
6ada26d629
clean up some code around keyrings, clean up more tests 2020-09-05 17:34:15 -07:00
Jonathan Wren
764227d2f2
move around behave tests, get rid of regression files 2020-09-05 16:00:13 -07:00
Jonathan Wren
b0be986759
add more tests, add more functionality to behave for calling mock editor 2020-09-05 15:26:39 -07:00
Jonathan Wren
3c10766372
clean up txt file after tests 2020-09-05 12:12:57 -07:00
Jonathan Wren
131477c7e3
standardize behave tests 2020-09-05 12:11:37 -07:00
Jonathan Wren
6b73eb786e
make behave slightly less verbose for use with behave --format progress2 2020-09-05 12:10:29 -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