lita-locker 0.5.0 → 0.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/lita/handlers/locker.rb +6 -12
- data/lita-locker.gemspec +1 -1
- data/spec/lita/handlers/locker_spec.rb +3 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 538195ef609b8545191a650afd2264a722de29fe
|
|
4
|
+
data.tar.gz: 1dcc32d437547e690f6241beca18a5980ae20300
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d1e099f1a54bce4d2e24973fb05302bb00babc7a159ceb5fdef4686e0fbaae3d2539c860bd501b26607343e015e9557e40be03100a7301069eca22ad34b4aa34
|
|
7
|
+
data.tar.gz: e2e83c9855f15e83ecbbb82afc48daac9b95fa4ce0372049b5f96ce450d41871aa7fe467f7b05c278c7af954068d5a9123c7cbdca8fb87b15db69ffd213e0735
|
data/lib/lita/handlers/locker.rb
CHANGED
|
@@ -145,10 +145,11 @@ module Lita
|
|
|
145
145
|
else
|
|
146
146
|
l = label(name)
|
|
147
147
|
if l['state'] == 'locked'
|
|
148
|
+
o = Lita::User.find_by_id(l['owner_id'])
|
|
148
149
|
response.reply('(failed) ' + t('label.owned',
|
|
149
150
|
name: name,
|
|
150
|
-
owner_name:
|
|
151
|
-
owner_mention:
|
|
151
|
+
owner_name: o.name,
|
|
152
|
+
owner_mention: o.mention_name))
|
|
152
153
|
else
|
|
153
154
|
response.reply('(failed) ' + t('label.dependency'))
|
|
154
155
|
end
|
|
@@ -173,10 +174,11 @@ module Lita
|
|
|
173
174
|
unlock_label!(name)
|
|
174
175
|
response.reply('(successful) ' + t('label.unlock', name: name))
|
|
175
176
|
else
|
|
177
|
+
o = Lita::User.find_by_id(l['owner_id'])
|
|
176
178
|
response.reply('(failed) ' + t('label.owned',
|
|
177
179
|
name: name,
|
|
178
|
-
owner_name:
|
|
179
|
-
owner_mention:
|
|
180
|
+
owner_name: o.name,
|
|
181
|
+
owner_mention: o.mention_name))
|
|
180
182
|
end
|
|
181
183
|
end
|
|
182
184
|
else
|
|
@@ -381,8 +383,6 @@ module Lita
|
|
|
381
383
|
# FIXME: Race condition!
|
|
382
384
|
redis.hset(resource_key, 'state', 'locked')
|
|
383
385
|
redis.hset(resource_key, 'owner_id', owner.id)
|
|
384
|
-
redis.hset(resource_key, 'owner_name', owner.name)
|
|
385
|
-
redis.hset(resource_key, 'owner_mention', owner.mention_name)
|
|
386
386
|
redis.hset(resource_key, 'until', time_until)
|
|
387
387
|
true
|
|
388
388
|
else
|
|
@@ -402,8 +402,6 @@ module Lita
|
|
|
402
402
|
end
|
|
403
403
|
redis.hset(key, 'state', 'locked')
|
|
404
404
|
redis.hset(key, 'owner_id', owner.id)
|
|
405
|
-
redis.hset(key, 'owner_name', owner.name)
|
|
406
|
-
redis.hset(key, 'owner_mention', owner.mention_name)
|
|
407
405
|
redis.hset(key, 'until', time_until)
|
|
408
406
|
true
|
|
409
407
|
else
|
|
@@ -415,8 +413,6 @@ module Lita
|
|
|
415
413
|
if resource_exists?(name)
|
|
416
414
|
key = "resource_#{name}"
|
|
417
415
|
redis.hset(key, 'state', 'unlocked')
|
|
418
|
-
redis.hset(key, 'owner_name', '')
|
|
419
|
-
redis.hset(key, 'owner_mention', '')
|
|
420
416
|
redis.hset(key, 'owner_id', '')
|
|
421
417
|
else
|
|
422
418
|
false
|
|
@@ -431,8 +427,6 @@ module Lita
|
|
|
431
427
|
unlock_resource!(m)
|
|
432
428
|
end
|
|
433
429
|
redis.hset(key, 'state', 'unlocked')
|
|
434
|
-
redis.hset(key, 'owner_name', '')
|
|
435
|
-
redis.hset(key, 'owner_mention', '')
|
|
436
430
|
redis.hset(key, 'owner_id', '')
|
|
437
431
|
true
|
|
438
432
|
else
|
data/lita-locker.gemspec
CHANGED
|
@@ -286,7 +286,9 @@ describe Lita::Handlers::Locker, lita_handler: true do
|
|
|
286
286
|
send_command('locker label add foo to bar')
|
|
287
287
|
send_command('locker label add baz to bar')
|
|
288
288
|
send_command('locker label show bar')
|
|
289
|
-
expect(replies.last).to
|
|
289
|
+
expect(replies.last).to match(/Label bar has:/)
|
|
290
|
+
expect(replies.last).to match(/foo/)
|
|
291
|
+
expect(replies.last).to match(/baz/)
|
|
290
292
|
end
|
|
291
293
|
|
|
292
294
|
it 'shows an error if the label does not exist' do
|