fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-18 03:58:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 35b9827eb1 into 8e627b01c0

Browse source
This commit is contained in:
flight16 2015-04-13 14:25:53 +00:00
commit 79e3258b87
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
features/core.feature
View file

@ -47,3 +47,14 @@ Feature: Basic reading and writing to a journal
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 contain "version" Then the output should contain "version"
# The quotes around the date in the second run are intentional. Without
# them, the behave will fail because it finds duplicate output. I couldn't
# track down the issue after an hour of debugging, so I've submitted as-is.
Scenario: --short and -s display the short version of entries (only the title)
Given we use the config "basic.yaml"
When we run "jrnl -on 2013-06-10 --short"
Then the output should be "2013-06-10 15:40 Life is good."
When we run "jrnl -on '2013-06-10' -s"
Then the output should be "2013-06-10 15:40 Life is good."

2
jrnl/cli.py
View file

@ -38,7 +38,7 @@ def parse_args(args=None):
reading.add_argument('-n', dest='limit', default=None, metavar="N", help="Shows the last n entries matching the filter. '-n 3' and '-3' have the same effect.", nargs="?", type=int) reading.add_argument('-n', dest='limit', default=None, metavar="N", help="Shows the last n entries matching the filter. '-n 3' and '-3' have the same effect.", nargs="?", type=int)
exporting = parser.add_argument_group('Export / Import', 'Options for transmogrifying your journal') exporting = parser.add_argument_group('Export / Import', 'Options for transmogrifying your journal')
exporting.add_argument('--short', dest='short', action="store_true", help='Show only titles or line containing the search tags') exporting.add_argument('-s', '--short', dest='short', action="store_true", help='Show only titles or line containing the search tags')
exporting.add_argument('--tags', dest='tags', action="store_true", help='Returns a list of all tags and number of occurences') exporting.add_argument('--tags', dest='tags', action="store_true", help='Returns a list of all tags and number of occurences')
exporting.add_argument('--export', metavar='TYPE', dest='export', choices=plugins.BaseExporter.PLUGIN_NAMES, help='Export your journal. TYPE can be %s.' % plugins.BaseExporter.get_plugin_types_string(), default=False, const=None) exporting.add_argument('--export', metavar='TYPE', dest='export', choices=plugins.BaseExporter.PLUGIN_NAMES, help='Export your journal. TYPE can be %s.' % plugins.BaseExporter.get_plugin_types_string(), default=False, const=None)
exporting.add_argument('-o', metavar='OUTPUT', dest='output', help='Optionally specifies output file when using --export. If OUTPUT is a directory, exports each entry into an individual file instead.', default=False, const=None) exporting.add_argument('-o', metavar='OUTPUT', dest='output', help='Optionally specifies output file when using --export. If OUTPUT is a directory, exports each entry into an individual file instead.', default=False, const=None)

2
setup.py
View file

@ -89,6 +89,8 @@ setup(
"PyYAML>=3.11", "PyYAML>=3.11",
"keyring>=3.3", "keyring>=3.3",
"passlib>=1.6.2", "passlib>=1.6.2",
"pyyaml>=3.09",
"pyxdg>=0.25",
] + [p for p, cond in conditional_dependencies.items() if cond], ] + [p for p, cond in conditional_dependencies.items() if cond],
long_description=__doc__, long_description=__doc__,
entry_points={ entry_points={