lita-locker 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90e3064b31cd1ed25871959527a507cf3f0f8674
-  data.tar.gz: b19fcdce56cd0e290317977bfe25d9c49abeaffa
+  metadata.gz: 03119612570e96f75bb028de84abf384232d3706
+  data.tar.gz: a05484fd65388045838e0bf6940162aff13ceb2f
 SHA512:
-  metadata.gz: 47178acf7895afab5c9c96a0df08842a86c538891c04500b3d6543e4f1f55c128466098039c68480fdfbbb2710a7486626dec62a0b2eee23efd85f92889e9db5
-  data.tar.gz: 0be130945fa756e2e7b6f9f8e0bf35bfa6a8219438f5a719f94f637c08dc170cf523d7d8f6fe3640c27d24a91b751e3e8d7ea6380d40c82aa5d659279ba14346
+  metadata.gz: 27704990d5d11504024266de0c058758eda2375f882cffa78f2377afe07f5ccc2328ed871ba0b3c963bd82abe46597244a376110059e2e59e02bf09bf1b97673
+  data.tar.gz: b8a522feb8841916016981f8d81136ccd1eb51b619978f64d58ce3b23d0f498a6f0dfc35bfb1df2900816ccc7d2aeacd52439798f03d13a0c070e23b0ca90ec6

data/README.md

@@ -58,7 +58,7 @@ unreserve <subject> - Remove yourself from the queue for <subject>
 ### Labels
 ```
 locker label list                          - List all labels
-locker label create <name>                 - Create a label with <name>.  <name> must be A-Z, a-z, 0-9, no spaces or punctuation.
+locker label create <name>                 - Create a label with <name>.
 locker label delete <name>                 - Delete the label with <name>.  Clears all locks associated.
 locker label add <resource> to <name>      - Adds <resource> to the list of things to lock/unlock for <name>
 locker label remove <resource> from <name> - Removes <resource> from <name>
@@ -68,8 +68,8 @@ locker label show <name>                   - Show all resources for <name>
 ### Resources
 ```
 locker resource list          - List all resources
-locker resource create <name> - Create a resource with <name>.  <name> must be A-Z, a-z, 0-9, no spaces or punctuation.
-locker resource delete <name> - Delete the resource with <name>.  Clears all locks associated.
+locker resource create <name> - Create a resource with <name>.  (Restricted to locker_admins group)
+locker resource delete <name> - Delete the resource with <name>.  Clears all locks associated.  (Restricted to locker_admins group)
 locker resource show <name>   - Show the state of <name>
 ```
 

data/lib/lita/handlers/locker.rb

@@ -4,18 +4,21 @@ module Lita
       http.get '/locker/label/:name', :http_label_show
       http.get '/locker/resource/:name', :http_resource_show
 
-#      route(
-#        /^\(lock\)\s([a-zA-Z0-9_-]+)$/,
-#        :lock
-#      )
+      LABEL_REGEX    = /([\W\S_-]+)/
+      RESOURCE_REGEX = /([\.a-zA-Z0-9_-]+)/
 
-#      route(
-#        /^\(unlock\)\s([a-zA-Z0-9_-]+)$/,
-#        :unlock
-#      )
+      route(
+        /^\(lock\)\s#{LABEL_REGEX}$/,
+        :lock
+      )
+
+      route(
+        /^\(unlock\)\s#{LABEL_REGEX}$/,
+        :unlock
+      )
 
       route(
-        /^lock\s([a-zA-Z0-9_-]+)$/,
+        /^lock\s#{LABEL_REGEX}$/,
         :lock,
         command: true,
         help: {
@@ -33,7 +36,7 @@ module Lita
 #      )
 
       route(
-        /^unlock\s([a-zA-Z0-9_-]+)$/,
+        /^unlock\s#{LABEL_REGEX}$/,
         :unlock,
         command: true,
         help: {
@@ -42,7 +45,7 @@ module Lita
       )
 
       route(
-        /^unlock\s([a-zA-Z0-9_-]+)\sforce$/,
+        /^unlock\s#{LABEL_REGEX}\sforce$/,
         :unlock_force,
         command: true,
         help: {
@@ -61,9 +64,10 @@ module Lita
       )
 
       route(
-        /^locker\sresource\screate\s([a-zA-Z0-9_-]+)$/,
+        /^locker\sresource\screate\s#{RESOURCE_REGEX}$/,
         :resource_create,
         command: true,
+        restrict_to: [:locker_admins],
         help: {
           t('help.resource_create_key') =>
           t('help.resource_create_value')
@@ -71,9 +75,10 @@ module Lita
       )
 
       route(
-        /^locker\sresource\sdelete\s([a-zA-Z0-9_-]+)$/,
+        /^locker\sresource\sdelete\s#{RESOURCE_REGEX}$/,
         :resource_delete,
         command: true,
+        restrict_to: [:locker_admins],
         help: {
           t('help.resource_delete_key') =>
           t('help.resource_delete_value')
@@ -81,7 +86,7 @@ module Lita
       )
 
       route(
-        /^locker\sresource\sshow\s([a-zA-Z0-9_-]+)$/,
+        /^locker\sresource\sshow\s#{RESOURCE_REGEX}$/,
         :resource_show,
         command: true,
         help: {
@@ -101,7 +106,7 @@ module Lita
       )
 
       route(
-        /^locker\slabel\screate\s([a-zA-Z0-9_-]+)$/,
+        /^locker\slabel\screate\s#{LABEL_REGEX}$/,
         :label_create,
         command: true,
         help: {
@@ -111,7 +116,7 @@ module Lita
       )
 
       route(
-        /^locker\slabel\sdelete\s([a-zA-Z0-9_-]+)$/,
+        /^locker\slabel\sdelete\s#{LABEL_REGEX}$/,
         :label_delete,
         command: true,
         help: {
@@ -121,7 +126,7 @@ module Lita
       )
 
       route(
-        /^locker\slabel\sshow\s([a-zA-Z0-9_-]+)$/,
+        /^locker\slabel\sshow\s#{LABEL_REGEX}$/,
         :label_show,
         command: true,
         help: {
@@ -131,7 +136,7 @@ module Lita
       )
 
       route(
-        /^locker\slabel\sadd\s([a-zA-Z0-9_-]+)\sto\s([a-zA-Z0-9_-]+)$/,
+        /^locker\slabel\sadd\s#{RESOURCE_REGEX}\sto\s#{LABEL_REGEX}$/,
         :label_add,
         command: true,
         help: {
@@ -141,7 +146,7 @@ module Lita
       )
 
       route(
-        /^locker\slabel\sremove\s([a-zA-Z0-9_-]+)\sfrom\s([a-zA-Z0-9_-]+)$/,
+        /^locker\slabel\sremove\s#{RESOURCE_REGEX}\sfrom\s#{LABEL_REGEX}$/,
         :label_remove,
         command: true,
         help: {

data/lita-locker.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-locker'
-  spec.version       = '0.3.1'
+  spec.version       = '0.4.0'
   spec.authors       = ['Eric Sigler']
   spec.email         = ['me@esigler.com']
   spec.description   = %q("lock" and "unlock" arbitrary subjects)
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '>= 3.0.0.beta2'
+  spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'rubocop'

data/spec/lita/handlers/locker_spec.rb

@@ -1,17 +1,26 @@
 require 'spec_helper'
 
 describe Lita::Handlers::Locker, lita_handler: true do
-#  it { routes('(lock) foobar').to(:lock) }
-#  it { routes('(unlock) foobar').to(:unlock) }
+  it { routes('(lock) foobar').to(:lock) }
+  it { routes('(unlock) foobar').to(:unlock) }
 
   it { routes_command('lock foobar').to(:lock) }
+  it { routes_command('lock foo bar').to(:lock) }
+  it { routes_command('lock foo-bar').to(:lock) }
+  it { routes_command('lock foo_bar').to(:lock) }
 #  it { routes_command('lock foobar 30m').to(:lock) }
 
   it { routes_command('unlock foobar').to(:unlock) }
+  it { routes_command('unlock foo bar').to(:unlock) }
+  it { routes_command('unlock foo-bar').to(:unlock) }
+  it { routes_command('unlock foo_bar').to(:unlock) }
   it { routes_command('unlock foobar force').to(:unlock_force) }
 
   it { routes_command('locker resource list').to(:resource_list) }
   it { routes_command('locker resource create foobar').to(:resource_create) }
+  it { routes_command('locker resource create foo.bar').to(:resource_create) }
+  it { routes_command('locker resource create foo-bar').to(:resource_create) }
+  it { routes_command('locker resource create foo_bar').to(:resource_create) }
   it { routes_command('locker resource delete foobar').to(:resource_delete) }
   it { routes_command('locker resource show foobar').to(:resource_show) }
 
@@ -25,6 +34,13 @@ describe Lita::Handlers::Locker, lita_handler: true do
   it { routes_http(:get, '/locker/label/foobar').to(:http_label_show) }
   it { routes_http(:get, '/locker/resource/foobar').to(:http_resource_show) }
 
+  before do
+    allow(Lita::Authorization).to receive(:user_in_group?).with(
+      user,
+      :locker_admins
+    ).and_return(true)
+  end
+
   describe '#lock' do
     it 'locks a resource when it is available' do
       send_command('locker resource create foobar')
@@ -175,7 +191,8 @@ describe Lita::Handlers::Locker, lita_handler: true do
       send_command('locker label create foobar')
       send_command('locker label create bazbat')
       send_command('locker label list')
-      expect(replies.last).to eq('Label: bazbat')
+      expect(replies.include?('Label: foobar')).to eq(true)
+      expect(replies.include?('Label: bazbat')).to eq(true)
     end
   end
 
@@ -298,7 +315,8 @@ describe Lita::Handlers::Locker, lita_handler: true do
       send_command('locker resource create foobar')
       send_command('locker resource create bazbat')
       send_command('locker resource list')
-      expect(replies.last).to eq('Resource: foobar, state: unlocked')
+      expect(replies.include?('Resource: foobar, state: unlocked')).to eq(true)
+      expect(replies.include?('Resource: bazbat, state: unlocked')).to eq(true)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-locker
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Eric Sigler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement