ruboty-reminder 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b61dbf5e2d3f2467a36ade7b6341532e8a8c0a8b
-  data.tar.gz: 5a3aa8f9e41fca2487f805f7ff4e61c6d6c1e4a4
+  metadata.gz: da80f209dcff681fda0091e2be6025fdd58ea5b2
+  data.tar.gz: 0c5b965d4791226ca2ce14a99b941fe17811e7bc
 SHA512:
-  metadata.gz: 6ef089c0cb2f1b10f60593c4aa19bcd869cac0d151ef0b4b287d57f56f87ef64a24271f40d5ebddb22c6251c40a50b175a81e83beee6d99c0dc0a799da127876
-  data.tar.gz: 6b8340491b685bc134aa8ab3ab8e69ecea29b3f91d821a8d38828c9c4d80592cbbb8af8fafc24fe5db54cdd5407c6a31768e39f838337618a09f6f8cae7f0545
+  metadata.gz: a01a00f58699c9ea3b6a561d8564f845f284c059c8c2e789a548ed7c4dc85a1f47968d548f4b93d8807ee1633cb307542d81aa5ed2088715ba6f82fd12bb0ae1
+  data.tar.gz: 223f2cbf7cd3eaade988047e2d2ecf25dcc10afe6164f897cbf2a9e863ec833b0d2860d94344946ed7e736e61c9e36523839e8df72eb39178e14303f24b92ac0

data/lib/ruboty/handlers/reminder.rb

@@ -28,8 +28,8 @@ module Ruboty
         hour = message[:hour].to_i
         min = message[:min].to_i
 
-        unless validate_time_format(year, month, day, hour, min)
-          message.reply('Invalid time format.')
+        unless valid_time?(year, month, day, hour, min)
+          message.reply('Invalid time.')
           return
         end
 
@@ -55,11 +55,13 @@ module Ruboty
         task.start(robot)
         message.reply("Reminder #{task.hash[:id]} is created.")
 
-        reminders[task.hash[:id]] = task.hash
+        reminders[task.hash[:id]] = task
       end
 
       def delete(message)
-        if reminders.delete(message[:id].to_i)
+        if task = reminders[message[:id].to_i]
+          task.thread.kill
+          reminders.delete(message[:id].to_i)
           message.reply("Reminder #{message[:id]} is deleted.")
         else
           message.reply("Reminder #{message[:id]} is not found.")
@@ -70,19 +72,21 @@ module Ruboty
         if reminders.empty?
           message.reply("The reminder doesn't exist.")
         else
-          reminder_list = reminders.map do |id, hash|
-            date = "#{hash[:year]}/#{'%02d' % hash[:month]}/#{'%02d' % hash[:day]}"
-            time = "#{'%02d' % hash[:hour]}:#{'%02d' % hash[:min]}"
-            "#{id}: #{date} #{time} -> #{hash[:body]}"
+          sorted_reminders = reminders.sort_by {|_id, task| task.hash[:unixtime]}
+
+          reminder_list = sorted_reminders.map do |id, task|
+            date = "#{task.hash[:year]}/#{'%02d' % task.hash[:month]}/#{'%02d' % task.hash[:day]}"
+            time = "#{'%02d' % task.hash[:hour]}:#{'%02d' % task.hash[:min]}"
+            "#{id}: #{date} #{time} -> #{task.hash[:body]}"
           end
           message.reply(reminder_list.join("\n"), code: true)
         end
       end
 
       def restart
-        reminders.each do |id, hash|
-          task = Ruboty::Reminder::Task.new(hash)
-          task.start(robot)
+        reminders.each do |id, task|
+          new_task = Ruboty::Reminder::Task.new(task.hash)
+          new_task.start(robot)
         end
       end
 
@@ -97,7 +101,7 @@ module Ruboty
         end
       end
 
-      def validate_time_format(year, month, day, hour, min)
+      def valid_time?(year, month, day, hour, min)
         YEAR_RANGE.include?(year) &&\
           MONTH_RANGE.include?(month) &&\
           DAY_RANGE.include?(day) &&\

data/lib/ruboty/reminder/task.rb

@@ -1,19 +1,20 @@
 module Ruboty
   module Reminder
     class Task
-      attr_reader :hash
+      attr_reader :hash, :thread
 
       def initialize(hash)
         @hash = hash
+        @thread = nil
       end
 
       def start(robot)
         wait_time = hash[:unixtime] - Time.now.to_i
 
-        Thread.start do
+        @thread = Thread.start do
           sleep(wait_time)
           Message.new(
-            hash.except(:id, :body, :hour, :min).merge(robot: robot)
+            hash.except(:id, :body, :year, :month, :day, :hour, :min, :unixtime).merge(robot: robot)
           ).reply(hash[:body])
           robot.brain.data[NAMESPACE].delete(hash[:id])
         end

data/lib/ruboty/reminder/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Reminder
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/ruboty-reminder.gemspec

@@ -20,6 +20,4 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'awesome_print'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-reminder
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty
@@ -52,34 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Ruboty handler to remind a task.
 email:
 - kaihar4@gmail.com