quickpress 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee5a03a88e8d2dccb44018e9cfd540361646bd1e
-  data.tar.gz: 186d0ec2e68375f3d889214859d920ecf5ffddd2
+  metadata.gz: 2139e020b8fc58f48b80aea389632cd9a4b6d3d8
+  data.tar.gz: b3873903acdfa799db6f20197190d67a55b94229
 SHA512:
-  metadata.gz: 6154b3e6c998f59d0704780e351a8f77552f3f1fdba4e1e4a38b9e1e62ac003914b1365623bc47851a2644ac55526a15f84589210b4aa2e3398945285527947c
-  data.tar.gz: 2b7dfad06683b7ac50c8e819762b6002b029a898ad533a0c8b84ef9d5779ad39d2806b4db649ab908c3671a0c792069c30c64686cbf1348bb53eeed586f1f39a
+  metadata.gz: f08d350ace33cf345c14c3dd7d8be16fcb984230183cf0d0dc94538df7ab0156f1c1186dc730805c636624bb5f326de65b0591b25ed1da3df2e5c1eca95b2e50
+  data.tar.gz: 57d30a935ed53a9f8b75297a1cc69f890038b044a11528a4214149faa6e8e00061247ae9dc9d6d6a59401a960c8498ce02c781d97207897a5de496a69c03a7fb

data/README.md

@@ -4,12 +4,13 @@
 [![emacs banner](http://badges.alexdantas.net/emacs.png)](http://badges.alexdantas.net/)
 [![free-software banner](http://badges.alexdantas.net/free-software.png)](http://badges.alexdantas.net/)
 
-Manage your Wordpress site on the command-line.
+Manage your Wordpress site from the command line.
 
 ## Features
 
-Quickpress allows you to quickly post on your Wordpress site.
-It is also:
+Quickpress allows you to create, delete, edit and list both posts and pages on your Wordpress site. You can also retrieve settings of the site and get status on comments, categories and users.
+
+It is:
 
 * **Powerful**: With quickpress you can create, delete and list
   your posts and pages. More actions are expected on next releases.
@@ -20,9 +21,11 @@ It is also:
 * **Documented**: [The wiki][wiki]
   has all the guides you'll ever need. Also, reference is only
   a `qp help` away.
-* **Unified**: Works on both Wordpress.com and self-hosted Wordpress.org
-  websites.
-* **Safe**: Quickpress doesn't store your username/password anywhere.
+* **Unified**: Works on both Wordpress.com and self-hosted
+  Wordpress.org websites.
+* **Safe**: Quickpress doesn't store your username/password
+  anywhere. It has three authentication methods, letting you
+  decide how to deal with username/passwords.
 * **Free**: It is licensed under the GPLv3. It means that quickpress
   will always be free
   ([both as in "free beer" and as in "freedom"](http://en.wikipedia.org/wiki/Gratis_versus_libre#.22Free_beer.22_vs_.22free_speech.22_distinction)).
@@ -38,11 +41,12 @@ and there you go!
 
 ## Getting started
 
-To use quickpress we call `qp` with some commands, just like `git`.
+To use quickpress we call `qp` with some commands,
+just like `git` or `bundle`.
 
-To start using a site withing quickpress, do:
+To start managing a site, do:
 
-    $ qp new-site
+    $ qp new-site your-site.com/path/to/blog
 
 Now you can do a lot with it. For example, let's list all
 existing posts there:
@@ -53,20 +57,27 @@ Want to post? Write it anywhere and point `qp` to it!
 
     $ qp new-post my-post.md
 
-If you're too lazy, calling `new-post` without no filenames will
-call your default text editor to write it.
-Try it!
+If you're too lazy, calling `new-post` without filenames will
+call your default text editor. When you're done, it is sent
+automatically.
+
+Oops, you made a mistake and want to edit a post.
+First, list them and edit by id.
+
+    $ emacs file.md           # edit your post
+    $ qp list-posts           # shows all posts, with their ID
+	$ qp edit-post ID file.md # send changes to post with ID
 
-Oops, you made a mistake and want to delete a post.
-First, list them and then delete by id:
+Finally, you can delete a post by id too:
 
-    $ qp list-posts      # shows all posts, with their ID
+    $ qp list-posts
 	$ qp delete-post ID
 
 All of the previous commands can be done with pages too.
+Simply replace `-post` with `-page`.
 
 Now say you want to post on another Worpress site.
-By doing `qp new-site` it should become the default.
+By doing `qp new-site` it should become the new default.
 
 After doing this, you can switch between them by using:
 
@@ -77,20 +88,22 @@ If you want help with any command, just call:
 
     $ qp help (command)
 
-To see a list of all commands, call:
+To see all commands, go:
 
-    $ qp help
+    $ qp
 
-Finally, a simple cheatsheet is shown when doing:
+To see most commonly used commands and examples, do:
 
-    $ qp
+    $ qp help
 
 For more help and nice guides, check out [the wiki][wiki].
 
 ## Supported template engines
 
-Thanks to [Tilt][tilt], you can write on `quickpress` with several templating
-engines. Just be sure to have at least one *required gem* of your favorite
+Thanks to [Tilt][tilt], you can write on `quickpress` with
+several templating engines.
+
+Just be sure to have at least one *required gem* of your favorite
 *engine*.
 
 | Engine                  | File extensions       | Required gem               |
@@ -127,8 +140,13 @@ lowercase:
 
 ## Development
 
-Quickpress uses [Thor][thor] for it's CLI interface and [rubypress] for
-the Wordpress XMLRPC API.
+Quickpress uses [Thor][thor] for it's CLI interface and
+[rubypress] for the Wordpress XMLRPC API.
+It was highly inspired by the [blogpost] tool - thanks
+a lot, Stuart Rackam!
+
+Quickpress follows the [Semantic Versioning standard][versioning],
+meaning that it increments versions in a MAJOR.MINOR.PATCH way.
 
 For now the source code is a mess.
 Any comments are well-appreciated.
@@ -160,4 +178,7 @@ Please take the time to visit any of the links below.
 [rubypress]:https://github.com/zachfeldman/rubypress
 [wiki]:https://github.com/alexdantas/quickpress/wiki
 [gem]:https://rubygems.org/gem/quickpress/
+[blogpost]:http://srackham.wordpress.com/blogpost-readme/
+[versioning]:http://semver.org/
 
+[![githalytics.com alpha](https://cruel-carlota.pagodabox.com/72dc86b8e7c376b54dabd5d33b42c774 "githalytics.com")](http://githalytics.com/alexdantas/quickpress)

data/bin/qp

@@ -2,19 +2,43 @@
 #  ___    _     _   __    _     ___   ___   ____  __   __
 # / / \  | | | | | / /`  | |_/ | |_) | |_) | |_  ( (` ( (`
 # \_\_\\ \_\_/ |_| \_\_, |_| \ |_|   |_| \ |_|__ _)_) _)_)
+#
+# Command-line blog client for Wordpress.
 
 require 'thor'
 require 'quickpress'
 
-# Command line interface above the `Quickpress` class.
+# Command-line interface to quickpress' features.
+#
+# It uses `Thor` to implement commands on top of the
+# `Quickpress` class. All the actual functionalities
+# are there.
+#
+# Look out for `Thor`'s documentation to understand
+# these domain-specific methods (like `desc`,
+# `option` and such).
 #
-class QP < Thor
+# @note Those `\x5` on the long descriptions are to force
+#       a line break - think of them as `<br />`s.
+#
+class QuickpressCLI < Thor
+  package_name "Quickpress"
 
   # Global `--debug` flag
   class_option(:debug,
                :desc => "debugging mode",
                :type => :boolean)
 
+  class_option(:user,
+               :desc => "Wordpress username",
+               :aliases => "-u",
+               :type => :string)
+
+  class_option(:pass,
+               :desc => "Wordpress password",
+               :aliases => "-p",
+               :type => :string)
+
   #  _      ____  _         ___   ___   __  _____
   # | |\ | | |_  \ \    /  | |_) / / \ ( (`  | |
   # |_| \| |_|__  \_\/\/   |_|   \_\_/ _)_)  |_|
@@ -23,9 +47,20 @@ class QP < Thor
        'Creates a post on your Wordpress site')
 
   option('markup',
-         :banner  => "name",
+         :banner  => "NAME",
          :desc    => "markup language",
-         :aliases => "-m")
+         :aliases => "-m",
+         :type => :string)
+
+  option('title',
+         :desc    => "post title",
+         :aliases => "-t",
+         :type => :string)
+
+  option('category',
+         :desc    => "categories",
+         :aliases => "-c",
+         :type => :string)
 
   long_desc(<<-END).remove_starting!
     If FILENAME is given, will post it to your Wordpress site.
@@ -34,14 +69,22 @@ class QP < Thor
     \x5wait for you to write a post. After you save it, will post
     \x5that.
 
-    * Set default text editor with the `EDITOR` environment
-    \x5variable.
-    \x5* For a list of markup languages, do `qp markup-list`.
+    The --categories option allows you to specify several of
+    \x5them, just make sure they're comma-separated. For example:
+
+    $ qp new-post file.md -t "My Title" -c "cat1, cat2, cat3"
+
+    Notes:
+
+    * Set default text editor with the `EDITOR` environment variable.
+
+    * For a list of languages to use with --markup, do `qp markup-list`.
+
+    * Unexisting categories will be created automatically.
   END
 
   def new_post(filename=nil)
-    $options[:debug] = options[:debug]
-    $options[:markup] = options[:markup]
+    $options.merge! options
 
     Quickpress::new(:post, filename)
   end
@@ -54,14 +97,18 @@ class QP < Thor
        'Shows last posts from Wordpress site')
 
   long_desc <<-END.remove_starting!
-    If COUNT is given, will show last COUNT posts,
-    \x5most recent first.
+    If COUNT is given, will show last COUNT posts.
 
     If no COUNT is given, will show all posts.
+
+    Notes:
+
+    * Posts are shown in order of old first, recent last.
   END
 
   def list_posts(ammount=0)
-    $options[:debug] = options[:debug]
+    $options.merge! options
+
     Quickpress::list(:post, ammount.to_i)
   end
 
@@ -80,25 +127,78 @@ class QP < Thor
   long_desc(<<-END).remove_starting!
     Deletes the post with numerical id equal to ID.
 
-    To see IDs, use `qp list-posts`.
-
     You can specify multiple IDs, just make sure to
-    \x5keep them apart with commas.
+    \x5keep them apart with commas. For example:
 
-    For example:
+    $ qp delete-post "4,8,15,16,23,42"
 
-    > $ qp delete-post "4,8,15,16,23,42"
+    Notes:
 
-    If the post doesn't exist, do nothing.
+    * To see IDs, use `qp list-posts`.
   END
 
   def delete_post(ids)
-    $options[:debug] = options[:debug]
-    $options[:force] = options[:force]
+    $options.merge! options
 
     Quickpress::delete(:post, ids)
   end
 
+  #  ____  ___   _  _____    ___   ___   __  _____
+  # | |_  | | \ | |  | |    | |_) / / \ ( (`  | |
+  # |_|__ |_|_/ |_|  |_|    |_|   \_\_/ _)_)  |_|
+  #
+  desc('edit-post ID [FILENAME]',
+       'Edits post already on Wordpress site')
+
+  option('markup',
+         :banner  => "NAME",
+         :desc    => "markup language",
+         :aliases => "-m",
+         :type => :string)
+
+  option('title',
+         :desc    => "post title",
+         :aliases => "-t",
+         :type => :string)
+
+  option('category',
+         :desc    => "categories",
+         :aliases => "-c",
+         :type => :string)
+
+  option('force',
+         :type => :boolean,
+         :desc    => "upload even if no changes were made",
+         :aliases => "-f")
+
+  long_desc(<<-END).remove_starting!
+    If FILENAME is given, will make the post with ID to
+    \x5have the contents of that file.
+
+    If no FILENAME is set, will launch your default text editor.
+    \x5with current contents of the post. After saving it,
+    \x5will post that.
+
+    Quickpress compares the old content with the new.
+    \x5If no changes were made, skips uploading.
+    \x5If you want to do it anyway, use the --force (pun intended).
+
+    You can specify title and categories just like in `new-post`.
+    \x5Leave them blank to keep current values. For example:
+
+    $ qp edit-post 666 file.md -t "" -c ""
+
+    That would mantain the current title and categories.
+
+    See `qp new-post`, same notes apply here.
+  END
+
+  def edit_post(id, filename=nil)
+    $options.merge! options
+
+    Quickpress::edit(:post, id.to_i, filename)
+  end
+
   #  _      ____  _         ___    __    __    ____
   # | |\ | | |_  \ \    /  | |_)  / /\  / /`_ | |_
   # |_| \| |_|__  \_\/\/   |_|   /_/--\ \_\_/ |_|__
@@ -107,9 +207,15 @@ class QP < Thor
        'Creates a page on your Wordpress site')
 
   option('markup',
-         :banner  => "name",
+         :banner  => "NAME",
          :desc    => "markup language",
-         :aliases => "-m")
+         :aliases => "-m",
+         :type => :string)
+
+  option('title',
+         :desc    => "page title",
+         :aliases => "-t",
+         :type => :string)
 
   long_desc <<-END.remove_starting!
     If FILENAME is given, will send it as a page to your
@@ -119,14 +225,15 @@ class QP < Thor
     \x5wait for you to write a page. After you save it, will send
     \x5that.
 
-    * Set default text editor with the `EDITOR` environment
-    \x5  variable.
-    \x5* For a list of markup languages, do `qp list-markup`.
+    Notes:
+
+    * Set default text editor with the `EDITOR` environment variable.
+
+    * For a list of languages to use with --markup, do `qp markup-list`.
   END
 
   def new_page(filename=nil)
-    $options[:debug] = options[:debug]
-    $options[:markup] = options[:markup]
+    $options.merge! options
 
     Quickpress::new(:page, filename)
   end
@@ -139,14 +246,18 @@ class QP < Thor
        'Shows last pages from Wordpress site')
 
   long_desc <<-END.remove_starting!
-    If COUNT is given, will show last COUNT pages,
-    \x5most recent first.
+    If COUNT is given, will show last COUNT pages.
 
     If no COUNT is given, will show all pages.
+
+    Notes:
+
+    * Pages are shown in order of old first, recent last.
   END
 
   def list_pages(ammount=0)
-    $options[:debug] = options[:debug]
+    $options.merge! options
+
     Quickpress::list(:page, ammount.to_i)
   end
 
@@ -165,24 +276,73 @@ class QP < Thor
   long_desc(<<-END).remove_starting!
     Deletes the page with numerical id equal to ID.
 
-    To see IDs, use `qp list-pages`.
-
     You can specify multiple IDs, just make sure to
-    \x5keep them apart with commas.
-    \x5For example:
+    \x5keep them apart with commas. For example:
+
+    $ qp delete-page "42,666,1337"
 
-    > $ qp delete-page "42,666,1337"
+    Notes:
 
-    If the page doesn't exist, do nothing.
+    * To see IDs, use `qp list-pages`.
   END
 
   def delete_page(ids)
-    $options[:debug] = options[:debug]
-    $options[:force] = options[:force]
+    $options.merge! options
 
     Quickpress::delete(:page, ids)
   end
 
+  #  ____  ___   _  _____    ___    __    __    ____
+  # | |_  | | \ | |  | |    | |_)  / /\  / /`_ | |_
+  # |_|__ |_|_/ |_|  |_|    |_|   /_/--\ \_\_/ |_|__
+  #
+  desc('edit-page ID [FILENAME]',
+       'Edits page already on Wordpress site')
+
+  option('markup',
+         :banner  => "NAME",
+         :desc    => "markup language",
+         :aliases => "-m",
+         :type => :string)
+
+  option('title',
+         :desc    => "page title",
+         :aliases => "-t",
+         :type => :string)
+
+  option('force',
+         :type => :boolean,
+         :desc    => "upload even if no changes were made",
+         :aliases => "-f")
+
+  long_desc(<<-END).remove_starting!
+    If FILENAME is given, will make the page with ID to
+    \x5have the contents of that file.
+
+    If no FILENAME is set, will launch your default text editor.
+    \x5with current contents of the page. After saving it,
+    \x5will send that.
+
+    Quickpress compares the old content with the new.
+    \x5If no changes were made, skips uploading.
+    \x5If you want to do it anyway, use the --force (pun intended).
+
+    You can specify the title just like in `new-page`.
+    \x5Leave it blank to keep current value. For example:
+
+    $ qp edit-page 666 file.md -t ""
+
+    That would mantain the current title.
+
+    See `new-page`, same notes there apply here.
+  END
+
+  def edit_page(id, filename=nil)
+    $options.merge! options
+
+    Quickpress::edit(:page, id.to_i, filename)
+  end
+
   #  _      ____  _         __   _  _____  ____
   # | |\ | | |_  \ \    /  ( (` | |  | |  | |_
   # |_| \| |_|__  \_\/\/   _)_) |_|  |_|  |_|__
@@ -193,16 +353,21 @@ class QP < Thor
   long_desc <<-END.remove_starting!
     If ADDRESS is provided, add it to quickpress.
 
-    If not, will prompt you for an address, username and password.
-    \x5If everything's correct, will add that site to quickpress.
+    If not, asks you for it. If everything's correct,
+    \x5will add that site to quickpress.
 
-    By adding we mean you'll be able to do all commands on it.
+    By "adding" we mean you'll be able to do all commands on it.
 
-    To see all sites added to quickpress, see `qp list-sites`.
+    Notes:
+
+    * To see all sites added to quickpress, see `qp list-sites`.
+
+    * To see all possible commands, simply use `qp`.
   END
 
   def new_site(address=nil)
-    $options[:debug] = options[:debug]
+    $options.merge! options
+
     Quickpress::new_site address
   end
 
@@ -215,11 +380,14 @@ class QP < Thor
 
   long_desc <<-END.remove_starting!
     Will list all sites you've added with `qp new-site`.
-    \x5If no COUNT is given, will show all pages.
+
+    They'll each have an id next to them. It is used by both
+    \x5`use-site` and `forget-site`.
   END
 
   def list_sites
-    $options[:debug] = options[:debug]
+    $options.merge! options
+
     Quickpress::list_sites
   end
 
@@ -239,18 +407,20 @@ class QP < Thor
     Makes quickpress stop managing the site with numerical
     \x5id equal to ID.
 
-    To see IDs, use `qp list-sites`.
-
     You can specify multiple IDs, just make sure to
-    \x5keep them apart with commas.
-    \x5For example:
+    \x5keep them apart with commas. For example:
+
+    $ qp forget-site "11,24,69"
+
+    Notes:
+
+    * To see IDs, use `qp list-sites`.
 
-    > $ qp forget-site "11,24,69"
+    * It doesn't do anything to the blog, don't worry
   END
 
-  def forget_site(ids)
-    $options[:debug] = options[:debug]
-    $options[:force] = options[:force]
+  def forget_site ids
+    $options.merge! options
 
     Quickpress::forget_site(ids)
   end
@@ -263,14 +433,16 @@ class QP < Thor
        'Sets site with ID as default')
 
   long_desc(<<-END).remove_starting!
-    From now on will do actions on the site with numerical
-    \x5id equal to ID.
+    From now on, all commands will affect the site with numerical ID.
+
+    Notes:
 
-    To see IDs, use `qp list-sites`.
+    * To see IDs, use `qp list-sites`.
   END
 
   def use_site id
-    $options[:debug] = options[:debug]
+    $options.merge! options
+
     Quickpress::use_site(id.to_i)
   end
 
@@ -282,56 +454,231 @@ class QP < Thor
        'Show all supported templating languages')
 
   long_desc(<<-END).remove_starting!
-    Lists all templating languages supported by quickpress.
+    Lists all templating languages supported by quickpress,
+    \x5together with their file extensions.
 
-    You can use them with the `--markup` option when creating
+    You can use them with the --markup option when creating
     \x5new posts or pages.
 
-    > $ qp new-post --markup asciidoc
+    $ qp new-post --markup asciidoc
 
-    If you create a post/page with a file, they're implied
-    \x5based on it's filename extension.
 
-    > $ qp new-post filename.asciidoc
+    Notes:
+
+    * When you create a post/page using a file, the markup is implied by the filename extension.
   END
 
   def list_markup
+    $options.merge! options
+
     Quickpress::list_markup
   end
-end
 
-#  ___   ____  __    _   _
-# | |_) | |_  / /`_ | | | |\ |
-# |_|_) |_|__ \_\_/ |_| |_| \|
-#
-begin
-  if ARGV.empty?
+  #  _     _   __  _____    __     __   _____  ____  __
+  # | |   | | ( (`  | |    / /`   / /\   | |  | |_  / /`_  __
+  # |_|__ |_| _)_)  |_|    \_\_, /_/--\  |_|  |_|__ \_\_/ (_()
+  #
+  desc('list-categories',
+       'Shows all posts\' categories on the Wordpress site')
+
+  long_desc <<-END.remove_starting!
+    Simply lists all existing categories withing the site.
+  END
+
+  def list_categories
+    $options.merge! options
+
+    Quickpress::list_categories
+  end
+
+  #  _     _   __  _____    ___   ___  _____  _   ___   _      __
+  # | |   | | ( (`  | |    / / \ | |_)  | |  | | / / \ | |\ | ( (`
+  # |_|__ |_| _)_)  |_|    \_\_/ |_|    |_|  |_| \_\_/ |_| \| _)_)
+  #
+  desc('list-options',
+       'Dumps all Wordpress options of the site')
+
+  long_desc <<-END.remove_starting!
+    Lists settings of the Wordpress site, along with their current
+    \x5values.
+
+    There's a lot of them, all explained here:
+    \x5http://codex.wordpress.org/Option_Reference
+  END
+
+  def list_options
+    $options.merge! options
+
+    Quickpress::list_options
+  end
+
+  #  _     _   __  _____    _     __   ____  ___   __
+  # | |   | | ( (`  | |    | | | ( (` | |_  | |_) ( (`
+  # |_|__ |_| _)_)  |_|    \_\_/ _)_) |_|__ |_| \ _)_)
+  #
+  desc('list-users',
+       'Shows all users on the site')
+
+  long_desc <<-END.remove_starting!
+    Lists all users currently registered on the site, along with
+    \x5their personal info :)
+  END
+
+  def list_users
+    $options.merge! options
+
+    Quickpress::list_users
+  end
+
+  #  __  _____   __   _____  _     __     __    ___   _
+  # ( (`  | |   / /\   | |  | | | ( (`   / /`  / / \ | |\/|  __
+  # _)_)  |_|  /_/--\  |_|  \_\_/ _)_)   \_\_, \_\_/ |_|  | (_()
+  #
+  desc('status-comments',
+       'Shows comment count according to their status')
+
+  long_desc <<-END.remove_starting!
+    Shows how many comments were:
+
+    - Approved
+    \x5- Awaiting Moderation
+    \x5- Marked as Spam
+    \x5- Created on Total
+  END
+
+  def status_comments
+    $options.merge! options
+
+    Quickpress::status_comments
+  end
+
+  #  __  _____   __   _____  _     __     __     __   _____
+  # ( (`  | |   / /\   | |  | | | ( (`   / /`   / /\   | |   __
+  # _)_)  |_|  /_/--\  |_|  \_\_/ _)_)   \_\_, /_/--\  |_|  (_()
+  #
+  desc('status-categories',
+       'Shows post count according to each category')
+
+  option('non-empty',
+         :desc    => "don't show categories without posts",
+         :aliases => "-n",
+         :type => :boolean)
+
+  long_desc <<-END.remove_starting!
+    Shows every existing category along with how many
+    \x5posts were made on them.
+  END
+
+  def status_categories
+    $options.merge! options
+
+    Quickpress::status_categories
+  end
+
+  #  ___    ___
+  # / / \  | |_)
+  # \_\_\\ |_|
+  #
+  # Overriding default message when user specify no arguments.
+  no_commands {
+  def self.qp
     puts <<-END.remove_starting!
       quickpress v#{Quickpress::VERSION}
-      Cheatsheet:
+      Usage:
+      	qp COMMAND [OPTIONS]
+
+      Quickpress works with commands, just like `git(1)` or `bundle(1)`.
+      Here's a list with all of them:
+
+    END
+
+    # Will get all commands and pretty-print them into
+    # columns.
+    all = QuickpressCLI
+      .all_tasks                       # internal Thor method
+      .to_a.sort
+      .map { |c| c[0] }                # only need their names
 
-      	$ qp {new,delete}-{post,page}
-      	$ qp list-(post|page|site)s
-      	$ qp {new,forget}-site
-      	$ qp use-site
-      	$ qp list-markup
+    all = all
+      .map { |c| c.gsub(/_/, '-') }    # replacing '_' with '-'
+      .each_slice(4)                   # splitting into columns
+      .to_a
 
-      All commands: `qp help`
-      Command info: `qp help (command)`
+    Thor::Shell::Basic.new.print_table all
+
+    puts <<-END.remove_starting!
+
+      Use `qp help` to show most used commands and their basic description.
+      Use `qp help <command>` to get more info on a specific command.
 
       Config directory: `~/.config/quickpress/`
 
-      homepage: http://quickpress.alexdantas.net
-      mailto:   eu@alexdantas.net
+      Homepage: http://quickpress.alexdantas.net
+      Contact:  Alexandre Dantas <eu@alexdantas.net>
 
-      This software is licensed under the
-      GNU General Public License version 3 or later.
+      This software is licensed under the GNU General Public License
+      version 3 or later.
+    END
+  end
+  #  _     ____  _     ___
+  # | |_| | |_  | |   | |_)
+  # |_| | |_|__ |_|__ |_|
+  #
+  # Overriding default help message - shell and subcommands
+  # are Thor's internals.
+  def self.show_help
+
+    puts <<-END
+quickpress v#{Quickpress::VERSION}
+The most commonly used commands are:
+
+  qp new-site        # Starts managing a new Wordpress site
+  qp use-site        # Sets site to manage from now on
+  qp new-post        # Creates a post on your Wordpress site
+  qp list-posts      # Shows last posts from Wordpress site
+  qp delete-post     # Deletes post by numerical ID
+  qp edit-post       # Edits post already on Wordpress site
+  qp list-markup     # Show formats on which you can write posts
+  qp status-comments # Display comment count according to status
+
+Here's some examples:
+
+  # Uploads post within `file.md` (Markdown) with
+  # title and categories
+  qp new-post file.md -t "Title" -c "Cat1, Cat2"
+
+  # Uploads page within `file.adoc` (Asciidoc) with
+  # username and password
+  qp new-page file.adoc -u username -p password
+
+  # Calls your default text editor with the contents of
+  # the post of id 12. After you save, uploads the changes.
+  qp edit-post 12
+
+Use `qp` to show all commands and program info.
+Use `qp help <command>` for info on a specific command.
     END
+  end}
+
+end
+
+#  ___   ____  __    _   _
+# | |_) | |_  / /`_ | | | |\ |
+# |_|_) |_|__ \_\_/ |_| |_| \|
+#
+begin
+  if ARGV.empty?
+    QuickpressCLI.qp
+    exit
+
+  elsif (ARGV.size == 1) and (ARGV.last == "help")
+    QuickpressCLI.show_help
     exit
   end
 
   Quickpress::config_init
-  QP.start ARGV
+
+  QuickpressCLI.start ARGV
 
   # Real mess of error-handling.
   # I wonder if there's a better way to do it.
@@ -358,6 +705,7 @@ rescue XMLRPC::FaultException => e
   else
     $stderr.puts
     $stderr.puts e.message
+    $stderr.puts e.backtrace if $options[:debug]
   end
   exit 666
 
@@ -368,6 +716,8 @@ rescue ArgumentError => arg
             Please use `http` or `https`.
         END
     exit 666
+  else
+    $stderr.puts arg.backtrace if $options[:debug]
   end
 
 rescue Interrupt => i