ferris-bueller 0.0.3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e42b63a6a4a472e0a57bf203fd2b40df207691f0
-  data.tar.gz: e17b58dd6390318e6540015e1d5ead60a8b5fd27
+  metadata.gz: f388396864494d4cdd8a39e1855e9e9ad00429cc
+  data.tar.gz: f255231cafc28d0003c9bf199ee02dec7c3ada56
 SHA512:
-  metadata.gz: 5e63ebf4b536ae282d08365cd580796e843a89685d53ef498f936bee99e592fd04a484cd6a9398296882ff17b3602a0eb373e0bc991dc9c379e4359d17f39a84
-  data.tar.gz: ae7e81ccd67840d08b36d0855fd7adcfb441e9249d7ede8916f8fb0f148e4722e6b208ce6c0dfe81e676e5d454735856b9a44eded1cafbf5c140c178e0305731
+  metadata.gz: 912d96dbb25ca30dcf194268416ce60196a7109eb1fb2cb82a3a821bc5eee05a90ddd2f034288398af6f219b21fb4ded7efdd9c51860e6db296f4e60c637df33
+  data.tar.gz: f672c22d2ab7578a697c4659f1dc0e9dcece80f160bad36f0e07be81d970e033445b5cc4be3da291eeffc0c7a2d860b74122bfa795f160f26733c35f5223d0b6

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.1

data/lib/ferris-bueller/constants.rb

@@ -33,5 +33,17 @@ module FerrisBueller
     }
 
     SEVERITY_FIELD = SHOW_FIELDS.key('Severity')
+
+    HELP_TEXT = <<-END.gsub(/^ +/,'')
+      /inc help - print this message
+      /inc resolve <inc> - resolve incident number <inc>
+      /inc close <inc> - close incident number <inc>
+      /inc whoami - test to see if bueller can tell who you are
+      /inc list - list incidents
+      /inc summary - summary of incidents
+      /inc show <inc> - show incident info for incident <inc>
+      /inc comment <inc> <comment> - comment on incident <inc> with comment <comment>
+      /inc open <severity> <summary> - open incident with severity of 1(high)-5(low) <severity>
+    END
   end
-end
+end

data/lib/ferris-bueller/helpers.rb

@@ -18,7 +18,7 @@ module FerrisBueller
     def store ; @store end
 
 
-    def start_your_day_off
+    def start_your_day_off queue
       Web.set :environment, options.environment
       Web.set :port, options.port
       Web.set :bind, options.bind
@@ -33,8 +33,10 @@ module FerrisBueller
         logger: log
       )
       Web.set :jira_project, options.jira_project
+      Web.set :jira_url, options.jira_url
       Web.set :jira_type, options.jira_type
       Web.set :refresh_rate, options.incident_refresh
+      Web.set :post_queue, queue
 
       if log.level >= ::Logger::DEBUG
         Web.set :raise_errors, true
@@ -48,6 +50,26 @@ module FerrisBueller
       Web.run!
     end
 
+    def go_handle_postbacks queue
+      Thread.new do
+        loop do
+          post_lambda = queue.pop
+          response, uri_string = post_lambda.call
+          uri = URI uri_string
+          log.debug \
+            event: 'sending Slack response',
+            path: uri_string,
+            data: response
+          Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https') do |http|
+            req = Net::HTTP::Post.new uri
+            req['Content-Type'] = 'application/json'
+            req['Accept'] = 'application/json'
+            req.body = JSON.generate response
+            http.request req
+          end
+        end
+      end
+    end
 
     def go_refresh_jira_users
       Thread.new do
@@ -100,9 +122,8 @@ module FerrisBueller
       log.error \
         error: 'could not refresh users',
         event: 'exception',
-        exception: e.inspect,
         class: e.class,
-        message: e.message,
+        message: e.message.inspect,
         backtrace: e.backtrace,
         remediation: 'pausing breifly before retrying'
       sleep RETRY_DELAY
@@ -111,20 +132,36 @@ module FerrisBueller
 
 
     def refresh_jira_members
-      data = jira_request 'group', \
-        groupname: options.jira_group,
-        expand: 'users'
+      req_path = 'rest/api/2/group/member'
+      is_last, values, start = false, [], 0
+      until is_last
+        req_params = QueryParams.encode \
+          groupname: options.jira_group,
+          startAt: start
+
+        uri = URI(options.jira_url + req_path + '?' + req_params)
+        http = Net::HTTP.new uri.hostname, uri.port
+
+        req = Net::HTTP::Get.new uri
+        req.basic_auth options.jira_user, options.jira_pass
+        req['Content-Type'] = 'application/json'
+        req['Accept'] = 'application/json'
+
+        resp    = http.request req
+        data    = JSON.parse resp.body
+        values += data['values']
+        is_last = data['isLast']
+        start  += data['maxResults']
+      end
 
-      user_names = data[:users][:items].map { |u| u[:name] }
+      user_names = values.map { |u| u['name'] }
       store[:jira_members] = user_names
-
     rescue StandardError => e
       log.error \
         error: 'could not refresh members',
         event: 'exception',
-        exception: e.inspect,
         class: e.class,
-        message: e.message,
+        message: e.message.inspect,
         backtrace: e.backtrace,
         remediation: 'pausing breifly before retrying'
       sleep RETRY_DELAY
@@ -142,14 +179,12 @@ module FerrisBueller
       store[:jira_incidents] = data[:issues].map do |i|
         i[:num] = i[:key].split('-', 2).last ; i
       end
-
     rescue StandardError => e
       log.error \
         error: 'could not refresh incidents',
         event: 'exception',
-        exception: e.inspect,
         class: e.class,
-        message: e.message,
+        message: e.message.inspect,
         backtrace: e.backtrace,
         remediation: 'pausing breifly before retrying'
       sleep RETRY_DELAY
@@ -159,7 +194,7 @@ module FerrisBueller
 
     def jira_request path, params
       api_url = File.join options.jira_url, 'rest/api/latest', path
-      log.trace \
+      log.debug \
         event: 'jira request',
         path: path,
         params: params,
@@ -183,4 +218,4 @@ module FerrisBueller
     end
 
   end
-end
+end

data/lib/ferris-bueller/jira_api.rb

@@ -14,7 +14,7 @@ module FerrisBueller
       @api_url   = options.fetch :api_url
       @base_path = options.fetch :base_path, '/rest/api/2'
       @logger    = options.fetch :logger, Slog.new
-      log.trace event: 'Jira API client initialized'
+      log.debug event: 'Jira API client initialized'
     end
 
     def send path, data={}
@@ -26,20 +26,32 @@ module FerrisBueller
       req['Content-Type'] = 'application/json'
       req['Accept'] = 'application/json'
       req.body = JSON.generate data
-      log.trace \
+      log.debug \
         event: 'sending Jira API request',
         path: path,
         data: data
-      res = JSON.parse http.request(req).body, symbolize_names: true
-      log.debug \
-        event: 'Jira API request returned',
-        path: path,
-        data: data,
-        response: res
-      res
+      raw_res = http.request(req).body
+      begin
+        return nil unless raw_res
+        res = JSON.parse raw_res, symbolize_names: true
+        log.debug \
+          event: 'Jira API request returned',
+          path: path,
+          data: data,
+          response: res
+        res
+      rescue => e
+        log.error \
+          event: 'exception parsing jira response',
+          response: raw_res.inspect,
+          exception: e.class,
+          message: e.message.inspect,
+          backtrace: e.backtrace
+        raise e
+      end
     end
 
   private
     def log ; @logger end
   end
-end
+end

data/lib/ferris-bueller/main.rb

@@ -112,8 +112,11 @@ module FerrisBueller
       go_refresh_jira_users
       go_refresh_jira_members
       go_refresh_jira_incidents
-      start_your_day_off
+
+      queue = Queue.new
+      go_handle_postbacks queue
+      start_your_day_off queue
     end
 
   end
-end
+end

data/lib/ferris-bueller/metadata.rb

@@ -29,15 +29,15 @@ module FerrisBueller
   # Every project deserves its own ASCII art
   ART      = <<-'EOART' % VERSION
 
-
-
-    .--.           . .
-    |   )          | |
-    |--:  .-. .  . | | .-. .--.
-    |   )(.-' |  | | |(.-' |
-    '--'  `--'`--`-`-`-`--''
-
+   /$$$$$$$                      /$$ /$$
+  | $$__  $$                    | $$| $$
+  | $$  \ $$ /$$   /$$  /$$$$$$ | $$| $$  /$$$$$$   /$$$$$$
+  | $$$$$$$ | $$  | $$ /$$__  $$| $$| $$ /$$__  $$ /$$__  $$
+  | $$__  $$| $$  | $$| $$$$$$$$| $$| $$| $$$$$$$$| $$  \__/
+  | $$  \ $$| $$  | $$| $$_____/| $$| $$| $$_____/| $$
+  | $$$$$$$/|  $$$$$$/|  $$$$$$$| $$| $$|  $$$$$$$| $$
+  |_______/  \______/  \_______/|__/|__/ \_______/|__/
 
 
   EOART
-end
+end

data/lib/ferris-bueller/replies.rb

@@ -13,13 +13,11 @@ module FerrisBueller
           attachments: [
             {
               title: 'Slack User',
-              # pretext: 'User found via Slack APIs',
               text: "```#{JSON.pretty_generate(u[:slack])}```",
               mrkdwn_in: %w[ text pretext ]
             },
             {
               title: 'Jira User',
-              # pretext: 'User found via Jira APIs',
               text: "```#{JSON.pretty_generate(u[:jira])}```",
               mrkdwn_in: %w[ text pretext ]
             }
@@ -34,7 +32,7 @@ module FerrisBueller
 
 
     def reply_help params
-      { text: "Help!" }
+      { text: HELP_TEXT }
     end
 
 
@@ -49,7 +47,7 @@ module FerrisBueller
       return { text: 'No open incidents at the moment' } if incidents.empty?
 
       attachments = incidents.map do |i|
-        attach_incident(incident)
+        attach_incident(i)
       end
       {
         text: 'Found %d open incidents' % attachments.size,
@@ -60,13 +58,22 @@ module FerrisBueller
 
     def reply_summary params
       incidents = recent_incidents
-      return { text: 'Could not list incidents' } if incidents.nil?
-      return { text: 'No recent incidents' } if incidents.empty?
+      return { response_type: 'in_channel', text: 'Could not list incidents' } if incidents.nil?
+      return { response_type: 'in_channel', text: 'No recent incidents' } if incidents.empty?
 
-      attachments = incidents.map do |i|
+      incidents = incidents.sort { |i| i[:id].to_i }.reverse
+
+      partitioned_incidents = []
+      severities = incidents.map { |i| i[:fields][:customfield_11250][:value] }.sort.uniq
+      severities.each do |severity|
+        partitioned_incidents += incidents.select { |i| i[:fields][:customfield_11250][:value] == severity }
+      end
+
+      attachments = partitioned_incidents.map do |i|
         attach_incident i
       end
       {
+        response_type: 'in_channel',
         text: 'Found %d recent incidents' % attachments.size,
         attachments: attachments
       }
@@ -78,76 +85,94 @@ module FerrisBueller
       return { text: 'Could not list incidents' } unless incident
 
       {
+        text: 'Incident info',
         attachments: [
-          attach_incident(incident)
+          attach_incident(incident, true)
         ]
       }
     end
 
 
     def reply_resolve inc_num, params
-      return { text: "You're not allowed to do that" } unless allowed? params
+      return { response_type: 'in_channel' }, lambda do
+        return { response_type: 'in_channel', text: "You're not allowed to do that" }, params[:response_url]  unless allowed? params
 
-      incident = select_incident inc_num
-      return { text: 'Could not list incidents' } unless incident
+        incident = select_incident inc_num
+        return { response_type: 'in_channel', text: 'Could not list incidents' }, params[:response_url]  unless incident
 
-      resolution = resolve_incident incident
-      return { text: 'Could not resolve incident' } if resolution.nil?
-      return { text: 'Already resolved' } if resolution == false
+        resolution = resolve_incident incident
+        return { response_type: 'in_channel', text: 'Could not resolve incident' }, params[:response_url]  if resolution.nil?
+        return { response_type: 'in_channel', text: 'Already resolved' } if resolution == false
 
-      {
-        text: 'Resolved incident',
-        attachments: [
-          attach_incident(incident)
-        ]
-      }
+        return {
+          response_type: 'in_channel',
+          text: 'Resolved incident',
+          attachments: [
+            attach_incident(incident)
+          ]
+        }, params[:response_url]
+      end
     end
 
 
     def reply_close inc_num, params
-      return { text: "You're not allowed to do that" } unless allowed? params
+      return { response_type: 'in_channel' }, lambda do
+        return { response_type: 'in_channel', text: "You're not allowed to do that" }, params[:response_url] unless allowed? params
 
-      incident = select_incident inc_num
-      return { text: 'Could not list incidents' } unless incident
+        incident = select_incident inc_num
+        return { response_type: 'in_channel', text: 'Could not list incidents' }, params[:response_url] unless incident
 
-      resolution = close_incident incident
-      return { text: 'Could not close incident' } unless resolution
+        resolution = close_incident incident
+        return { response_type: 'in_channel', text: 'Could not close incident' }, params[:response_url] unless resolution
 
-      {
-        text: 'Closed incident',
-        attachments: [
-          attach_incident(incident)
-        ]
-      }
+        return {
+          response_type: 'in_channel',
+          text: 'Closed incident',
+          attachments: [
+            attach_incident(incident)
+          ]
+        }, params[:response_url]
+      end
     end
 
 
     def reply_open sev_num, summary, params
-      return { text: "You're not allowed to do that" } unless allowed? params
-
-      new_incident = construct_incident sev_num, summary, params
-      incident = open_incident new_incident, summary
-      return { text: 'Could not open incident' } unless incident
-
-      incident = new_incident.merge incident
-      {
-        text: 'Opened incident',
-        attachments: [
-          attach_incident(incident)
-        ]
-      }
+      return { response_type: 'in_channel' }, lambda do
+        return { response_type: 'in_channel', text: "You're not allowed to do that" }, params[:response_url] unless allowed? params
+
+        new_incident = construct_incident sev_num, summary, params
+        incident = open_incident new_incident, summary
+        return { response_type: 'in_channel', text: 'Could not open incident' }, params[:response_url] unless incident
+
+        incident = new_incident.merge incident
+        log.debug \
+          event: 'created incident',
+          incident: incident
+        return {
+          response_type: 'in_channel',
+          text: 'Opened incident',
+          attachments: [
+            {
+               title: incident[:key],
+               title_link: File.join(settings.jira_url, 'browse', incident[:key]),
+               text: incident[:fields][:summary]
+            }
+          ]
+        }, params[:response_url]
+      end
     end
 
 
     def reply_comment inc_num, message, params
       incident = select_incident inc_num
-      return { text: 'Could not list incidents' } unless incident
+      return { response_type: 'in_channel', text: 'Could not list incidents' } unless incident
 
       comment = construct_comment message, params
       annotation = comment_on_incident incident, comment
-      return { text: 'Could not comment on incident' } unless annotation
+      return { response_type: 'in_channel', text: 'Could not comment on incident' } unless annotation
 
       {
+        response_type: 'in_channel',
         text: 'Commented on incident',
         attachments: [
           attach_incident(incident)
@@ -159,10 +184,49 @@ module FerrisBueller
 
   private
 
-    def attach_incident i
+    def attach_incident i, detailed=false
+      severity_colors = {
+        '1' => '#e60000',
+        '2' => '#e60000',
+        '3' => '#ff6600',
+        '4' => '#ffff00',
+        '5' => '#ccff33'
+      }
+      severity = i[:fields][:customfield_11250][:value] rescue 'Unknown'
+      severity_color = severity_colors[severity[3]] rescue '#cccccc'
+
+      additional_fields = if detailed
+        [
+          {
+            title: 'Description',
+            value: i[:fields][:description]
+          }
+        ]
+      end
+
       {
         title: i[:key],
-        text: i[:fields][:summary],
+        title_link: File.join(settings.jira_url, 'browse', i[:key]),
+        text: "*#{severity}*\n_#{i[:fields][:summary]}_",
+        fields: [
+          {
+            title: 'Created',
+            value: (DateTime.parse(i[:fields][:created]).iso8601 rescue nil),
+            short: true
+          },
+          {
+            title: 'Status',
+            value: (i[:fields][:status][:name] rescue nil),
+            short: true
+          },
+          {
+            title: 'Updated',
+            value: (DateTime.parse(i[:fields][:updated]).iso8601 rescue nil),
+            short: true
+          },
+          *additional_fields
+        ].reject { |f| f[:value].nil? || f[:value].empty? || f[:value] == 'Unknown' },
+        color: severity_color,
         mrkdwn_in: %w[ text pretext ]
       }
     end
@@ -172,7 +236,7 @@ module FerrisBueller
       status = normalize_value i[:fields][:status]
       return false if status =~ RESOLVED_STATE
 
-      log.trace \
+      log.debug \
         event: 'resolving incident',
         incident: i
 
@@ -201,7 +265,7 @@ module FerrisBueller
       status = normalize_value i[:fields][:status]
       return false if status =~ CLOSED_STATE
 
-      log.trace \
+      log.debug \
         event: 'closing incident',
         incident: i
 
@@ -329,12 +393,12 @@ module FerrisBueller
       24 * 60 * 60 # seconds/day
     end
 
+
     def allowed? params
       u = user_lookup params
       u && store[:jira_members] \
         && store[:jira_members].include?(u[:jira][:nick])
     end
 
-
   end
-end
+end

data/lib/ferris-bueller/slack_api.rb

@@ -12,13 +12,13 @@ module FerrisBueller
       @token   = options.fetch :token
       @logger  = options.fetch :logger, Slog.new
       @api_url = options.fetch :api_url, 'https://slack.com/api'
-      log.trace event: 'Slack API client initialized'
+      log.debug event: 'Slack API client initialized'
     end
 
     def send method, options={}
       uri = URI File.join(@api_url, method)
       options = { token: @token }.merge(options)
-      log.trace event: 'sending api request', method: method, options: options
+      log.debug event: 'sending api request', method: method, options: options
       res = Net::HTTP.post_form uri, options
       log.debug event: 'sent api request', method: method, options: options, response: res
       JSON.parse res.body, symbolize_names: true
@@ -27,4 +27,4 @@ module FerrisBueller
   private
     def log ; @logger end
   end
-end
+end

data/lib/ferris-bueller/web.rb

@@ -42,7 +42,8 @@ module FerrisBueller
         halt 403
       else
         content_type :json
-        reply = respond(params)
+        reply, post = respond(params)
+        settings.post_queue << post if post
         JSON.generate reply if reply
       end
     end
@@ -81,4 +82,4 @@ module FerrisBueller
     end
 
   end
-end
+end

data/lib/ferris-bueller/web_helpers.rb

@@ -24,12 +24,16 @@ module FerrisBueller
         email: data[:user][:email]
       }
 
+      log.info \
+        event: 'matching user',
+        slack_user: slack_user
+
       jira_matches = store[:jira_users].values.map do |jira_user|
         distances = [ :name, :nick ].map do |k|
           compare slack_user[k], jira_user[k]
         end.compact
         mean_distance = 1.0 * distances.inject(:+) / distances.size
-        if mean_distance > threshold
+        if mean_distance > threshold or distances.max > 0.99
           { user: jira_user, distance: mean_distance}
         end
       end.compact
@@ -56,7 +60,7 @@ module FerrisBueller
         event: 'exception',
         exception: e.inspect,
         class: e.class,
-        message: e.message,
+        message: e.message.inspect,
         backtrace: e.backtrace
       return nil
     end
@@ -71,4 +75,4 @@ module FerrisBueller
     end
 
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ferris-bueller
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.1
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slog
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement