Upping version

AUTHORS.rst

@@ -28,9 +28,9 @@ Thanks to the following people for their contributions to this project.
 * `Ryan Reno <https://github.com/rreno>`_
 * `afloofloo <https://github.com/afloofloo>`_
 * `Charles Saracco <https://github.com/crsaracco>`_
+* `cmccandless <https://github.com/cmccandless>`_
 * `Fabio Alessandro Locati <https://github.com/Fale>`_
 * `Hans Roman <https://github.com/snahor>`_
 * `Marc Abramowitz <https://github.com/msabramo>`_
 * `Matthew Smith <https://github.com/msmith491>`_
-* `mskwon <https://github.com/mskwon>`_
-* `Ram-Z <https://github.com/Ram-Z>`_
+* `mskwon <https://github.com/mskwon>`_

CHANGELOG.rst

@@ -2,6 +2,7 @@
 RTV Changelog
 =============
 
+.. _1.18.0: http://github.com/michael-lazar/rtv/releases/tag/v1.18.0
 .. _1.17.1: http://github.com/michael-lazar/rtv/releases/tag/v1.17.1
 .. _1.17.0: http://github.com/michael-lazar/rtv/releases/tag/v1.17.0
 .. _1.16.0: http://github.com/michael-lazar/rtv/releases/tag/v1.16.0
@@ -29,6 +30,37 @@ RTV Changelog
 .. _1.2.1: http://github.com/michael-lazar/rtv/releases/tag/v1.2.1
 .. _1.2: http://github.com/michael-lazar/rtv/releases/tag/v1.2
 
+--------------------
+1.18.0_ (2017-09-06)
+--------------------
+
+Features
+
+* The ``rtv -l`` flag has been deprecated and replaced with a positional
+  argument, in order to match the syntax of other command line web browsers.
+* NSFW content is now filtered according to the user's reddit profile
+  settings.
+* ``$RTV_BROWSER`` has been added as a way to set the preferred web browser.
+* Sorting options for **relevance** and **comments** are now displayed on
+  the search results page.
+* An **[S]** badge is now displayed next to the submission author.
+* The gfycat MIME parser has been expanded to support more URLs.
+* New MIME parsers have been added for oddshot.tv, clips.twitch.tv,
+  clippituser.tv, and Reddit's beta hosted videos.
+
+Bugfixes
+
+* Users can now use the prompt to navigate to "/comments/..." pages from
+  inside of a submission.
+* Users can now navigate to multireddits using the "/u/me/" prefix.
+* Fixed the ``$BROWSER`` behavior on macOS to support the **chrome**,
+  **firefox**, **safari**, and **default** keywords.
+
+Codebase
+
+* Travis CI tests have been moved to the trusty environment.
+* Added more detailed logging of the environment and settings at startup.
+
 --------------------
 1.17.1_ (2017-08-06)
 --------------------

rtv.1

@@ -1,27 +1,22 @@
-.TH "RTV" "1" "August 06, 2017" "Version 1.17.0" "Usage and Commands"
+.TH "RTV" "1" "September 06, 2017" "Version 1.18.0" "Usage and Commands"
 .SH NAME
 RTV - Reddit Terminal Viewer
 .SH SYNOPSIS
-rtv [\-h] [\-V] [\-s SUBREDDIT] [\-l LINK] [\-\-log FILE] [\-\-config FILE] [\-\-ascii] [\-\-monochrome] [\-\-non\-persistent] [\-\-clear\-auth] [\-\-copy\-config] [\-\-copy\-mailcap] [\-\-enable\-media]
+rtv [\-h] [\-s SUBREDDIT] [\-\-log FILE] [\-\-config FILE] [\-\-ascii] [\-\-monochrome] [\-\-non\-persistent] [\-\-clear\-auth] [\-\-copy\-config] [\-\-copy\-mailcap] [\-\-enable\-media] [\-V] [URL]
 .SH DESCRIPTION
-Reddit Terminal Viewer is a lightweight browser for www.reddit.com built into a
-terminal window.
+Reddit Terminal Viewer is a lightweight browser for https://www.reddit.com
 .SH OPTIONS
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
+\fBURL\fR
+[optional] Full URL of a submission to open
 
 .TP
-\fB\-V\fR, \fB\-\-version\fR
-show program's version number and exit
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
 
 .TP
 \fB\-s SUBREDDIT\fR
-Name of the subreddit that will be opened on start
-
-.TP
-\fB\-l LINK\fR
-Full URL of a submission that will be opened on start
+Name of the subreddit that will be loaded on start
 
 .TP
 \fB\-\-log FILE\fR
@@ -59,12 +54,16 @@ Copy an example mailcap configuration to {HOME}/.mailcap
 \fB\-\-enable\-media\fR
 Open external links using programs defined in the mailcap config
 
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+show program's version number and exit
+
 
 .SH CONTROLS
-Move the cursor using either the arrow keys or Vim-style movement.
-- Press \fBup\fR and \fBdown\fR to scroll through submissions.
-- Press \fBright\fR to view the selected submission and \fBleft\fR to return.
-- Press \fB?\fR to open the help screen.
+Move the cursor using the arrow keys or vim style movement.
+Press \fBup\fR and \fBdown\fR to scroll through submissions.
+Press \fBright\fR to view the selected submission and \fBleft\fR to return.
+Press \fB?\fR to open the help screen.
 .SH FILES
 .TP
 .BR $XDG_CONFIG_HOME/rtv/rtv.cfg
@@ -82,16 +81,13 @@ Text editor to use when editing comments and submissions. Will fallback to
 \fI$EDITOR\fR. 
 .TP
 .BR RTV_URLVIEWER
-Url Viewer to use to extract links from comments.  Requires a compatible 
-Url Viewer to be installed
-.TP
-.BR BROWSER
-Web browser to use when opening links.
+Url viewer to use to extract links from comments.  Requires a compatible
+program to be installed.
 .TP
-.BR PAGER
-Pager to use when expanding individual comments and submissions. 
+.BR RTV_BROWSER
+Web browser to use when opening links. Will fallback to \fI$BROWSER\fR.
 .SH AUTHOR
-Michael Lazar <[email protected]> (2016).
+Michael Lazar <[email protected]> (2017).
 .SH BUGS
 Report bugs to \fIhttps://github.com/michael-lazar/rtv/issues\fR
 .SH LICENSE

rtv/__version__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-__version__ = '1.17.1'
+__version__ = '1.18.0'

scripts/build_manpage.py

@@ -46,12 +46,16 @@ def main():
     #         \fB-h\fR, \fB--help\fR
     #         show this help message and exit
     options = ''
-    lines = help_sections[2].split('\n')[1:]
+    lines = help_sections[2].split('\n')[1:]  # positional arguments
+    lines.extend(help_sections[3].split('\n')[1:])  # optional arguments
     lines = [line.strip() for line in lines]
     arguments = []
     for line in lines:
         if line.startswith('-'):
             arguments.append(line)
+        elif line.startswith('URL'):
+            # Special case for URL which is a positional argument
+            arguments.append(line)
         else:
             arguments[-1] = arguments[-1] + ' ' + line
     for argument in arguments:

scripts/rtv.1.template

@@ -8,10 +8,10 @@ RTV - Reddit Terminal Viewer
 .SH OPTIONS
 {options}
 .SH CONTROLS
-Move the cursor using either the arrow keys or Vim-style movement.
-- Press \fBup\fR and \fBdown\fR to scroll through submissions.
-- Press \fBright\fR to view the selected submission and \fBleft\fR to return.
-- Press \fB?\fR to open the help screen.
+Move the cursor using the arrow keys or vim style movement.
+Press \fBup\fR and \fBdown\fR to scroll through submissions.
+Press \fBright\fR to view the selected submission and \fBleft\fR to return.
+Press \fB?\fR to open the help screen.
 .SH FILES
 .TP
 .BR $XDG_CONFIG_HOME/rtv/rtv.cfg
@@ -29,16 +29,13 @@ Text editor to use when editing comments and submissions. Will fallback to
 \fI$EDITOR\fR. 
 .TP
 .BR RTV_URLVIEWER
-Url Viewer to use to extract links from comments.  Requires a compatible 
-Url Viewer to be installed
+Url viewer to use to extract links from comments.  Requires a compatible
+program to be installed.
 .TP
-.BR BROWSER
-Web browser to use when opening links.
-.TP
-.BR PAGER
-Pager to use when expanding individual comments and submissions. 
+.BR RTV_BROWSER
+Web browser to use when opening links. Will fallback to \fI$BROWSER\fR.
 .SH AUTHOR
-Michael Lazar <[email protected]> (2016).
+Michael Lazar <[email protected]> (2017).
 .SH BUGS
 Report bugs to \fIhttps://github.com/michael-lazar/rtv/issues\fR
 .SH LICENSE