cogbot 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e507f5555aea13239fa0c558da83b0adaff0769c
-  data.tar.gz: bcb41ab67f0dec2678ab884d5eff810907afbf94
+  metadata.gz: ed9500a2174f92bcc12ab3cae3e2654a3607267a
+  data.tar.gz: f45b95e057fb6c7610fe6093f9e473b7d138566f
 SHA512:
-  metadata.gz: ad328acddaf1f81bed239d03e5c1f7d052a820ec1569ca2092ff0f6512b7201bba96eb35c5c27a8e207fff2e7ddae05bf9a3846961ac04dff8da5df1a1360d02
-  data.tar.gz: a8604ada50f361692af7a5f097f2564e0f4f4cf552e2a018f1213acb63411aa6d4c852033e373626e1d21c9acd865e80412a90d5e172cbf825c379d496d5a1db
+  metadata.gz: 8ce87667fc15508303457c29a78dee2070166f1373128737c1ec98b34a8fdae4829db43befe5b22fc5a380853aefa07921ea999fc71d1279e7e2e04a2f75c915
+  data.tar.gz: 2e695e32ea44f41fa127fe5d24772b0dad73784779f928cc7a37ac35c1de9b7b7f9e3ca2d8be8ecbbc5b36a802bd04c312e980d01949f48b70139dc47532b909

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 config/cogbot.yml
 vendor/
+*.swp
+*.swo

data/.ruby-version

@@ -1 +1 @@
-2.2
+2.2.1

data/CHANGELOG.md

@@ -1,17 +1,26 @@
 Cogbot Changelog
 ===================
 
-## v0.1.1 - 2015-01-28
+### v0.1.2 - 2015-03-16
+- add link to status on twitter plugin search results
+- add age of status in twitter plugin
+- fix bug on tweet search results that are more than one day old or less than one minute
+- add a weak protection for the manager plugin (which anyways should only be used in development mode)
+- update dependencies on cinch and eventmachine (fixing a mem leak issue)
+- add a trello listener plugin, for receiving hooks from Trello
+- change the git listener to listen only on http://host:ip/gitlistener (to avoid confuse with the trello listener)
+
+### v0.1.1 - 2015-01-28
 - avoid disclose local path in nmanager plugin when plugin not found
 - fix setup message config.yaml to cogbot.yaml
 
-## v0.1.0 - 2015-01-08
+### v0.1.0 - 2015-01-08
 - upgrade dependency to cinch 2.0.6 to 2.2.2
 - upgrade other gems as well
 - fix all plugins for upgrade
 - handle compat with ruby 2.2
 
-## v0.0.3 - 2013-07-29
+### v0.0.3 - 2013-07-29
 
-## v0.0.2 - 2013-04-03
+### v0.0.2 - 2013-04-03
 

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    cogbot (0.1.1)
-      cinch (~> 2.2.2)
+    cogbot (0.1.2)
+      cinch (= 2.2.4)
       daemons (~> 1.1.9)
-      eventmachine (~> 1.0.4)
+      eventmachine (= 1.0.7)
       eventmachine_httpserver (~> 0.2.1)
       fortune_gem (~> 0.0.8)
-      json (~> 1.8.1)
-      nokogiri (~> 1.6.5)
+      json (~> 1.8.2)
+      nokogiri (~> 1.6.6)
       thor (~> 0.19.1)
       twitter (~> 5.13.0)
       yajl-ruby (~> 1.2.1)
@@ -16,19 +16,19 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.6)
+    addressable (2.3.7)
     awesome_print (1.6.1)
     buftok (0.2.0)
-    cinch (2.2.3)
+    cinch (2.2.4)
     coderay (1.1.0)
     daemons (1.1.9)
     docile (1.1.5)
     equalizer (0.0.9)
-    eventmachine (1.0.4)
+    eventmachine (1.0.7)
     eventmachine_httpserver (0.2.1)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    flog (4.3.1)
+    flog (4.3.2)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.4)
     fortune_gem (0.0.8)
@@ -66,7 +66,7 @@ GEM
       simplecov (>= 0.4.1)
     slop (3.6.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     twitter (5.13.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)

data/README.md

@@ -1,6 +1,9 @@
 # Cogbot
 
-[![Gem Version](https://badge.fury.io/rb/cogbot.svg)](http://badge.fury.io/rb/cogbot)
+[![Gem Version](http://img.shields.io/gem/v/cogbot.svg)](http://rubygems.org/gems/cogbot)
+[![Downloads](http://img.shields.io/gem/dt/cogbot.svg)](https://rubygems.org/gems/cogbot)
+[![Dependency Status](https://img.shields.io/gemnasium/mose/cogbot.svg)](https://gemnasium.com/mose/cogbot)
+[![Code Climate](http://img.shields.io/codeclimate/github/mose/cogbot.svg)](https://codeclimate.com/github/mose/cogbot)
 
 Cogbot is an irc bot written in ruby based on [Cinch bot framework](https://github.com/cinchrb/cinch).
 
@@ -10,10 +13,13 @@ team that uses irc as a main shared communication space:
 
 * git notifications pushed on the channel
 * redmine issues polled from redmine and announced
-* commands to ask rubygems or stack overflow
+* commands to ask google, rubygems or stack overflow
 * the urban dictionary to make us laugh
+* a twitter search plugin
+* a trello webhooks listener
 * and some other more or less used features
 
+
 ## Installation
 
     gem install cogbot
@@ -27,6 +33,39 @@ At first launch:
 you will be prompted to create a configuration file in ~/.cogbot/cogbot.yml
 When this is done you can launch again and it will just run according to your configuration.
 
+## Configuration
+
+Some plugins require extra config parameters:
+
+Git and trello webhook listeners use a small eventmachine http server, which is only launched if the configuration is present:
+
+    server:
+      ip: x.x.x.x
+      port: xxxxx
+
+Twitter plugin requires to have credentials set:
+
+    tweet:
+      consumer_key: "xxx"
+      consumer_secret: "xxx"
+      access_token: "xxx"
+      access_token_secret: "xxx"
+
+Trello plugin has some config too, for knowing where to announce the trello changes. The webhook has to be setup independantly, it's quite easy to declare by using postman.
+
+    trello:
+      announce:
+      - "#trello-announces"
+
+Then in Trello, using the API, you can set a hook to send events to http://ip:port/trellolistener
+
+## Todo
+
+- document each plugin
+- add multi-entrypoints system for webhooks listener
+- add a users database
+- add a credentials system
+
 ## Development
 
     git clone git@github.com:mose/cogbot.git

data/cogbot.gemspec

@@ -16,15 +16,15 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Cogbot::VERSION
 
-  gem.add_dependency 'cinch', '~> 2.2.2'
+  gem.add_dependency 'cinch', '2.2.4'
   gem.add_dependency "thor", '~> 0.19.1'
-  gem.add_dependency "eventmachine", '~> 1.0.4'
+  gem.add_dependency "eventmachine", '1.0.7'
   gem.add_dependency "eventmachine_httpserver", '~> 0.2.1'
-  gem.add_dependency 'nokogiri', '~> 1.6.5'
+  gem.add_dependency 'nokogiri', '~> 1.6.6'
   gem.add_dependency "daemons", '~> 1.1.9'
 
   gem.add_dependency 'twitter', '~> 5.13.0'  # twitter plugin
-  gem.add_dependency 'json', '~> 1.8.1' # stackoverflow plugin
+  gem.add_dependency 'json', '~> 1.8.2' # stackoverflow plugin
   gem.add_dependency 'yajl-ruby', '~> 1.2.1' # rubygems plugin
   gem.add_dependency 'fortune_gem', '~> 0.0.8' # fortune plugin
 

data/config/cogbot.yml.defaults

@@ -12,6 +12,9 @@ main:
   - 'dice'
   - 'urban'
   - 'tweet'
+manager:
+  admin:
+  - 'mose'
 server:
   ip: 127.0.0.1
   port: 9090
@@ -24,3 +27,11 @@ redmine:
   api_key: ''
   url: ''
   project: ''
+trello:
+  announce:
+  - 
+    channel: "#trello"
+    board: "General"
+  - 
+    channel: "#trello-dev"
+    board: "Dev"

data/lib/cogbot/server.rb

@@ -12,7 +12,11 @@ class Server < EM::Connection
 
   def process_http_request
     if @http_request_method == "POST"
-      @bot.handlers.dispatch(:api_callback, nil, @http_post_content)
+      pluginlist = @bot.plugins.map { |e| e.class.name.split('::').last.downcase }
+      query = @http_request_uri[1..-1]
+      if pluginlist.include? query
+        @bot.handlers.dispatch("http_#{query}".to_sym, nil, @http_post_content)
+      end
     end
 
     response = EM::DelegatedHttpResponse.new(self)

data/lib/cogbot/version.rb

@@ -1,3 +1,3 @@
 module Cogbot
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/plugins/gitlistener.rb

@@ -7,7 +7,7 @@ module Cinch
 
       set :plugin_name, 'gitlistener'
 
-      listen_to :api_callback
+      listen_to :http_gitlistener
 
       def listen(m, json)
         hash = Yajl::Parser.parse(URI.unescape(json[8..-1]))

data/plugins/manager.rb

@@ -10,6 +10,14 @@ module Cinch
       match(/m reload (\S+)/, method: :reload_plugin)
       match(/m set (\S+) (\S+) (.+)$/, method: :set_option)
 
+      def authorized(m, &block)
+        if @bot.config.options['cogconf']['manager']['admin'].include? m.user.nick
+         instance_eval(&block)
+        else
+          m.reply "Sorry, you don't have the right."
+        end
+      end
+
       def list_plugins(m)
         back = ''
         @bot.plugins.each { |p| back += "#{p.class.name.split('::').last.downcase} " }
@@ -17,85 +25,94 @@ module Cinch
       end
 
       def load_plugin(m, mapping)
-        plugin = mapping.downcase.camelize
-        p plugin
-        p mapping
-
-        file_name = "#{ROOT_DIR}/plugins/#{mapping.downcase}.rb"
-        unless File.exist?(file_name)
-          m.reply "Could not load #{plugin} because #{File.basename(file_name)} does not exist."
-          return
-        end
+        authorized m do
+          plugin = mapping.downcase.camelize
+          p plugin
+          p mapping
 
-        begin
-          load(file_name)
-        rescue Exception
-          m.reply "Could not load #{plugin}."
-          raise
-        end
+          file_name = "#{ROOT_DIR}/plugins/#{mapping.downcase}.rb"
+          unless File.exist?(file_name)
+            m.reply "Could not load #{plugin} because #{File.basename(file_name)} does not exist."
+            return
+          end
 
-        begin
-          const = Cinch::Plugins.const_get(plugin)
-        rescue NameError
-          m.reply "Could not load #{plugin} because no matching class was found."
-          return
-        end
+          begin
+            load(file_name)
+          rescue Exception
+            m.reply "Could not load #{plugin}."
+            raise
+          end
 
-        @bot.plugins.register_plugin(const)
-        m.reply "Successfully loaded #{plugin}"
+          begin
+            const = Cinch::Plugins.const_get(plugin)
+          rescue NameError
+            m.reply "Could not load #{plugin} because no matching class was found."
+            return
+          end
+
+          @bot.plugins.register_plugin(const)
+          m.reply "Successfully loaded #{plugin}"
+        end
       end
 
       def unload_plugin(m, plugin)
-        begin
-          plugin_class = Cinch::Plugins.const_get(plugin.downcase.camelize)
-        rescue NameError
-          m.reply "Could not unload #{plugin} because no matching class was found."
-          return
-        end
+        authorized m do
+          begin
+            plugin_class = Cinch::Plugins.const_get(plugin.downcase.camelize)
+          rescue NameError
+            m.reply "Could not unload #{plugin} because no matching class was found."
+            return
+          end
 
-        @bot.plugins.select {|p| p.class == plugin_class}.each do |p|
-          @bot.plugins.unregister_plugin(p)
-        end
+          @bot.plugins.select {|p| p.class == plugin_class}.each do |p|
+            @bot.plugins.unregister_plugin(p)
+          end
+
+          ## FIXME not doing this at the moment because it'll break
+          ## plugin options. This means, however, that reloading a
+          ## plugin is relatively dirty: old methods will not be removed
+          ## but only overwritten by new ones. You will also not be able
+          ## to change a classes superclass this way.
+          # Cinch::Plugins.__send__(:remove_const, plugin)
+
+          # Because we're not completely removing the plugin class,
+          # reset everything to the starting values.
+          plugin_class.hooks.clear
+          plugin_class.matchers.clear
+          plugin_class.listeners.clear
+          plugin_class.timers.clear
+          plugin_class.ctcps.clear
+          plugin_class.react_on = :message
+          plugin_class.plugin_name = nil
+          plugin_class.help = nil
+          plugin_class.prefix = nil
+          plugin_class.suffix = nil
+          plugin_class.required_options.clear
 
-        ## FIXME not doing this at the moment because it'll break
-        ## plugin options. This means, however, that reloading a
-        ## plugin is relatively dirty: old methods will not be removed
-        ## but only overwritten by new ones. You will also not be able
-        ## to change a classes superclass this way.
-        # Cinch::Plugins.__send__(:remove_const, plugin)
-
-        # Because we're not completely removing the plugin class,
-        # reset everything to the starting values.
-        plugin_class.hooks.clear
-        plugin_class.matchers.clear
-        plugin_class.listeners.clear
-        plugin_class.timers.clear
-        plugin_class.ctcps.clear
-        plugin_class.react_on = :message
-        plugin_class.plugin_name = nil
-        plugin_class.help = nil
-        plugin_class.prefix = nil
-        plugin_class.suffix = nil
-        plugin_class.required_options.clear
-
-        m.reply "Successfully unloaded #{plugin}"
+          m.reply "Successfully unloaded #{plugin}"
+        end
       end
 
       def reload_plugin(m, plugin)
-        unload_plugin(m, plugin)
-        load_plugin(m, plugin)
+        authorized m do
+          unload_plugin(m, plugin)
+          load_plugin(m, plugin)
+        end
       end
 
       def set_option(m, plugin, option, value)
-        begin
-          const = Cinch::Plugins.const_get(plugin.downcase.camelize)
-        rescue NameError
-          m.reply "Could not set plugin option for #{plugin} because no matching class was found."
-          return
+        authorized m do
+          begin
+            const = Cinch::Plugins.const_get(plugin.downcase.camelize)
+          rescue NameError
+            m.reply "Could not set plugin option for #{plugin} because no matching class was found."
+            return
+          end
+          @bot.config.plugins.options[const][option.to_sym] = eval(value)
+
+          m.reply "Successfuly set option."
         end
-        @bot.config.plugins.options[const][option.to_sym] = eval(value)
 
-        m.reply "Successfuly set option."
       end
     end
   end

data/plugins/trellolistener.rb

@@ -0,0 +1,211 @@
+require "cgi"
+
+module Cinch
+  module Plugins
+    class Trellolistener
+      include Cinch::Plugin
+
+      set :plugin_name, 'trellolistener'
+
+      listen_to :http_trellolistener
+
+      def listen(m, json)
+        hash = Yajl::Parser.parse(URI.unescape(json))
+        #bot.loggers.debug(hash.inspect)
+        if  @bot.config.options['cogconf']['trello']
+          @bot.config.options['cogconf']['trello']['announce'].each do |announce|
+            if hash['action']['data']['board']['name'] == announce['board']
+              channel = announce['channel']
+              action = hash['action']['type']
+              case action
+              when 'updateBoard'
+                # not implemented yet
+                # "prefs":{"cardAging":"pirate"}
+                # "prefs":{"voting":"members"}
+              when 'addMemberToBoard'
+                message(channel, hash, "added %s to board" % [
+                  Format(:aqua, hash['action']['member']['username'])
+                ])
+              when 'removeMemberFromBoard'
+                message(channel, hash, "removed %s from board" % [
+                  Format(:aqua, hash['action']['member']['username'])
+                ])
+              when 'updateList'
+                message(channel, hash, "changed column name %s to %s" % [
+                  Format(:orange, hash['action']['data']['old']['name']),
+                  Format(:orange, hash['action']['data']['list']['name'])
+                ])
+              when 'createCard'
+                message(channel, hash, "created \"%s\" in %s" % [
+                  truncate(hash['action']['data']['card']['name']),
+                  Format(:orange, hash['action']['data']['list']['name'])
+                ])
+              when 'addMemberToCard'
+                message(channel, hash, "added %s to \"%s\"" % [
+                  Format(:aqua, hash['action']['member']['username']),
+                  truncate(hash['action']['data']['card']['name'])
+                ]) or puts json
+              when 'removeMemberFromCard'
+                message(channel, hash, "removed %s from \"%s\"" % [
+                  Format(:aqua, hash['action']['member']['username']),
+                  truncate(hash['action']['data']['card']['name'])
+                ]) or puts json
+              when 'updateCard'
+                if hash['action']['data']['old']
+                  if hash['action']['data']['listAfter']
+                    message(channel, hash, "moved \"%s\" from %s to %s" % [
+                      truncate(hash['action']['data']['card']['name']),
+                      Format(:orange, hash['action']['data']['listBefore']['name']),
+                      Format(:orange, hash['action']['data']['listAfter']['name'])
+                    ])
+                  elsif hash['action']['data']['old']['desc']
+                    message(channel, hash, "changed desc on \"%s\" in %s to \"%s\"" % [
+                      truncate(hash['action']['data']['card']['name']),
+                      Format(:orange, hash['action']['data']['list']['name']),
+                      truncate(hash['action']['data']['card']['desc'])
+                    ])
+                  elsif hash['action']['data']['old']['closed'] != nil
+                    if hash['action']['data']['card']['closed']
+                      message(channel, hash, "archived \"%s\" from %s" % [
+                        truncate(hash['action']['data']['card']['name']),
+                        Format(:orange, hash['action']['data']['list']['name'])
+                      ])
+                    else
+                      message(channel, hash, "restored \"%s\" in %s" % [
+                        truncate(hash['action']['data']['card']['name']),
+                        Format(:orange, hash['action']['data']['list']['name'])
+                      ])
+                    end
+                  elsif hash['action']['data']['old'].has_key? 'due'
+                    if hash['action']['data']['card']['due'] && hash['action']['data']['old']['due']
+                      date_new = Date.parse(hash['action']['data']['card']['due']).strftime("%a %-d %b")
+                      date_old = Date.parse(hash['action']['data']['old']['due']).strftime("%a %-d %b")
+                      message(channel, hash, "changed date on \"%s\" in %s, from %s to %s" % [
+                        truncate(hash['action']['data']['card']['name']),
+                        Format(:orange, hash['action']['data']['list']['name']),
+                        Format(:yellow, date_old),
+                        Format(:yellow, date_new)
+                      ])
+                    elsif hash['action']['data']['card']['due']
+                      date_new = Date.parse(hash['action']['data']['card']['due']).strftime("%a %-d %b")
+                      message(channel, hash, "set date on \"%s\" in %s, to %s" % [
+                        truncate(hash['action']['data']['card']['name']),
+                        Format(:orange, hash['action']['data']['list']['name']),
+                        Format(:yellow, date_new)
+                      ])
+                    else
+                      date_old = Date.parse(hash['action']['data']['old']['due']).strftime("%a %-d %b")
+                      message(channel, hash, "removed date on \"%s\" in %s, was \"%s\"" % [
+                        truncate(hash['action']['data']['card']['name']),
+                        Format(:orange, hash['action']['data']['list']['name']),
+                        Format(:yellow, date_old)
+                      ])
+                    end
+                  else
+                    puts "---- no known old ----"
+                    bot.loggers.debug(json)
+                    puts "---- / no known old ----"
+                  end
+                else
+                  puts "---- no old ----"
+                  bot.loggers.debug(json)
+                  puts "---- / no old ----"
+                end
+              when 'voteOnCard'
+                message(channel, hash, "voted on card \"%s\"" % [
+                  truncate(hash['action']['data']['card']['name'])
+                ])
+              when 'addLabelToCard'
+                message(channel, hash, "labelled \"%s\" as %s" % [
+                  truncate(hash['action']['data']['card']['name']),
+                  Format(:green, hash['action']['data']['label']['name'])
+                ])
+              when 'removeLabelFromCard'
+                message(channel, hash, "unlabelled \"%s\" as %s" % [
+                  truncate(hash['action']['data']['card']['name']),
+                  Format(:grey, hash['action']['data']['label']['name'])
+                ])
+              when 'commentCard'
+                message(channel, hash, "commented on \"%s\" in %s: %s" % [
+                  truncate(hash['action']['data']['card']['name']),
+                  Format(:orange, hash['action']['data']['list']['name']),
+                  truncate(hash['action']['data']['text'])
+                ])
+              when 'addChecklistToCard'
+                message(channel, hash, "added checklist \"%s\" on \"%s\"" % [
+                  truncate(hash['action']['data']['checklist']['name']),
+                  truncate(hash['action']['data']['card']['name'])
+                ])
+              when 'updateChecklist'
+                message(channel, hash, "changed checklist \"%s\" to \"%s\"" % [
+                  truncate(hash['action']['data']['checkItem']['name']),
+                  truncate(hash['action']['data']['old']['name'])
+                ])
+              when 'createCheckItem'
+                message(channel, hash, "added \"%s\" in checklist \"%s\" on \"%s\"" % [
+                  truncate(hash['action']['data']['checkItem']['name']),
+                  truncate(hash['action']['data']['checklist']['name']),
+                  truncate(hash['action']['data']['card']['name'])
+                ])
+              when 'updateCheckItem'
+                message(channel, hash, "changed \"%s\" in checklist \"%s\" to \"%s\" on \"%s\"" % [
+                  truncate(hash['action']['data']['old']['name']),
+                  truncate(hash['action']['data']['checklist']['name']),
+                  truncate(hash['action']['data']['checkItem']['name']),
+                  truncate(hash['action']['data']['card']['name'])
+                ])
+              when 'updateCheckItemStateOnCard'
+                message(channel, hash, "changed state of \"%s\" in \"%s\"  to %s on \"%s\"" % [
+                  truncate(hash['action']['data']['checkItem']['name']),
+                  truncate(hash['action']['data']['checklist']['name']),
+                  Format(:yellow, hash['action']['data']['checkItem']['state']),
+                  truncate(hash['action']['data']['card']['name'])
+                ])
+              when 'moveCardFromBoard'
+                message(channel, hash, "moved card \"%s\" to board %s" % [
+                  truncate(hash['action']['data']['card']['name']),
+                  Format(:yellow, "[%s]" % hash['action']['data']['boardTarget']['name'])
+                ])
+              else
+                puts "------------- not yet implemented: #{action} ------"
+                bot.loggers.debug(json)
+                puts "---------------------------------------------------"
+              end
+            end
+          end
+        end
+      end
+
+    private
+
+      def link(x)
+        "https://trello.com/c/#{x}"
+      end
+
+      def truncate(content, limit=50)
+        message = ''
+        words = content.gsub(/[\s\n]+/," ").split(" ")
+        while words.count > 0
+           word = words.shift
+          if (message.size + word.size + 2) > limit
+            message << ' …'
+            words.clear
+          else
+            message << " #{word}"
+          end
+        end
+        message.strip
+      end
+
+      def message(channel, hash, msg)
+        Channel(channel).send("%s %s %s %s" % [
+          Format(:yellow, "[%s]" % hash['action']['data']['board']['name']),
+          Format(:aqua, hash['action']['memberCreator']['username']),
+          msg,
+          Format(:grey, "(%s)" % link(hash['action']['data']['card']['shortLink']))
+        ])
+      end
+
+    end
+  end
+end

data/plugins/tweet.rb

@@ -26,6 +26,25 @@ EOT
         end
       end
 
+      def ago(timestamp)
+        now = Time.now.utc
+        timespent = now - timestamp
+        case timespent
+        when 0..60
+          "#{timespent.round}s ago"
+        when 61..3600
+          "#{(timespent/60).floor}m ago"
+        when 3601..86400
+          "#{(timespent/3600).floor}h ago"
+        when 86401..2592000
+          "#{(timespent/86400).floor}d ago"
+        when 2592001..31536000
+          "#{(timespent/2592000).floor} month ago"
+        else
+          "more than one year ago"
+        end
+      end
+
       def new(bot)
         @bot = bot
       end
@@ -37,7 +56,11 @@ EOT
           case command
           when 'search'
             client.search(args).take(3).each do |status|
-              back += Format(:bold, :underline, :yellow, "@#{status.user.screen_name}") + " " + status.text + "\n"
+              back += Format(:bold, :underline, :yellow, "@#{status.user.screen_name}") 
+              back += " #{status.text.gsub(/\n/,' ')}"
+              back += " (#{ago(status.created_at)}"
+              back += " https://twitter.com/#{status.user.screen_name}/status/#{status.id})"
+              back += "\n"
             end
           else
             back += "Usage: .t search <term> : searches the public timelines"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cogbot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: eventmachine_httpserver
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: 1.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -297,6 +297,7 @@ files:
 - plugins/shorturl.rb
 - plugins/stackoverflow.rb
 - plugins/tests.rb
+- plugins/trellolistener.rb
 - plugins/tweet.rb
 - plugins/urban.rb
 - plugins/users.rb