Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

New manpages

  • Loading branch information...
commit 5856352b05ee849aa7b44e245734cbf699016c83 1 parent 0edf972
@mwunsch mwunsch authored
Showing with 51 additions and 6 deletions.
  1. +34 −3 man/tumblr.1
  2. +17 −3 man/tumblr.1.html
View
37 man/tumblr.1
@@ -21,17 +21,21 @@ If you preface your \fIFILE\fR with a bit of YAML (<yaml.org>) frontmatter, you
.SH "OPTIONS"
.
.TP
-\fB\-a\fR,\fB\-\-auth\fR [\fIEMAIL:PASSWORD\fR]
+\fB\-a\fR,\fB\-\-auth\fR \fIEMAIL:PASSWORD\fR
Provide Email Address and Password, to authenticate to Tumblr, separated by a colon.
If these are not provided, you will be prompted for them.
- You \fBmust\fR provide this argument if the post comes from standard input.
+ You \fBmust\fR provide this or the \fB\-\-credentials\fR argument if the post comes from standard input.
.
.TP
-\fB\-e\fR, \fB\-\-email\fR [\fIEMAIL\fR]
+\fB\-e\fR, \fB\-\-email\fR \fIEMAIL\fR
Email Address associated with your Tumblr account.
You will be prompted for a password.
.
.TP
+\fB\-\-credentials\fR \fIFILE\fR
+ A YAML file with the user credentials. Should have keys \fBemail\fR and \fBpassword\fR.
+.
+.TP
\fB\-p\fR,\fB\-\-publish\fR
Publish the post immediately. This will ignore the \fBstate\fR parameter set in the post.
.
@@ -106,6 +110,33 @@ $ tumblr http://www.youtube.com/watch?v=CW0DUg63lqU
.
.IP "" 0
.
+.P
+Save it as a draft:
+.
+.IP "" 4
+.
+.nf
+$ tumblr \-d http://www.youtube.com/watch?v=CW0DUg63lqU
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Authenticate with credentials given from a file:
+.
+.IP "" 4
+.
+.nf
+$ cat ~/.tumblrlogin
+email: tumblruser@generic\-email.com
+password: myvoiceismypassport
+$ cat data.yml my_post.txt | tumblr \-\-credentials ~/.tumblrlogin
+.
+.fi
+.
+.IP "" 0
+.
.SH "INSTALLATION"
If you have RubyGems installed:
.
View
20 man/tumblr.1.html
@@ -80,11 +80,12 @@ <h2 id='NAME'>NAME</h2>
<h2>OPTIONS</h2>
<dl>
-<dt><code>-a</code>,<code>--auth</code> [<em>EMAIL:PASSWORD</em>]</dt><dd><p> Provide Email Address and Password, to authenticate to Tumblr, separated by a colon.
+<dt><code>-a</code>,<code>--auth</code> <em>EMAIL:PASSWORD</em></dt><dd><p> Provide Email Address and Password, to authenticate to Tumblr, separated by a colon.
If these are not provided, you will be prompted for them.
- You <b>must</b> provide this argument if the post comes from standard input.</p></dd>
-<dt><code>-e</code>, <code>--email</code> [<em>EMAIL</em>]</dt><dd><p> Email Address associated with your Tumblr account.
+ You <b>must</b> provide this or the <code>--credentials</code> argument if the post comes from standard input.</p></dd>
+<dt><code>-e</code>, <code>--email</code> <em>EMAIL</em></dt><dd><p> Email Address associated with your Tumblr account.
You will be prompted for a password.</p></dd>
+<dt><code>--credentials</code> <em>FILE</em></dt><dd><p> A YAML file with the user credentials. Should have keys <code>email</code> and <code>password</code>.</p></dd>
<dt><code>-p</code>,<code>--publish</code></dt><dd><p> Publish the post immediately. This will ignore the <code>state</code> parameter set in the post.</p></dd>
<dt><code>-q</code>,<code>--queue</code></dt><dd><p> Add the post to the queue.</p></dd>
<dt><code>-d</code>,<code>--draft</code></dt><dd><p> Save the post as a draft.</p></dd>
@@ -122,6 +123,19 @@ <h2 id='NAME'>NAME</h2>
<pre><code>$ tumblr http://www.youtube.com/watch?v=CW0DUg63lqU
</code></pre>
+<p>Save it as a draft:</p>
+
+<pre><code>$ tumblr -d http://www.youtube.com/watch?v=CW0DUg63lqU
+</code></pre>
+
+<p>Authenticate with credentials given from a file:</p>
+
+<pre><code>$ cat ~/.tumblrlogin
+email: tumblruser@generic-email.com
+password: myvoiceismypassport
+$ cat data.yml my_post.txt | tumblr --credentials ~/.tumblrlogin
+</code></pre>
+
<h2>INSTALLATION</h2>
<p>If you have RubyGems installed:</p>
Please sign in to comment.
Something went wrong with that request. Please try again.