quickpress 0.0.1 → 0.1.0

data/lib/quickpress.rb

@@ -6,6 +6,7 @@ require 'quickpress/version'
 require 'quickpress/wordpress'
 require 'quickpress/cli'
 require 'quickpress/options'
+require 'digest/md5'
 
 class String
   # Removes starting whitespace.
@@ -36,7 +37,8 @@ module Quickpress
   ROOT_DIR    = File.expand_path "~/.config/quickpress"
   CONFIG_FILE = "#{ROOT_DIR}/config.yml"
 
-  @@inited = nil
+  @@inited = nil     # config
+  @@started = false  # overall
   @@ran_first_time = false
 
   # URL of the default site used to post.
@@ -205,6 +207,7 @@ module Quickpress
 
         File.write(CONFIG_FILE, YAML.dump(settings))
       end
+      puts "Site added"
 
     rescue StandardError => e
       retry if e.message =~ /will retry/
@@ -303,6 +306,7 @@ module Quickpress
     end
 
     File.write(CONFIG_FILE, YAML.dump(settings))
+    puts "Forgotten"
 
     # Ooh, boy
     # We've just ran out of sites! Better delete that config file!
@@ -422,6 +426,38 @@ module Quickpress
     end
   end
 
+  # Pretty-prints categories list.
+  def list_categories
+    Quickpress::startup
+
+    # Will show categories in columns of n
+    columns = 5
+    table = @@connection.categories.each_slice(columns).to_a
+
+    puts
+    Thor::Shell::Basic.new.print_table table
+  end
+
+  # Pretty-prints all options of the Wordpress site.
+  def list_options
+    Quickpress::startup
+    options = @@connection.get_options
+
+    puts
+    Thor::Shell::Basic.new.print_table options
+  end
+
+  # Pretty-prints all users currently registered on the site.
+  def list_users
+    Quickpress::startup
+    users = @@connection.get_users
+
+    users.each do |user|
+      puts
+      Thor::Shell::Basic.new.print_table user
+    end
+  end
+
   # Actually sends post/page `filename` to the blog.
   def new_file(what, filename)
     Quickpress::startup
@@ -431,16 +467,24 @@ module Quickpress
     id, link = nil, nil
 
     if what == :post
-      title = CLI::get "Post title:"
 
-      puts "Existing blog categories:"
-      @@connection.categories.each { |c| puts "* #{c}" }
+      # User specified title/categories on command line?
+      title = $options[:title]
+      if title.nil?
+        title = CLI::get "Post title:"
+      end
 
-      puts "Use a comma-separated list (eg. 'cat1, cat2, cat3')"
-      puts "Tab-completion works."
-      puts "(will create non-existing categories automatically)"
+      categories = $options[:category]
+      if categories.nil?
+        puts "Existing blog categories:"
+        Quickpress::list_categories
+        puts
+        puts "Use a comma-separated list (eg. 'cat1, cat2, cat3')"
+        puts "Tab-completion works."
+        puts "(will create non-existing categories automatically)"
 
-      categories = CLI::tab_complete("Post categories:", @@connection.categories)
+        categories = CLI::tab_complete("Post categories:", @@connection.categories)
+      end
 
       cats = []
       categories.split(',').each { |c| cats << c.lstrip.strip }
@@ -458,7 +502,10 @@ module Quickpress
       puts "Post successful!"
 
     elsif what == :page
-      title = CLI::get "Page title:"
+      title = $options[:title]
+      if title.nil?
+        title = CLI::get "Page title:"
+      end
 
       CLI::with_status("Creating page...") do
 
@@ -477,6 +524,131 @@ module Quickpress
     END
   end
 
+  # Entrance for when we're editing a page or a post
+  # with numerical `id` (`what` says so).
+  #
+  def edit(what, id, filename=nil)
+    Quickpress::startup
+
+    # Get previous content
+    old_content = nil
+    if what == :post
+      post = @@connection.get_post id
+
+      old_content = post["post_content"]
+    else
+      page = @@connection.get_page id
+
+      old_content = page["post_content"]
+    end
+
+    if filename.nil?
+
+      # Get editor to open temporary file
+      editor = ENV["EDITOR"]
+      if editor.nil?
+        editor = get("Which text editor we'll use?")
+      end
+
+      # Create draft file
+      tempfile = Tempfile.new ['quickpress', '.html']
+      tempfile.write old_content
+      tempfile.flush
+
+      # Oh yeah, baby
+      `#{editor} #{tempfile.path}`
+
+      if tempfile.size.zero?
+        puts "Empty file: did nothing"
+        tempfile.close
+        exit 666
+      end
+
+      tempfile.close  # Apparently, calling `tempfile.flush`
+      tempfile.open   # won't do it. Need to close and reopen.
+
+      md5old = Digest::MD5.hexdigest old_content
+      md5new = Digest::MD5.hexdigest tempfile.read
+
+      if (md5old == md5new) and (not $options[:force])
+        puts "Contents unchanged: skipping"
+        puts "(use --force if you want to do it anyway)"
+        return
+      end
+
+      puts "File: '#{tempfile.path}'" if $options[:debug]
+
+      edit_file(what, id, tempfile.path)
+      tempfile.close
+
+    else
+
+      md5old = Digest::MD5.hexdigest old_content
+      md5new = Digest::MD5.hexdigest File.read(filename)
+
+      if (md5old == md5new) and (not $options[:force])
+        puts "Contents unchanged: skipping"
+        puts "(use --force if you want to do it anyway)"
+        return
+      end
+
+      edit_file(what, id, filename)
+    end
+  end
+
+  # Actually edits post/page `filename` to the blog.
+  def edit_file(what, id, filename)
+
+    html = Tilt.new(filename).render
+
+    link = nil
+
+    if what == :post
+
+      # User specified title/categories on command line?
+      title = $options[:title]
+      if title.nil?
+        title = CLI::get("New Post title:", true)
+      end
+
+      categories = $options[:category]
+      if categories.nil?
+        puts "Existing blog categories:"
+        Quickpress::list_categories
+        puts
+        puts "Use a comma-separated list (eg. 'cat1, cat2, cat3')"
+        puts "Tab-completion works."
+        puts "(will create non-existing categories automatically)"
+        puts "(leave empty to keep current categories)"
+
+        categories = CLI::tab_complete("Post categories:", @@connection.categories)
+      end
+
+      cats = []
+      categories.split(',').each { |c| cats << c.lstrip.strip }
+
+      CLI::with_status("Editing post...") do
+        link = @@connection.edit_post(id, html, title, categories)
+      end
+
+    elsif what == :page
+      title = $options[:title]
+      if title.nil?
+        title = CLI::get("New Page title:", true)
+      end
+
+      CLI::with_status("Editing Page...") do
+        link = @@connection.edit_page(id, html, title)
+      end
+    end
+
+    puts <<-END.remove_starting!
+      Edit successful!
+      link: #{link}
+    END
+  end
+
+
   # Deletes comma-separated list of posts/pages with `ids`.
   # A single number is ok too.
   def delete(what, ids)
@@ -527,6 +699,7 @@ module Quickpress
           @@connection.delete_page id.to_i
         end
       end
+      puts "Deleted!"
     end
   end
 
@@ -570,12 +743,35 @@ module Quickpress
     end
   end
 
+  # Shows comment count according to their status.
+  def status_comments
+    Quickpress::startup
+    status = @@connection.get_comment_status
+
+    puts
+    Thor::Shell::Basic.new.print_table status
+  end
+
+  def status_categories
+    Quickpress::startup
+    status = @@connection.get_category_status
+
+    if $options[:"non-empty"]
+      status.reject! { |s| s[1].zero? }
+    end
+
+    puts
+    Thor::Shell::Basic.new.print_table status
+  end
+
   private
   module_function
 
   # Initializes everything based on the config file or
   # simply by asking the user.
   def startup
+    return if @started
+
     Quickpress::first_time if @@default_site.nil?
 
     puts "Using site '#{@@default_site}'"
@@ -585,15 +781,28 @@ module Quickpress
     CLI::with_status("Connecting...") do
       @@connection ||= Wordpress.new(@@default_site, @@username, @@password)
     end
+    @started = true
   end
 
-  # Gets username and password.
+  # Gets username and password for the Wordpress site.
+  #
+  # There's three ways of authenticating,
+  # in order of importance:
   #
-  # First, try getting from environment variables
-  # `QP_USERNAME` and `QP_PASSWORD`.
+  # 1. Command-line options.
+  #    User can specify user/pass with the `-u` and `-p`
+  #    options, overrides everything else.
+  # 2. Environment variables.
+  #    Whatever's inside `QP_USERNAME` and `QP_PASSWORD`
+  #    envvars will be used.
+  # 3. Ask the user.
+  #    If all else fails, we'll ask the user for
+  #    username/password.
   #
-  # If that fails, asks to the user.
   def authenticate
+    @@username ||= $options[:user]
+    @@password ||= $options[:pass]
+
     @@username ||= ENV["QP_USERNAME"]
     @@password ||= ENV["QP_PASSWORD"]
 

data/lib/quickpress/cli.rb

@@ -18,11 +18,20 @@ module Quickpress
     #
     # This ensures that the string is not empty
     # and pre/post spaces are removed.
-    def get prompt
+    #
+    # If `allow_empty` is true, allows the user to
+    # type an empty input.
+    #
+    def get(prompt, allow_empty=false)
       print "#{prompt} "
 
       ret = ""
-      ret = $stdin.gets.lstrip.strip while ret.empty?
+
+      if allow_empty
+        ret = $stdin.gets.lstrip.strip
+      else
+        ret = $stdin.gets.lstrip.strip while ret.empty?
+      end
       ret
     end
 

data/lib/quickpress/options.rb

@@ -1,18 +1,33 @@
 
 module Quickpress
+
+  # Hash that holds global program's settings.
+  #
+  # There should be only one instalce of it.
+  #
   class Options
     def initialize
-      @options = {}
-      @options[:force] = false
-      @options[:markup] = 'markdown'
+      @values = {}
     end
 
     def [] label
-      @options[label]
+      @values[label]
     end
 
     def []=(label, val)
-      @options[label] = val
+      @values[label] = val
+    end
+
+    # To add settings saved on other hash.
+    #
+    # @note I don't use Hash#merge because Thor's
+    #       argument list creates a Hash with darn
+    #       Strings as keys.
+    #       I want symbols, dammit!
+    def merge! other_hash
+      other_hash.each do |key, val|
+        @values[key.to_sym] = val
+      end
     end
   end
 

data/lib/quickpress/version.rb

@@ -1,5 +1,5 @@
 module Quickpress
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
   VERSION_MAJOR = VERSION.split('.')[0]
   VERSION_MINOR = VERSION.split('.')[1]
   VERSION_PATCH = VERSION.split('.')[2]

data/lib/quickpress/wordpress.rb

@@ -17,6 +17,9 @@ module Quickpress
     # All categories on blog
     attr_reader :categories
 
+    # Blog's options in a Hash. Need to call `get_options` first.
+    attr_reader :options
+
     # Yes it is
     VERY_LARGE_NUMBER = 2**31 - 1
 
@@ -44,15 +47,17 @@ module Quickpress
                                       :username => user,
                                       :password => pass)
 
-      # Actually connecting
-      options = @client.getOptions
+      # Actually connecting, takes a while
+      options = @client.getOptions(:options => ["blog_title",
+                                                "blog_tagline",
+                                                "blog_url"])
 
       @title   = options["blog_title"]["value"]
       @tagline = options["blog_tagline"]["value"]
       @url     = options["blog_url"]["value"]
 
       @categories = []
-      terms = @client.getTerms(:taxonomy => 'category')
+      terms = @client.getTerms(:taxonomy => "category")
       terms.each do |term|
         @categories << term["name"]
       end
@@ -61,15 +66,71 @@ module Quickpress
     # Sends a post/page to the Wordpress site.
     def post options
       id   = @client.newPost(:content => options)
-      link = @client.getPost(:post_id => id, :fields => [:link])["link"]
+
+      info = @client.getPost(:post_id => id,
+                             :fields => [:link])
+      link = info["link"]
 
       return id, link
     end
 
+    # Returns post with numerical `id`.
+    # It's a Hash with attributes/values.
+    #
     def get_post id
       @client.getPost(:post_id => id)
     end
 
+    # Edits post with numerical `id` to have `new_content`.
+    #
+    # If any of the arguments is nil, will keep their
+    # old values.
+    #
+    def edit_post(id, new_content="", new_title="", new_categories=[])
+      old_post = get_post id
+
+      new_content = old_post["post_content"] if new_content.empty?
+      new_title   = old_post["post_title"]   if new_title.empty?
+
+      if new_categories == []
+
+        # Filtering out terms that are not categories
+        terms = old_post["terms"].select { |t| t["taxonomy"] == "category" }
+
+        # Getting category names
+        cats = terms.map { |c| c["name"] }
+        new_categories = cats
+      end
+
+      @client.editPost(:post_id => id,
+                       :content => {
+                         :post_content => new_content,
+                         :post_title => new_title,
+                         :terms_names => {
+                           :category => new_categories
+                         }
+                       })
+      old_post["link"]
+    end
+
+    def edit_page(id, new_content="", new_title="")
+      old_page = get_page id
+
+      new_content = old_page["post_content"] if new_content.empty?
+      new_title   = old_page["post_title"]   if new_title.empty?
+
+      @client.editPost(:post_id => id,
+                       :filter => {
+                         :post_type => 'page'
+                       },
+                       :content => {
+                         :post_content => new_content,
+                         :post_title => new_title
+                       })
+      old_page["link"]
+    end
+
+    # Returns page with numerical `id`.
     def get_page id
       @client.getPost(:post_id => id,
                       :filter => {
@@ -98,10 +159,12 @@ module Quickpress
                        })
     end
 
+    # Deletes post with numerical `id`.
     def delete_post id
       @client.deletePost(:post_id => id)
     end
 
+    # Deletes page with numerical `id`.
     def delete_page id
       @client.deletePost(:post_id => id,
                          :filter => {
@@ -109,6 +172,83 @@ module Quickpress
                          })
     end
 
+    # Retrieves as much metadata about the blog as it can.
+    #
+    # Returns an array of 3-element arrays:
+    #
+    # 1. Wordpress' internal option name.
+    #    You must use it to set options. See `set_options`.
+    # 2. Human-readable description of the option.
+    # 3. Current value.
+    #
+    # The values are detailed here:
+    # http://codex.wordpress.org/Option_Reference
+    #
+    def get_options
+      options = @client.getOptions
+
+      options.map { |o| [o[0], o[1]["desc"], o[1]["value"]] }
+    end
+
+    # Sets the blog's options according to `new_options`
+    # hash.
+    # It points to an array with two elements:
+    #
+    # 1. Wordpress' internal option name.
+    #    See `get_options`.
+    # 2. It's new value.
+    #    See link on `get_options` for possible values.
+    #
+    # Returns the new options, the same way as `get_options`.
+    #
+    def set_options new_options
+      options = @client.setOptions
+
+      options.map { |o| [o[0], o[1]["desc"], o[1]["value"]] }
+
+    end
+
+    # Returns all users currently registered on the blog.
+    #
+    # It's an Array of two-element Arrays:
+    #
+    # 1. Wordpress' internal info name
+    # 2. It's value
+    def get_users
+      users = @client.getUsers
+
+      # Replacing XML-RPC's ugly DateTime class
+      # with Ruby's Time
+      users.each do |u|
+        u["registered"] = u["registered"].to_time
+      end
+
+      users.map { |u| u.to_a }
+    end
+
+    # Returns comment counts according to their status.
+    # It's an Array of two elements:
+    #
+    # 1. Wordpress' internal status name
+    # 2. Comment counts on that status
+    #
+    def get_comment_status
+      status = @client.getCommentCount
+
+      status.to_a
+    end
+
+    # Returns categories and how many posts they have.
+    # It's an Array of two elements:
+    #
+    # 1. Category name
+    # 2. Post count
+    #
+    def get_category_status
+      status = @client.getTerms(:taxonomy => 'category')
+
+      status.map { |s| [s["name"], s["count"]] } # all we need
+    end
   end
 end