Commit graph

1673 commits

Author SHA1 Message Date
Jonathan Wren
9bca32b438
Merge branch 'develop' into mode-actions-1639
Conflicts:
  CHANGELOG.md
  docs/privacy-and-security.md
  jrnl/controller.py
  tests/bdd/features/change_time.feature
2023-03-04 14:07:46 -08:00
Micah Jerome Ellison
eac0571709 run poe format 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
7eec231095 Track added/deleted counts in a register in the Journal class instead of attempting to infer it via controller counting 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
9f44ab22ce Remove extraneous comment in test 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
0e70a57a67 Add tests for counting combinations of action arguments (change-time, edit, delete) and for change-time counts. Some are failing and should be investigated 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
94d78f3e2d Test combinations of found/deleted messages when using --delete 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
4ad9f58213 Add tests for found count with -n equivalent argument 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
14fd024ed1 Add found/modified counts to edit tests 2023-03-04 13:58:20 -08:00
Jrnl Bot
c8d79d075d Update changelog [ci skip] 2023-03-04 13:58:20 -08:00
Briscoooe
a708c15eb7 Don't save templated journal entries if the received raw text is the same as the template itself (#1653) 2023-03-04 13:58:20 -08:00
David Isaksson
3ec0839748 Add documentation about information leaks in Vim/Neovim (#1674)
* Add documentation about using Vim/Neovim as editor
* Add documentation about information leaks in editors
* Spelling fix

---------

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2023-03-04 13:58:20 -08:00
Jrnl Bot
99c29f2051 Update changelog [ci skip] 2023-03-04 13:58:20 -08:00
Giuseppe D'Andrea
905a9ec37e Update documentation on temporary files naming (#1673) 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
2be80a5fa0 Fix other unit test that did not account for short-circuit 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
8ee1632760 Fix unit test that did not account for new short-circuit when displaying journal with no entries 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
46b7a64549 Reconcile tests with new error message when clearing editor in edit mode 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
cac3b43e19 Preserve existing behavior when editor is empty but make the message more clear 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
742a16b548 Track modification of entries with --change-time 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
80a4b0778f Correct entry edit modified count test 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
1873f69ded Remove unneeded exception when editor is empty and fix test that was testing incorrect message 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
2e06e3d4eb Track journal entry deletion consistently 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
0c439200f4 Track found entry count and remove incorrect modified stat logic 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
d341f3240c Don't show summary if no entries found and prevent extra line break when no entries found by short-circuiting display method 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
752e55d363 Add currently-failing test conditions for count messages when changing time and deleting 2023-03-04 13:58:20 -08:00
Jonathan Wren
c182395fce Clean up controller
- streamline `run` function in `controller.py`
- add debug logging
- fix unnecessary import of Journal class (only needed for typing)
- standardize summary display across different actions
2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
bade98ef0d Fix user input mock - was not appropriately checking return value 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
6e24769294 Fix failing change-time test by using same method signature as base journal class 2023-03-04 13:58:20 -08:00
Micah Jerome Ellison
dc6900e9fe Remove ipdb and remove search mode conditional that added explicit tag search behavior 2023-03-04 13:58:20 -08:00
Jrnl Bot
aa8433f881 Update changelog [ci skip] 2023-03-04 20:53:29 +00:00
Micah Jerome Ellison
e54908be0d
Document -tagged, -not -tagged, and -not -starred in command line reference (#1684) 2023-03-04 12:51:12 -08:00
Jrnl Bot
22bf6595da Update changelog [ci skip] 2023-03-04 20:47:31 +00:00
Micah Jerome Ellison
427485a1d7
Add message with config location and docs location when installation is complete (#1695) 2023-03-04 12:45:37 -08:00
Jrnl Bot
23150ddb31 Update changelog [ci skip] 2023-03-04 20:39:09 +00:00
Micah Jerome Ellison
1a67fd5dec
Use pytest-bdd 6 (#1685)
* update pytest-bdd to 6.0
* update lock file
* fix first test (inject command fixture to request)
* fix some more tests
* fix cli_run fixture
* fix password fixture
* Remove unused import
* Fix greedy should_or_should_not parsing problems while also consolidating its parse/transformation-to-bool code
* Prevent greedy matching in "we run" by using regular expression lookahead
* Add missing "Outline" in scenario outlines with examples
* Split "we use the config" and "we use no config" so pytest won't try to consume config_file as a fixture
* Fix missing ShouldOrShouldNot
* Formatting
* fix get_fixture function
* change output of failing test to be a little more useful
* update lock file
* update type builder to for should/should not to be in it's own file, rename some vars for readability
* add parse-type new dev/testing dependency
* update lock file

---------

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2023-03-04 12:37:06 -08:00
Micah Jerome Ellison
2d0b15ea7b
Update documentation front page text (#1698)
* Update front page console examples and feature text with more present-day style, brand-agnostic examples, and hopefully a more inclusive tone

* Updating feature blurb text

* Blurb edit

* Update index.html

* Update index.html

* Update index.html

📓🖉 👍

---------

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2023-03-04 12:20:20 -08:00
Jrnl Bot
611f3af772 Update changelog [ci skip] 2023-02-25 23:32:54 +00:00
Micah Jerome Ellison
e6804f1627
Prompt to include colors in config when first running jrnl (#1687)
* Add prompt to ask user if entries should be formatted with colors when installing jrnl
* Use magenta instead of black for default date color
* Use other default colors and alphabetize color list
* Update tests
* Delete test file
* update lock file
* fix failing test after merge conflict

---------

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2023-02-25 15:30:25 -08:00
Jrnl Bot
fecd696b2a Update changelog [ci skip] 2023-02-25 20:31:52 +00:00
Micah Jerome Ellison
3c87111710
Save empty journal on install instead of just creating a zero-length file (#1690)
* Add failing test for issue #1493
* Write journal upon creation instead of just creating 0-length file
* Fix test to accommodate current password mocking form
2023-02-25 12:29:43 -08:00
Jrnl Bot
592e7bcf27 Update changelog [ci skip] 2023-02-25 20:18:29 +00:00
Micah Jerome Ellison
d81b5ad955
Support mkdocs 1.4.2 and fix its missing breadcrumb (#1691)
* Use latest mkdocs version 1.4.2
* Add docs_theme to mkdocs watch so it automatically reloads localhost when modifying theme
* Bring in ReadTheDocs breadcrumb theme and fix display issues around "Docs" root breadcrumb
* The problem is CSS, not the breadcrumbs template. Tightly scope offending CSS and remove breadcrumbs template override
* Bring mkdocs ReadTheDocs breadcrumbs theme back in
* Fix pa11y validation issue by replacing breadcrumb a alt attribute with aria-label
* Attribute source of new breadcrumbs file
* Use mkdocs 1.4 or greater with no upper bound
2023-02-25 12:16:33 -08:00
Micah Jerome Ellison
fcac94a30e
Document temporary file extension behavior when using template (#1686)
* Document jrnl's temp file behavior when using templates
* Move up "Files in transit from editor to jrnl" section and add notes about template extension behavior in solutions that reference .jrnl extension
* Update privacy-and-security.md
2023-02-25 12:15:52 -08:00
Giuseppe D'Andrea
18397b13eb
Update documentation about privacy and security in VSCode (#1680)
* docs: vscode file history

* docs: vscode unsaved files

* Edited for tone

---------

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2023-02-21 08:45:53 -08:00
Jrnl Bot
b4da3a51f7 Update changelog [ci skip] 2023-02-11 20:40:50 +00:00
Briscoooe
b41a988d6f
Don't save templated journal entries if the received raw text is the same as the template itself (#1653) 2023-02-11 12:38:21 -08:00
David Isaksson
6c6937c507
Add documentation about information leaks in Vim/Neovim (#1674)
* Add documentation about using Vim/Neovim as editor
* Add documentation about information leaks in editors
* Spelling fix

---------

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2023-02-11 12:16:31 -08:00
Jrnl Bot
6b179e673b Update changelog [ci skip] 2023-02-11 20:12:27 +00:00
Giuseppe D'Andrea
2d1a52afe5
Update documentation on temporary files naming (#1673) 2023-02-11 12:10:18 -08:00
Jrnl Bot
d4ce2a84cf Update changelog [ci skip] 2023-01-28 19:47:17 +00:00
Ciaran Concannon
7bd15d12ad
Search for entries with no tags or stars with -not -starred and -not -tagged (#1663)
* Allow for `-not -starred` to search for unstarred entries

* Add `-tagged` and `-not -tagged` functionality
2023-01-28 11:45:01 -08:00