gwtf 0.7.1 → 0.7.2

data/lib/gwtf.rb

@@ -58,6 +58,12 @@ module Gwtf
         require 'gwtf/notifier/boxcar'
 
         return Notifier::Boxcar
+      when "notifo"
+        gem 'notifo'
+        require 'notifo'
+        require 'gwtf/notifier/notifo'
+
+        return Notifier::Notifo
       else
         raise "Do not know how to handle addresses of type #{protocol} for #{address}"
     end

data/lib/gwtf/item.rb

@@ -5,13 +5,14 @@ module Gwtf
     attr_accessor :file
     attr_reader :project
 
-    property :description, :default => nil, :validation => String
-    property :subject, :default => nil, :validation => String
-    property :status, :default => "open", :validation => ["open", "closed"]
-    property :item_id, :default => nil, :validation => Integer
-    property :work_log, :default => [], :validation => Array
-    property :due_date, :default => nil, :validation => /^20\d\d[- \/.](0[1-9]|1[012])[- \/.](0[1-9]|[12][0-9]|3[01])$/
-    property :closed_at, :default => nil
+    property :description, :default => nil,    :validation => String
+    property :subject,     :default => nil,    :validation => String
+    property :status,      :default => "open", :validation => ["open", "closed"]
+    property :item_id,     :default => nil,    :validation => Integer
+    property :work_log,    :default => [],     :validation => Array
+    property :due_date,    :default => nil,    :validation => /^20\d\d[- \/.](0[1-9]|1[012])[- \/.](0[1-9]|[12][0-9]|3[01])$/
+    property :at_job,      :default => nil,    :validation => Integer
+    property :closed_at,   :default => nil
 
     def initialize(file=nil, project=nil)
       @file = file
@@ -133,6 +134,7 @@ module Gwtf
       summary.puts "Time Worked: %s" % [ Gwtf.seconds_to_human(time_worked) ] if time_worked > 0
       summary.puts "    Created: %s" % [ Time.parse(created_at.to_s).strftime("%F %R") ]
       summary.puts "     Closed: %s" % [ Time.parse(closed_at.to_s).strftime("%F %R") ] if closed?
+      summary.puts "     At Job: %d" % [ at_job ] if at_job?
       summary.puts "         ID: %s" % [ item_id ]
 
       if has_description?
@@ -186,16 +188,22 @@ module Gwtf
     end
 
     def schedule_reminer(timespec, recipient, done=false, ifopen=false)
-      command_args = ["--remind"]
+      command_args = ["--remind=%s" % [item_id]]
       command_args << "--recipient=%s" % [ recipient ]
       command_args << "--done" if done
       command_args << "--ifopen" if ifopen
 
-      command = "echo gwtf --project='%s' email %s %s | at %s 2>&1" % [ @project, command_args.join(" "), item_id, timespec]
+      command = "echo gwtf --project='%s' notify %s | at %s 2>&1" % [ @project, command_args.join(" "), timespec]
       out = %x[#{command}]
 
       raise "Failed to add at(1) job: %s" % [ out ] unless $? == 0
 
+      if out =~ /^job (\d+?) at \d/
+        update_property(:at_job, Integer($1))
+      else
+        raise "Could not parse at(1) output for jobid: #{out}"
+      end
+
       puts out
       out
     end

data/lib/gwtf/notifier/notifo.rb

@@ -0,0 +1,35 @@
+module Gwtf
+  module Notifier
+    class Notifo<Base
+      def notify
+        config_file = File.join(Etc.getpwuid.dir, ".notifo")
+
+        raise "Please configure notifo in ~/.notifo" unless File.exist?(config_file)
+
+        config = YAML.load_file(config_file)
+
+        raise "Config needs to be a hash" unless config.is_a?(Hash)
+        raise "Config must include :apiuser" unless config[:apiuser]
+        raise "Config must include :apisecret" unless config[:apisecret]
+        raise "Config must include :sender" unless config[:sender]
+
+        uri = URI.parse(recipient)
+
+        raise "Recipient must have a user portion" unless uri.user
+        raise "Recipient must have a host portion" unless uri.host
+
+        notifo = ::Notifo.new(config[:apiuser], config[:apisecret])
+
+        if item.project == "default"
+          msg = "%s: %s" % [ item.item_id, item.subject ]
+        else
+          msg = "%s:%s: %s" % [ item.project, item.item_id, item.subject ]
+        end
+
+        # notifo gem doesn't return anything on failure
+        notifo.post(uri.user, msg, config[:sender])
+
+      end
+    end
+  end
+end

data/lib/gwtf/version.rb

@@ -1,3 +1,3 @@
 module Gwtf
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gwtf
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-12 00:00:00 +01:00
+date: 2012-04-13 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: notifo
+  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: 
@@ -116,6 +130,7 @@ files:
 - lib/gwtf/notifier/email.rb
 - lib/gwtf/notifier/boxcar.rb
 - lib/gwtf/notifier/base.rb
+- lib/gwtf/notifier/notifo.rb
 - lib/gwtf/version.rb
 - lib/gwtf/item.rb
 - lib/gwtf/items.rb