gwtf 0.1.0 → 0.2.0

data/lib/gwtf/commands/done_command.rb

@@ -8,6 +8,6 @@ command [:done, :d] do |c|
     item.close
     item.save
 
-    puts "Marked item #{args.first} as done"
+    puts item
   end
 end

data/lib/gwtf/commands/edit_command.rb

@@ -1,35 +1,49 @@
-desc 'Edit an item using EDITOR'
-arg_name 'Item id'
+desc 'Edit an item subject using pattern replacement of using EDITOR'
+arg_name 'item'
+arg_name 'item [/foo/bar]'
 command [:edit, :vi, :e] do |c|
   c.action do |global_options,options,args|
     raise "Please specify an item ID to edit" if args.empty?
-    raise "EDITOR environment variable should be set" unless ENV.include?("EDITOR")
 
     item = @items.load_item(args.first)
 
-    descr_sep = "== EDIT BETWEEN THESE LINES =="
+    if args.size == 1
+      raise "EDITOR environment variable should be set" unless ENV.include?("EDITOR")
 
-    temp_item = {"description" => "#{descr_sep}\n#{item.description}\n#{descr_sep}", "subject" => item.subject}
+      descr_sep = "== EDIT BETWEEN THESE LINES =="
 
-    begin
-      tmp = Tempfile.new("gwtf")
-      tmp.write(temp_item.to_yaml)
-      tmp.rewind
-      system("%s %s" % [ENV["EDITOR"], tmp.path])
-      edited_item = YAML.load_file(tmp.path)
-    ensure
-      tmp.close
-      tmp.unlink
-    end
+      temp_item = {"description" => "#{descr_sep}\n#{item.description}\n#{descr_sep}", "subject" => item.subject}
 
-    item.subject = edited_item["subject"] if edited_item["subject"]
+      begin
+        tmp = Tempfile.new("gwtf")
+        tmp.write(temp_item.to_yaml)
+        tmp.rewind
+        system("%s %s" % [ENV["EDITOR"], tmp.path])
+        edited_item = YAML.load_file(tmp.path)
+      ensure
+        tmp.close
+        tmp.unlink
+      end
 
-    if edited_item["description"] =~ /#{descr_sep}\n(.+)\n#{descr_sep}/m
-      item.description = $1
-    end
+      item.subject = edited_item["subject"] if edited_item["subject"]
+
+      if edited_item["description"] =~ /#{descr_sep}\n(.+)\n#{descr_sep}/m
+        item.description = $1
+      end
 
-    item.save
+      item.save
 
-    puts "Item #{item.item_id} has been saved"
+      puts item
+    else
+      editor = args[1..-1].join(" ")
+      delim = editor[0,1]
+      splits = editor.split(delim)
+
+      raise "Attempting to do a subject edit with #{editor} based on delimiter #{delim} failed" unless splits.size == 3
+
+      item.subject = item.subject.gsub(splits[1], splits[2])
+      item.save
+      puts item
+    end
   end
 end

data/lib/gwtf/commands/list_command.rb

@@ -10,14 +10,15 @@ command [:list, :ls, :l] do |c|
     @items.each_item do |item|
       count[ item[:status] ] += 1
 
-      item.has_description ? id = "*#{item.item_id.to_s}" : id = item.item_id.to_s
+      flags = []
+      flags << "D" if item.has_description?
+      flags << "C" if item.closed? && options[:all]
 
-      puts "%5s %-3s%8s" % [ id, "", item.subject] if item.open?
-      puts "%5s %-3s%8s" % [ id, "C", item.subject] if (item.closed? && options[:all])
+      puts "%5s %-4s%-12s%8s" % [ item.item_id, flags.join, Time.parse(item.created_at).strftime("%F"), item.subject ] if (options[:all] || item.open?)
     end
 
     puts
-    puts "Items: %d / %d" % [count["open"], count["open"] + count["closed"]]
+    puts "Project %s items: %d / %d" % [ global_options[:project], count["open"], count["open"] + count["closed"] ]
   end
 end
 

data/lib/gwtf/commands/new_command.rb

@@ -1,6 +1,6 @@
 desc 'Create an item'
 arg_name 'Short item description'
-command [:new, :n] do |c|
+command [:new, :add, :n, :a, :c] do |c|
   c.desc 'Invoke EDITOR to provide a long form description'
   c.default_value false
   c.switch [:edit, :e]
@@ -26,6 +26,6 @@ command [:new, :n] do |c|
     item.description = description if description
     item.save
 
-    puts "Item #{item.item_id} saved"
+    puts item
   end
 end

data/lib/gwtf/commands/open_command.rb

@@ -11,8 +11,6 @@ command [:open, :o] do |c|
     item.open
     item.save
 
-    puts "Item #{args.first} as been re-opened"
+    puts item
   end
 end
-
-

data/lib/gwtf/commands/remind_command.rb

@@ -0,0 +1,57 @@
+desc 'Send a reminder about an item via email'
+arg_name 'id [at time specification]'
+long_desc <<EOF
+When run without the --send option this comand will
+add an at() job using the supplied at time specification.
+
+The at job will call the same command again this time
+with the --send option that will send an email to you
+or the address specified in --recipient using your system
+mail command
+EOF
+
+command [:remind, :rem] do |c|
+  c.desc 'Email address to send to'
+  c.default_value Etc.getlogin
+  c.flag [:recipient, :r]
+
+  c.desc 'Send email immediately'
+  c.default_value false
+  c.switch [:send]
+
+  c.action do |global_options,options,args|
+    raise "Please supply an item ID to remind about" if args.empty?
+
+    unless options[:send]
+      raise "Please specify a valid at() time specification" unless args.size > 2
+
+      at = args[1..-1].join(" ")
+
+      STDOUT.sync
+
+      print "Creating reminder at job for item #{args.first}: "
+      system "echo gwtf --project='%s' remind --recipient='%s' --send %s|at %s" % [ global_options[:project], options[:recipient], args.first, at]
+    else
+      item = @items.load_item(args.first)
+
+      begin
+        tmp = Tempfile.new("gwtf")
+        tmp.write(item.summary)
+        tmp.rewind
+
+        if global_options[:project] == "default"
+          subject = "Reminder for item %s" % [ args.first ]
+        else
+          subject = "Reminder for item %s in %s project" % [ args.first, global_options[:project] ]
+        end
+
+        system("cat #{tmp.path}|mail -s '#{subject}' '#{options[:recipient]}'")
+      ensure
+        tmp.close
+        tmp.unlink
+      end
+    end
+  end
+end
+
+

data/lib/gwtf/commands/shell_command.rb

@@ -30,13 +30,12 @@ command :shell do |c|
     end
 
     description = "Worked in a subshell" if description == ""
-    description = description + " (#{Gwtf.seconds_to_human(elapsed_time.round)})"
 
     item.record_work(description, elapsed_time.round)
 
     item.save
 
-    puts "Recorded #{elapsed_time} seconds of work against item #{item.item_id}"
+    puts "Recorded #{Gwtf.seconds_to_human(elapsed_time.round)} of work against item: #{item}"
   end
 end
 

data/lib/gwtf/commands/show_command.rb

@@ -1,44 +1,11 @@
 desc 'Show an item'
-arg_name 'Item ID'
+arg_name 'id'
 command [:show, :s] do |c|
   c.action do |global_options,options,args|
     raise "Please supply an item ID to show" if args.empty?
 
     item = @items.load_item(args.first)
 
-    time_worked = item.work_log.inject(0) do |result, log|
-      begin
-        result + log["elapsed"]
-      rescue
-        result
-      end
-    end
-
-    puts "         ID: %s" % [ item.item_id ]
-    puts "    Subject: %s" % [ item.subject ]
-    puts "     Status: %s" % [ item.status ]
-    puts "Time Worked: %s" % [ Gwtf.seconds_to_human(time_worked) ]
-    puts "    Created: %s" % [ Time.parse(item.created_at).strftime("%D %R") ]
-    puts "     Closed: %s" % [ Time.parse(item.closed_at).strftime("%D %R") ] if item.closed?
-
-    if item.has_description?
-      puts
-      puts "Description:"
-
-      item.description.split("\n").each do |line|
-        puts "%13s%s" % [ "", line]
-      end
-
-      puts
-    end
-
-    time_spent = 0
-
-    item.work_log.each_with_index do |log, idx|
-      puts
-      puts "Work Log: " if idx == 0
-
-      puts "%27s %s" % [Time.parse(log["time"]).strftime("%D %R"), log["text"]]
-    end
+    puts item.summary
   end
 end

data/lib/gwtf/item.rb

@@ -56,6 +56,68 @@ module Gwtf
        "work_log" => []}
     end
 
+    def time_worked
+      work_log.inject(0) do |result, log|
+        begin
+          result + log["elapsed"]
+        rescue
+          result
+        end
+      end
+    end
+
+    def flags
+      flag = []
+
+      flag << "closed" if closed?
+      flag << "open" if open?
+      flag << "descr" if description?
+      flag << work_log.size.to_s unless work_log.empty?
+      flag
+    end
+
+    def summary
+      summary = StringIO.new
+
+      summary.puts "    Subject: %s" % [ subject ]
+      summary.puts "     Status: %s" % [ status ]
+      summary.puts "Time Worked: %s" % [ Gwtf.seconds_to_human(time_worked) ]
+      summary.puts "    Created: %s" % [ Time.parse(created_at).strftime("%F %R") ]
+      summary.puts "     Closed: %s" % [ Time.parse(closed_at).strftime("%F %R") ] if closed?
+      summary.puts "         ID: %s" % [ item_id ]
+
+      if has_description?
+        summary.puts
+        summary.puts "Description:"
+
+        description.split("\n").each do |line|
+          summary.puts "%13s%s" % [ "", line]
+        end
+
+        summary.puts
+      end
+
+      time_spent = 0
+
+      work_log.reverse.each_with_index do |log, idx|
+        summary.puts if idx == 0
+        summary.puts "Work Log: " if idx == 0
+
+        # we used to automatically embed this into the description which was dumb
+        elapsed = "(%s)" % [Gwtf.seconds_to_human(log["elapsed"])] unless log["text"] =~ /\(.+?\)$/
+
+        summary.puts "%27s %s %s" % [Time.parse(log["time"]).strftime("%F %R"), log["text"], elapsed]
+      end
+
+      summary.string
+    end
+
+    def to_s
+      flag = " (#{flags.join(',')})" unless flags.empty?
+
+      "%s%s: %s" % [item_id, flag, subject]
+    end
+
     def to_hash
       @item
     end

data/lib/gwtf/items.rb

@@ -56,8 +56,8 @@ module Gwtf
       end
     end
 
-    def items
-      Dir.entries(@data_dir).grep(/\.gwtf$/).sort.map{|i| File.basename(i, ".gwtf")}
+    def item_ids
+      Dir.entries(@data_dir).grep(/\.gwtf$/).map{|i| File.basename(i, ".gwtf")}.map{|i| Integer(i)}.sort
     end
 
     def file_for_item(item)
@@ -65,7 +65,7 @@ module Gwtf
     end
 
     def each_item
-      items.each {|item| yield load_item(item) }
+      item_ids.each {|item| yield load_item(item) }
     end
   end
 end

data/lib/gwtf/version.rb

@@ -1,3 +1,3 @@
 module Gwtf
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gwtf
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-10 00:00:00 +00:00
+date: 2012-03-12 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -94,6 +94,7 @@ files:
 - lib/gwtf/commands/edit_command.rb
 - lib/gwtf/commands/new_command.rb
 - lib/gwtf/commands/list_command.rb
+- lib/gwtf/commands/remind_command.rb
 - lib/gwtf/version.rb
 - lib/gwtf/item.rb
 - lib/gwtf/items.rb