i3-ipc 0.1.4 → 0.2.0

data/README.markdown

@@ -58,10 +58,10 @@ There are 3 arguments passed to the block:
 To send data to the socket, you need to use `em.send_data`.
 * `type` is the received message type.
 This could be one of
-  * MESSAGE\_REPLY\_COMMAND
-  * MESSAGE\_REPLY\_GET\_WORKSPACES
-  * MESSAGE\_REPLY\_SUBSCRIBE
-  * MESSAGE\_REPLY\_GET\_OUTPUTS
+  * MESSAGE\_TYPE\_COMMAND
+  * MESSAGE\_TYPE\_GET\_WORKSPACES
+  * MESSAGE\_TYPE\_SUBSCRIBE
+  * MESSAGE\_TYPE\_GET\_OUTPUTS
   * EVENT\_WORKSPACE
 * `data` is the received data, already parsed.
 

data/Rakefile

@@ -1,23 +1,24 @@
-begin
-  require 'mg'
-  MG.new("i3-ipc.gemspec")
-
-  desc "Build a gem."
-  task :gem => :package
-
-  desc "Push a new version to Gemcutter and publish docs."
-  task :publish => [:test, :gemcutter] do
-    require File.dirname(__FILE__) + '/lib/i3-ipc/version'
-
-    sh "git tag v#{I3::Version}"
-    sh "git push origin master --tags"
-    sh "git clean -fd"
-    exec "rake pages"
-  end
-rescue LoadError
-  warn "mg not available."
-  warn "Install it with: gem i mg"
-end
+#begin
+  #require 'mg'
+  #MG.new("i3-ipc.gemspec")
+
+  #desc "Build a gem."
+  #task :gem => :package
+
+  #desc "Push a new version to Gemcutter and publish docs."
+  #task :publish => [:test, :gemcutter] do
+    #require_relative 'lib/i3-ipc/version'
+
+    #sh "git tag v#{I3::Version}"
+    #sh "git push origin master --tags"
+    #sh "git clean -fd"
+    #exec "rake pages"
+  #end
+#rescue LoadError => e
+  #raise unless e.message =~ /-- mg$/
+  #warn "mg not available."
+  #warn "Install it with: gem i mg"
+#end
 
 desc "Build standalone script"
 task :build => [ "build:standalone", "build:man" ]
@@ -27,6 +28,11 @@ task :man => "build:man" do
   exec "man man/i3-ipc.1"
 end
 
+file "i3-ipc" => FileList.new("lib/i3-ipc.rb", "lib/i3-ipc/*.rb", "man/i3-ipc.1") do |task|
+  require_relative 'lib/i3-ipc/standalone'
+  I3::Standalone.save(task.name)
+end
+
 namespace :build do
   desc "Build i3-ipc manual"
   task :man do
@@ -34,15 +40,7 @@ namespace :build do
   end
 
   desc "Build standalone script"
-  task :standalone => :load_i3_ipc do
-    require 'i3-ipc/standalone'
-    I3::Standalone.save('i3-ipc')
-  end
-end
-
-task :load_i3_ipc do
-  $LOAD_PATH.unshift 'lib'
-  require 'i3-ipc'
+  task :standalone => "i3-ipc"
 end
 
 Rake::TaskManager.class_eval do

data/lib/i3-ipc.rb

@@ -1,83 +1,112 @@
 require 'socket'
-require 'json'
-require 'i3-ipc/runner'
-require 'i3-ipc/subscription'
-require 'i3-ipc/manpage'
-require 'i3-ipc/version'
+require 'yajl/json_gem'
+require_relative 'i3-ipc/runner'
+require_relative 'i3-ipc/subscription'
+require_relative 'i3-ipc/manpage'
+require_relative 'i3-ipc/version'
 
 module I3
   class IPC
     MAGIC_STRING = "i3-ipc"
-    SOCKET_PATH = File.expand_path("~/.i3/ipc.sock")
 
-    MESSAGE_TYPE_COMMAND = 0
-    MESSAGE_TYPE_GET_WORKSPACES = 1
+    COMMANDS = [
+      # Send a command to i3.
+      #
+      # The payload is a command for i3
+      # (like the commands you can bind to keys in the configuration file)
+      # and will be executed directly after receiving it.
+      #
+      # Returns { "success" => true } for now.
+      # i3 does send this reply without checks.
+      [0, :command,        :required],
+
+      # Gets the current workspaces.
+      # The reply will be the list of workspaces
+      # (see the reply section of i3 docu)
+      [1, :get_workspaces, :none],
+
+      # Gets the current outputs.
+      # The reply will be a JSON-encoded list of outputs
+      # (see the reply section of i3 docu).
+      [3, :get_outputs,    :none],
+
+      # Gets the layout tree.
+      # i3 uses a tree as data structure which includes every container.
+      # The reply will be the JSON-encoded tree
+      # (see the reply section of i3 docu)
+      [4, :get_tree,       :none],
+
+      # Gets a list of marks (identifiers for containers to easily jump
+      # to them later).
+      # The reply will be a JSON-encoded list of window marks.
+      # (see the reply section of i3 docu)
+      [5, :get_marks,      :none],
+
+      # Gets the configuration (as JSON map) of the workspace bar with
+      # the given ID.
+      # If no ID is provided, an array with all configured bar IDs is returned instead.
+      [6, :get_bar_config, :optional],
+    ]
+    # Needed because subscribe is handled in submodule.
     MESSAGE_TYPE_SUBSCRIBE = 2
-    MESSAGE_TYPE_GET_OUTPUTS = 3
-
-    MESSAGE_REPLY_COMMAND = 0
-    MESSAGE_REPLY_GET_WORKSPACES = 1
-    MESSAGE_REPLY_SUBSCRIBE = 2
-    MESSAGE_REPLY_GET_OUTPUTS = 3
 
     EVENT_MASK = (1 << 31)
     EVENT_WORKSPACE = (EVENT_MASK | 0)
 
+    def self.message_type_subscribe
+      MESSAGE_TYPE_SUBSCRIBE
+    end
+
+    meta = class<<self; self; end
+    COMMANDS.each do |(id, cmd, arg)|
+      meta.instance_eval {
+        define_method "message_type_#{cmd.downcase}" do
+          id
+        end
+      }
+      if arg == :none
+        define_method cmd do
+          write format(id)
+          handle_response id
+        end
+      elsif arg == :optional || arg == :required
+        define_method cmd do |arg|
+          write format(id, arg)
+          handle_response id
+        end
+      end
+    end
+
     class WrongMagicCode < RuntimeError; end # :nodoc:
     class WrongType < RuntimeError; end # :nodoc:
 
+    # Get socket path via i3 itself.
+    def self.socket_path
+      @@socket_path ||= `i3 --get-socketpath`.chomp
+    end
+
     # connects to the given i3 ipc interface
     # @param socket_path String the path to i3's socket
     # @param force_connect Boolean connects to the socket if true
-    def initialize(socket_path=SOCKET_PATH, force_connect=false)
-      @socket_path = socket_path
+    def initialize(socket=nil, force_connect=false)
+      @@socket_path = socket if socket
       connect if connect
     end
 
     # shortcut
-    def self.subscribe(list, socket_path=SOCKET_PATH, &blk)
-      Subscription.subscribe(list, socket_path, &blk)
+    def self.subscribe(list, socket_path=nil, &blk)
+      Subscription.subscribe(list, socket_path || self.socket_path, &blk)
     end
 
-    # send a command to i3
+    # Reads the reply from the socket
+    # and parses the returned json into a ruby object.
     #
-    # the payload is a command for i3
-    # (like the commands you can bind to keys in the configuration file)
-    # and will be executed directly after receiving it.
+    # Throws WrongMagicCode when magic word is wrong.
+    # Throws WrongType if returned type does not match expected.
     #
-    # returns { "success" => true } for now.
-    # i3 does send this reply without checks
-    def command(payload)
-      write format(MESSAGE_TYPE_COMMAND, payload)
-      handle_response MESSAGE_TYPE_COMMAND
-    end
-
-    # gets the current workspaces.
-    # the reply will be the list of workspaces
-    # (see the reply section of i3 docu)
-    def get_workspaces
-      write format(MESSAGE_TYPE_GET_WORKSPACES)
-      handle_response MESSAGE_TYPE_GET_WORKSPACES
-    end
-
-    # Gets the current outputs.
-    # The reply will be a JSON-encoded list
-    # of outputs
-    # (see the reply section of i3 docu).
-    def get_outputs
-      write format(MESSAGE_TYPE_GET_OUTPUTS)
-      handle_response MESSAGE_TYPE_GET_OUTPUTS
-    end
-
-    # reads the reply from the socket
-    # and parse the returned json into a ruby object
-    #
-    # throws WrongMagicCode when magic word is wrong
-    # throws WrongType if returned type does not match expected
-    #
-    # this is a bit duplicated code
-    # but I don't know a way to read the full send reply
-    # without knowing its length
+    # This is a bit duplicated code
+    #  but I don't know a way to read the full send reply
+    #  without knowing its length
     def handle_response(type)
       # reads 14 bytes
       # length of "i3-ipc" + 4 bytes length + 4 bytes type
@@ -91,8 +120,8 @@ module I3
       ::JSON.parse(answer)
     end
 
-    # format the message
-    # a typical message looks like
+    # Format the message.
+    # A typical message looks like
     #   "i3-ipc" <message length> <message type> <payload>
     def self.format(type, payload=nil)
       size = payload ? payload.to_s.bytes.count : 0
@@ -105,9 +134,9 @@ module I3
       self.class.format(type, payload)
     end
 
-    # parse a full ipc response
-    # similar to handle_response,
-    # but parses full reply as received by EventMachine
+    # Parse a full ipc response.
+    # Similar to handle_response,
+    # but parses full reply as received by EventMachine.
     #
     # returns an Array containing the
     # reply type and the parsed data
@@ -126,8 +155,8 @@ module I3
       self.class.parse_response(response)
     end
 
-    # writes message to the socket
-    # if socket is not connected, it connects first
+    # Writes message to the socket.
+    # If socket is not connected, it connects first.
     def write(msg)
       connect if @socket.nil? || closed?
       @last_write_length = @socket.write msg
@@ -137,20 +166,19 @@ module I3
       @socket.read(len)
     end
 
-    # connects to the given socket
+    # Connects to the given socket.
     def connect
-      @socket = UNIXSocket.new(@socket_path)
+      @socket = UNIXSocket.new(self.class.socket_path)
     end
 
-    # closes the socket connection
+    # Closes the socket connection.
     def close
       @socket.close
     end
 
-    # alias for @socket.closed? for easy access
+    # Alias for @socket.closed? for easy access
     def closed?
       @socket.closed?
     end
   end
 end
-

data/lib/i3-ipc/runner.rb

@@ -6,7 +6,8 @@ module I3
     extend self
     OUTPUT = $stdout
 
-    def format_output(object, output)
+    def format_output(object, output, quiet)
+      return if quiet
       if output == :pretty_print
         PP.pp(object, OUTPUT)
       elsif output == :json
@@ -21,16 +22,16 @@ module I3
       trap('SIGINT') { EM.stop; puts }
       I3::IPC.subscribe([:workspace], path) do |em, type, data|
         case type
-        when I3::IPC::MESSAGE_REPLY_GET_WORKSPACES
-          format_output data, output
+        when I3::IPC.message_type_get_workspaces
+          format_output data, output, false
         when I3::IPC::EVENT_WORKSPACE
-          em.send_data I3::IPC.format(I3::IPC::MESSAGE_TYPE_GET_WORKSPACES)
+          em.send_data I3::IPC.format(I3::IPC.message_type_get_workspaces)
         end
       end
     end
 
     def execute(*args)
-      socket_file = File.expand_path('~/.i3/ipc.sock')
+      socket_file = nil
       type = 0
       quiet = false
       output = :default
@@ -38,12 +39,12 @@ module I3
       opts = OptionParser.new do |opts|
         opts.banner = "Usage: i3-ipc [options] [message]"
 
-        s_desc = 'Set socket file, defaults to ~/.i3/ipc.sock'
+        s_desc = 'Set socket file, defaults to `i3 --get-socketpath` output'
         opts.on('-s SOCKET', '--socket SOCKET', s_desc) do |s|
           socket_file = File.expand_path(s)
         end
 
-        t_desc = 'Set type, 0 = command, 1 = workspace list, 2 = subscribe to workspace event, 3 = output list, default: 0'
+        t_desc = 'Set type, 0 = command, 1 = workspace list, 2 = subscribe to workspace event, 3 = output list, 4 = tree list, default: 0'
         opts.on('-tTYPE', '--type TYPE', Integer, t_desc) do |t|
           type = t
         end
@@ -72,24 +73,28 @@ module I3
 
       opts.parse!(args)
 
-      s = I3::IPC.new(socket_file)
+      socket_file ||= I3::IPC.socket_path
 
-      case type
-      when 0
-        if args.empty?
-          abort "error: message type needs a message"
-        end
-
-        payload = args.shift
-        OUTPUT.puts s.command(payload).inspect unless quiet
-      when I3::IPC::MESSAGE_TYPE_GET_WORKSPACES
-        format_output s.get_workspaces, output
-      when I3::IPC::MESSAGE_REPLY_SUBSCRIBE
+      if type == I3::IPC.message_type_subscribe
         subscribe socket_file, output
-      when I3::IPC::MESSAGE_TYPE_GET_OUTPUTS
-        format_output s.get_outputs, output
       else
-        abort "error: type #{type} not yet implemented"
+        i3 = I3::IPC.new(socket_file)
+        arg = I3::IPC::COMMANDS.find {|t| t.first == type}
+        if arg
+          if arg.last == :none
+            format_output i3.send(arg[1]), output, quiet
+          elsif arg.last == :required
+            payload = args.shift
+            if payload.nil?
+              abort "error: payload needed."
+            else
+              format_output i3.send(arg[1], payload), output, quiet
+            end
+          elsif arg.last == :optional
+            payload = args.shift
+            format_output i3.send(arg[1], payload), output, quiet
+          end
+        end
       end
     end
   end

data/lib/i3-ipc/standalone.rb

@@ -46,7 +46,7 @@ preamble
 
         File.readlines(file).each do |line|
           next if line =~ /^\s*#/
-          next if line =~ /^require 'i3-ipc/
+          next if line =~ /^require(_relative)? 'i3-ipc/
           standalone << line
         end
       end

data/lib/i3-ipc/subscription.rb

@@ -5,7 +5,7 @@ module I3
     extend self
 
     class SubscriptionConnection < EM::Connection
-      def self.connect(subscription_list, socket_path=I3::IPC::SOCKET_PATH, &blk)
+      def self.connect(subscription_list, socket_path=nil, &blk)
         new_klass = Class.new(self)
         new_klass.send(:define_method, :initialize) do
           @subscription_list = subscription_list
@@ -16,7 +16,7 @@ module I3
 
       # send subscription to i3
       def post_init
-        send_data I3::IPC.format(I3::IPC::MESSAGE_TYPE_SUBSCRIBE,
+        send_data I3::IPC.format(I3::IPC.message_type_subscribe,
                                  @subscription_list.to_json)
       end
 
@@ -26,7 +26,8 @@ module I3
       end
     end
 
-    def subscribe(subscription_list, socket_path=I3::IPC::SOCKET_PATH, &blk)
+    def subscribe(subscription_list, socket_path=nil, &blk)
+      socket_path ||= I3::IPC.socket_path
       EM.run do
         SubscriptionConnection.connect(subscription_list,
                                        socket_path, &blk)

data/lib/i3-ipc/version.rb

@@ -1,3 +1,3 @@
 module I3
-  Version = '0.1.4'
+  Version = '0.2.0'
 end

data/man/i3-ipc.1

@@ -1,67 +1,61 @@
-.\" generated with Ronn/v0.5
-.\" http://github.com/rtomayko/ronn/
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "I3\-IPC" "1" "April 2010" "badboy" "i3-ipc Manual"
+.TH "I3\-IPC" "1" "August 2012" "badboy" "i3-ipc Manual"
 .
 .SH "NAME"
-\fBi3\-ipc\fR \-\- inter\-process communication with i3
+\fBi3\-ipc\fR \- inter\-process communication with i3
 .
 .SH "SYNOPSIS"
 \fBi3\-ipc\fR [\fB\-s\fR] [\fB\-t type\fR] [\fB\-p\fR] [\fB\-j\fR] [\fB\-q\fR] [\fBmessage\fR]
 .
 .SH "DESCRIPTION"
-\fBi3\-ipc\fR can be used to communicate with i3, the improved tiling window manager, through the provided ipc socket. Useful for scripting the window manager.
+\fBi3\-ipc\fR can be used to communicate with i3, the improved tiling window manager, through the provided ipc socket\. Useful for scripting the window manager\.
 .
 .P
 Currently implemented message types of i3 are the following:
 .
 .TP
 \fB0 (COMMAND)\fR
-  The payload of the message is a command for i3
-  (like the commands you can bind to keys in the configuration file)
-  The command will be executed directly after receiving it.
-  The reply will be always {"succes":true} for now.
+The payload of the message is a command for i3 (like the commands you can bind to keys in the configuration file) The command will be executed directly after receiving it\. The reply will be always {"succes":true} for now\.
 .
 .TP
 \fB1 (GET_WORKSPACES)\fR
-  Gets the current workspaces.
-  The reply will be a JSON\-encoded list of workspaces.
+Gets the current workspaces\. The reply will be a JSON\-encoded list of workspaces\.
 .
 .TP
 \fB2 (SUBSCRIBE)\fR
-  Subscribes your connection to the \fBworkspace\fR event.
+Subscribes your connection to the \fBworkspace\fR event\.
 .
 .TP
 \fB3 (GET_OUTPUTS)\fR
-  Gets the current outputs.
-  The reply will be a JSON\-encoded list of outputs.
+Gets the current outputs\. The reply will be a JSON\-encoded list of outputs\.
 .
 .SH "OPTIONS"
-\fBi3\-ipc\fR's default mode of operation is to send the command (type 0) specified on the command line.
+\fBi3\-ipc\fR\'s default mode of operation is to send the command (type 0) specified on the command line\.
 .
 .P
 These options can be used to change this behavior:
 .
 .TP
 \fB\-s\fR, \fB\-\-socket\fR
-Set the socket file, defaults to ~/.i3/ipc.sock
+Set the socket file, defaults to ~/\.i3/ipc\.sock
 .
 .TP
 \fB\-t\fR, \fB\-\-type\fR
-Set the type. Passing a type of 0 is the default and will send the specified command, type 1 gets the current workspace list,
-type 2 subscribes to the workspace stream, type 3 gets the current output list.
+Set the type\. Passing a type of 0 is the default and will send the specified command, type 1 gets the current workspace list, type 2 subscribes to the workspace stream, type 3 gets the current output list\.
 .
 .TP
 \fB\-p\fR, \fB\-\-pretty\-print\fR
-This will pretty print the received reply. Useful for the workspace list.
+This will pretty print the received reply\. Useful for the workspace list\.
 .
 .TP
 \fB\-j\fR, \fB\-\-json\fR
-This will print the received reply as raw json\-encoded data. Useful to pass to another script.
+This will print the received reply as raw json\-encoded data\. Useful to pass to another script\.
 .
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-Turn off the output. Useful for command mode.
+Turn off the output\. Useful for command mode\.
 .
 .TP
 \fBmessage\fR
@@ -72,11 +66,11 @@ You may additionally ask for help:
 .
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-Print help.
+Print help\.
 .
 .TP
 \fB\-m\fR, \fB\-\-man\fR
-Display this man page.
+Display this man page\.
 .
 .SH "EXAMPLES"
 .
@@ -90,10 +84,10 @@ $ i3\-ipc "exec xterm"
 .fi
 .
 .SH "BUGS"
-\fIhttp://github.com/badboy/i3\-ipc/issues\fR
+\fIhttp://github\.com/badboy/i3\-ipc/issues\fR
 .
 .SH "AUTHOR"
-Jan\-Erik Rediger:: badboy@archlinux.us
+Jan\-Erik Rediger:: badboy@archlinux\.us
 .
 .SH "SEE ALSO"
-i3(1), i3\-msg(1), \fIhttp://i3.zekjur.net/\fR, \fIhttp://github.com/badboy/i3\-ipc\fR
+i3(1), i3\-msg(1), \fIhttp://i3\.zekjur\.net/\fR, \fIhttp://github\.com/badboy/i3\-ipc\fR

data/man/i3-ipc.1.html

@@ -2,74 +2,83 @@
 <html>
 <head>
   <meta http-equiv='content-type' value='text/html;charset=utf8'>
-  <meta name='generator' value='Ronn/v0.5'>
-  <title>i3-ipc(1) -- inter-process communication with i3</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>i3-ipc(1) - inter-process communication with i3</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'>
-
-<h1 class='man-title'>i3-ipc(1)</h1>
-
-<ol class='head man'>
-  <li class='tl'>i3-ipc(1)</li>
-  <li class='tc'>i3-ipc Manual</li>
-  <li class='tr'>i3-ipc(1)</li>
-</ol>
-
-<h2 id='NAME'>NAME</h2>
-<p><code>i3-ipc</code> -- inter-process communication with i3</p>
-
-<h2>SYNOPSIS</h2>
+<!--
+  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.
+
+  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'>
+
+  <div class='man-navigation' style='display:none'>
+    <a href="#NAME">NAME</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#OPTIONS">OPTIONS</a>
+    <a href="#EXAMPLES">EXAMPLES</a>
+    <a href="#BUGS">BUGS</a>
+    <a href="#AUTHOR">AUTHOR</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+  </div>
+
+  <ol class='man-decor man-head man head'>
+    <li class='tl'>i3-ipc(1)</li>
+    <li class='tc'>i3-ipc Manual</li>
+    <li class='tr'>i3-ipc(1)</li>
+  </ol>
+
+  <h2 id="NAME">NAME</h2>
+<p class="man-name">
+  <code>i3-ipc</code> - <span class="man-whatis">inter-process communication with i3</span>
+</p>
+
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
 
 <p><code>i3-ipc</code> [<code>-s</code>] [<code>-t type</code>] [<code>-p</code>] [<code>-j</code>] [<code>-q</code>] [<code>message</code>]</p>
 
-<h2>DESCRIPTION</h2>
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p><code>i3-ipc</code> can be used to communicate with i3, the improved tiling window manager, through the provided ipc socket. Useful for scripting the window manager.</p>
 
@@ -88,7 +97,7 @@
 </dl>
 
 
-<h2>OPTIONS</h2>
+<h2 id="OPTIONS">OPTIONS</h2>
 
 <p><code>i3-ipc</code>'s default mode of operation is to send the command (type 0) specified on the command line.</p>
 
@@ -113,7 +122,7 @@ type 2 subscribes to the workspace stream, type 3 gets the current output list.<
 </dl>
 
 
-<h2>EXAMPLES</h2>
+<h2 id="EXAMPLES">EXAMPLES</h2>
 
 <pre><code>$ i3-ipc -t 1
 $ i3-ipc -t 2 -p
@@ -121,25 +130,25 @@ $ i3-ipc -t 3 -j
 $ i3-ipc "exec xterm"
 </code></pre>
 
-<h2>BUGS</h2>
+<h2 id="BUGS">BUGS</h2>
 
-<p><a href="http://github.com/badboy/i3-ipc/issues">http://github.com/badboy/i3-ipc/issues</a></p>
+<p><a href="http://github.com/badboy/i3-ipc/issues" data-bare-link="true">http://github.com/badboy/i3-ipc/issues</a></p>
 
-<h2>AUTHOR</h2>
+<h2 id="AUTHOR">AUTHOR</h2>
 
 <p>Jan-Erik Rediger:: badboy@archlinux.us</p>
 
-<h2>SEE ALSO</h2>
+<h2 id="SEE-ALSO">SEE ALSO</h2>
 
-<p>i3(1), i3-msg(1), <a href="http://i3.zekjur.net/">http://i3.zekjur.net/</a>, <a href="http://github.com/badboy/i3-ipc">http://github.com/badboy/i3-ipc</a></p>
+<p><span class="man-ref">i3<span class="s">(1)</span></span>, <span class="man-ref">i3-msg<span class="s">(1)</span></span>, <a href="http://i3.zekjur.net/" data-bare-link="true">http://i3.zekjur.net/</a>, <a href="http://github.com/badboy/i3-ipc" data-bare-link="true">http://github.com/badboy/i3-ipc</a></p>
 
 
-<ol class='foot man'>
-  <li class='tl'>badboy</li>
-  <li class='tc'>April 2010</li>
-  <li class='tr'>i3-ipc(1)</li>
-</ol>
+  <ol class='man-decor man-foot man foot'>
+    <li class='tl'>badboy</li>
+    <li class='tc'>August 2012</li>
+    <li class='tr'>i3-ipc(1)</li>
+  </ol>
 
-</div>
+  </div>
 </body>
 </html>

metadata

@@ -1,115 +1,141 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: i3-ipc
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jan-Erik Rediger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-04-16 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.10
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 10
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.12.10
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 10
-        - 3
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 2.10.3
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.3
+- !ruby/object:Gem::Dependency
   name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.9.8
+- !ruby/object:Gem::Dependency
+  name: ronn
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.3
   type: :development
-  version_requirements: *id003
-description: "  uses the ipc socket of i3 to send commands or get information directly from the window manager. Useful for scripting the window manager.'\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+description: ! '  uses the ipc socket of i3 to send commands or get information directly
+  from the window manager. Useful for scripting the window manager.''
+
+'
 email: badboy@archlinux.us
-executables: 
+executables:
 - i3-ipc
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.markdown
 - Rakefile
 - LICENSE
-- lib/i3-ipc/subscription.rb
-- lib/i3-ipc/manpage.rb
+- lib/i3-ipc.rb
 - lib/i3-ipc/standalone.rb
-- lib/i3-ipc/version.rb
+- lib/i3-ipc/subscription.rb
 - lib/i3-ipc/runner.rb
-- lib/i3-ipc.rb
+- lib/i3-ipc/version.rb
+- lib/i3-ipc/manpage.rb
 - bin/i3-ipc
 - man/i3-ipc.1.html
-- man/i3-ipc.1
 - man/i3-ipc.1.ronn
-has_rdoc: true
+- man/i3-ipc.1
 homepage: http://github.com/badboy/i3-ipc
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: inter-process communication with i3, the improved tiling window manager.
 test_files: []
-