lita-reminder 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f1c845e64fefcdcdf36a771173bc84ba69d8a07
-  data.tar.gz: 30e7b7133f4880f04a4be2eeebaf1a1e75efe645
+  metadata.gz: 1416912c50f4884287365f915763b3953fc738c6
+  data.tar.gz: 64008f920b6e526a2d9951610fc2538e95086a95
 SHA512:
-  metadata.gz: 2b37246013b7a636e8d5ecbe58efdde24b281b615159b28c77042ba2bddee0674476108a29793f66f171f0ceb620572aea8abeae8222826cafcd40e77c680e9b
-  data.tar.gz: 15e2ff3b315d3735ea9f808facb2480acdb27f4bbdedeba23423e7528620cf489334cbb800e3386714460d7bf30d670f0dfcf1ea8e7f6b7ba930574abf92d452
+  metadata.gz: 78a1b5109cbd2532b5cbd17692269660154d5309a6a0788532278ce38704d3ec427efefb5a4bc752d883a821c1d8b9c9d48965022bcfc4178df376c9c53554d5
+  data.tar.gz: 01642925d74ba84d329237c4aeb05a0ee9c50741c109f2068e27055d5da2abdaca786b038c34e9f3c350bcc9267749d5136ac0acf5a1b45e8aab6eae19cb2209

data/lib/lita/handlers/reminder.rb

@@ -12,7 +12,7 @@ module Lita
       @@mutex = Mutex.new
       @@runner = ReminderRunner.new
 
-      route(/^remind\s+(?<who>\S+)\s+(?<type>at|in|every|cron)\s+(?<time>.*)(\s+first\s+at\s+(?<first>.*))?\s+to\s+(?<task>.*?)(\s+repeat\s+(?<repeat>.*)\s+times\s+(?<repeat_interval>.*))?$/, :add,
+      route(/^remind\s+(?<who>.*?)\s+(?<type>at|in|every|cron)\s+(?<time>.*)(\s+first\s+at\s+(?<first>.*))?\s+to\s+(?<task>.*?)(\s+repeat\s+(?<repeat>.*)\s+times\s+(?<repeat_interval>.*))?$/, :add,
             help: {"remind (me|here|username|room) (at|in|every|cron) TIME [first at TIME] to TASK [repeat 3|many times 10m]" => "Add a reminder"})
       route(/^reminder\s+done\s+(\d+)$/, :done, help: {"reminder ID done" => "Stop nagging"})
       route(/^reminder\s+delete\s+(\d+)$/, :delete, help: {"reminder ID delete" => "Delete reminder"})

data/lib/reminder/runner.rb

@@ -28,19 +28,26 @@ class ReminderRunner
   def add(response)
     task = ReminderTask.from_message(@reminder_count, response.match_data, response.message.source)
     @redis.rpush("reminders", task.dump)
-    task.start_job(self)
     @reminders << task
+    task.start_job(self)
     response.reply("Task #{task.index} added, next run at #{task.job.next_time.strftime('%Y-%m-%d %H:%M:%S')}")
     @reminder_count += 1
   end
 
   def done(response)
-    @reminders[response.match_data[1]].stop_repeat
+    @reminders[response.match_data[1].to_i].stop_repeat
   end
   
   def delete(response)
-    index = kill(response.match_data[1].to_i)
-    response.reply("Task #{index} deleted")
+    index = response.match_data[1].to_i
+    if @reminders[index].nil?
+      response.reply("Task #{index} does not exist")
+    elsif index != @reminders[index].index
+      response.reply("Task #{index} is broken (bot internal error)")
+    else
+      kill(index)
+      response.reply("Task #{index} deleted")
+    end
   end
 
   def list(response)
@@ -60,9 +67,6 @@ class ReminderRunner
   end
 
   def kill(index)
-    if index != @reminders[index].index
-      raise 'failed sanity check: task has bad index'
-    end
     @reminders[index].die
     @reminders[index] = nil
     @redis.lset("reminders", index, nil)

data/lib/reminder/task.rb

@@ -69,8 +69,10 @@ class ReminderTask
   end
 
   def stop_repeat
-    @repeat_job.unschedule
-    @repeat_job = nil
+    unless @repeat_job.nil?
+      @repeat_job.unschedule
+      @repeat_job = nil
+    end
     unless @periodic
       kill
     end
@@ -126,7 +128,11 @@ class ReminderTask
       else
         re = /^(user\s+id\s+(?<user_id>.*))?^(user\s+name\s+(?<user_id>.*))?(room \s+(?<room>.*))?$/
         m = re.match(message['who'])
-        attrs = attrs.merge(m)
+        if m.nil?
+          attrs['user_name'] = message['who']
+        else
+          attrs = attrs.merge(m)
+        end
       end
       attrs['type'] = message['type']
       attrs['time'] = message['time']

data/lita-reminder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-reminder"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["glebtv"]
   spec.email         = ["glebtv@gmail.com"]
   spec.description   = %q{Reminder for Lita chat bot }

data/spec/lita/handlers/reminder_spec.rb

@@ -9,6 +9,9 @@ describe Lita::Handlers::Reminder, lita_handler: true do
   it { routes("reminder delete 1").to(:delete) }
   it { routes("reminder done 1").to(:done) }
   it { routes("remind me at 10:00 to do work repeat 2 times 1m").to(:add) }
+  it { routes("remind alex at 09:00 to РАБОТАЙ").to(:add) }
+  it { routes("remind Shell User in 10s to work").to(:add) }
+
   it "adds tasks" do
     send_message("remind me at 2024-01-01 10:30 to заплатить за сервер")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-reminder
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - glebtv