lita-envy 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fefb7d9332f5bba20cfcf815f152d9c08543d13e
-  data.tar.gz: 79bb292a9a52240e40f50a213a867a95680df83a
+  metadata.gz: 1771ca4a7139bb295de5a3f34643749b612f5f69
+  data.tar.gz: 7d16778ffb99417dbdcea91d498bb95a2d9f94b7
 SHA512:
-  metadata.gz: 9ff2ddd4e7d3eff8bb6b905cbecd05a34dcb877d7a880dd4d427070ae4f8de869689ff74c7a5933131d58a566887009dab7ae3640973d2bb07f119ad8a6d2b6d
-  data.tar.gz: bea1f158534a2d257cd8ede909fb9d4b76e332b8b37ddef3639a995c8e9949dcef4aca1599cc684b51ccd525b2a7f843ca9ccb0ef3ea785e74eb278ba32dcadf
+  metadata.gz: 5be321f0ef3ad3df62d7c173164c0c8974c449a8a2eba2581fabccc78345b62138c192e23dfb26db9dded90dbe25ac8e68f2ffcf329173443c202d7fc7de1cc2
+  data.tar.gz: 089233c504f022a389b9d6702fca600327c04dc5d6e452b831db5856ff65511e408a7f64729434611b1d9cc490e75b45f6a752fd2b1f9e611af800fc5ae30ee5

data/lib/lita/handlers/envy.rb

@@ -11,7 +11,7 @@ module Lita
       def start_using_environment(response)
         env_id = response.matches.first.first
         current_user = redis.hget(['environments', env_id].join(':'), 'user')
-        if current_user.nil?
+        if current_user.nil? || current_user.empty?
           redis.hset(['environments', env_id].join(':'), 'user', response.user.name)
           response.reply('ok')
         elsif current_user == response.user.name
@@ -23,8 +23,16 @@ module Lita
 
       def stop_using_environment(response)
         env_id = response.matches.first.first
-        redis.hset(['environments', env_id].join(':'), 'user', nil)
-        response.reply('ok')
+        current_user = redis.hget(['environments', env_id].join(':'), 'user')
+        if current_user == response.user.name
+          redis.hset(['environments', env_id].join(':'), 'user', nil)
+          response.reply('ok')
+        elsif current_user.nil? || current_user.empty?
+          response.reply("You are not currently using #{env_id}")
+        else
+          response.reply("You are not currently using #{env_id} (#{current_user} is)")
+        end
+
       end
 
       def list_environments(response)
@@ -41,8 +49,17 @@ module Lita
 
       def remove_environment(response)
         env_id = response.matches.first.first
-        redis.del(['environments', env_id].join(':'))
-        response.reply('ok')
+        current_user = redis.hget(['environments', env_id].join(':'), 'user')
+        if current_user == response.user.name
+          response.reply("You are currently using #{env_id}")
+        elsif current_user.nil?
+          response.reply("I do not know about environment #{env_id}")
+        elsif current_user.empty?
+          redis.del(['environments', env_id].join(':'))
+          response.reply('ok')
+        else
+          response.reply("Sorry, #{env_id} is currently in use by #{current_user}")
+        end
       end
 
       def wrestle_environment_from_user(response)

data/lita-envy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-envy"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["Ingo Weiss"]
   spec.email         = ["ingo.weiss@lab49.com"]
   spec.description   = "Mark environments as in use. Mark environments as available. List environments"

data/spec/lita/handlers/envy_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Lita::Handlers::Envy, lita_handler: true do
 
-  describe 'routing' do
+  describe 'Routing' do
 
     it { is_expected.to route_command("started using env ENV123").to(:start_using_environment)  }
     it { is_expected.to route_command("stopped using env ENV123").to(:stop_using_environment)  }
@@ -12,63 +12,180 @@ describe Lita::Handlers::Envy, lita_handler: true do
 
   end
 
-  describe 'start using environment' do
+  describe 'User claiming environment' do
 
-    it "should mark environment as in use" do
-      carl = Lita::User.create(123, name: "Carl")
-      send_command('started using env ENV123', :as => carl)
-      expect(subject.redis.hget('environments:ENV123', 'user')).to eq("Carl")
-    end
+    context "when environment is available" do
+
+      before(:each) do
+        subject.redis.hset('environments:ENV123', 'user', '')
+      end
+
+      it "should mark environment as in use by user" do
+        carl = Lita::User.create(123, name: "Carl")
+        send_command('started using env ENV123', :as => carl)
+        expect(subject.redis.hget('environments:ENV123', 'user')).to eq("Carl")
+      end
+
+      it "should reply with confirmation" do
+        send_command('started using env ENV123')
+        expect(replies.first).to eq("ok")
+      end
 
-    it "should confirm" do
-      send_command('started using env ENV123')
-      expect(replies.first).to eq("ok")
     end
 
-    it "should not change the user if the environment is already in use" do
-      subject.redis.hset('environments:ENV123', 'user', 'Alicia')
-      carl = Lita::User.create(123, name: "Carl")
-      send_command('started using env ENV123', :as => carl)
-      expect(subject.redis.hget('environments:ENV123', 'user')).to eq("Alicia")
+    context "when environment is unknown to bot" do
+
+      before(:each) do
+        subject.redis.del('environments:ENV123')
+      end
+
+      it "should mark environment as in use by user" do
+        carl = Lita::User.create(123, name: "Carl")
+        send_command('started using env ENV123', :as => carl)
+        expect(subject.redis.hget('environments:ENV123', 'user')).to eq("Carl")
+      end
+
+      it "should reply with confirmation" do
+        send_command('started using env ENV123')
+        expect(replies.first).to eq("ok")
+      end
+
     end
 
-    it "should notify the user if the environment is already in use" do
-      subject.redis.hset('environments:ENV123', 'user', 'Alicia')
-      carl = Lita::User.create(123, name: "Carl")
-      send_command('started using env ENV123', :as => carl)
-      expect(replies.first).to eq("Sorry, ENV123 is currently in use by Alicia")
+    context "when environment is in use by another user" do
+
+      before(:each) do
+        subject.redis.hset('environments:ENV123', 'user', 'Alicia')
+      end
+
+      it "should leave the environment untouched" do
+        carl = Lita::User.create(123, name: "Carl")
+        send_command('started using env ENV123', :as => carl)
+        expect(subject.redis.hget('environments:ENV123', 'user')).to eq("Alicia")
+      end
+
+      it "should reply with notification" do
+        subject.redis.hset('environments:ENV123', 'user', 'Alicia')
+        carl = Lita::User.create(123, name: "Carl")
+        send_command('started using env ENV123', :as => carl)
+        expect(replies.first).to eq("Sorry, ENV123 is currently in use by Alicia")
+      end
+
     end
 
-    it "should notify the user if the environment is already marked as in use by user" do
-      subject.redis.hset('environments:ENV123', 'user', 'Carl')
-      carl = Lita::User.create(123, name: "Carl")
-      send_command('started using env ENV123', :as => carl)
-      expect(replies.first).to eq("You are already using ENV123")
+    context "when environment is already in use by user" do
+
+      before(:each) do
+        subject.redis.hset('environments:ENV123', 'user', 'Carl')
+      end
+
+      it "should leave the environment untouched" do
+        carl = Lita::User.create(123, name: "Carl")
+        send_command('started using env ENV123', :as => carl)
+        expect(subject.redis.hget('environments:ENV123', 'user')).to eq("Carl")
+      end
+
+      it "should reply with notification" do
+        subject.redis.hset('environments:ENV123', 'user', 'Carl')
+        carl = Lita::User.create(123, name: "Carl")
+        send_command('started using env ENV123', :as => carl)
+        expect(replies.first).to eq("You are already using ENV123")
+      end
+
     end
 
   end
 
-  describe 'stop using environment' do
+  describe 'User releasing environment' do
+
+    context "when environment is in use by user" do
+
+      before(:each) do
+        subject.redis.hset('environments:ENV234', 'user', 'Alicia')
+      end
+
+      it "should mark environment as available" do
+        alicia = Lita::User.create(123, name: "Alicia")
+        send_command('stopped using env ENV234', :as => alicia)
+        expect(subject.redis.hget('environments:ENV234', 'user')).to be_empty
+      end
+
+      it "should reply with confirmation" do
+        alicia = Lita::User.create(123, name: "Alicia")
+        send_command('stopped using env ENV234', :as => alicia)
+        expect(replies.first).to eq("ok")
+      end
 
-    it "should mark environment as available" do
-      subject.redis.hset('environments:ENV123', 'user', 'Alicia')
-      send_command('stopped using env ENV123')
-      expect(subject.redis.hget('environments:ENV123', 'user')).to be_empty
     end
 
-    it "should confirm" do
-      send_command('stopped using env ENV123')
-      expect(replies.first).to eq("ok")
+    context "when environment is in use by another user" do
+
+      before(:each) do
+        subject.redis.hset('environments:ENV234', 'user', 'Carl')
+      end
+
+      it "should leave the environment untouched" do
+        alicia = Lita::User.create(123, name: "Alicia")
+        send_command('stopped using env ENV234', :as => alicia)
+        expect(subject.redis.hget('environments:ENV234', 'user')).to eq('Carl')
+      end
+
+      it "should reply with notification" do
+        alicia = Lita::User.create(123, name: "Alicia")
+        send_command('stopped using env ENV234', :as => alicia)
+        expect(replies.first).to eq("You are not currently using ENV234 (Carl is)")
+      end
+
+    end
+
+    context "when environment is not in use" do
+
+      before(:each) do
+        subject.redis.hset('environments:ENV234', 'user', '')
+      end
+
+      it "should leave the environment untouched" do
+        alicia = Lita::User.create(123, name: "Alicia")
+        send_command('stopped using env ENV234', :as => alicia)
+        expect(subject.redis.hget('environments:ENV234', 'user')).to eq('')
+      end
+
+      it "should reply with notification" do
+        alicia = Lita::User.create(123, name: "Alicia")
+        send_command('stopped using env ENV234', :as => alicia)
+        expect(replies.first).to eq("You are not currently using ENV234")
+      end
+
+    end
+
+    context "when environment is unknown to bot" do
+
+      before(:each) do
+        subject.redis.del('environments:ENV234')
+      end
+
+      it "should leave the environment untouched" do
+        alicia = Lita::User.create(123, name: "Alicia")
+        send_command('stopped using env ENV234', :as => alicia)
+        expect(subject.redis.hget('environments:ENV234', 'user')).to be_nil
+      end
+
+      it "should reply with notification" do
+        alicia = Lita::User.create(123, name: "Alicia")
+        send_command('stopped using env ENV234', :as => alicia)
+        expect(replies.first).to eq("You are not currently using ENV234")
+      end
+
     end
 
   end
 
-  describe 'list environments' do
+  describe 'User listing environments' do
 
     it "should list environments" do
       subject.redis.hset('environments:ENV123', 'user', 'Alicia')
       subject.redis.hset('environments:ENV234', 'user', 'Carl')
-      subject.redis.hset('environments:ENV345', 'user', nil)
+      subject.redis.hset('environments:ENV345', 'user', '')
       send_command('environments')
       expect(replies.first.split("\n")).to eq([
         "ENV123 (Alicia)",
@@ -79,22 +196,81 @@ describe Lita::Handlers::Envy, lita_handler: true do
 
   end
 
-  describe 'remove environment' do
+  describe 'User removing environment' do
+
+    context "when environment is available" do
+
+      before(:each) do
+        subject.redis.hset('environments:ENV345', 'user', '')
+      end
+
+      it "should remove environments" do
+        send_command('remove env ENV345')
+        expect(subject.redis.keys).to_not include('environments:ENV345')
+      end
+
+      it "should confirm" do
+        send_command('remove env ENV345')
+        expect(replies.first).to eq("ok")
+      end
 
-    it "should remove environments" do
-      subject.redis.hset('environments:ENV123', 'user', 'Alicia')
-      send_command('remove env ENV123')
-      expect(subject.redis.keys).to_not include('environments:ENV123')
     end
 
-    it "should confirm" do
-      send_command('remove env ENV123')
-      expect(replies.first).to eq("ok")
+    context "when environment is unknown to bot" do
+
+      before(:each) do
+        subject.redis.del('environments:ENV345')
+      end
+
+      it "should reply with notification" do
+        send_command('remove env ENV345')
+        expect(replies.first).to eq("I do not know about environment ENV345")
+      end
+
+    end
+
+    context "when environment is in use by another user" do
+
+      before(:each) do
+        subject.redis.hset('environments:ENV345', 'user', 'Carl')
+      end
+
+      it "should leave the environment untouched" do
+        alicia = Lita::User.create(123, name: "Alicia")
+        send_command('remove env ENV345', :as => alicia)
+        expect(subject.redis.hget('environments:ENV345', 'user')).to eq('Carl')
+      end
+
+      it "should reply with notification" do
+        send_command('remove env ENV345')
+        expect(replies.first).to eq("Sorry, ENV345 is currently in use by Carl")
+      end
+
+    end
+
+    context "when environment is in use by user" do
+
+      before(:each) do
+        subject.redis.hset('environments:ENV345', 'user', 'Alicia')
+      end
+
+      it "should leave the environment untouched" do
+        alicia = Lita::User.create(123, name: "Alicia")
+        send_command('remove env ENV345', :as => alicia)
+        expect(subject.redis.hget('environments:ENV345', 'user')).to eq('Alicia')
+      end
+
+      it "should reply with notification" do
+        alicia = Lita::User.create(123, name: "Alicia")
+        send_command('remove env ENV345', :as => alicia)
+        expect(replies.first).to eq("You are currently using ENV345")
+      end
+
     end
 
   end
 
-  describe 'wrestle environment from user' do
+  describe 'User claiming environment from other user' do
 
     context "when environment is currently in use by specified user" do
 
@@ -108,7 +284,7 @@ describe Lita::Handlers::Envy, lita_handler: true do
         expect(subject.redis.hget('environments:ENV123', 'user')).to eq("Carl")
       end
 
-      it "should confirm" do
+      it "should reply with confirmation" do
         send_command('wrestle env ENV123 from Alicia')
         expect(replies.first).to eq("ok")
       end
@@ -121,13 +297,13 @@ describe Lita::Handlers::Envy, lita_handler: true do
         subject.redis.hset('environments:ENV123', 'user', 'Alicia')
       end
 
-      it "should not mark environment" do
+      it "should leave the environment untouched" do
         carl = Lita::User.create(123, name: "Carl")
         send_command('wrestle env ENV123 from Ben', :as => carl)
         expect(subject.redis.hget('environments:ENV123', 'user')).to eq("Alicia")
       end
 
-      it "should notify the user" do
+      it "should reply with notification" do
         send_command('wrestle env ENV123 from Ben')
         expect(replies.first).to eq("Sorry, ENV123 is currently in use by Alicia, not Ben")
       end
@@ -140,13 +316,13 @@ describe Lita::Handlers::Envy, lita_handler: true do
         subject.redis.hset('environments:ENV123', 'user', nil)
       end
 
-      it "should not mark environment" do
+      it "should leave the environment untouched" do
         carl = Lita::User.create(123, name: "Carl")
         send_command('wrestle env ENV123 from Ben', :as => carl)
         expect(subject.redis.hget('environments:ENV123', 'user')).to be_empty
       end
 
-      it "should notify the user" do
+      it "should reply with notification" do
         send_command('wrestle env ENV123 from Ben')
         expect(replies.first).to eq("Sorry, ENV123 is not currently in use")
       end
@@ -159,13 +335,13 @@ describe Lita::Handlers::Envy, lita_handler: true do
         subject.redis.hset('environments:ENV123', 'user', 'Carl')
       end
 
-      it "should not mark environment" do
+      it "should leave the environment untouched" do
         carl = Lita::User.create(123, name: "Carl")
         send_command('wrestle env ENV123 from Ben', :as => carl)
         expect(subject.redis.hget('environments:ENV123', 'user')).to eq('Carl')
       end
 
-      it "should notify the user" do
+      it "should reply with notification" do
         carl = Lita::User.create(123, name: "Carl")
         send_command('wrestle env ENV123 from Ben', :as => carl)
         expect(replies.first).to eq("You are already using ENV123")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-envy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ingo Weiss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita