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

Merge branch 'pr/342' into 2.0-rc1

Browse source
This commit is contained in:
Manuel Ebert 2015-04-20 14:15:57 +02:00
commit 57ef796ccb
3 changed files with 16 additions and 5 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"
Scenario: --short displays 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."
Scenario: -s displays the short version of entries (only the title)
Given we use the config "basic.yaml"
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)

8
setup.py
View file

@ -32,7 +32,7 @@ If you just call jrnl you will be prompted to compose your entry - but you can a
Links Links
````` `````
* `website & documentation <http://maebert.github.com/jrnl>`_ * `website & documentation <http://www.jrnl.sh>`_
* `GitHub Repo <https://github.com/maebert/jrnl>`_ * `GitHub Repo <https://github.com/maebert/jrnl>`_
""" """
@ -45,7 +45,7 @@ import os
import sys import sys
import re import re
try: try:
import readline import readline # NOQA
readline_available = True readline_available = True
except ImportError: except ImportError:
readline_available = False readline_available = False
@ -80,15 +80,15 @@ setup(
description="A command line journal application that stores your journal in a plain text file", description="A command line journal application that stores your journal in a plain text file",
packages=['jrnl'], packages=['jrnl'],
install_requires=[ install_requires=[
"pyxdg>=0.19",
"parsedatetime>=1.2", "parsedatetime>=1.2",
"pytz>=2013b", "pytz>=2013b",
"six>=1.7.4", "six>=1.7.4",
"cryptography==0.8.1", "cryptography==0.8.1",
"tzlocal>=1.1", "tzlocal>=1.1",
"PyYAML>=3.11", "pyyaml>=3.11",
"keyring>=3.3", "keyring>=3.3",
"passlib>=1.6.2", "passlib>=1.6.2",
"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={