gwtf 0.4.0 → 0.4.1

data/lib/gwtf.rb

@@ -8,6 +8,8 @@ module Gwtf
   require 'fileutils'
   require 'tempfile'
   require 'uri'
+  require 'time'
+  require 'readline'
 
   def self.each_command
     commands_dir = File.join(File.dirname(__FILE__), "gwtf", "commands")
@@ -43,6 +45,17 @@ module Gwtf
     end
   end
 
+  def self.ask(prompt="")
+    stty_save = `stty -g`.chomp
+
+    begin
+      return Readline.readline("#{prompt} ", true)
+    rescue Interrupt => e
+      system('stty', stty_save)
+      raise
+    end
+  end
+
   # borrowed from ohai, thanks Adam.
   def self.seconds_to_human(seconds)
     days = seconds.to_i / 86400

data/lib/gwtf/commands/edit_command.rb

@@ -10,25 +10,31 @@ command [:edit, :vi, :e] do |c|
     if args.size == 1
       raise "EDITOR environment variable should be set" unless ENV.include?("EDITOR")
 
-      descr_sep = "== EDIT BETWEEN THESE LINES =="
-
-      temp_item = {"description" => "#{descr_sep}\n#{item.description}\n#{descr_sep}", "subject" => item.subject}
-
       begin
         tmp = Tempfile.new("gwtf")
-        tmp.write(temp_item.to_yaml)
+        tmp.puts "Subject: %s" % [ item.subject ]
+        tmp.puts "Description:"
+        tmp.puts item.description if item.description
         tmp.rewind
         system("%s %s" % [ENV["EDITOR"], tmp.path])
-        edited_item = YAML.load_file(tmp.path)
+        edited_item = File.read(tmp.path)
       ensure
         tmp.close
         tmp.unlink
       end
 
-      item.subject = edited_item["subject"] if edited_item["subject"]
+      if edited_item.split("\n").first =~ /^Subject:\s*(.+)/
+        item.subject = $1
+      else
+        raise "Subject is required"
+      end
+
+      description = edited_item.split("\n")[2..-1]
 
-      if edited_item["description"] =~ /#{descr_sep}\n(.+)\n#{descr_sep}/m
-        item.description = $1
+      unless [description].flatten.compact.empty?
+        item.description = description.join("\n")
+      else
+        item.description = nil
       end
 
       item.save

data/lib/gwtf/commands/list_command.rb

@@ -23,8 +23,7 @@ command [:list, :ls, :l] do |c|
         items = Gwtf::Items.new(File.join(global_options[:data], project), project)
         stats = items.stats
 
-        puts "%#{longest_name + 3}s: open: %3d: closed %3d: total: %3d" % [ project, stats["open"], stats["closed"], stats["total"] ] unless stats["total"] == 0
-
+        puts "%#{longest_name + 3}s: open: %3d: closed %3d: total: %3d" % [ project, stats["open"], stats["closed"], stats["total"] ] unless stats["open"] == 0
       end
 
       puts

data/lib/gwtf/commands/shell_command.rb

@@ -20,10 +20,10 @@ command :shell do |c|
 
     STDOUT.sync = true
 
-    print "Optional description for work log (start with done! to close): "
 
     begin
-      description = STDIN.gets.chomp
+      description = Gwtf.ask "Optional description for work log (start with done! to close): "
+
       if description =~ /^(done|close)!\s*(.+)/
         description = $2
         item.close

data/lib/gwtf/version.rb

@@ -1,3 +1,3 @@
 module Gwtf
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gwtf
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 +00:00
+date: 2012-03-18 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency