RubyGems - tumblr-rb - Versions diffs - 1.3.0 → 2.0.0.alpha - Mend

tumblr-rb 1.3.0 → 2.0.0.alpha

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (62) hide show

data/.travis.yml +7 -0
data/Gemfile +15 -8
data/Gemfile.lock +65 -65
data/LICENSE +4 -2
data/README.md +31 -84
data/Rakefile +8 -68
data/bin/tumblr +3 -133
data/lib/tumblr.rb +7 -184
data/lib/tumblr/authentication.rb +71 -0
data/lib/tumblr/client.rb +148 -0
data/lib/tumblr/command_line_interface.rb +222 -0
data/lib/tumblr/credentials.rb +31 -0
data/lib/tumblr/post.rb +253 -171
data/lib/tumblr/post/answer.rb +17 -0
data/lib/tumblr/post/audio.rb +22 -10
data/lib/tumblr/post/chat.rb +25 -0
data/lib/tumblr/post/link.rb +22 -9
data/lib/tumblr/post/photo.rb +29 -10
data/lib/tumblr/post/quote.rb +17 -10
data/lib/tumblr/post/text.rb +18 -0
data/lib/tumblr/post/video.rb +26 -11
data/lib/tumblr/version.rb +3 -0
data/lib/tumblr/views/error.erb +6 -0
data/lib/tumblr/views/form.erb +11 -0
data/lib/tumblr/views/layout.erb +41 -0
data/lib/tumblr/views/success.erb +6 -0
data/man/tumblr.1 +67 -65
data/man/tumblr.1.html +131 -108
data/man/tumblr.1.ronn +76 -57
data/man/tumblr.5 +48 -68
data/man/tumblr.5.html +106 -114
data/man/tumblr.5.ronn +38 -51
data/spec/fixtures/posts.json +10 -0
data/spec/fixtures/typical_animated_gif.gif +0 -0
data/spec/spec_helper.rb +12 -0
data/spec/tumblr/authentication_spec.rb +57 -0
data/spec/tumblr/client_spec.rb +223 -0
data/spec/tumblr/credentials_spec.rb +63 -0
data/spec/tumblr/post_spec.rb +125 -0
data/tumblr-rb.gemspec +16 -89
metadata +101 -102
data/lib/tumblr/authenticator.rb +0 -18
data/lib/tumblr/post/conversation.rb +0 -15
data/lib/tumblr/post/regular.rb +0 -14
data/lib/tumblr/reader.rb +0 -191
data/lib/tumblr/writer.rb +0 -39
data/test/fixtures/vcr_cassettes/authenticate/authenticate.yml +0 -39
data/test/fixtures/vcr_cassettes/read/all_pages.yml +0 -34
data/test/fixtures/vcr_cassettes/read/authenticated.yml +0 -40
data/test/fixtures/vcr_cassettes/read/authentication_failure.yml +0 -33
data/test/fixtures/vcr_cassettes/read/like.yml +0 -31
data/test/fixtures/vcr_cassettes/read/mwunsch.yml +0 -101
data/test/fixtures/vcr_cassettes/read/optional.yml +0 -48
data/test/fixtures/vcr_cassettes/read/pages.yml +0 -36
data/test/fixtures/vcr_cassettes/read/tumblrgemtest.yml +0 -42
data/test/fixtures/vcr_cassettes/read/unlike.yml +0 -31
data/test/fixtures/vcr_cassettes/write/delete.yml +0 -31
data/test/fixtures/vcr_cassettes/write/edit.yml +0 -31
data/test/fixtures/vcr_cassettes/write/reblog.yml +0 -31
data/test/fixtures/vcr_cassettes/write/write.yml +0 -31
data/test/helper.rb +0 -44
data/test/test_tumblr.rb +0 -710

data/man/tumblr.1.html CHANGED

@@ -2,164 +2,187 @@
 <html>
 <head>
   <meta http-equiv='content-type' value='text/html;charset=utf8'>
-  <meta name='generator' value='Ronn/v0.4.1'>
-  <title>tumblr(1) -- publish to tumblr.com</title>
-  <style type='text/css'>
-    body {margin:0}
-    #man, #man code, #man pre, #man tt, #man kbd, #man samp {
-      font-family:consolas,monospace;
-      font-size:16px;
-      line-height:1.3;
-      color:#343331;
-      background:#fff; }
-    #man { max-width:89ex; text-align:justify; margin:0 25px 25px 25px }
-    #man h1, #man h2, #man h3 { color:#232221;clear:left }
-    #man h1 { font-size:28px; margin:15px 0 30px 0; text-align:center }
-    #man h2 { font-size:18px; margin-bottom:0; margin-top:10px; line-height:1.3; }
-    #man h3 { font-size:16px; margin:0 0 0 4ex; }
-    #man p, #man ul, #man ol, #man dl, #man pre { margin:0 0 18px 0; }
-    #man pre {
-      color:#333231;
-      background:#edeceb;
-      padding:5px 7px;
-      margin:0px 0 20px 0;
-      border-left:2ex solid #ddd}
-    #man pre + h2, #man pre + h3 {
-      margin-top:22px;
-    }
-    #man h2 + pre, #man h3 + pre {
-      margin-top:5px;
-    }
-    #man > p, #man > ul, #man > ol, #man > dl, #man > pre { margin-left:8ex; }
-    #man dt { margin:0; clear:left }
-    #man dt.flush { float:left; width:8ex }
-    #man dd { margin:0 0 0 9ex }
-    #man code, #man strong, #man b { font-weight:bold; color:#131211; }
-    #man pre code { font-weight:normal; color:#232221; background:inherit }
-    #man em, var, u {
-      font-style:normal; color:#333231; border-bottom:1px solid #999; }
-    #man h1.man-title { display:none; }
-    #man ol.man, #man ol.man li { margin:2px 0 10px 0; padding:0;
-      float:left; width:33%; list-style-type:none;
-      text-transform:uppercase; font-size:18px; color:#999;
-      letter-spacing:1px;}
-    #man ol.man { width:100%; }
-    #man ol.man li.tl { text-align:left }
-    #man ol.man li.tc { text-align:center;letter-spacing:4px }
-    #man ol.man li.tr { text-align:right }
-    #man ol.man a { color:#999 }
-    #man ol.man a:hover { color:#333231 }
+  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
+  <title>tumblr(1) - publish to tumblr.com</title>
+  <style type='text/css' media='all'>
+  /* style: man */
+  body#manpage {margin:0}
+  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
+  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
+  .mp h2 {margin:10px 0 0 0}
+  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
+  .mp h3 {margin:0 0 0 4ex}
+  .mp dt {margin:0;clear:left}
+  .mp dt.flush {float:left;width:8ex}
+  .mp dd {margin:0 0 0 9ex}
+  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
+  .mp pre {margin-bottom:20px}
+  .mp pre+h2,.mp pre+h3 {margin-top:22px}
+  .mp h2+pre,.mp h3+pre {margin-top:5px}
+  .mp img {display:block;margin:auto}
+  .mp h1.man-title {display:none}
+  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
+  .mp h2 {font-size:16px;line-height:1.25}
+  .mp h1 {font-size:20px;line-height:2}
+  .mp {text-align:justify;background:#fff}
+  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
+  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
+  .mp u {text-decoration:underline}
+  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
+  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
+  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
+  .mp b.man-ref {font-weight:normal;color:#434241}
+  .mp pre {padding:0 4ex}
+  .mp pre code {font-weight:normal;color:#434241}
+  .mp h2+pre,h3+pre {padding-left:0}
+  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
+  ol.man-decor {width:100%}
+  ol.man-decor li.tl {text-align:left}
+  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
+  ol.man-decor li.tr {text-align:right;float:right}
   </style>
 </head>
-<body>
-<div id='man'>
+<!--
+  The following styles are deprecated and will be removed at some point:
+  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
-<h1 class='man-title'>tumblr(1)</h1>
+  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
+  .man-navigation should be used instead.
+-->
+<body id='manpage'>
+  <div class='mp' id='man'>
-<ol class='head man'>
-  <li class='tl'>tumblr(1)</li>
-  <li class='tc'>Tumblr Manual</li>
-  <li class='tr'>tumblr(1)</li>
-</ol>
+  <div class='man-navigation' style='display:none'>
+    <a href="#NAME">NAME</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#COMMANDS">COMMANDS</a>
+    <a href="#POSTING-OPTIONS">POSTING OPTIONS</a>
+    <a href="#COMMON-OPTIONS">COMMON OPTIONS</a>
+    <a href="#AUTHORIZATION">AUTHORIZATION</a>
+    <a href="#EXAMPLES">EXAMPLES</a>
+    <a href="#COPYRIGHT">COPYRIGHT</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+  </div>
-<h2 id='NAME'>NAME</h2>
-<p><code>tumblr</code> -- publish to tumblr.com</p>
+  <ol class='man-decor man-head man head'>
+    <li class='tl'>tumblr(1)</li>
+    <li class='tc'>Tumblr Manual</li>
+    <li class='tr'>tumblr(1)</li>
+  </ol>
-<h2>SYNOPSIS</h2>
+  <h2 id="NAME">NAME</h2>
+<p class="man-name">
+  <code>tumblr</code> - <span class="man-whatis">publish to tumblr.com</span>
+</p>
-<p><code>tumblr</code> [<var>OPTIONS</var>] <var>FILE OR URL</var></p>
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
-<h2>DESCRIPTION</h2>
+<p><code>tumblr</code> COMMAND [ARGS]</p>
-<p><code>tumblr</code> is a command line utility and Ruby library for working with Tumblr.com. It can read plain-text files and publish them to Tumblr.</p>
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
-<p>The <code>tumblr</code> command will publish a named input <var>FILE</var> (or Standard Input if no file is given), or if a <var>URL</var> is given it will publish that URL as a Link post (or a Video post if the url is a YouTube or Vimeo post).</p>
+<p><code>tumblr</code> is a command line utility and Ruby library for working with Tumblr.com. It can read plain-text and binary files and publish them to Tumblr.</p>
-<p>If you preface your <var>FILE</var> with a bit of YAML (&lt;yaml.org>) frontmatter, you can give <code>tumblr</code> more explicit instructions for publishing your post. See tumblr(5) for available YAML parameters.</p>
+<p><code>tumblr</code> is driven through a group of <a href="#COMMANDS" title="COMMANDS" data-bare-link="true">COMMANDS</a> (similar to <code>git</code> or <code>rbenv</code>).</p>
-<h2>OPTIONS</h2>
+<p>If you preface your plaintext file with a bit of YAML (&lt;yaml.org>) frontmatter, you can give <code>tumblr</code> more explicit instructions for how to publish your post. See <a class="man-ref" href="tumblr.5.html">tumblr<span class="s">(5)</span></a> for available YAML parameters.</p>
+<h2 id="COMMANDS">COMMANDS</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.
-  If these are not provided, you will be prompted for them.
-  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>
-<dt><code>--group</code>=<em>GROUP</em></dt><dd><p>  Publish the post to a <em>GROUP</em> tumblelog.</p></dd>
+<dt><code>tumblr post</code> <var>POST</var> | <var>FILE</var> | <var>URL</var></dt><dd><p>  Post to tumblr.
+  A <var>POST</var> is a piece of plaintext, assumed to be formatted as <code>tumblr(5)</code>.
+  <var>FILE</var> is a path to a <var>POST</var>. If <var>FILE</var> has a binary extension, that file will be uploaded as an image, audio, or video post.
+  <var>URL</var> will create a link-type post, or a video or audio post, depending on the location of the url.</p></dd>
+<dt><code>tumblr pipe</code></dt><dd><p>  Read from STDIN and post to tumblr.</p></dd>
+<dt><code>tumblr edit</code> <var>POST_ID</var></dt><dd><p>  Edit <var>POST_ID</var> on tumblr.
+  Will open the serialized post in the foreground with $TUMBLREDITOR then $EDITOR.</p></dd>
+<dt><code>tumblr fetch</code> <var>POST_ID</var></dt><dd><p>  Fetch <var>POST_ID</var> from tumblr and write out its serialized form.</p></dd>
+<dt><code>tumblr delete</code> <var>POST_ID</var></dt><dd><p>  Delete <var>POST_ID</var> from tumblr.</p></dd>
+<dt><code>tumblr help</code> [<var>TASK</var>]</dt><dd><p>  Print the help message and the description for <var>TASK</var>.</p></dd>
+<dt><code>tumblr authorize</code></dt><dd><p>  Start a web server and application to authenticate to tumblr and authorize the cli.
+  See <a href="#AUTHORIZATION" title="AUTHORIZATION" data-bare-link="true">AUTHORIZATION</a></p></dd>
+<dt><code>tumblr version</code></dt><dd><p>  Print the <code>tumblr</code> version and quit.</p></dd>
 </dl>
-<p>Other:</p>
+<h2 id="POSTING-OPTIONS">POSTING OPTIONS</h2>
+<p>These options are used when posting to tumblr, i.e. when using <code>tumblr post</code> or <code>tumblr pipe</code>.</p>
 <dl>
-<dt><code>-h</code>, <code>--help</code></dt><dd><p>  Print the help message and quit.</p></dd>
-<dt><code>-v</code>, <code>--version</code></dt><dd><p>  Print the <code>tumblr</code> version and quit.</p></dd>
+<dt><code>-p</code>,<code>--publish</code></dt><dd><p>  Publish this post (ignoring the <code>state</code> parameter set in the post).</p></dd>
+<dt><code>-q</code>,<code>--queue</code></dt><dd><p>  Add this post to the queue.</p></dd>
+<dt><code>-d</code>,<code>--draft</code></dt><dd><p>  Save this post as a draft.</p></dd>
 </dl>
-<h2>EXAMPLES</h2>
+<h2 id="COMMON-OPTIONS">COMMON OPTIONS</h2>
+<dl>
+<dt><code>--credentials</code>=<em>PATH</em></dt><dd><p>  The file where your OAuth keys are stored.
+  When authenticating, this path is where the keys should be stored.</p></dd>
+<dt><code>--host</code>=<em>HOST</em></dt><dd><p>  The hostname of the Tumblr account your posting to.
+  Posting and fetching posts require the hostname.</p></dd>
+</dl>
+<h2 id="AUTHORIZATION">AUTHORIZATION</h2>
+<p>Most actions of the cli require authorization to Tumblr. <code>tumblr authorize</code> provides a mechanism to authenticate and authorize the cli.</p>
+<p>In order to use <code>tumblr</code>, you first need to <a href="http://www.tumblr.com/oauth/apps">register</a> an OAuth application with tumblr.</p>
+<p>Run <code>tumblr authorize</code> to start up server, and type in the consumer key and secret. You'll then be asked to authorize the app.
+These keys are saved to the file noted in <code>--credentials</code>, defaulting to <code>~/.tumblr</code>.
+If you choose not to use this default, you will need to enter the <code>--credentials</code> option every time you post.
+Alternatively, use the <code>$TUMBLRCRED</code> environment variable.</p>
+<h2 id="EXAMPLES">EXAMPLES</h2>
 <p>Publish a file to Tumblr.com:</p>
-<pre><code>$ tumblr my_post.txt
+<pre><code>$ tumblr post my_post.txt
 </code></pre>
 <p>Or from standard input:</p>
-<pre><code>$ cat data.yml my_post.txt | tumblr -a tumblr_user@foobar.com:p4ssw0rd
+<pre><code>$ cat data.yml my_post.txt | tumblr --host=mwunsch.tumblr.com
 </code></pre>
 <p>Make a Link post:</p>
-<pre><code>$ tumblr http://github.com/mwunsch/tumblr
+<pre><code>$ tumblr post http://github.com/mwunsch/tumblr
 </code></pre>
 <p>Or a Video post:</p>
-<pre><code>$ tumblr http://www.youtube.com/watch?v=CW0DUg63lqU
+<pre><code>$ tumblr post 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>
-<pre><code>gem install tumblr-rb
+<pre><code>$ tumblr post -d http://www.youtube.com/watch?v=CW0DUg63lqU
 </code></pre>
-<h2>COPYRIGHT</h2>
+<h2 id="COPYRIGHT">COPYRIGHT</h2>
-<p>Tumblr (the gem) is Copyright (C) 2010 Mark Wunsch</p>
+<p>Tumblr (the gem) is Copyright (C) 2010 - 2012 Mark Wunsch</p>
 <p>Tumblr is Copyright (c) Tumblr, Inc. The Tumblr gem is NOT affiliated with Tumblr, Inc.</p>
-<h2>SEE ALSO</h2>
+<h2 id="SEE-ALSO">SEE ALSO</h2>
-<p>tumblr(5), gem(1)</p>
+<p><a class="man-ref" href="tumblr.5.html">tumblr<span class="s">(5)</span></a>, <span class="man-ref">gem<span class="s">(1)</span></span></p>
-<ol class='foot man'>
-  <li class='tl'>Mark Wunsch</li>
-  <li class='tc'>March 2010</li>
-  <li class='tr'>tumblr(1)</li>
-</ol>
+  <ol class='man-decor man-foot man foot'>
+    <li class='tl'>Mark Wunsch</li>
+    <li class='tc'>October 2012</li>
+    <li class='tr'>tumblr(1)</li>
+  </ol>
-</div>
+  </div>
 </body>
 </html>

data/man/tumblr.1.ronn CHANGED

@@ -3,88 +3,107 @@ tumblr(1) -- publish to tumblr.com
 ## SYNOPSIS
-`tumblr` [<OPTIONS>] <FILE OR URL>
+`tumblr` COMMAND [ARGS]
 ## DESCRIPTION
-`tumblr` is a command line utility and Ruby library for working with Tumblr.com. It can read plain-text files and publish them to Tumblr.
-The `tumblr` command will publish a named input <FILE> (or Standard Input if no file is given), or if a <URL> is given it will publish that URL as a Link post (or a Video post if the url is a YouTube or Vimeo post).
-If you preface your <FILE> with a bit of YAML (<yaml.org>) frontmatter, you can give `tumblr` more explicit instructions for publishing your post. See tumblr(5) for available YAML parameters.
-## OPTIONS
-* `-a`,`--auth` _EMAIL:PASSWORD_:
-	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 or the `--credentials` argument if the post comes from standard input.
-* `-e`, `--email` _EMAIL_:
-	Email Address associated with your Tumblr account.
-	You will be prompted for a password.
-* `--credentials` _FILE_:
-	A YAML file with the user credentials. Should have keys `email` and `password`.
+`tumblr` is a command line utility and Ruby library for working with Tumblr.com. It can read plain-text and binary files and publish them to Tumblr.
+`tumblr` is driven through a group of [COMMANDS][] (similar to `git` or `rbenv`).
+If you preface your plaintext file with a bit of YAML (<yaml.org>) frontmatter, you can give `tumblr` more explicit instructions for how to publish your post. See tumblr(5) for available YAML parameters.
+## COMMANDS
+* `tumblr post` <POST> | <FILE> | <URL>:
+	Post to tumblr.
+	A <POST> is a piece of plaintext, assumed to be formatted as `tumblr(5)`.
+	<FILE> is a path to a <POST>. If <FILE> has a binary extension, that file will be uploaded as an image, audio, or video post.
+	<URL> will create a link-type post, or a video or audio post, depending on the location of the url.
+* `tumblr pipe`:
+	Read from STDIN and post to tumblr.
+* `tumblr edit` <POST_ID>:
+	Edit <POST_ID> on tumblr.
+	Will open the serialized post in the foreground with $TUMBLREDITOR then $EDITOR.
+* `tumblr fetch` <POST_ID>:
+	Fetch <POST_ID> from tumblr and write out its serialized form.
+* `tumblr delete` <POST_ID>:
+	Delete <POST_ID> from tumblr.
+* `tumblr help` [<TASK>]:
+	Print the help message and the description for <TASK>.
+* `tumblr authorize`:
+	Start a web server and application to authenticate to tumblr and authorize the cli.
+	See [AUTHORIZATION][]
+* `tumblr version`:
+	Print the `tumblr` version and quit.
+## POSTING OPTIONS
+These options are used when posting to tumblr, i.e. when using `tumblr post` or `tumblr pipe`.
 * `-p`,`--publish`:
-	Publish the post immediately. This will ignore the `state` parameter set in the post.
+	Publish this post (ignoring the `state` parameter set in the post).
 * `-q`,`--queue`:
-	Add the post to the queue.
+	Add this post to the queue.
 * `-d`,`--draft`:
-	Save the post as a draft.
-* `--group`=_GROUP_:
-	Publish the post to a _GROUP_ tumblelog.
+	Save this post as a draft.
-Other:
-* `-h`, `--help`:
-	Print the help message and quit.
-* `-v`, `--version`:
-	Print the `tumblr` version and quit.
+## COMMON OPTIONS
+* `--credentials`=_PATH_:
+	The file where your OAuth keys are stored.
+	When authenticating, this path is where the keys should be stored.
+* `--host`=_HOST_:
+	The hostname of the Tumblr account your posting to.
+	Posting and fetching posts require the hostname.
+## AUTHORIZATION
+Most actions of the cli require authorization to Tumblr. `tumblr authorize` provides a mechanism to authenticate and authorize the cli.
+In order to use `tumblr`, you first need to [register](http://www.tumblr.com/oauth/apps) an OAuth application with tumblr.
+Run `tumblr authorize` to start up server, and type in the consumer key and secret. You'll then be asked to authorize the app.
+These keys are saved to the file noted in `--credentials`, defaulting to `~/.tumblr`.
+If you choose not to use this default, you will need to enter the `--credentials` option every time you post.
+Alternatively, use the `$TUMBLRCRED` environment variable.
 ## EXAMPLES
 Publish a file to Tumblr.com:
-	$ tumblr my_post.txt
+	$ tumblr post my_post.txt
 Or from standard input:
-	$ cat data.yml my_post.txt | tumblr -a tumblr_user@foobar.com:p4ssw0rd
+	$ cat data.yml my_post.txt | tumblr --host=mwunsch.tumblr.com
 Make a Link post:
-	$ tumblr http://github.com/mwunsch/tumblr
-Or a Video post:
+	$ tumblr post http://github.com/mwunsch/tumblr
-	$ tumblr http://www.youtube.com/watch?v=CW0DUg63lqU
-Save it as a draft:
-	$ tumblr -d http://www.youtube.com/watch?v=CW0DUg63lqU
-Authenticate with credentials given from a file:
+Or a Video post:
-	$ cat ~/.tumblrlogin
-	email: tumblruser@generic-email.com
-	password: myvoiceismypassport
-	$ cat data.yml my_post.txt | tumblr --credentials ~/.tumblrlogin
-## INSTALLATION
+	$ tumblr post http://www.youtube.com/watch?v=CW0DUg63lqU
-If you have RubyGems installed:
+Save it as a draft:
-	gem install tumblr-rb
+	$ tumblr post -d http://www.youtube.com/watch?v=CW0DUg63lqU
 ## COPYRIGHT
-Tumblr (the gem) is Copyright (C) 2010 Mark Wunsch
+Tumblr (the gem) is Copyright (C) 2010 - 2012 Mark Wunsch
 Tumblr is Copyright (c) Tumblr, Inc. The Tumblr gem is NOT affiliated with Tumblr, Inc.