gwtf 0.8.0 → 0.9.0

data/lib/gwtf/commands/new_command.rb

@@ -54,7 +54,7 @@ command [:new, :add, :n, :a, :c] do |c|
 
       print "Creating reminder at job for item #{item.item_id}: "
 
-      item.schedule_reminer(options[:remind], options[:recipient], options[:done], options[:ifopen])
+      item.schedule_reminder(options[:remind], options[:recipient], options[:done], options[:ifopen])
     end
 
     item.save

data/lib/gwtf/commands/remind_command.rb

@@ -30,22 +30,32 @@ command [:remind, :rem] do |c|
   c.default_value nil
   c.flag [:at]
 
+  c.desc "Cancel a previously set reminder"
+  c.default_value nil
+  c.switch [:cancel]
+
   c.action do |global_options,options,args|
     raise "Please supply an item ID to remind about" if args.empty?
 
     STDOUT.sync = true
 
     unless options[:send]
-      if args.first =~ /^\d+$/ # got an item id, schedule a reminder
-        unless options[:at]
-          raise "Please specify a valid at(1) time specification with --at after the item id" unless args.size >= 2
-          options[:at] = args[1..-1].join(" ")
+      if args.first =~ /^\d+$/ # got an item id, manage a reminder
+        if options[:cancel]
+          item = @items.load_item(args.first)
+          item.cancel_reminder
+        else
+          unless options[:at]
+            raise "Please specify a valid at(1) time specification with --at after the item id" unless args.size >= 2
+            options[:at] = args[1..-1].join(" ")
+          end
+
+          print "Creating reminder at job for item #{args.first}: "
+
+          item = @items.load_item(args.first)
+          item.schedule_reminder(options[:at], options[:recipient], options[:done], options[:ifopen])
+          item.save
         end
-
-        print "Creating reminder at job for item #{args.first}: "
-
-        @items.load_item(args.first).schedule_reminer(options[:at], options[:recipient], options[:done], options[:ifopen])
-
       else # new reminder in the 'reminders' project
         raise "Please specify an at(1) time specification" unless options[:at]
         raise "Please specify a subject for the reminder item" if args.empty?
@@ -58,7 +68,7 @@ command [:remind, :rem] do |c|
         reminder.subject = args.join(" ")
 
         print "Creating reminder at job for item #{reminder.item_id}: "
-        out = reminder.schedule_reminer(options[:at], options[:recipient], true, true)
+        out = reminder.schedule_reminder(options[:at], options[:recipient], true, true)
 
         if out =~ /job (\d+) at (\d+-\d+-\d+)\s/
           reminder.due_date = reminder.date_to_due_date($2)

data/lib/gwtf/item.rb

@@ -193,15 +193,17 @@ module Gwtf
       update_property(:status, "closed")
     end
 
-    def schedule_reminer(timespec, recipient, done=false, ifopen=false)
+    def schedule_reminder(timespec, recipient, done=false, ifopen=false)
       command_args = ["--remind=%s" % [item_id]]
       command_args << "--recipient=%s" % [ recipient ]
       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")]
+      unless timespec.include?("+")
+        if time = Gwtf.parse_time(timespec)
+          timespec = "-t %s" % [time.strftime("%Y%m%d%H%M")]
+        end
       end
 
       command = "echo gwtf --project='%s' notify %s | at %s 2>&1" % [ @project, command_args.join(" "), timespec]
@@ -219,6 +221,17 @@ module Gwtf
       out
     end
 
+    def cancel_reminder
+      raise "No at job id recorded for this item, cannot cancel a reminder" unless has_at_job?
+
+      system("atrm %s" % at_job)
+
+      raise "Failed to remove the at job %s" % at_job unless $? == 0
+
+      update_property(:at_job, nil)
+      save
+    end
+
     def send_reminder(recipient, mark_as_done)
       recipient.split(",").each do |r|
         Gwtf.notifier_for_address(r.strip).new(self, r.strip).notify

data/lib/gwtf/notifier/boxcar.rb

@@ -9,29 +9,36 @@ module Gwtf
         config = YAML.load_file(config_file)
 
         raise "Config needs to be a hash" unless config.is_a?(Hash)
-        raise "Config must include :apikey" unless config[:apikey]
-        raise "Config must include :apisecret" unless config[:apisecret]
-        raise "Config must include :serviceid" unless config[:serviceid]
-        raise "Config must include :sender" unless config[:sender]
+        raise "Config must include :icon_url" unless config[:icon_url]
+        raise "Config must include :source_name" unless config[:source_name]
+        raise "Config must include :sound" unless config[:sound]
 
         uri = URI.parse(recipient)
 
-        raise "Recipient must have a user portion" unless uri.user
         raise "Recipient must have a host portion" unless uri.host
 
-        email_address = "%s@%s" % [uri.user, uri.host]
-
-        bp = BoxcarAPI::Provider.new(config[:apikey], config[:apisecret], config[:sender])
-
         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
 
-        res = bp.notify(email_address, msg, {:from_screen_name => config[:sender], :icon_url => "http://www.devco.net/images/gwtf.jpg"})
+        api_uri = URI.parse("https://new.boxcar.io/api/notifications")
+        http = Net::HTTP.new(api_uri.host, api_uri.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        request = Net::HTTP::Post.new(api_uri.path)
+
+        request.set_form_data("user_credentials" => uri.host,
+                              "notification[title]" => item.subject,
+                              "notification[long_message]" => msg,
+                              "notification[sound]" => config[:sound],
+                              "notification[source_name]" => config[:source_name],
+                              "notification[icon_url]" => config[:icon_url])
+
+        res = http.request(request)
 
-        raise "Failed to send message to Boxcar, got code #{res.code}" unless res.code == 200
+        raise "Failed to send message to Boxcar, got code #{res.code}" unless res.code == "201"
       end
     end
   end

data/lib/gwtf/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gwtf
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: false
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-19 00:00:00 +01:00
+date: 2014-09-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,26 +76,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: boxcar_api
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
-  type: :runtime
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: chronic
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,7 +89,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 description: A Unix cli centric todo manager
 email: rip@devco.net
 executables: