lita-locker 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c37515e071dc49fb68a05ccefe0b708ef60bfd
-  data.tar.gz: 4fe6d90d4764be77216f11625c8c377d4a6aaabb
+  metadata.gz: 51d68722a9a837146295120ccd13ec48d9135bbe
+  data.tar.gz: a821ec80a688f3b6ff13cae131d6fddb3c2233a5
 SHA512:
-  metadata.gz: cb09f15584cd47ecbfbfbc6876fac0792d5708fd6e83012e4b7711578fe211770b9b1ba0ddcba4f62b252c00b421ad02bbf52dd1f25fc5a1d08f50b38136c128
-  data.tar.gz: 534cc1c533df5b591bf9a6f3e0baf8644efb69a3763e0892d931439b9018aa63d6a6f38057b78fe771f17cd50f0c85b2bc74adad65f02452619bd3efb1f074cf
+  metadata.gz: 793ac5553e20c774572bc4f558c9badc5086b03689c5bcb8f5f48e2e5acc0d9633940a3f0bb1e3d509450fbfb47a93682477f20166e970b383e3c177b0acbef1
+  data.tar.gz: f7c7b6596d3b5d1a5b7eadedcdd9c0fad27cc929cfd4a650da06890cfb43227cf01b4d259542cc050466e95583c8955b0e79de14e790d6bce647db69a5ff427e

data/lib/lita/handlers/locker_misc.rb

@@ -58,6 +58,11 @@ module Lita
         return response.reply(t('subject.does_not_exist', name: name)) unless Label.exists?(name)
         l = Label.new(name)
         l.wait_queue.delete(response.user.id)
+        queued = l.wait_queue.to_a
+        l.wait_queue.clear
+        queued.chunk { |x| x }.map(&:first).each do |user|
+          l.wait_queue << user
+        end
         response.reply(t('label.removed_from_queue', name: name))
       end
 

data/lita-locker.gemspec

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

data/spec/lita/handlers/locker_misc_spec.rb

@@ -69,6 +69,19 @@ describe Lita::Handlers::LockerMisc, lita_handler: true do
       send_command('locker dequeue foo', as: bob)
       expect(replies.last).to eq('You have been removed from the queue for foo')
     end
+
+    it 'avoids adjacent duplicates in the queue when a sandwiched dequeue occurs' do
+      send_command('locker resource create bar')
+      send_command('locker label create foo')
+      send_command('locker label add bar to foo')
+      send_command('lock foo', as: alice)
+      send_command('lock foo', as: bob)
+      send_command('lock foo', as: doris)
+      send_command('lock foo', as: bob)
+      send_command('locker dequeue foo', as: doris)
+      send_command('locker status foo')
+      expect(replies.last).to eq('foo is locked by Alice (taken 1 second ago). Next up: Bob')
+    end
   end
 
   describe '#status' do

metadata

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