lita-envy 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21707c780210a5ded4161bcc0cd5c3ad45ae98bc
-  data.tar.gz: d3ef0aced19fb250ab90bafed746e306bdbebd78
+  metadata.gz: 108cbd88f65699d4b6c14c1ff9f33d89d29c3fd9
+  data.tar.gz: 07b6e07d268f524dfc3ac4d956437464b92bb3dd
 SHA512:
-  metadata.gz: bee308f93ff9aace074d3404a3e3e9fa04c648671214071a616858566905508bdb77ec051602da7b1c4bc3a89f9e628c675008219453738fe0d0df1b4222b140
-  data.tar.gz: 7ae0fdb46cf96a83345be094c6184dde2ce284c5f45e71e55f999296af276c813fdbdcd12769f5605a11e9002b67e4f3c9c062e3d4c33edd4041735122ab22ec
+  metadata.gz: 834ba666981125994210cc15181bbb95aeda785f0e12c7364bc4f2d53e8b2d42297c82ff95ab40f58c1cb9ebd9d8b3d4413270d1e474bd6c077a469f9dbe5ef5
+  data.tar.gz: 6687c4f34e64243c035bb698cb4c5ee706eb7225ec4be1caf80418d7cc776477b3e5fc31ba5f65f7b46536fe789db471fc761c0e36381a1d39a0fe3f21fbb633

data/lib/lita/handlers/envy.rb

@@ -16,29 +16,33 @@ module Lita
 
       def claim_environment(response)
         env_id = response.matches.first.first
-        current_user = redis.hget(key(env_id), 'user')
-        if current_user.nil? || current_user.empty?
+        case current_user(env_id)
+        when nil
           redis.hset(key(env_id), 'user', response.user.name)
-          response.reply('ok')
-        elsif current_user == response.user.name
-          response.reply("Hmm, you are already using #{env_id}")
+          response.reply t('claim_environment.success')
+        when ''
+          redis.hset(key(env_id), 'user', response.user.name)
+          response.reply t('claim_environment.success')
+        when response.user.name
+          response.reply t('claim_environment.failure.env_in_use_by_user', :env_id => env_id)
         else
-          response.reply("Hmm, #{env_id} is currently in use by #{current_user}")
+          response.reply t('claim_environment.failure.env_in_use_by_other_user', :env_id => env_id, :user => current_user(env_id))
         end
       end
 
       def release_environment(response)
         env_id = response.matches.first.first
-        current_user = redis.hget(key(env_id), 'user')
-        if current_user == response.user.name
+        case current_user(env_id)
+        when nil
+          response.reply t('release_environment.failure.env_unknown', :env_id => env_id)
+        when ''
+          response.reply t('release_environment.failure.env_not_in_use_by_user', :env_id => env_id)
+        when response.user.name
           redis.hset(key(env_id), 'user', nil)
-          response.reply('ok')
-        elsif current_user.nil? || current_user.empty?
-          response.reply("Hmm, you are not currently using #{env_id}")
+          response.reply t('release_environment.success')
         else
-          response.reply("Hmm, you are not currently using #{env_id} (#{current_user} is)")
+          response.reply t('release_environment.failure.env_in_use_by_other_user', :env_id => env_id, :user => current_user(env_id))
         end
-
       end
 
       def list_environments(response)
@@ -50,36 +54,42 @@ module Lita
           line += " (#{user})" unless user.empty?
           lines << line
         end
-        response.reply(lines.join("\n"))
+        if lines.any?
+          response.reply(lines.join("\n"))
+        else
+          response.reply t('list_environments.failure.no_environments')
+        end
       end
 
       def forget_environment(response)
         env_id = response.matches.first.first
-        current_user = redis.hget(key(env_id), 'user')
-        if current_user == response.user.name
-          response.reply("Hmm, you are currently using #{env_id}")
-        elsif current_user.nil?
-          response.reply("Hmm, I do not know about #{env_id}")
-        elsif current_user.empty?
+        case current_user(env_id)
+        when nil
+          response.reply t('forget_environment.failure.env_unknown', :env_id => env_id)
+        when ''
           redis.del(key(env_id))
-          response.reply('ok')
+          response.reply t('forget_environment.success')
+        when response.user.name
+          response.reply t('forget_environment.failure.env_in_use_by_user', :env_id => env_id)
         else
-          response.reply("Hmm, #{env_id} is currently in use by #{current_user}")
+          response.reply t('forget_environment.failure.env_in_use_by_other_user', :env_id => env_id, :user => current_user(env_id))
         end
       end
 
       def claim_used_environment(response)
         env_id, specified_user = response.matches.first
-        current_user = redis.hget(key(env_id), 'user')
-        if specified_user == current_user
+        case current_user(env_id)
+        when nil
+          response.reply t('claim_used_environment.failure.env_unknown', :env_id => env_id)
+        when ''
+          response.reply t('claim_used_environment.failure.env_not_in_use', :env_id => env_id)
+        when response.user.name
+          response.reply t('claim_used_environment.failure.env_in_use_by_user', :env_id => env_id)
+        when specified_user
           redis.hset(key(env_id), 'user', response.user.name)
-          response.reply('ok')
-        elsif current_user.nil? or current_user.empty?
-          response.reply("Hmm, #{env_id} is not currently in use")
-        elsif current_user == response.user.name
-          response.reply("Hmm, you are already using #{env_id}")
+          response.reply t('claim_used_environment.success')
         else
-          response.reply("Hmm, #{env_id} is currently in use by #{current_user}, not #{specified_user}")
+          response.reply t('claim_used_environment.failure.env_in_use_by_user_other_than_specified_one', :env_id => env_id, :user => current_user(env_id), :specified_user => specified_user)
         end
       end
 
@@ -89,6 +99,10 @@ module Lita
         ['environments', config.namespace, env_id].join(':')
       end
 
+      def current_user(env_id)
+        redis.hget(key(env_id), 'user')
+      end
+
       Lita.register_handler(self)
     end
   end

data/lita-envy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-envy"
-  spec.version       = "0.1.5"
+  spec.version       = "0.1.6"
   spec.authors       = ["Ingo Weiss"]
   spec.email         = ["ingo@ingoweiss.com"]
   spec.description   = "Helps with management of environment ussage. Adds commands for claiming and releasing environments"

data/locales/en.yml

@@ -2,3 +2,31 @@ en:
   lita:
     handlers:
       envy:
+        claim_environment:
+          success: ok
+          failure:
+            env_in_use_by_user: "Hmm, you are already using %{env_id}"
+            env_in_use_by_other_user: "Hmm, %{env_id} is currently in use by %{user}"
+        release_environment:
+          success: ok
+          failure:
+            env_unknown: "Hmm, I do not know about %{env_id}"
+            env_not_in_use_by_user: "Hmm, you are not currently using %{env_id}"
+            env_in_use_by_other_user: "Hmm, you are not currently using %{env_id} (%{user} is)"
+        forget_environment:
+          success: ok
+          failure:
+            env_unknown: "Hmm, I do not know about %{env_id}"
+            env_in_use_by_user: "Hmm, you are currently using %{env_id}"
+            env_in_use_by_other_user: "Hmm, %{env_id} is currently in use by %{user}"
+        claim_used_environment:
+          success: ok
+          failure:
+            env_unknown: "Hmm, I do not know about %{env_id}"
+            env_not_in_use: "Hmm, %{env_id} is not currently in use"
+            env_in_use_by_user: "Hmm, you are already using %{env_id}"
+            env_in_use_by_user_other_than_specified_one: "Hmm, %{env_id} is currently in use by %{user}, not %{specified_user}"
+        list_environments:
+          failure:
+            no_environments: "I do not know about any environments yet"
+

data/spec/lita/handlers/envy_spec.rb

@@ -177,7 +177,7 @@ describe Lita::Handlers::Envy, lita_handler: true do
       it "should reply with notification" do
         alicia = Lita::User.create(123, name: "Alicia")
         send_command('release ENV234', :as => alicia)
-        expect(replies.first).to eq("Hmm, you are not currently using ENV234")
+        expect(replies.first).to eq("Hmm, I do not know about ENV234")
       end
 
     end
@@ -186,16 +186,32 @@ describe Lita::Handlers::Envy, lita_handler: true do
 
   describe 'User listing environments' do
 
-    it "should list environments" do
-      subject.redis.hset('environments:my_project:ENV123', 'user', 'Alicia')
-      subject.redis.hset('environments:my_project:ENV234', 'user', 'Carl')
-      subject.redis.hset('environments:my_project:ENV345', 'user', '')
-      send_command('envs')
-      expect(replies.first.split("\n")).to eq([
-        "ENV123 (Alicia)",
-        "ENV234 (Carl)",
-        "ENV345"
-      ])
+    context "with environments recorded" do
+
+      before(:each) do
+        subject.redis.hset('environments:my_project:ENV345', 'user', '')
+        subject.redis.hset('environments:my_project:ENV123', 'user', 'Alicia')
+        subject.redis.hset('environments:my_project:ENV234', 'user', 'Carl')
+      end
+
+      it "should list environments" do
+        send_command('envs')
+        expect(replies.first.split("\n")).to eq([
+          "ENV123 (Alicia)",
+          "ENV234 (Carl)",
+          "ENV345"
+        ])
+      end
+
+    end
+
+    context "with no environments recorded" do
+
+      it "should respond with notification" do
+        send_command('envs')
+        expect(replies.first).to eq("I do not know about any environments yet")
+      end
+
     end
 
   end
@@ -208,7 +224,7 @@ describe Lita::Handlers::Envy, lita_handler: true do
         subject.redis.hset('environments:my_project:ENV345', 'user', '')
       end
 
-      it "should forgetironments" do
+      it "should forget environment" do
         send_command('forget ENV345')
         expect(subject.redis.keys).to_not include('environments:my_project:ENV345')
       end
@@ -353,6 +369,20 @@ describe Lita::Handlers::Envy, lita_handler: true do
 
     end
 
+    context "when environment is unknown to bot" do
+
+      before(:each) do
+        subject.redis.del('environments:my_project:ENV123')
+      end
+
+      it "should reply with notification" do
+        carl = Lita::User.create(123, name: "Carl")
+        send_command('wrestle ENV123 from Ben', :as => carl)
+        expect(replies.first).to eq("Hmm, I do not know about ENV123")
+      end
+
+    end
+
   end
 
 end

metadata

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