lita-locker 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6486024efd68e3b338f738adb2dad218b8d1b23f
-  data.tar.gz: 70ca546c520752096d4c0130de5f7907a98be117
+  metadata.gz: ee0b2b2211b4a8e374e294510a405ede0a492d50
+  data.tar.gz: a84b6149da9dd9a6ac46d9f9c9590efab1ff4650
 SHA512:
-  metadata.gz: 8adf1447143a90c49860d5bed23255b71420483db7d328619c6ccdb17e1ccb8c401e6eb77e95f52d3daaf6b34f0a9113c91d062a452956e29c6cba1b7976d37d
-  data.tar.gz: 1122f9f8241f56561ea73244f2547b2f3ed3deada9fd0983345f4aa03ebac7d8e415253902ec1163803104f8e332b34acd1e0c1fd61818fa292794b3391f4936
+  metadata.gz: f6c2a8cbbc6dd91c1b3ef652c44c21c0b31d83d6bb1c9c855ae43c6c85cc8283b234f71080f9445549430590eb64b6a056f4649ef50c16a2791fb7540199faf2
+  data.tar.gz: 2580987de7715041491d3523471bdaf37d55692ca0bddc5f1724c4b87af0d8a7a30a2425775c03eaeca3b7649259ce8918bf186bfd5e0c6453171e8a7c7ef449

data/.rspec

@@ -0,0 +1 @@
+--color --profile 5

data/.rubocop.yml

@@ -6,7 +6,7 @@ LineLength:
   Max: 130
 
 AbcSize:
-  Max: 30
+  Max: 34
 
 MethodLength:
   Max: 20

data/lib/lita/handlers/locker.rb

@@ -90,10 +90,10 @@ module Lita
 
         return if l.locked?
         mention_names = l.observers
-                        .map { |observer| render_template('mention', name: observer.mention_name, id: observer.id) }
-                        .reject { |mention| mention == '' }
-                        .sort
-                        .join(' ')
+                         .map { |observer| render_template('mention', name: observer.mention_name, id: observer.id) }
+                         .reject { |mention| mention == '' }
+                         .sort
+                         .join(' ')
         response.reply(t('label.unlocked_no_queue', name: name, mention: mention_names)) unless mention_names.empty?
       end
 
@@ -132,6 +132,7 @@ module Lita
 
         return response.reply(failed(t('subject.does_not_exist', name: name))) unless Label.exists?(name)
         l = Label.new(name)
+        return response.reply(failed(t('give.not_owned', label: name))) unless l.locked?
         owner_mention = render_template('mention', name: l.owner.mention_name, id: l.owner.id)
         return response.reply(t('give.not_owner',
                                 label: name,

data/lib/lita/handlers/locker_labels.rb

@@ -75,11 +75,11 @@ module Lita
         results = []
 
         names.each do |name|
-          if !Label.exists?(name) && Label.create(name)
-            results <<= t('label.created', name: name)
-          else
-            results <<= t('label.exists', name: name)
-          end
+          results <<= if !Label.exists?(name) && Label.create(name)
+                        t('label.created', name: name)
+                      else
+                        t('label.exists', name: name)
+                      end
         end
 
         response.reply(results.join(', '))
@@ -90,11 +90,11 @@ module Lita
         results = []
 
         names.each do |name|
-          if Label.exists?(name) && Label.delete(name)
-            results <<= t('label.deleted', name: name)
-          else
-            results <<= failed(t('label.does_not_exist', name: name))
-          end
+          results <<= if Label.exists?(name) && Label.delete(name)
+                        t('label.deleted', name: name)
+                      else
+                        failed(t('label.does_not_exist', name: name))
+                      end
         end
 
         response.reply(results.join(', '))

data/lib/lita/handlers/locker_misc.rb

@@ -79,7 +79,7 @@ module Lita
         user = Lita::User.fuzzy_find(username)
         return response.reply(t('user.unknown', user: username)) unless user
         l = user_locks(user)
-        return response.reply(t('user.no_active_locks', user: user.name)) unless l.size > 0
+        return response.reply(t('user.no_active_locks', user: user.name)) if l.empty?
         composed = ''
         l.each do |label_name|
           composed += "Label: #{label_name}\n"

data/lib/locker/label.rb

@@ -20,7 +20,7 @@ module Locker
       attr_reader :id
 
       def initialize(key)
-        fail 'Unknown label key' unless Label.exists?(key)
+        raise 'Unknown label key' unless Label.exists?(key)
         @id = Label.normalize(key)
       end
 
@@ -29,7 +29,7 @@ module Locker
       end
 
       def self.create(key)
-        fail 'Label key already exists' if Label.exists?(key)
+        raise 'Label key already exists' if Label.exists?(key)
         redis.sadd('label-list', Label.normalize(key))
         l = Label.new(key)
         l.state    = 'unlocked'
@@ -39,7 +39,7 @@ module Locker
       end
 
       def self.delete(key)
-        fail 'Unknown label key' unless Label.exists?(key)
+        raise 'Unknown label key' unless Label.exists?(key)
         %w(state, owner_id, membership, wait_queue, journal, observer_ids).each do |item|
           redis.del("label:#{key}:#{item}")
         end
@@ -95,7 +95,7 @@ module Locker
         # FIXME: Possible race condition where resources become unavailable between unlock and relock
         if wait_queue.count > 0
           next_user = wait_queue.shift
-          self.lock!(next_user)
+          lock!(next_user)
         end
         true
       end
@@ -103,15 +103,15 @@ module Locker
       def steal!(owner_id)
         log("Stolen from #{owner.id} to #{owner_id}")
         wait_queue.unshift(owner_id)
-        self.dedupe!
-        self.unlock!
+        dedupe!
+        unlock!
       end
 
       def give!(recipient_id)
         log("Given from #{owner.id} to #{recipient_id}")
         wait_queue.unshift(recipient_id)
-        self.dedupe!
-        self.unlock!
+        dedupe!
+        unlock!
       end
 
       def dedupe!

data/lib/locker/resource.rb

@@ -15,7 +15,7 @@ module Locker
       attr_reader :id
 
       def initialize(key)
-        fail 'Unknown resource key' unless Resource.exists?(key)
+        raise 'Unknown resource key' unless Resource.exists?(key)
         @id = key
       end
 
@@ -24,7 +24,7 @@ module Locker
       end
 
       def self.create(key)
-        fail 'Resource key already exists' if Resource.exists?(key)
+        raise 'Resource key already exists' if Resource.exists?(key)
         redis.sadd('resource-list', key)
         r = Resource.new(key)
         r.state    = 'unlocked'
@@ -33,7 +33,7 @@ module Locker
       end
 
       def self.delete(key)
-        fail 'Unknown resource key' unless Resource.exists?(key)
+        raise 'Unknown resource key' unless Resource.exists?(key)
         %w(state, owner_id).each do |item|
           redis.del("resource:#{key}:#{item}")
         end

data/lita-locker.gemspec

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

data/locales/en.yml

@@ -7,6 +7,7 @@ en:
           already_unlocked: "%{label} was already unlocked"
           self: "%{user}, why are you stealing the lock from yourself?"
         give:
+          not_owned: "%{label} is not currently locked, so it cannot be given"
           not_owner: "The lock on %{label} can only be given by its current owner: %{owner} %{mention}"
           given: "%{giver} gave %{label} to %{recipient} %{mention}"
           self: "%{user}, why are you giving the lock to yourself?"

data/spec/lita/handlers/locker_http_spec.rb

@@ -24,7 +24,7 @@ describe Lita::Handlers::LockerHttp, lita_handler: true do
     it 'shows json if the label exists' do
       send_command('locker label create foo')
       subject.label_show(request, response)
-      expect(response.body).to eq(["{\"id\":\"foo\",\"state\":\"unlocked\",\"membership\":\"\"}"])
+      expect(response.body).to eq(['{"id":"foo","state":"unlocked","membership":""}'])
     end
 
     it 'shows 404 if the label does not exist' do
@@ -38,7 +38,7 @@ describe Lita::Handlers::LockerHttp, lita_handler: true do
       robot.auth.add_user_to_group!(user, :locker_admins)
       send_command('locker resource create foo')
       subject.resource_show(request, response)
-      expect(response.body).to eq(["{\"id\":\"foo\",\"state\":\"unlocked\",\"owner_id\":\"\"}"])
+      expect(response.body).to eq(['{"id":"foo","state":"unlocked","owner_id":""}'])
     end
 
     it 'shows 404 if the resource does not exist' do

data/spec/lita/handlers/locker_spec.rb

@@ -325,6 +325,14 @@ describe Lita::Handlers::Locker, lita_handler: true do
       expect(replies.last).to match(/^bazbat is locked by Charlie \(taken \d seconds? ago\)\. Next up: Bob, Charlie$/)
     end
 
+    it 'shows a warning when a give is attempted on an unlocked resource' do
+      send_command('locker resource create foobar')
+      send_command('locker label create bazbat')
+      send_command('locker label add foobar to bazbat')
+      send_command('locker give bazbat to @alice # with a comment', as: bob)
+      expect(replies.last).to eq('bazbat is not currently locked, so it cannot be given')
+    end
+
     it 'shows a warning when the owner attempts to give the label to herself' do
       send_command('locker resource create foobar')
       send_command('locker label create bazbat')

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'simplecov'
 require 'coveralls'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatters = [
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]
@@ -20,3 +20,20 @@ RSpec.configure do |config|
     registry.register_handler(Lita::Handlers::LockerResources)
   end
 end
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+  config.default_formatter = 'doc' if config.files_to_run.one?
+  config.order = :random
+
+  Kernel.srand config.seed
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-locker
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Eric Sigler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -144,6 +144,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - CONTRIBUTING.md