tot 0.0.3.2 → 0.0.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjI0YmQwOGExYzhhNzk5ZGU0YzllOGRhMDU1Yzk5OWM0NzdiZTI5NA==
+    MzBhM2I5Y2Q0Yjc4N2E0OGRiYjNjN2RjYzc4OTlmYTNhNTE5MDQ0NA==
   data.tar.gz: !binary |-
-    NzA4ZjUyNDIxZDMxM2ViNzViMDcxNTk5ZWMwY2MzODM0MmY0NDAxMw==
+    Zjc1N2Q4YWE0YmI3YmQ5MmEyNTZiMTE4MGViZGQzNjk5OWZjZWY0YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2E2MDFiNzNiNjlkMjMxYzIyMzdhOTRmODNmZDQ2OTIyMjk2MmFlYzBiOWRk
-    ZjE1M2RjNGM3OGI4NWY3MjZjOWQ4ZWYyNmZkMWIyNTMwNjJiYjdlNDJhMWI4
-    NzVmOTJhMzljODJmYmZjYWQ1N2FiNTMyMjRkM2RjNjU2YzI1ZTg=
+    MTM5ODFjNjc0N2EwOTE2NmQyNmY2ZjQ1MTkzYTc1M2YzM2U5OWE3OTJhYTk4
+    NThlYWQ0ODJjNmU0OTQwY2MxN2RmZjM1MWVlNmQ2YTBmODI4Y2M0M2EzMTg0
+    MjBhYjA0NjM1OWQ1NGQ2M2U4YTlkZGJhM2VjYjBiNzUxN2Y2ODU=
   data.tar.gz: !binary |-
-    OTUyZjEwYzZmNTk0OWNiZGUwOGFhOTRjMGE2ZGIwODFkNWM5MDBmMzJjMGE1
-    NzdiNDRkMGYzYWVlMTNmYzIwNzdlY2FmZGE2Mjg4MGQyMGYwYTFlYjQ0YWFi
-    NzdlMmI3ZGZlOGQyYmIwNThlMzQ2OTMzNDg1NDJlZDI1YmQyNGY=
+    N2YzM2RlM2UxMGEzYjBjYTAwOTQ2M2EyMDA2MzFjZGJkNzNiOGY0MzQ2Zjc5
+    OTEwNjIxZTExNDkzMGFjZjI5NmJhNjliMmRlZDQ1YzYyYWIzNmRhNWM4ZWMw
+    ZTY1YzJhODc2ZjlkNjYzMzk3NDc2MGFhODBiODZlMDU1YmJkOWU=

data/lib/tot.rb

@@ -169,11 +169,27 @@ module Tot
       ret
     end #}}}
 
+    def time_filter(buf) #{{{
+      ret = []
+      case buf
+      when /(\d+):(\d+)/, /(\d+)時(\d+)分/, /(\d+)じ(\d+)ふん/
+        ret[0] = $1.to_i
+        ret[1] = $2.to_i
+      when /(\d+)時/
+        ret[0] = $1.to_i
+        ret[1] = 0
+      default
+        ret[0] = 0
+        ret[1] = 0
+      end
+      ret
+    end #}}}
+
     def stdin_incoming? #{{{
       (File.pipe?(STDIN) || File.select([STDIN], [], [], 0) != nil)
     end #}}}
 
-    module_function :datetime_filter,:stdin_incoming?
+    module_function :datetime_filter,:time_filter,:stdin_incoming?
   end #}}}
 
   class CLI < Thor
@@ -213,10 +229,13 @@ module Tot
       new_todo = {}
       new_todo['title'] = Readline.readline('title> ', true).chomp('\n').strip
       begin
-          new_todo['date'] = Time.parse(Utils.datetime_filter(Readline.readline('date> ', true).chomp('\n')).to_s)
+        input = Readline.readline('date> ', true).chomp('\n').strip.split
+        date = Utils.datetime_filter(input[0])
+        h,m  = Utils.time_filter(input[1])
+        new_todo['date'] = Time.mktime(date.year, date.month, date.day, h, m)
       rescue
-          puts "Invalid input. Please retry."
-          retry
+        puts "Invalid input. Please retry."
+        retry
       end
       new_todo['tag'] = Readline.readline('tag (separate by space)> ', true)
                           .chomp('\n').split(' ')

data/lib/tot/version.rb

@@ -1,3 +1,3 @@
 module Tot
-  VERSION = "0.0.3.2"
+  VERSION = "0.0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tot
 version: !ruby/object:Gem::Version
-  version: 0.0.3.2
+  version: 0.0.3.3
 platform: ruby
 authors:
 - Shohei Fujii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler