lita-coffee 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b6fd18a9681ae1c31cb6fdb0f752a566205c18
-  data.tar.gz: 951b84eec9c661714d019e08b78ee19c2cabe202
+  metadata.gz: 4b49345f070b8d118bf1d960e0f07dcd7a56dffc
+  data.tar.gz: 7ff14d8b53dbeb2cee7200933edcd8e164e96c2e
 SHA512:
-  metadata.gz: e218834fae3471c72221e1b59982c865edb6a888610e1ad14cf70e31aad5a8822a4afcc91e5ed5dc8ea47c3a13718b0318993e7169eb2eabac4e788c75b67a3d
-  data.tar.gz: 12c67a729d5126d23e985885554568ed1e51ef54e873fce086ba1b38d8992dc41fa50cbc29038ee8cbce20e3295d33113e72839e0452b94cdf20c8a6228f48e4
+  metadata.gz: 48816a6a46e4569e3b64a2e3393c9be8daa0855bcb5db2260b248be329e0ecb215c24f4337ec549caa47537953793b54933e34b3575fd7344ad78ae1779ca113
+  data.tar.gz: b897fd6aa5f26089d1a0d57636ffe8163f33f9f509f7a2e3282856fc0b92f13a294de8e0b12acbe7aa4c91233a309aebbe617abf8c34ef533cce0f9ee2747dcc

data/lib/lita/handlers/coffee.rb

@@ -19,18 +19,18 @@ module Lita
       end
 
       route(
-        /^\(coffee\)(\s+\-[bcdgist]?|\s+\+)?(.*)/i,
+        /^\(?coffee\)?(\s+\-[bcdgist]?|\s+\+)?(.*)/i,
         :coffee,
         help: {
-          '(coffee)'                      => "List the (coffee) orders for your group",
-          '(coffee) -i'                   => "Display your (coffee) profile",
-          '(coffee) -s Colombian Filter'  => "Set your (coffee) preference",
-          '(coffee) -g Cool Kids'         => "Change your (coffee) group",
-          '(coffee) +'                    => "Order a (coffee)",
-          '(coffee) -c'                   => "Cancel your (coffee) order",
-          '(coffee) -b You owe me one!'   => "Buy (coffee) for your group, clear the orders and send a message",
-          '(coffee) -t'                   => "Display (coffee) system settings",
-          '(coffee) -d'                   => "Delete you from the (coffee) system",
+          'coffee'                      => "List the orders for your group",
+          'coffee -i'                   => "Display your profile",
+          'coffee -s Colombian Filter'  => "Set your coffee preference",
+          'coffee -g Cool Kids'         => "Change your group",
+          'coffee +'                    => "Order a coffee",
+          'coffee -c'                   => "Cancel your order",
+          'coffee -b You owe me one!'   => "Buy coffee for your group, clear the orders and send a message to each coffee drinker",
+          'coffee -t'                   => "Display system settings",
+          'coffee -d'                   => "Delete you from the coffee system",
         }
       )
 
@@ -50,71 +50,71 @@ module Lita
         group = get_group(my_user)
 
         # Setup new users
-        response.reply("Welcome to (coffee)! You have been setup in the #{@@DEFAULT_GROUP} group with an order of #{@@DEFAULT_COFFEE}. Type help (coffee) for help.") if initialize_user_redis(my_user) == :new_user
+        response.reply("Welcome to coffee! You have been added to the #{@@DEFAULT_GROUP} group with an order of #{@@DEFAULT_COFFEE}. Type help coffee for help.") if initialize_user_redis(my_user) == :new_user
 
         # Retrieve my preference
         if get_settings
           settings = get_settings(my_user)
-          response.reply("Your current (coffee) is #{settings['coffee']}. You are in the #{settings['group']} group.")
+          response.reply("Your current coffee is #{settings['coffee']}. You are in the #{settings['group']} group.")
         # Set my coffee
         elsif set_coffee
           result = set_coffee(my_user,preference)
           if result == "OK"
-            response.reply("(coffee) set to #{preference}")
+            response.reply("Coffee set to #{preference}")
           else
-            response.reply("(sadpanda) Failed to set your (coffee) for some reason: #{result.inspect}")
+            response.reply("(sadpanda) Failed to set your coffee for some reason: #{result.inspect}")
           end
         # Delete me altogether
         elsif delete_me
           result = delete_user(my_user)
           if result == 1
-            response.reply("You have been deleted from (coffee)")
+            response.reply("You have been deleted from coffee")
           else
-            response.reply("(sadpanda) Failed to delete you from (coffee) for some reason: #{result.inspect}")
+            response.reply("(sadpanda) Failed to delete you from coffee for some reason: #{result.inspect}")
           end
         # Change my coffee group
         elsif change_group
           result = set_coffee_group(my_user,preference)
           if result == "OK"
-            response.reply("(coffee) group set to #{preference}")
+            response.reply("Group set to #{preference}")
           else
-            response.reply("(sadpanda) Failed to set your (coffee) group for some reason: #{result.inspect}")
+            response.reply("(sadpanda) Failed to set your coffee group for some reason: #{result.inspect}")
           end
         # Order a coffee
         elsif order
           result = order_coffee(my_user)
           if result == "OK"
-            response.reply("Ordered you a (coffee)")
+            response.reply("Ordered you a coffee")
           else
-            response.reply("(sadpanda) Failed to order your (coffee) for some reason: #{result.inspect}")
+            response.reply("(sadpanda) Failed to order your coffee for some reason: #{result.inspect}")
           end
         # Cancel a coffee
         elsif cancel
           result = cancel_coffee(my_user)
           if result == "OK"
-            response.reply("Cancelled your (coffee)")
+            response.reply("Cancelled your coffee")
           else
-            response.reply("(sadpanda) Failed to cancel your (coffee) for some reason: #{result.inspect}")
+            response.reply("(sadpanda) Failed to cancel your coffee for some reason: #{result.inspect}")
           end
         # Buy the coffees and clear the orders
         elsif buy_coffee
-          response.reply("Thanks for ordering the (coffee) for #{group}!\n--")
+          response.reply("Thanks for ordering the coffee for #{group}!\n--")
           get_orders(group).each do |order|
             response.reply("#{order}: #{get_coffee(order)}")
             send_coffee_message(order,my_user,preference) unless order == my_user
           end
           result = clear_orders(group)
           if result == "OK"
-            response.reply("Cleared all (coffee) orders for #{group}")
+            response.reply("Cleared all orders for #{group}")
           else
-            response.reply("(sadpanda) Failed to clear the (coffee) orders for some reason: #{result.inspect}")
+            response.reply("(sadpanda) Failed to clear the orders for some reason: #{result.inspect}")
           end
         # tests
         elsif system_settings
           response.reply("Default coffee: #{@@DEFAULT_COFFEE}, Default group: #{@@DEFAULT_GROUP}")
         # List the orders
         else
-          response.reply("Current (coffee) orders for #{group}:-\n--")
+          response.reply("Current orders for #{group}:-\n--")
           get_orders(group).each do |order|
             response.reply("#{order}: #{get_coffee(order)}")
           end
@@ -192,7 +192,7 @@ module Lita
       def send_coffee_message(user,purchaser,message)
         myuser = Lita::User.find_by_name(user)
         msg = Lita::Message.new(robot,'',Lita::Source.new(user: myuser))
-        msg.reply("#{purchaser} has bought you a (coffee)!")
+        msg.reply("#{purchaser} has bought you a coffee!")
         msg.reply(message) # what happens if message is nil?
       rescue => e
         Lita.logger.error("Coffee#send_coffee_message raised #{e.class}: #{e.message}\n#{e.backtrace}")

data/lita-coffee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-coffee'
-  spec.version       = '0.0.1'
+  spec.version       = '0.0.2'
   spec.authors       = ['Stuart Auld']
   spec.email         = ['sja@marsupialmusic.net']
   spec.description   = %q{Lita integration to manage office coffee orders}

data/spec/lita/handlers/coffee_spec.rb

@@ -1,71 +1,90 @@
 require "spec_helper"
-#TODO: write this stuff
 
 describe Lita::Handlers::Coffee, lita_handler: true do
 
-  it { is_expected.to route('(coffee).to(:coffee)')}
+  it { is_expected.to route('(coffee)').to(:coffee) }
+  it { is_expected.to route('coffee').to(:coffee) }
 
   describe '#coffee' do
     before{robot.trigger(:loaded)}
 
     it 'sets up a user if they do not exist already' do
-      send_message("(coffee)")
-      expect(replies.first).to start_with("Welcome to (coffee)!") #TODO: test for defaults here?
+      send_message("coffee")
+      expect(replies.first).to start_with("Welcome to coffee!")
     end
 
     it 'lists the current coffee orders if no options received' do
-      send_message("(coffee)")
-      expect(replies.last).to start_with("Current (coffee) orders")
+      send_message("coffee")
+      expect(replies.last).to start_with("Current orders")
     end
 
     it 'orders me a coffee if I ask it!' do
-      send_message("(coffee) +")
-      expect(replies.last).to eq("Ordered you a (coffee)") #TODO: test that it has been added to the queue?
+      send_message("coffee +")
+      expect(replies.last).to eq("Ordered you a coffee")
+      send_message("coffee")
+      expect(replies.last).to start_with("Test User:")
     end
 
     it 'displays my profile settings' do
-      send_message("(coffee) -i")
-      expect(replies.last).to start_with("Your current (coffee) is")
+      send_message("coffee -i")
+      expect(replies.last).to start_with("Your current coffee is")
     end
 
     it 'sets my coffee preference' do
-      send_message("(coffee) -s decaf soy cappuccino")
-      expect(replies.last).to eq("(coffee) set to decaf soy cappuccino")
-      send_message("(coffee) -i")
-      expect(replies.last).to start_with("Your current (coffee) is decaf soy cappuccino")
+      send_message("coffee -s decaf soy cappuccino")
+      expect(replies.last).to eq("Coffee set to decaf soy cappuccino")
+      send_message("coffee -i")
+      expect(replies.last).to start_with("Your current coffee is decaf soy cappuccino")
     end
 
     it 'changes my coffee group' do
-      send_message("(coffee) -g testing team")
-      expect(replies.last).to eq("(coffee) group set to testing team")
-      send_message("(coffee) -i")
+      send_message("coffee -g testing team")
+      expect(replies.last).to eq("Group set to testing team")
+      send_message("coffee -i")
       expect(replies.last).to end_with("You are in the testing team group.")
     end
 
     it 'cancels my order' do
-      send_message("(coffee) -c")
-      expect(replies.last).to eq("Cancelled your (coffee)") #TODO: check that my name has been removed from the queue
+      send_message("coffee +")
+      order_a_coffee('stu')
+      order_a_coffee('joel')
+      expect(coffees_in_the_queue).to eq(3)
+      send_message("coffee -c")
+      expect(replies.last).to eq("Cancelled your coffee") #TODO: check that my name has been removed from the queue
+      expect(coffees_in_the_queue).to eq(2)
     end
 
     it 'deletes me from the system' do
-      send_message("(coffee) -d")
-      expect(replies.last).to eq("You have been deleted from (coffee)")
+      send_message("coffee -d")
+      expect(replies.last).to eq("You have been deleted from coffee")
     end
 
     it 'displays default settings' do
-      send_message("(coffee) -t")
+      send_message("coffee -t")
       expect(replies.last).to start_with("Default coffee:")
     end
 
     it 'buys the coffees and clears the queue' do
-      send_message("(coffee) +")
-      send_message("(coffee) -b")
-      expect(replies.last).to start_with("Cleared all (coffee) orders")
-      send_message("(coffee)")
+      order_a_coffee('stu')
+      order_a_coffee('joel')
+      send_message("coffee -b")
+      expect(replies.last).to start_with("Cleared all orders")
+      send_message("coffee")
       expect(replies.last).to end_with("--")
+      expect(replies.select{|x| x == "Test User has bought you a coffee!"}.count).to eq(2)
     end
 
-    
+    def order_a_coffee(user)
+      user = Lita::User.create(1,name: user)
+      send_message('coffee +', as: user)
+    end
+
+    def coffees_in_the_queue
+      send_message('coffee')
+      replies.reverse.slice(0,replies.reverse.index{|x| ( x =~ /^Current orders/ ) == 0}).count
+    end
+
+
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-coffee
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Stuart Auld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita