lita-jira 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 372aaea44e1c7953b66a0cb3afe6a53a631e08c9
-  data.tar.gz: 8ffc592e14e99e246d07effe13f1248d850c7a3f
+  metadata.gz: eca25015401127d628654b155f01c2186adee367
+  data.tar.gz: 8ecded11919390a55da963235b9b7eeb9f272382
 SHA512:
-  metadata.gz: 74d908bfa0e64d3d9331447e75873797b5d1fb8ae485da8beff3c1ecf49cc1faa830ec41e66a4f8a7a646684e531fb8124350f193510457b3b5814944e96a439
-  data.tar.gz: 76ef2321482c259b729f97475525e671d084fdf6992e68c01b694aff11de65c3b943eae4a5a31d867560709558c1f67edda4e1ab86014cb8f1b79aa6868a083a
+  metadata.gz: f736bd91ff2ff195ec600a289f44b1d58397b6eb874643597b4f6fd024c6e6c3fb053eccdc0175f0952354e2ae809ffe63f3a50923bbe9299f3e017daba4de69
+  data.tar.gz: dd89520f0235451055bd7243b011aabf3d65ec6a0334b1937e9139032ff9a5bf14956fd69f38ba137daa734f4ee67e5ae0edab4523ff02b703c1750a626bea83

data/README.md

@@ -31,14 +31,14 @@ config.handlers.jira.site     = 'https://your.jira.instance.example.com/'
 * `context` (string) - If your instance is in a /subdirectory, put that here. Default: `''`
 * `format` (string) - You can select a compact one line issue summary by setting this parameter to `one-line`. Default: `verbose`
 * `ambient` (boolean) - When set to `true`, Lita will show JIRA issue details when a JIRA issue key is mentioned in chat, outside the context of a command. Default: `false`
-* `ignore` (array) - Prevent ambient JIRA issue detection in certain users' messages. Default: `[]`
+* `ignore` (array) - Prevent ambient JIRA issue detection in certain users' messages. Accepts user names, mention names, and IDs. Default: `[]`
 * `rooms` (array) - Limit ambient JIRA issue detection to a certain list of rooms. If unspecified, the bot will respond to detected issues in all rooms.
 
 ``` ruby
 config.handlers.jira.context = '/myjira'
-config.handlers.jira.ambient = true
 config.handlers.jira.format = 'one-line'
-config.handlers.jira.ignore = ['Jira', 'Github']
+config.handlers.jira.ambient = true
+config.handlers.jira.ignore = ['Jira', 'Github', 'U1234']
 config.handlers.jira.rooms = ['devtools', 'engineering']
 ```
 

data/lib/lita/handlers/jira.rb

@@ -3,6 +3,7 @@ module Lita
   # Because we can.
   module Handlers
     # Main handler
+    # rubocop:disable Metrics/ClassLength
     class Jira < Handler
       namespace 'Jira'
 
@@ -114,18 +115,23 @@ module Lita
       end
 
       def ambient(response)
-        return if invalid_ambient(response)
+        return if invalid_ambient?(response)
         issue = fetch_issue(response.match_data['issue'], false)
         response.reply(format_issue(issue)) if issue
       end
 
       private
 
-      def invalid_ambient(response)
-        response.message.command? || !config.ambient || config.ignore.include?(response.user.name) || (config.rooms && !config.rooms.include?(response.message.source.room))
+      def invalid_ambient?(response)
+        response.message.command? || !config.ambient || ignored?(response.user) || (config.rooms && !config.rooms.include?(response.message.source.room))
+      end
+
+      def ignored?(user)
+        config.ignore.include?(user.id) || config.ignore.include?(user.mention_name) || config.ignore.include?(user.name)
       end
       # rubocop:enable Metrics/AbcSize
     end
+    # rubocop:enable Metrics/ClassLength
     Lita.register_handler(Jira)
   end
 end

data/lita-jira.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-jira'
-  spec.version       = '0.7.0'
+  spec.version       = '0.7.1'
   spec.authors       = ['Eric Sigler', 'Matt Critchlow']
   spec.email         = ['me@esigler.com', 'matt.critchlow@gmail.com']
   spec.description   = 'A JIRA plugin for Lita.'

data/spec/lita/handlers/jira_spec.rb

@@ -201,9 +201,11 @@ describe Lita::Handlers::Jira, lita_handler: true do
 
       context 'and an ignore list is defined' do
         before(:each) do
-          @user1 = Lita::User.create(1, name: 'User1')
-          @user2 = Lita::User.create(2, name: 'User2')
-          registry.config.handlers.jira.ignore = ['User2']
+          @user1 = Lita::User.create('U1', name: 'User 1', mention_name: 'user1')
+          @user2 = Lita::User.create('U2', name: 'User 2', mention_name: 'user2')
+          @user3 = Lita::User.create('U3', name: 'User 3', mention_name: 'user3')
+          @user4 = Lita::User.create('U4', name: 'User 4', mention_name: 'user4')
+          registry.config.handlers.jira.ignore = ['User 2', 'U3', 'user4']
         end
 
         it 'shows details for a detected issue sent by a user absent from the list' do
@@ -211,10 +213,20 @@ describe Lita::Handlers::Jira, lita_handler: true do
           expect(replies.last).to eq("[XYZ-987] Some summary text\nStatus: In Progress, assigned to: A Person, fixVersion: Sprint 2, priority: P0\nhttp://jira.local/browse/XYZ-987")
         end
 
-        it 'does not show details for a detected issue sent by a user on the list' do
+        it 'does not show details for a detected issue sent by a user whose name is on the list' do
           send_message('foo XYZ-987 bar', as: @user2)
           expect(replies.size).to eq(0)
         end
+
+        it 'does not show details for a detected issue sent by a user whose ID is on the list' do
+          send_message('foo XYZ-987 bar', as: @user3)
+          expect(replies.size).to eq(0)
+        end
+
+        it 'does not show details for a detected issue sent by a user whose mention name is on the list' do
+          send_message('foo XYZ-987 bar', as: @user4)
+          expect(replies.size).to eq(0)
+        end
       end
 
       context 'and a room list is defined' do
@@ -262,7 +274,7 @@ describe Lita::Handlers::Jira, lita_handler: true do
       it 'shows results when returned' do
         grab_request(valid_client)
         send_command('jira myissues')
-        expect(replies.last).to eq([
+        expect(replies[-3..-1]).to eq([
           'Here are issues currently assigned to you:',
           "[XYZ-987] Some summary text\nStatus: In Progress, assigned to: A Person, fixVersion: Sprint 2, priority: P0\nhttp://jira.local/browse/XYZ-987",
           "[XYZ-988] Some summary text 2\nStatus: In Progress 2, assigned to: A Person 2, fixVersion: none, priority: P1\nhttp://jira.local/browse/XYZ-988"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-jira
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Eric Sigler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita