bender-bot 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eff1d2551be6a4039e117067c97b71a246488bc
-  data.tar.gz: 9b7f0a4415aa65ce54a69c28ee873db38811d706
+  metadata.gz: 268fd0e2852e1f26a640003d74b3b6bd7ed12700
+  data.tar.gz: 107352d30d4f117cc3d99b1110105db9a557c357
 SHA512:
-  metadata.gz: be3ff23c1ed7b956262236ccfd94596d88a97ad027dc7c9643accad7a7a60f4dbf808698275700092af2d000bd0a0753a736e2766757842c0573d71456e2071a
-  data.tar.gz: 8436e940e11db1d586ad20fe783a6321dd705be6319141a4b657b06f96fbe0fce6230b155f225a4cdbd7a2e6f6a78986d861ea599fa56e8a5e0c585a7ff9e15a
+  metadata.gz: c7bc07efab94683ef5825319cef8fd436f24e24f60440982d8f7ffda57d2d6fb6a24de70cd3ecfae5f03413266e348426b486dd9c3f1535c7213f418757ce92d
+  data.tar.gz: bf6b12223f0fe6262079e021b144389d8a80559e6932bb5603c50fc1747c0d0c215d7607b3748ba6404750d5b1c7ac53db9fc9c505004fa6ec78b606040ce91c

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/bender/bot.rb

@@ -30,6 +30,8 @@ class BenderBot
 
   CLOSE_TRANSITIONS = %w[ 21 41 ]
 
+  CLOSE_STATE = /done/i
+
   SEVERITIES = {
     1 => '10480',
     2 => '10481',
@@ -54,6 +56,9 @@ class BenderBot
 
 
   def handle time, sender, message
+    severity_field = SHOW_FIELDS.key 'Severity'
+    severities = Hash.new { |h,k| h[k] = [] }
+
     case message
 
 
@@ -68,79 +73,127 @@ class BenderBot
       u = user_where(name: $1) || user_where(nick: $1)
       reply '%s: %s (%s)' % [ u[:nick], u[:name], u[:email] ]
 
+    # ?inc - This help text
     when /^\s*\?inc\s*$/
       reply [
-        '?inc - This help text',
+        '?inc - Display this help text',
         '/inc - List open incidents',
-        '/inc NUM - Show incident details',
-        '/inc close NUM - Close an incident',
-        '/inc SEVERITY SUMMARY - File a new incident',
-        '/inc summary - Summarize recent incidents'
+        '/inc [INCIDENT_NUMBER] - Display incident details',
+        '/inc close [INCIDENT_NUMBER] - Close an incident',
+        '/inc open [SEVERITY=1,2,3,4,5] [SUMMARY_TEXT] - Open a new incident',
+        '/inc summary - Summarize incidents from past 24 hours (open or closed)',
+        '/inc comment [INCIDENT_NUMBER] [COMMENT_TEXT] - Add a comment to an incident'
       ].join("\n")
 
+    # /inc - List open incidents
     when /^\s*\/inc\s*$/
       refresh_incidents
 
-      is = store['incidents'].map do |i|
+      is = store['incidents'].reverse.map do |i|
         status = normalize_value i['fields']['status']
         unless status =~ /done|complete|closed/i
-          '%s: %s' % [ i['num'], i['fields']['summary'] ]
+          '%s-%s (%s - %s) [%s]: %s' % [
+            options.jira_project,
+            i['num'],
+            short_severity(i['fields'][severity_field]['value']),
+            normalize_value(i['fields']['status']),
+            friendly_date(i['fields']['created']),
+            i['fields']['summary']
+          ]
         end
       end.compact.join("\n")
 
+      is = 'No open incidents at the moment!' if is.empty?
+
       reply is
 
+    # /inc summary - Summarize recent incidents
     when /^\s*\/inc\s+summary\s*$/
       refresh_incidents
 
-      severity_field = SHOW_FIELDS.key 'Severity'
-      severities = Hash.new { |h,k| h[k] = [] }
+      statuses = Hash.new { |h,k| h[k] = 0 }
 
-      store['incidents'].each do |i|
+      store['incidents'].reverse.each do |i|
         if recent_incident? i
-          repr = '%s-%s: %s' % [
-            options.jira_project, i['num'], i['fields']['summary']
+          status = normalize_value(i['fields']['status'])
+
+          repr = '%s-%s (%s) [%s]: %s' % [
+            options.jira_project,
+            i['num'],
+            status,
+            friendly_date(i['fields']['created']),
+            i['fields']['summary']
           ]
+
           sev  = i['fields'][severity_field]['value']
           severities[sev] << repr
+          statuses[status] += 1
         end
       end
 
-      is = severities.keys.sort.map do |sev|
-        "%s:\n%s" % [ sev, severities[sev].join("\n") ]
-      end.join("\n\n")
+      summary = []
+      summary << 'By Status:'
+      statuses.each do |status, size|
+        summary << '%s: %d ticket(s)' % [ status, size ]
+      end
+      summary << ''
+      summary << 'By Severity:'
+      severities.keys.sort.each do |severity|
+        summary << '%s: %d ticket(s)' % [
+          short_severity(severity),
+          severities[severity].size
+        ]
+      end
 
-      reply is
+      if severities.empty?
+        reply 'No recent incidents! Woohoo!'
 
-    when /^\s*\/inc\s+(\d+)\s*$/
-      refresh_incidents
-      incident = store['incidents'].select { |i| i['num'] == $1 }.first
+      else
+        is = severities.keys.sort.map do |sev|
+          "%s:\n%s" % [ sev, severities[sev].join("\n") ]
+        end.join("\n\n")
 
-      fields = SHOW_FIELDS.keys - %w[ summary ]
+        reply(summary.join("\n") + "\n\n" + is)
+      end
 
-      i = fields.map do |f|
-        val = incident['fields'][f]
-        if val
-          key = SHOW_FIELDS[f]
-          val = normalize_value val
-          '%s: %s' % [ key, val ]
-        end
-      end.compact
 
-      reply "%s\n%s: %s\n%s" % [
-        (options.jira_site + '/browse/' + incident['key']),
-        incident['key'],
-        incident['fields']['summary'],
-        i.join("\n")
-      ]
+    # /inc NUM - Show incident details
+    when /^\s*\/inc\s+(\d+)\s*$/
+      incident = select_incident $1
 
-    when /^\s*\/inc\s+close\s+(\d+)\s*$/
-      refresh_incidents
-      incident = store['incidents'].select { |i| i['num'] == $1 }.first
+      if incident.nil?
+        reply 'Sorry, no such incident!'
+      else
+        fields = SHOW_FIELDS.keys - %w[ summary ]
+
+        i = fields.map do |f|
+          val = incident['fields'][f]
+          if val
+            key = SHOW_FIELDS[f]
+            val = normalize_value val
+            '%s: %s' % [ key, val ]
+          end
+        end.compact
+
+        reply "%s\n%s: %s\n%s" % [
+          (options.jira_site + '/browse/' + incident['key']),
+          incident['key'],
+          incident['fields']['summary'],
+          i.join("\n")
+        ]
+      end
 
-      reply close_incident(incident)
+    # /inc close NUM - Close an incident
+    when /^\s*\/inc\s+close\s+(\d+)\s*$/
+      incident = select_incident $1
+      if incident
+        reply close_incident(incident)
+      else
+        reply 'Sorry, no such incident!'
+      end
 
-    when /^\s*\/inc\s+(sev|s|p)?(\d+)\s+(.*?)\s*$/i
+    # /inc open SEVERITY SUMMARY - File a new incident
+    when /^\s*\/inc\s+open\s+(severity|sev|s|p)?(\d+)\s+(.*?)\s*$/i
       user = user_where name: sender
       data = {
         fields: {
@@ -155,6 +208,15 @@ class BenderBot
       }
 
       reply file_incident(data)
+
+
+    # /inc comment [INCIDENT_NUMBER] [COMMENT_TEXT]
+    when /^\s*\/inc\s+comment\s+(\d+)\s+(.*?)\s*$/i
+      incident = select_incident $1
+      comment  = $2
+      user     = user_where name: sender
+
+      reply comment_on_incident(incident, comment, user)
     end
 
     return true
@@ -226,7 +288,11 @@ private
     resp  = http.request req
     issue = JSON.parse(resp.body)
 
-    return options.jira_site + '/browse/' + issue['key']
+    if issue.has_key? 'key'
+      options.jira_site + '/browse/' + issue['key']
+    else
+      "Sorry, I couldn't file that!"
+    end
   end
 
 
@@ -242,26 +308,44 @@ private
     req['Content-Type'] = 'application/json'
     req['Accept'] = 'application/json'
 
-    closed = false
     CLOSE_TRANSITIONS.each do |tid|
       req.body = {
         transition: { id: tid }
       }.to_json
-      resp = http.request req
-      case resp
-      when Net::HTTPBadRequest
-        next
-      else
-        closed = true
-        break
-      end
+      http.request req
     end
 
-    if closed
+    incident = select_incident incident['key'].split('-',2).last
+    status = normalize_value incident['fields']['status']
+
+    if status =~ CLOSE_STATE
       'Closed: ' + options.jira_site + '/browse/' + incident['key']
     else
       [
-        "Failed to close, make sure you've got the ticket filled out",
+        'Failed to close automatically, you might try yourself',
+        (options.jira_site + '/browse/' + incident['key'])
+      ].join("\n")
+    end
+  end
+
+
+  def comment_on_incident incident, comment, user
+    req_path = '/rest/api/2/issue/%s/comment' % incident['key']
+    uri = URI(options.jira_site + req_path)
+    http = Net::HTTP.new uri.hostname, uri.port
+
+    req = Net::HTTP::Post.new uri
+    req.basic_auth options.jira_user, options.jira_pass
+    req['Content-Type'] = 'application/json'
+    req['Accept'] = 'application/json'
+    req.body = { body: '_[~%s]_ says: %s' % [ user[:nick], comment ] }.to_json
+
+    case http.request(req)
+    when Net::HTTPCreated
+      'Added: ' + options.jira_site + '/browse/' + incident['key']
+    else
+      [
+        'Sorry, I had trouble adding your comment',
         (options.jira_site + '/browse/' + incident['key'])
       ].join("\n")
     end
@@ -283,7 +367,12 @@ private
 
 
   def normalize_date val
-    Time.parse(val).utc.iso8601(3).sub(/Z$/, 'UTC')
+    Time.parse(val).utc.iso8601(0).sub(/Z$/, 'UTC')
+  end
+
+
+  def friendly_date val
+    Time.parse(val).strftime('%Y-%m-%d %H:%M %Z')
   end
 
 
@@ -297,4 +386,15 @@ private
     24 * 60 * 60 # seconds/day
   end
 
+
+  def select_incident num, refresh=true
+    refresh_incidents if refresh
+    store['incidents'].select { |i| i['num'] == num }.first
+  end
+
+
+  def short_severity s
+    s.split(' - ', 2).first
+  end
+
 end

data/lib/bender/main.rb

@@ -153,7 +153,6 @@ module Bender
       Thread.new do
         loop do
           resp = http.request req
-
           users = JSON.parse(resp.body).inject({}) do |h, user|
             h[user['key']] = {
               nick: user['key'],
@@ -189,4 +188,4 @@ module Bender
 
 
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bender-bot
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor