lita-slack-standup 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 338d349d57654950fcebc59b784f26ce6f9ae2e0
-  data.tar.gz: 66ce4d083951479599860fbcbbaee10b6add3046
+  metadata.gz: b4da7d0c0f5efd3c66b7375cf0436b846c32cca8
+  data.tar.gz: d37286039c6068cf220331a1f9cffebe8352af9f
 SHA512:
-  metadata.gz: 8bd47e27d5db1dd72c68f7b053c691b3073c76fe2e0d10630bde89c25611e8ba0ecca46d33adb48147cac012684ce78822bbbf0e582881ea8c76873205d4fd82
-  data.tar.gz: 1a5863614bd506f32ac9c1d4ff18a567ec63bd8e071332a9990ec828427a20f00cb29e32545f5abec3ac1754ee5817c4c3f6a5485e8e61f36c8c2d93e7b8bd6a
+  metadata.gz: 184fa2d42176ae1b83201405ee45fcba74a116003117fff82a549577fffd8819acf89b303b232504a813dc205f6391b2c36c8ac3c3795c2e486729db4d98165e
+  data.tar.gz: b2bf9cd99cb33c11fdf18d0d93f4651d7a57ba1ef302a4cfc3ffa2011eaebea3a21ee6897003679593f3dcbc973232181980f48f2da4875a6281ec0268044447

data/README.md

@@ -23,10 +23,10 @@ end
 ## Usage
 
  - !standup start : launches the standup, prints the standups already filled and asks for someone else to report
- - !standup next : skips the current user and asks the next user to do his standup report
- - !standup report <some standup report> : saves your standup. If you do it before the start of the standup, you won't be asked to report. The bot will displays your standup in your stead
+ - !standup next : consider current user's standup done and asks the next user to report
+ - !standup report <some standup report> : saves your standup. If you do it before the start of the standup, you won't be asked to report. The bot will display your standup in your stead
  - !standup ignore <some user> : ignores an user for the standups
  - !standup unignore <some user> : unignores an user
- - !standup list : list all ignored users
+ - !standup list : lists all ignored users
   
 The standup stops when everyone has done his report or has been skipped.

data/lib/lita/handlers/slack_standup.rb

@@ -13,6 +13,8 @@ module Lita
       route(/^standup\s+start$/, :standup_start, command: true, help: {t("help.start_cmd") => t("help.start_description") })
 
       def standup_start(message=nil)
+        return if already_started? 
+       
         in_standup.value = 'true'
         send_message(config.channel, t("sentence.start"))
         prewritten_standups_summary
@@ -81,12 +83,37 @@ module Lita
         )
       end
 
+      route(/^standup\s+end$/, :standup_end, command: true, help: {t("help.end_cmd") => t("help.end_description")})
+
+      def standup_end(message=nil)
+        contextual_end_message
+
+        in_standup.value = 'false'
+        update_standup_members
+        update_ids_to_members
+      end
+
       private 
 
       def extract_user(message)
         message.matches[0][0].gsub('@','')
       end
 
+      def already_started?
+        if in_standup.value == 'true'
+          send_message(config.channel, t("sentence.already_started"))
+        end
+        in_standup.value == 'true'
+      end
+
+      def contextual_end_message
+        if in_standup.value == 'true'
+          send_message(config.channel,t("sentence.end_standup"))
+        else
+          send_message(config.channel, t("sentence.clear_objects"))
+        end
+      end
+
       def standup_check?
         if in_standup.value != 'true'
           send_message(config.channel, t("sentence.next_forbidden"))
@@ -170,15 +197,6 @@ module Lita
       def select_next_standup
         standup_members.select{ |key,value| value.empty? }.first.first
       end
-
-      def standup_end
-        in_standup.value = 'false'
-
-        send_message(config.channel,t("sentence.end_standup"))
-        
-        update_standup_members
-        update_ids_to_members
-      end
     end
     Lita.register_handler(SlackStandup)
   end

data/lita-slack-standup.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-slack-standup"
-  spec.version       = "0.9.0"
+  spec.version       = "0.10.0"
   spec.authors       = ["Sybil Deboin"]
   spec.email         = ["sybil.deboin@gmail.com"]
   spec.description   = "Standup feature for slack"

data/locales/en.yml

@@ -4,17 +4,19 @@ en:
       slack_standup:
         help:
           start_cmd: standup start
-          start_description: Launches the standup, prints the standups already filled and asks for someone else to report
+          start_description: Launches the standup, prints the reports already filled and asks for someone else to report
           report_cmd: standup report TEXTE
-          report_description: Saves your standup. If you do it before the start of the standup, you won't be asked to report. The bot will displays your standup in your stead
+          report_description: Saves your standup. If you do it before the start of the standup, you won't be asked to report. The bot will display your standup in your stead
           next_cmd: standup next
-          next_description: Skips the current user and asks the next user to do his standup report
+          next_description: Consider current's user standup done and asks the next user to report
           ignore_cmd: standup ignore USER
           ignore_description: Ignores an user for the standups
           unignore_cmd: standup unignore USER
           unignore_description: Unignores an user
           list_cmd: standup list
           list_description: List all ignored users
+          end_cmd: standup end
+          end_description: End the standup, clear the saved standups and update the users list.
         sentence:
           start: "Hello <!channel> ! The standup is starting :)"
           report: "your standup is saved. Thanks :)"
@@ -24,6 +26,8 @@ en:
           unignore: "<@%{user}> is now an attendee of the standups"
           list: "Ignored users : "
           next_forbidden: "The command is unavailable outside standups."
-          standup_done: "%{user} has already filled his standup: \n %{standup}"
+          standup_done: "%{user} has already filled her/his/its standup: \n %{standup}"
           standup_fill: "Standup done in live."
+          already_started: "The standup is already started."
           end_standup: "That's it ! It's all good for today. Thanks everyone :)"
+          clear_objects: "We're not during standup. The saved standups have been erased and the users list updated."

data/locales/fr.yml

@@ -15,6 +15,8 @@ fr:
           unignore_description: Remet l'utilisateur dans la liste des personnes participant aux standups
           list_cmd: standup list
           list_description: Liste les utilisateurs ignorés
+          end_cmd: standup end
+          end_description: Termine le standup, efface les standups enregistrés et met `a jour la liste des utilisateurs.
         sentence:
           start: "Hello <!channel> ! Le standup va commencer :)"
           report: "Ton standup est enregistré. Merci :)"
@@ -26,4 +28,6 @@ fr:
           next_forbidden: "La commande n'est pas disponible en dehors d'un standup."
           standup_done: "%{user} a déjà renseigné son standup : \n %{standup}"
           standup_fill: "Standup fait en live."
+          already_started: "Le standup est déjà en cours."
           end_standup: "Et voilà ! C'est bon pour aujourd'hui. Merci tout le monde :)"
+          clear_objects: "Aucun standup en cours. Les standups enregistrés ont été supprimés et la liste des utilisateurs mise à jour."

data/spec/lita/handlers/slack_standup_spec.rb

@@ -21,7 +21,7 @@ describe Lita::Handlers::SlackStandup, lita_handler: true do
 
     stub_request(:post, "https://slack.com/api/channels.list").
       with(:headers => header).
-      to_return(:status => 200, :body => '{"ok":true,"channels":[{"id":"CHAN","name":"jambot-test","members":["B","A","C","D","E"],"num_members":5}]}', :headers => {})
+      to_return(:status => 200, :body => '{"ok":true,"channels":[{"id":"C","name":"jambot-test","members":["B","A","C","D","E"],"num_members":5}]}', :headers => {})
     
     stub_request(:post, "https://slack.com/api/chat.postMessage").
       with(:body => {"as_user"=>"true", "channel"=>"#jambot-test", "text"=>"Hello <!channel> ! Le standup va commencer :)", "token"=>nil},:headers => header).
@@ -38,11 +38,20 @@ describe Lita::Handlers::SlackStandup, lita_handler: true do
     stub_request(:post, "https://slack.com/api/chat.postMessage").
       with(:body => {"as_user"=>"true", "channel"=>"#jambot-test", "text"=>"Et voilà ! C'est bon pour aujourd'hui. Merci tout le monde :)", "token"=>nil},:headers => header).
       to_return(:status => 200, :body => '{"ok": true,"channel": "C","message": "Et voilà ! C\'est bon pour aujourd\'hui. Merci tout le monde :)"}', :headers => {})
+
+    stub_request(:post, "https://slack.com/api/chat.postMessage").
+      with(:body => {"as_user"=>"true", "channel"=>"#jambot-test", "text"=>"Aucun standup en cours. Les standups enregistrés ont été supprimés et la liste des utilisateurs mise à jour.", "token"=>nil},:headers => header).
+      to_return(:status => 200, :body => '{"ok": true,"channel": "C","message": "Aucun standup en cours. Les standups enregistrés ont été supprimés et la liste des utilisateurs mise à jour."}', :headers => {})
  
     stub_request(:post, "https://slack.com/api/chat.postMessage").
       with(:body => {"as_user"=>"true", "channel"=>"#jambot-test", "text"=>"La commande n'est pas disponible en dehors d'un standup.", "token"=>nil},:headers => header).
       to_return(:status => 200, :body => '{"ok": true,"channel": "C","message": "La commande n\'est pas disponible en dehors d\'un standup."}', :headers => {})
+
+    stub_request(:post, "https://slack.com/api/chat.postMessage").
+      with(:body => {"as_user"=>"true", "channel"=>"#jambot-test", "text"=>"Le standup est déjà en cours.", "token"=>nil},:headers => header).
+      to_return(:status => 200, :body => '{"ok": true,"channel": "C","message": "Le standup est déjà en cours."}', :headers => {})
  
+
     reg.register_handler(Lita::Handlers::SlackStandup)
     
     reg.configure do |config|
@@ -80,6 +89,16 @@ describe Lita::Handlers::SlackStandup, lita_handler: true do
       subject 
     end
 
+    context "during standup" do
+      before do 
+        send_message("!standup start", as: sybil, from: channel)
+      end
+
+      it "doesn't restart the standup" do
+        expect_any_instance_of(Slack::Web::Client).to receive(:chat_postMessage).with({:channel=>channel, :text=>"Le standup est déjà en cours.", :as_user=>true})
+        subject
+      end
+    end
     context "with pre-filled report" do
       before do 
         send_message("!standup report My standup report for testing purposes", as: sybil, from: channel)
@@ -192,4 +211,31 @@ describe Lita::Handlers::SlackStandup, lita_handler: true do
       expect(replies.last).to eq("<@sybil> est à nouveau inclus dans les standups.")
     end
   end
+
+  describe "!standup end" do
+    subject do 
+      send_message("!standup end", as: sybil, from: channel)
+    end
+
+    it { is_expected.to route("!standup end") }
+
+    context "during standup" do
+      before do
+        send_message("!standup start", as: sybil, from: channel)
+      end
+
+      it "ends the standup" do
+        expect_any_instance_of(Slack::Web::Client).to receive(:chat_postMessage).with({:channel=>channel, :text=>"Et voilà ! C'est bon pour aujourd'hui. Merci tout le monde :)", :as_user=>true})
+        subject 
+      end
+    end
+
+    context "outside the standup" do
+      it "clears the objects" do
+ 
+        expect_any_instance_of(Slack::Web::Client).to receive(:chat_postMessage).with({:channel=>channel, :text=>"Aucun standup en cours. Les standups enregistrés ont été supprimés et la liste des utilisateurs mise à jour.", :as_user=>true})
+        subject
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-slack-standup
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Sybil Deboin