gwtf 0.7.3 → 0.8.0

data/lib/gwtf.rb

@@ -12,9 +12,14 @@ module Gwtf
   require 'uri'
   require 'time'
   require 'readline'
+  require 'chronic'
 
   @@color = true
 
+  def self.parse_time(timespec)
+    Chronic.parse(timespec, :ambiguous_time_range => 8)
+  end
+
   def self.color=(value)
     @@color = value
   end

data/lib/gwtf/commands/edit_command.rb

@@ -36,7 +36,7 @@ command [:edit, :vi, :e] do |c|
         if ["", " "].include?($1)
           item.due_date = nil
         else
-          item.due_date = $1
+          item.due_date = item.date_to_due_date($1)
         end
       else
         item.due_date = nil       # if the user just delete the line from the

data/lib/gwtf/commands/new_command.rb

@@ -47,7 +47,7 @@ command [:new, :add, :n, :a, :c] do |c|
     item = @items.new_item
     item.subject = subject
     item.description = description if description
-    item.due_date = options[:due] if options[:due]
+    item.due_date = item.date_to_due_date(options[:due]) if options[:due]
 
     if options[:remind]
       STDOUT.sync

data/lib/gwtf/commands/remind_command.rb

@@ -61,7 +61,7 @@ command [:remind, :rem] do |c|
         out = reminder.schedule_reminer(options[:at], options[:recipient], true, true)
 
         if out =~ /job (\d+) at (\d+-\d+-\d+)\s/
-          reminder.due_date = $2
+          reminder.due_date = reminder.date_to_due_date($2)
         end
 
         reminder.record_work "Scheduled reminder for %s: %s" % [ options[:at], out.chomp ]

data/lib/gwtf/item.rb

@@ -21,6 +21,12 @@ module Gwtf
       load_item if file
     end
 
+    def date_to_due_date(timespec)
+      Gwtf.parse_time(timespec).strftime("%Y-%m-%d")
+    rescue
+      raise "Could not parse time specification #{timespec}"
+    end
+
     def open?
       status == "open"
     end
@@ -193,6 +199,11 @@ module Gwtf
       command_args << "--done" if done
       command_args << "--ifopen" if ifopen
 
+      # attempt to parse the timespec with Chronic, if it cant then pass it onto at verbatim
+      if time = Gwtf.parse_time(timespec)
+        timespec = "-t %s" % [time.strftime("%Y%m%d%H%M")]
+      end
+
       command = "echo gwtf --project='%s' notify %s | at %s 2>&1" % [ @project, command_args.join(" "), timespec]
       out = %x[#{command}]
 

data/lib/gwtf/version.rb

@@ -1,3 +1,3 @@
 module Gwtf
-  VERSION = '0.7.3'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gwtf
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 3
-  version: 0.7.3
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-13 00:00:00 +01:00
+date: 2012-04-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,20 @@ dependencies:
         version: 1.2.0
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: chronic
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
 description: A Unix cli centric todo manager
 email: rip@devco.net
 executables: