bender-bot 0.4.8 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c283ea7083ad833690d22b910550e2ea8c611011
-  data.tar.gz: 9b621bcb3cf8ac33b63ca2e2f3e9a213708b5cc4
+  metadata.gz: c92f8f176538d8e81ca22f3c7b032981c91ea7ce
+  data.tar.gz: 85a6f7a33ce6945786dea6918378db2527619299
 SHA512:
-  metadata.gz: 1eff378cba2f9b35d3bedda415a8d488c8a18d2a72e74e2de3ecbd2c270e53cdccf6acc48aeb4ea0a6f4e0ef4595f360c7a59b76e388438f84515eea2ad77b6a
-  data.tar.gz: acfb05cfdc199ce95a640d970c6da58f49ac244ff640527edbe9b375cf282e88af1fb055e6629a420981fac6423017fe02ae028dc81c699339336fa489126e54
+  metadata.gz: 05d9d101c52c63e2dda43964cdcbc470c73b323eb99f5d7b8d93c92dd67fe35a98f4a6260a2d2d1ef29b2601007a84c5050247f4af30ab6148c3444586336003
+  data.tar.gz: 9a6bc3702182bcd3e3a31a028fbc284b91dd3cbbce7bc7c54f15c7961a865b89db7ddc79fb3032a8b14c64fa10502e6438f91dc90a5c04400d67520cc7d0d0c3

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.5.0

data/lib/bender/bot.rb

@@ -15,11 +15,12 @@ Bot = Robut # alias
 
 
 module Bot
-  def self.run! options
+  def self.run! options, logger
     hipchat = HipChat::Client.new(options.hipchat_token)
     BenderBot.class_variable_set :@@hipchat, hipchat
     BenderBot.class_variable_set :@@rooms, hipchat.rooms
     BenderBot.class_variable_set :@@options, options
+    BenderBot.class_variable_set :@@logger, logger
     Bot::Plugin.plugins = [ BenderBot ]
     conn = Bot::Connection.new
     conn.store['users'] ||= {}
@@ -109,13 +110,21 @@ class BenderBot
 
     when /^\s*\/whoami\s*$/
       u = user_where name: sender
-      m = '<b>%{nick}</b>: %{name} (<a href="mailto:%{email}">%{email}</a>)' % u
-      reply_html m, :purple
+      if u
+        m = '<b>%{nick}</b>: %{name} (<a href="mailto:%{email}">%{email}</a>)' % u
+        reply_html m, :purple
+      else
+        reply_html "Couldn't find the associated user in JIRA", :red
+      end
 
     when /^\s*\/lookup\s+(.+)\s*$/
       u = user_where(name: $1) || user_where(nick: $1)
-      m = '<b>%{nick}</b>: %{name} (<a href="mailto:%{email}">%{email}</a>)' % u
-      reply_html m, :purple
+      if u
+        m = '<b>%{nick}</b>: %{name} (<a href="mailto:%{email}">%{email}</a>)' % u
+        reply_html m, :purple
+      else
+        reply_html "Couldn't find the associated user in JIRA", :red
+      end
 
     # /inc help - This help text
     when /^\s*(\?inc|\/inc\s+help)\s*$/
@@ -272,7 +281,9 @@ class BenderBot
       comment  = $2
       user     = user_where name: sender
 
-      if incident
+      if !user
+        reply_html "Couldn't find the associated user in JIRA", :red
+      elsif incident
         reply_html *comment_on_incident(incident, comment, user)
       else
         reply_html 'Sorry, no such incident!', :red
@@ -292,25 +303,38 @@ class BenderBot
 
 private
 
+  def log ; @@logger end
+
   def options ; @@options end
 
-  def user_where fields, threshold=0.8
+  def user_where fields, threshold=0.85
     field, value = fields.to_a.shift
     suggested_user = store['users'].values.sort_by do |u|
       compare value, u[field]
     end.last
 
     distance = compare value, suggested_user[field]
-    return distance < threshold ? nil : suggested_user
+
+    user = distance < threshold ? nil : suggested_user
+
+    log.trace \
+      action: 'user_where',
+      fields: fields,
+      threshold: threshold,
+      field: field,
+      value: value,
+      suggested_user: suggested_user,
+      distance: distance,
+      user: user
+
+    return user
   end
 
 
   def compare name1, name2
-    n1 = name1.gsub /\W/, ''
-    n2 = name2.gsub /\W/, ''
-    d1 = JARO.getDistance n1.downcase, n2.downcase
-    d2 = JARO.getDistance n1, n2
-    return d1 + d2 / 2.0
+    n1 = name1.gsub(/\W/, '').downcase
+    n2 = name2.gsub(/\W/, '').downcase
+    JARO.getDistance n1, n2
   end
 
 
@@ -446,7 +470,7 @@ private
 
   def allowed?
     user = user_where name: @sender
-    store['group'].include? user[:name]
+    user && store['group'].include?(user[:name])
   end
 
 end

data/lib/bender/main.rb

@@ -168,7 +168,7 @@ module Bender
         config.logger = log
       end
 
-      Bot.run! options
+      Bot.run! options, log
     end
 
 
@@ -189,7 +189,7 @@ module Bender
 
       @open = nil unless defined? @open
 
-      log.info \
+      log.trace \
         primary_room_name: bot.store['primary_room_name'],
         primary_room_topic: bot.store['primary_room_topic'],
         new_room_name: new_room['name'],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bender-bot
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.0
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: hipchat
   requirement: !ruby/object:Gem::Requirement