catfriend 0.16 → 0.17

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d3298ab27969cad7ca4f284d27fdfe153f83bbfb
+  data.tar.gz: dced1579477fff11e1acf0252908539893f6ca6f
+SHA512:
+  metadata.gz: c16e9adb4de53431a43c83d1b681f1a9ed59e350f4f1885d9d13203b825185c644ea4177a790bfdb8bf39f7b3afd0c0ec43b574d3c7b2c1a56fde2a6c633da8c
+  data.tar.gz: 46f30291ee03d29ae6ecd795fc207f8b78c760dacc638c4b30e7a3161df86dd42399172201d9ef8baf676eb75473f5de0d1b30122aa280ecee09a28cb3fa64ee

data/bin/catfriend

@@ -4,12 +4,14 @@
 # new e-mail arrives.
 #
 # Author:: James Pike (mailto:catfriend@chilon.net)
-# Copyright:: Copyright (c) 2011 James Pike
+# Copyright:: Copyright (c) 2011-2014 James Pike
 # License:: MIT
+
+$LOAD_PATH << 'lib' if File.exists? 'lib/catfriend'
+
 require 'catfriend/filetokenstack'
 require 'catfriend/imap'
 require 'catfriend/dbus'
-require 'net/imap'
 require 'optparse'
 
 module Catfriend
@@ -20,149 +22,149 @@ APP_NAME = "catfriend"
 stderr_bak = $stderr.dup
 $stderr.reopen '/dev/null', 'w'
 begin
-    require 'xdg'
+  require 'xdg'
 rescue LoadError ; end
 $stderr = stderr_bak # restore stderr
 
 # Reads a simple configuration format and returns an array of servers.
 def self.parse_config
-    # xdg is optional
-    begin
-        config_file = XDG['CONFIG'].find APP_NAME
-    rescue NameError ; end
-    config_file ||= "#{ENV['HOME']}/.config/#{APP_NAME}"
-
-    # for location of certificate file
-    Dir.chdir File.dirname(config_file)
-
-    servers = []
-    current = {}
-    defaults = {}
-
-    tokens = FileTokenStack.new config_file
-    until tokens.empty?
-        field = tokens.shift
-
-        # obviously assigning it in a loop like this is slow but hey it's
-        # only run-once config and ruby people say DRY a lot.
-        shift_tokens = lambda do
-            if tokens.empty?
-                raise ConfigError, "field #{field} requires parameter"
-            end
-            return tokens.shift
-        end
+  # xdg is optional
+  begin
+    config_file = XDG['CONFIG'].find APP_NAME
+  rescue NameError ; end
+  config_file ||= "#{ENV['HOME']}/.config/#{APP_NAME}"
+
+  # for location of certificate file
+  Dir.chdir File.dirname(config_file)
+
+  servers = []
+  current = {}
+  defaults = {}
+
+  tokens = FileTokenStack.new config_file
+  until tokens.empty?
+    field = tokens.shift
+
+    # obviously assigning it in a loop like this is slow but hey it's
+    # only run-once config and ruby people say DRY a lot.
+    shift_tokens = lambda do
+      if tokens.empty?
+        raise ConfigError, "field #{field} requires parameter"
+      end
+      return tokens.shift
+    end
 
-        case field
-        when "host","imap"
-            # host is deprecated
-            if not current.empty?
-                servers << ImapServer.new(current)
-                current = {}
-            end
-            current[:host] = shift_tokens.call
-        when "notificationTimeout", "errorTimeout", "socketTimeout"
-            # convert from camelCase to camel_case
-            clean_field =
-                field.gsub(/([a-z])([A-Z])/) { "#{$1}_#{$2.downcase}" }
-            defaults[clean_field] = shift_tokens.call
-        when "checkInterval"
-            shift_tokens.call # deprecated, ignore parameter
-        when "cert_file"
-            cert_file = shift_tokens.call
-            unless File.exists? cert_file
-                raise ConfigError,
-                      "non-existant SSL certificate `#{cert_file}'" +
-                      ", search path: #{File.dirname(config_file)}/"
-            end
-            current[:cert_file] = cert_file
-        when "mailbox", "id", "user", "password"
-            current[field] = shift_tokens.call
-        when "nossl"
-            current[:no_ssl] = true
-        when "work"
-            current[:work_account] = true
-        else
-            raise ConfigError,
-                "invalid config parameter '#{field}'"
-        end
+    case field
+    when "host","imap"
+      # host is deprecated
+      if not current.empty?
+        servers << ImapServer.new(current)
+        current = {}
+      end
+      current[:host] = shift_tokens.call
+    when "notificationTimeout", "errorTimeout", "socketTimeout"
+      # convert from camelCase to camel_case
+      clean_field =
+        field.gsub(/([a-z])([A-Z])/) { "#{$1}_#{$2.downcase}" }
+      defaults[clean_field] = shift_tokens.call
+    when "checkInterval"
+      shift_tokens.call # deprecated, ignore parameter
+    when "cert_file"
+      cert_file = shift_tokens.call
+      unless File.exists? cert_file
+        raise ConfigError,
+          "non-existant SSL certificate `#{cert_file}'" +
+          ", search path: #{File.dirname(config_file)}/"
+      end
+      current[:cert_file] = cert_file
+    when "mailbox", "id", "user", "password"
+      current[field] = shift_tokens.call
+    when "nossl"
+      current[:no_ssl] = true
+    when "work"
+      current[:work_account] = true
+    else
+      raise ConfigError,
+        "invalid config parameter '#{field}'"
     end
+  end
 
-    servers << ImapServer.new(current) unless current.empty?
-    Catfriend.notification_timeout = (defaults["notification_timeout"] or 60).to_i
+  servers << ImapServer.new(current) unless current.empty?
+  Catfriend.notification_timeout = (defaults["notification_timeout"] or 60).to_i
 
-    servers
+  servers
 end
 
 # Main interface to the application. Reads all servers from config then runs
 # each one in a thread. The program exits when all threads encounter an
 # unrecoverable error. Perhaps I should make it exit if any thread exits.
 def self.main args
-    work_accounts = false
-    foreground = false
-    Catfriend.verbose = false
-    done_action = false
-    begin
-        OptionParser.new do |opts|
-            opts.banner = "usage: #{APP_NAME} [options]"
-            opts.on("-f", "--foreground", "run in foreground") do
-                foreground = true
-            end
-
-            opts.on("-w", "--work", "enable work accounts") do
-                work_accounts = true
-            end
-            opts.on("-v", "--verbose", "verbose output to console") do
-                Catfriend.verbose = true
-            end
-
-            opts.on("-s", "--stop", "shut down running server") do
-                done_action = true
-                dbus = DBus.new
-                if dbus.send_shutdown
-                    puts "sent shutdown signal"
-                else
-                    puts "could not send shutdown signal, no server running?"
-                end
-            end
-        end.parse!
-
-        return 0 if done_action
-
-        Catfriend.verbose = false unless foreground
-
-        servers = parse_config
-        servers.reject! { |s| s.work_account } unless work_accounts
-        raise ConfigError, "no servers to check" if servers.empty?
-
-        if foreground
-            main_loop servers
+  work_accounts = false
+  foreground = false
+  Catfriend.verbose = false
+  done_action = false
+  begin
+    OptionParser.new do |opts|
+      opts.banner = "usage: #{APP_NAME} [options]"
+      opts.on("-f", "--foreground", "run in foreground") do
+        foreground = true
+      end
+
+      opts.on("-w", "--work", "enable work accounts") do
+        work_accounts = true
+      end
+      opts.on("-v", "--verbose", "verbose output to console") do
+        Catfriend.verbose = true
+      end
+
+      opts.on("-s", "--stop", "shut down running server") do
+        done_action = true
+        dbus = DBus.new
+        if dbus.send_shutdown
+          puts "sent shutdown signal"
         else
-            pid = fork do
-                main_loop servers
-            end
-            Process.detach pid
+          puts "could not send shutdown signal, no server running?"
         end
-    rescue ConfigError => e
-        puts "misconfiguration: #{e.message}"
-    rescue Interrupt
-        servers.each { |s| s.kill }
-    rescue => e
-        puts "unknown error #{e.message}\n#{e.backtrace.join("\n")}"
+      end
+    end.parse!
+
+    return 0 if done_action
+
+    Catfriend.verbose = false unless foreground
+
+    servers = parse_config
+    servers.reject! { |s| s.work_account } unless work_accounts
+    raise ConfigError, "no servers to check" if servers.empty?
+
+    if foreground
+      main_loop servers
     else
-        return 0
+      pid = fork do
+        main_loop servers
+      end
+      Process.detach pid
     end
-
-    1
+  rescue ConfigError => e
+    puts "misconfiguration: #{e.message}"
+  rescue Interrupt
+    servers.each { |s| s.kill }
+  rescue => e
+    puts "unknown error #{e.message}\n#{e.backtrace.join("\n")}"
+  else
+    return 0
+  end
+
+  1
 end
 
 def self.main_loop servers
-    dbus = DBus.new servers
-    dbus.start
-    servers.each { |s| s.start }
-    servers.each { |s| s.join }
-    dbus.join
+  dbus = DBus.new servers
+  dbus.start
+  servers.each { |s| s.start }
+  servers.each { |s| s.join }
+  dbus.join
 end
 
-end ########################### end module
+end
 
 exit Catfriend.main ARGV

data/lib/catfriend/dbus.rb

@@ -2,70 +2,70 @@ require 'catfriend/thread'
 require 'catfriend/server'
 require 'dbus'
 
-module Catfriend # {
+module Catfriend
 
 SERVICE   = "org.freedesktop.Catfriend"
 PATH      = "/org/freedesktop/Catfriend"
 INTERFACE = "org.freedesktop.Catfriend.System"
 
 class DBus
-    include Thread
+  include Thread
 
-    class DBusObject < ::DBus::Object
-        def initialize(main, servers)
-            @main    = main
-            @servers = servers
-            super PATH
-        end
-
-        dbus_interface INTERFACE do
-          dbus_method :stop do
-            Catfriend.whisper "received shutdown request"
-            @main.quit  # this must be run from within method handler
-            @servers.each { |s| s.disconnect }
-          end
-        end
+  class DBusObject < ::DBus::Object
+    def initialize(main, servers)
+      @main    = main
+      @servers = servers
+      super PATH
     end
 
-    def initialize(servers = nil)
-        @servers = servers
+    dbus_interface INTERFACE do
+      dbus_method :stop do
+        Catfriend.whisper "received shutdown request"
+        @main.quit  # this must be run from within method handler
+        @servers.each { |s| s.disconnect }
+      end
     end
+  end
 
-    def init
-        @bus = ::DBus::SessionBus.instance unless @bus
-    end
+  def initialize(servers = nil)
+    @servers = servers
+  end
 
-    def send_shutdown
-        init
-        service = @bus.service(SERVICE)
-        object = service.object(PATH)
-        object.introspect
-        object.default_iface = INTERFACE
-        object.stop
-        true
-    rescue
-        false
-    end
+  def init
+    @bus = ::DBus::SessionBus.instance unless @bus
+  end
 
-    def start_service
-        object = DBusObject.new(@main, @servers)
-        service = @bus.request_service(SERVICE)
-        service.export object
-    end
+  def send_shutdown
+    init
+    service = @bus.service(SERVICE)
+    object = service.object(PATH)
+    object.introspect
+    object.default_iface = INTERFACE
+    object.stop
+    true
+  rescue
+    false
+  end
 
-    def run
-        init
-        if send_shutdown
-            Catfriend.whisper "shut down existing catfriend"
-        end
+  def start_service
+    object = DBusObject.new(@main, @servers)
+    service = @bus.request_service(SERVICE)
+    service.export object
+  end
 
-        @main = ::DBus::Main.new
-        start_service
-        @main << @bus
-        @main.run
-    rescue => e
-        puts "dbus unknown error #{e.message}\n#{e.backtrace.join("\n")}"
+  def run
+    init
+    if send_shutdown
+      Catfriend.whisper "shut down existing catfriend"
     end
+
+    @main = ::DBus::Main.new
+    start_service
+    @main << @bus
+    @main.run
+  rescue => e
+    puts "dbus unknown error #{e.message}\n#{e.backtrace.join("\n")}"
+  end
 end
 
-end # } end module
+end

data/lib/catfriend/filetokenstack.rb

@@ -2,40 +2,40 @@ module Catfriend
 
 # Adapt a file to a stack of tokens.
 class FileTokenStack
-    # Initialize the token stack with the path of the file, the given token
-    # match and comment skipping regexs.
-    def initialize file, token_match = /\S+/, comment_match = /#.*/
-        @token_match   = token_match
-        @comment_match = comment_match
-        @stream = File.new file, "r"
-        @tokens = []
-        get_next_tokens
-    end
+  # Initialize the token stack with the path of the file, the given token
+  # match and comment skipping regexs.
+  def initialize file, token_match = /\S+/, comment_match = /#.*/
+    @token_match   = token_match
+    @comment_match = comment_match
+    @stream = File.new file, "r"
+    @tokens = []
+    get_next_tokens
+  end
 
-    def get_next_tokens
-        # Never let the token stack get empty so that empty? can always
-        # work ahead of time.. this wouldn't be good for a network stream as
-        # it would block before delivering the last token.
-        while @tokens.empty?
-            @line = @stream.gets
-            return unless @line
-            @tokens = @line.sub(@comment_match, '').scan(@token_match) if @line
-        end
+  def get_next_tokens
+    # Never let the token stack get empty so that empty? can always
+    # work ahead of time.. this wouldn't be good for a network stream as
+    # it would block before delivering the last token.
+    while @tokens.empty?
+      @line = @stream.gets
+      return unless @line
+      @tokens = @line.sub(@comment_match, '').scan(@token_match) if @line
     end
+  end
 
-    # Shift the next token from the current stream position.
-    def shift
-        ret = @tokens.shift
-        get_next_tokens
-        ret
-    end
+  # Shift the next token from the current stream position.
+  def shift
+    ret = @tokens.shift
+    get_next_tokens
+    ret
+  end
 
-    # Report if any tokens remain
-    def empty?
-        @stream.eof and @tokens.empty?
-    end
+  # Report if any tokens remain
+  def empty?
+    @stream.eof and @tokens.empty?
+  end
 
-    private :get_next_tokens
+  private :get_next_tokens
 end
 
-end # end module
+end

data/lib/catfriend/imap.rb

@@ -2,169 +2,176 @@ require 'libnotify'
 require 'catfriend/server'
 require 'catfriend/thread'
 
+require 'net/imap'
+
 # unless I do this I get random errors from Libnotify on startup 90% of the
 # time... this could be a bug in autoload or ruby 1.9 rather than libnotify
 module Libnotify
-    class API ; end
+  class API ; end
 end
 
 module Catfriend
 
+require_relative 'net_imap_exchange_patch'
+
 # This class represents a thread capable of checking and creating
 # notifications for a single mailbox on a single IMAP server.
 class ImapServer
-    include Thread
-    include AccessorsFromHash
-
-    # Create new IMAP server with optional full configuration hash.
-    # If the hash is not supplied at construction a further call must be
-    # made to #configure before #start is called to start the thread.
-    def initialize(args = nil)
-        configure args if args
+  include Thread
+  include AccessorsFromHash
+
+  # Create new IMAP server with optional full configuration hash.
+  # If the hash is not supplied at construction a further call must be
+  # made to #configure before #start is called to start the thread.
+  def initialize(args = nil)
+    configure args if args
+  end
+
+  # Configure all attributes based on hash then make sure this
+  # represents a total valid configuration.
+  def configure args
+    super args
+
+    if not @user
+      raise ConfigError, "imap user not set"
     end
-
-    # Configure all attributes based on hash then make sure this
-    # represents a total valid configuration.
-    def configure args
-        super args
-
-        if not @user
-            raise ConfigError, "imap user not set"
-        end
-        if not @host
-            raise ConfigError, "imap host not set"
-        end
-        if not @password
-            raise ConfigError, "imap password not set"
-        end
+    if not @host
+      raise ConfigError, "imap host not set"
     end
-
-    # The id is a token which represents this server when displaying
-    # notifications and is set to the host unless over-ridden by the
-    # configuration file
-    def id ; @id || @host ; end
-
-    # Raise an error related to this particular server.
-    def error message
-        # consider raising notification instead?
-        puts "#{id}: #{message}"
+    if not @password
+      raise ConfigError, "imap password not set"
     end
-
-    # ThreadMixin interface. This connects to the mailserver and then
-    # runs #check_loop to do the e-mail checking if the connection
-    # succeeds.
-    def run
-        begin
-            @notification =
-                Libnotify.new :body => nil,
-                              :timeout => Catfriend.notification_timeout
-            @message_count = connect
-            notify_message @message_count
-            # :body => nil means summary only
-        rescue OpenSSL::SSL::SSLError
-            error "try providing ssl certificate"
-        rescue Net::IMAP::NoResponseError
-            error "no response to connect, try ssl"
-        else
-            loop {
-                check_loop
-                break if stopping?
-            }
-        end
+  end
+
+  # The id is a token which represents this server when displaying
+  # notifications and is set to the host unless over-ridden by the
+  # configuration file
+  def id ; @id || @host ; end
+
+  # Raise an error related to this particular server.
+  def error message
+    # consider raising notification instead?
+    puts "#{id}: #{message}"
+  end
+
+  # ThreadMixin interface. This connects to the mailserver and then
+  # runs #check_loop to do the e-mail checking if the connection
+  # succeeds.
+  def run
+    begin
+      @notification =
+        Libnotify.new :body => nil,
+        :timeout => Catfriend.notification_timeout
+      @message_count = connect
+      notify_message @message_count
+      # :body => nil means summary only
+    rescue OpenSSL::SSL::SSLError
+      error "try providing ssl certificate"
+    rescue Net::IMAP::NoResponseError
+      error "no response to connect, try ssl"
+    else
+      loop {
+        check_loop
+        break if stopping?
+      }
     end
-
-    # Continually waits for new e-mail raising notifications when new
-    # e-mail arrives or when error conditions happen. This methods only exits
-    # on an unrecoverable error.
-    def check_loop
-        @imap.idle do |r|
-            Catfriend.whisper "#{id}: #{r}"
-            next if r.instance_of? Net::IMAP::ContinuationRequest
-
-            if r.instance_of? Net::IMAP::UntaggedResponse
-                case r.name
-                when 'EXISTS'
-                    # some servers send this even when the message count
-                    # hasn't increased so suspiciously double-check
-                    if r.data != @message_count
-                        notify_message(r.data) if r.data > @message_count
-                        @message_count = r.data
-                    end
-                when 'EXPUNGE'
-                    @message_count -= 1
-                end
-            end
-        end
-
-        Catfriend.whisper "idle loop over"
-    rescue Net::IMAP::Error, IOError
-        # reconnect and carry on
-        reconnect unless stopping?
-    rescue => e
-        unless stopping?
-            # todo: see if we have to re-open socket
-            notify_message "#{@message_count} [error: #{e.message}]"
-            puts e.backtrace.join "\n"
+  end
+
+  # Continually waits for new e-mail raising notifications when new
+  # e-mail arrives or when error conditions happen. This methods only exits
+  # on an unrecoverable error.
+  def check_loop
+    @imap.idle do |r|
+      Catfriend.whisper "#{id}: #{r}"
+      next if r.instance_of? Net::IMAP::ContinuationRequest
+
+      if r.instance_of? Net::IMAP::UntaggedResponse
+        case r.name
+        when 'EXISTS', 'EXPUNGE'
+          @imap.idle_done
         end
+      end
     end
 
-    def notify_message message
-        @notification.update :summary => "#{id}: #{message}"
-        Catfriend.whisper @notification.summary
+    Catfriend.whisper "idle loop over"
+    count = get_unseen_count
+    if count != @message_count
+      notify_message(count) if count > @message_count
+      @message_count = count
     end
-
-    def stopping?
-        stopped? or @stopping
+  rescue Net::IMAP::Error, IOError
+    # reconnect and carry on
+    reconnect unless stopping?
+  rescue => e
+    unless stopping?
+      # todo: see if we have to re-open socket
+      notify_message "#{@message_count} [error: #{e.message}]"
+      puts e.backtrace.join "\n"
     end
-
-    def kill
-        disconnect
-        super
+  end
+
+  def notify_message message
+    @notification.update :summary => "#{id}: #{message}"
+    Catfriend.whisper @notification.summary
+  end
+
+  def stopping?
+    stopped? or @stopping
+  end
+
+  def kill
+    disconnect
+    super
+  end
+
+  def get_unseen_count
+    begin
+      # fetch raises an exception when the mailbox is empty
+      @imap.status(@mailbox || "INBOX", ["UNSEEN"])["UNSEEN"]
+    rescue => e
+      error "failed to get count of unseen messages"
+      0
     end
-
-    # Connect to the configured IMAP server and return message count.
-    def connect
-        args = nil
-        if not @no_ssl
-            if @cert_file
-                args = { :ssl => { :ca_file => @cert_file } }
-            else
-                args = { :ssl => true }
-            end
-        end
-        @imap = Net::IMAP.new(@host, args)
-        @imap.login(@user, @password)
-        @imap.select(@mailbox || "INBOX")
-
-        begin
-            # fetch raises an exception when the mailbox is empty
-            @imap.fetch('*', 'UID').first.seqno
-        rescue
-            0
-        end
+  end
+
+  # Connect to the configured IMAP server and return message count.
+  def connect
+    args = nil
+    if not @no_ssl
+      if @cert_file
+        args = { :ssl => { :ca_file => @cert_file } }
+      else
+        args = { :ssl => true }
+      end
     end
-
-    def reconnect
-        notify_message "#{@message_count} [reconnecting]"
-        new_count = connect
-        if new_count != @message_count
-            notify_message new_count
-        else
-            # todo: only if it was still open
-            @notification.close
-        end
-        @message_count = new_count
+    @imap = Net::IMAP.new(@host, args)
+    @imap.login(@user, @password)
+    @imap.select(@mailbox || "INBOX")
+
+    get_unseen_count
+  end
+
+  def reconnect
+    notify_message "#{@message_count} [reconnecting]"
+    new_count = connect
+    if new_count != @message_count
+      notify_message new_count
+    else
+      # todo: only if it was still open
+      @notification.close
     end
+    @message_count = new_count
+  end
 
-    def disconnect
-        @stopping = true
-        @imap.disconnect
-    end
+  def disconnect
+    @stopping = true
+    @imap.disconnect
+  end
 
-    private :connect, :reconnect, :check_loop, :run, :error, :notify_message
+  private :connect, :reconnect, :check_loop, :run, :error, :notify_message
 
-    attr_writer :host, :password, :id, :user, :no_ssl, :cert_file, :mailbox
-    attr_accessor :work_account
+  attr_writer :host, :password, :id, :user, :no_ssl, :cert_file, :mailbox
+  attr_accessor :work_account
 end
 
-end # end module
+end

data/lib/catfriend/net_imap_exchange_patch.rb

@@ -0,0 +1,27 @@
+require 'net/imap'
+
+# source:
+# http://claudiofloreani.blogspot.co.uk/2012/01/monkeypatching-ruby-imap-class-to-build.html
+# thank you!
+
+module Net
+  class IMAP
+    class ResponseParser
+      def response
+        token = lookahead
+        case token.symbol
+        when T_PLUS
+          result = continue_req
+        when T_STAR
+          result = response_untagged
+        else
+          result = response_tagged
+        end
+        match(T_SPACE) if lookahead.symbol == T_SPACE
+        match(T_CRLF)
+        match(T_EOF)
+        return result
+      end
+    end
+  end
+end

data/lib/catfriend/server.rb

@@ -1,25 +1,25 @@
 module Catfriend
 
 class << self
-    attr_accessor :notification_timeout, :verbose
+  attr_accessor :notification_timeout, :verbose
 
-    # puts something if -v was used
-    def whisper *args
-        puts *args if verbose
-    end
+  # puts something if -v was used
+  def whisper *args
+    puts *args if verbose
+  end
 end
 
 # Mixin to provide #configure which allows all instance variables with write
 # accessors declared to be set from a hash.
 module AccessorsFromHash
-    # Call this to tranfer the hash data to corresponding attributes. Any
-    # hash keys that do not have a corresponding write accessor in the
-    # class are silently ignored.
-    def configure args
-        args.each do |opt, val|
-            instance_variable_set("@#{opt}", val) if respond_to? "#{opt}="
-        end
+  # Call this to tranfer the hash data to corresponding attributes. Any
+  # hash keys that do not have a corresponding write accessor in the
+  # class are silently ignored.
+  def configure args
+    args.each do |opt, val|
+      instance_variable_set("@#{opt}", val) if respond_to? "#{opt}="
     end
+  end
 end
 
 # This class is used to signal the user made an error in their configuration.

data/lib/catfriend/thread.rb

@@ -2,28 +2,28 @@ module Catfriend
 
 # Mixin this module and define "run" for a simple runnable/joinable thread
 module Thread
-    # Call to start a thread running via the start method.
-    def start ; @thread = ::Thread.new { run } ; end
+  # Call to start a thread running via the start method.
+  def start ; @thread = ::Thread.new { run } ; end
 
-    # Test whether thread is currently stopped or closing down.
-    def stopped? ; @thread.nil? ; end
+  # Test whether thread is currently stopped or closing down.
+  def stopped? ; @thread.nil? ; end
 
-    # Join thread if it has started.
-    def join
-        unless stopped?
-            @thread.join
-            @thread = nil
-        end
+  # Join thread if it has started.
+  def join
+    unless stopped?
+      @thread.join
+      @thread = nil
     end
+  end
 
 
-    # Kill thread if it has started.
-    def kill
-        unless stopped?
-            @thread.kill
-            @thread = nil
-        end
+  # Kill thread if it has started.
+  def kill
+    unless stopped?
+      @thread.kill
+      @thread = nil
     end
+  end
 end
 
 end # end Catfriend module

metadata

@@ -1,38 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: catfriend
 version: !ruby/object:Gem::Version
-  version: '0.16'
-  prerelease: 
+  version: '0.17'
 platform: ruby
 authors:
 - James Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &12342540 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.1
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *12342540
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: ruby-dbus
-  requirement: &12340600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.11'
   type: :runtime
   prerelease: false
-  version_requirements: *12340600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.11'
 description: E-mail checker with libnotify desktop notifications.
 email:
 - catfriend@chilon.net
@@ -43,36 +60,35 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - catfriend.example
-- lib/catfriend/dbus.rb
 - lib/catfriend/server.rb
-- lib/catfriend/filetokenstack.rb
+- lib/catfriend/dbus.rb
 - lib/catfriend/thread.rb
+- lib/catfriend/net_imap_exchange_patch.rb
 - lib/catfriend/imap.rb
-- !binary |-
-  YmluL2NhdGZyaWVuZA==
+- lib/catfriend/filetokenstack.rb
+- bin/catfriend
 homepage: https://github.com/nuisanceofcats/catfriend
 licenses:
 - Expat
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 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: '1.3'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: E-mail checker with desktop notifications.
 test_files: []