lita-locker 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 538195ef609b8545191a650afd2264a722de29fe
-  data.tar.gz: 1dcc32d437547e690f6241beca18a5980ae20300
+  metadata.gz: 853bfa98b4792e8411a7163b75defa0517a06c7a
+  data.tar.gz: 64c81dfca6d3442fec0300d5e24535dd39f6439f
 SHA512:
-  metadata.gz: d1e099f1a54bce4d2e24973fb05302bb00babc7a159ceb5fdef4686e0fbaae3d2539c860bd501b26607343e015e9557e40be03100a7301069eca22ad34b4aa34
-  data.tar.gz: e2e83c9855f15e83ecbbb82afc48daac9b95fa4ce0372049b5f96ce450d41871aa7fe467f7b05c278c7af954068d5a9123c7cbdca8fb87b15db69ffd213e0735
+  metadata.gz: 4f98df72b876afa152652397618339ec417307decd6010b49e740b937bcfc2790f0ef8e42fd40ebb20ef0a258bca5a4826e8d0e0c875053c9dd31f9f54c17368
+  data.tar.gz: f0e316189d4f0df2ed8c6ac6df574556c43c1d1c490461a327c17a8bb7a1444b20168a79ebb82ee64bf0f2daad8b190392fd068d23e6393e827fe492c4e4f338

data/lib/lita/handlers/locker.rb

@@ -146,10 +146,16 @@ module Lita
               l = label(name)
               if l['state'] == 'locked'
                 o = Lita::User.find_by_id(l['owner_id'])
-                response.reply('(failed) ' + t('label.owned',
-                                               name: name,
-                                               owner_name: o.name,
-                                               owner_mention: o.mention_name))
+                if o.mention_name
+                  response.reply('(failed) ' + t('label.owned_mention',
+                                                 name: name,
+                                                 owner_name: o.name,
+                                                 owner_mention: o.mention_name))
+                else
+                  response.reply('(failed) ' + t('label.owned',
+                                                 name: name,
+                                                 owner_name: o.name))
+                end
               else
                 response.reply('(failed) ' + t('label.dependency'))
               end
@@ -175,10 +181,16 @@ module Lita
               response.reply('(successful) ' + t('label.unlock', name: name))
             else
               o = Lita::User.find_by_id(l['owner_id'])
-              response.reply('(failed) ' + t('label.owned',
-                                             name: name,
-                                             owner_name: o.name,
-                                             owner_mention: o.mention_name))
+              if o.mention_name
+                response.reply('(failed) ' + t('label.owned_mention',
+                                               name: name,
+                                               owner_name: o.name,
+                                               owner_mention: o.mention_name))
+              else
+                response.reply('(failed) ' + t('label.owned',
+                                               name: name,
+                                               owner_name: o.name))
+              end
             end
           end
         else

data/lita-locker.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-locker'
-  spec.version       = '0.5.1'
+  spec.version       = '0.5.2'
   spec.authors       = ['Eric Sigler']
   spec.email         = ['me@esigler.com']
   spec.description   = '"lock" and "unlock" arbitrary subjects'

data/locales/en.yml

@@ -57,12 +57,14 @@ en:
           is_locked: "%{name} is locked"
           unlock: "%{name} unlocked"
           is_unlocked: "%{name} is unlocked"
-          owned: "%{name} is locked by %{owner_name} %{owner_mention}"
+          owned: "%{name} is locked by %{owner_name}"
+          owned_mention: "%{name} is locked by %{owner_name} (@%{owner_mention})"
         subject:
           does_not_exist: "Sorry, that does not exist"
         label:
           unlock: "%{name} unlocked"
-          owned: "%{name} is locked by %{owner_name} %{owner_mention}"
+          owned: "%{name} is locked by %{owner_name}"
+          owned_mention: "%{name} is locked by %{owner_name} (@%{owner_mention})"
           is_unlocked: "%{name} is unlocked"
           unable_to_lock: "%{name} unable to be locked"
           lock: "%{name} locked"

data/spec/lita/handlers/locker_spec.rb

@@ -58,11 +58,11 @@ describe Lita::Handlers::Locker, lita_handler: true do
   end
 
   let(:alice) do
-    Lita::User.create('9001@hipchat', name: 'Alice', mention_name: '@alice')
+    Lita::User.create('9001@hipchat', name: 'Alice', mention_name: 'alice')
   end
 
   let(:bob) do
-    Lita::User.create('9002@hipchat', name: 'Bob', mention_name: '@bob')
+    Lita::User.create('9002@hipchat', name: 'Bob', mention_name: 'bob')
   end
 
   describe '#lock' do
@@ -101,7 +101,7 @@ describe Lita::Handlers::Locker, lita_handler: true do
       send_command('locker label add foobar to bazbat')
       send_command('lock bazbat', as: alice)
       send_command('lock bazbat', as: bob)
-      expect(replies.last).to eq('(failed) bazbat is locked by Alice @alice')
+      expect(replies.last).to eq('(failed) bazbat is locked by Alice (@alice)')
     end
 
     it 'shows an error when a label does not exist' do
@@ -141,7 +141,7 @@ describe Lita::Handlers::Locker, lita_handler: true do
       send_command('locker label add foobar to bazbat')
       send_command('lock bazbat', as: alice)
       send_command('unlock bazbat', as: bob)
-      expect(replies.last).to eq('(failed) bazbat is locked by Alice @alice')
+      expect(replies.last).to eq('(failed) bazbat is locked by Alice (@alice)')
     end
 
     it 'shows a warning when a label is already unlocked' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-locker
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Eric Sigler