lita-locker 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70b559ef8d1386aeed3494ce3457136d7ab67c2a
-  data.tar.gz: b36e662f929049b22ed1f021bab7e759c1d045c9
+  metadata.gz: 838b81165b9ea6dc31218d5e149bb9728718dec0
+  data.tar.gz: fbbb65767d43508fe8ad15e20d786a07132ed3c3
 SHA512:
-  metadata.gz: 949add8a59be4f7b589f473f13839507bfa5931263aa1ab6df45f78bf69e865d18c99909dbdc8da7c8e0028cb3c149c94fe6c1c8fe694bce0d9228300674e675
-  data.tar.gz: c59ecc9cd585c9deb66ab2ec95bfe45c93c5414f95946fe57cfe9c25dda60e2a6a2cfee56d80ef0230c7ba10aa00273fc4ac3dee254b4f22eac86c4dd5c11030
+  metadata.gz: 2c0bd826f755585ab3a724a0b3436ba0c49edaba2ec6b52b692308fbc01ebd503c08f8460cc46cf607f149e840576d5076709fa78889579815d1c9cd89268d4c
+  data.tar.gz: c0dd281cae6b579fd077b9394d39af1df10963c1d0781141e7a2d148309f10d74297569f456afa44c9fc1c2bd2b45135d8c290e7e213c1a50da4cb46d1087a76

data/README.md

@@ -44,6 +44,15 @@ steal <label>                 - Force removal of a reservation.  This can be don
 locker give <label> to <user> - Transfer ownership of a lock to another user.  This can only be done by the lock's current owner. Can have # comments afterwards.
 ```
 
+### Status
+```
+locker status <label or resource>  - Show the current state of <label or resource>
+locker list <username>             - Show what locks a user currently holds
+locker log <label>                 - Show up to the last 10 activity log entries for <label>
+locker observe <label>             - Get a notification when <label> becomes available
+locker unobserve <label>           - Stop getting notifications when <label> becomes available
+```
+
 ### Queueing
 ```
 lock <label>           - If <label> is already locked, adds you to a FIFO queue of pending reservations for <label>

data/lib/lita/handlers/locker_misc.rb

@@ -10,7 +10,7 @@ module Lita
       include ::Locker::Resource
 
       route(
-        /^locker\sstatus\s#{LABEL_REGEX}$/,
+        /^locker\sstatus\s#{LABEL_WILDCARD_REGEX}$/,
         :status,
         command: true,
         help: { t('help.status.syntax') => t('help.status.desc') }
@@ -48,9 +48,18 @@ module Lita
 
       def status(response)
         name = response.match_data['label']
-        return response.reply(status_label(name)) if Label.exists?(name)
-        return response.reply(status_resource(name)) if Resource.exists?(name)
-        response.reply(failed(t('subject.does_not_exist', name: name)))
+        unless name =~ /\*/
+          # Literal query
+          return response.reply(status_label(name)) if Label.exists?(name)
+          return response.reply(status_resource(name)) if Resource.exists?(name)
+        end
+        # Wildcard query
+        matcher = Regexp.new(name.gsub(/\*/, '.*'))
+        labels = Label.list.select { |label| label =~ matcher }
+        return response.reply(failed(t('subject.does_not_exist', name: name))) if labels.empty?
+        labels.each do |n|
+          response.reply(status_label(n))
+        end
       end
 
       def dequeue(response)

data/lib/locker/regex.rb

@@ -2,13 +2,14 @@
 module Locker
   # Regex definitions
   module Regex
-    LABEL_REGEX    = /(?<label>[\.\w\s-]+)(\s)?/
-    LABELS_REGEX   = /(?<labels>[\.\w\s-]+(?:,\s*[\.\w\s-]+)*)(\s)?/
-    RESOURCE_REGEX = /(?<resource>[\.\w-]+)/
-    RESOURCES_REGEX = /(?<resources>[\.\w-]+(?:,\s*[\.\w-]+)*)/
-    COMMENT_REGEX  = /(\s\#.+)?/
-    LOCK_REGEX     = /\(lock\)\s/i
-    USER_REGEX     = /(?:@)?(?<username>[\w\s-]+)/
-    UNLOCK_REGEX   = /(?:\(unlock\)|\(release\))\s/i
+    LABEL_REGEX           = /(?<label>[\.\w\s-]+)(\s)?/
+    LABEL_WILDCARD_REGEX  = /(?<label>[\.\*\w\s-]+)(\s)?/
+    LABELS_REGEX          = /(?<labels>[\.\w\s-]+(?:,\s*[\.\w\s-]+)*)(\s)?/
+    RESOURCE_REGEX        = /(?<resource>[\.\w-]+)/
+    RESOURCES_REGEX       = /(?<resources>[\.\w-]+(?:,\s*[\.\w-]+)*)/
+    COMMENT_REGEX         = /(\s\#.+)?/
+    LOCK_REGEX            = /\(lock\)\s/i
+    USER_REGEX            = /(?:@)?(?<username>[\w\s-]+)/
+    UNLOCK_REGEX          = /(?:\(unlock\)|\(release\))\s/i
   end
 end

data/lita-locker.gemspec

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

data/locales/en.yml

@@ -23,22 +23,22 @@ en:
             syntax: locker dequeue <label>
             desc: Remove yourself from the queue for a label
           lock:
-            syntax: lock <subject>
+            syntax: lock <label>
             desc: "Make something unavailable to others. Can have # comments afterwards."
           unlock:
-            syntax: unlock <subject>
+            syntax: unlock <label>
             desc: "Make something available to others. Can have # comments afterwards."
           observe:
-            syntax: locker observe <subject>
+            syntax: locker observe <label>
             desc: "Get a notification when something becomes available. Can have # comments afterwards."
           unobserve:
-            syntax: locker unobserve <subject>
+            syntax: locker unobserve <label>
             desc: "Stop getting notifications when something becomes available. Can have # comments afterwards."
           steal:
-            syntax: steal <subject>
+            syntax: steal <label>
             desc: "Force removal of a reservation. Can have # comments afterwards."
           give:
-            syntax: locker give <subject> to <username>
+            syntax: locker give <label> to <username>
             desc: "Transfer ownership of a lock to another user. Can have # comments afterwards."
           status:
             syntax: locker status <label or resource>

data/spec/lita/handlers/locker_misc_spec.rb

@@ -17,6 +17,8 @@ describe Lita::Handlers::LockerMisc, lita_handler: true do
     it { is_expected.to route_command("locker status #{r}").to(:status) }
   end
 
+  it { is_expected.to route_command('locker status foo*').to(:status) }
+
   it do
     is_expected.to route_command('locker list @alice').to(:list)
     is_expected.to route_command('locker list Alice').to(:list)
@@ -113,6 +115,22 @@ describe Lita::Handlers::LockerMisc, lita_handler: true do
       expect(replies.last).to eq('Resource: bar, state: locked')
     end
 
+    it 'allows label wildcard search with an asterisk' do
+      send_command('locker resource create foobarbaz')
+      send_command('locker label create foobar')
+      send_command('locker label add foobarbaz to foobar')
+      send_command('locker resource create foobazbar')
+      send_command('locker label create foobaz')
+      send_command('locker label add foobazbar to foobaz')
+      send_command('locker resource create bazbarluhrmann')
+      send_command('locker label create bazbar')
+      send_command('locker label add bazbarluhrmann to bazbar')
+      send_command('lock foobar')
+      send_command('locker status foo*')
+      expect(replies[-2]).to match(/^foobar is locked by Test User \(taken \d seconds? ago\)$/)
+      expect(replies.last).to match(/^foobaz is unlocked$/)
+    end
+
     it 'shows an error if nothing exists with that name' do
       send_command('locker status foo')
       expect(replies.last).to eq('Sorry, that does not exist')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-locker
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Eric Sigler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita