xtdo 0.2 → 0.2.1

data/HISTORY

@@ -1,3 +1,7 @@
+0.2.1 - 3 December 2010
+  * Easier to read formatting for list
+  * Can not add a blank task
+
 0.2.0 - 28 November 2010
   * Added ZSH completion
   * Added XTDO_PATH environment variable for customizing storage location

data/README.rdoc

@@ -37,6 +37,19 @@ There is a command line completion script for ZSH in bin/xtdo_completion.zsh tha
 
 By default tasks are stored in ~/.xtdo. Customize this by setting the XTDO_PATH environment variable. I store mine in Dropbox.
 
+== More speed!
+
+Load paths and gems and friends can add about 300ms to the load time of xtdo. Unacceptable! I haven't worked out a neat way around this yet, but for now my hack is to create my own script to run xtdo which I place in my path, with load paths hard coded in to it. This has the benefit of also working if you switch gemsets. Here is mine, yours will look slightly different:
+
+  #!/Users/xavier/.rvm/rubies/ruby-1.9.2-p0/bin/ruby
+
+  $LOAD_PATH.unshift "/Users/xavier/.rvm/gems/ruby-1.9.2-p0/gems/xtdo-0.2/lib"
+
+  require 'xtdo'
+  file = ENV['XTDO_PATH'] || "~/.xtdo"
+  result = Xtdo.run file, ARGV.join(" ")
+  puts result if result && result.is_a?(String) && result.length > 0
+
 == Why?
 
 I used to use a small subset of Things.app, and I really dug the workflow. I spend my life on the command-line though. Existing command line apps didn't quite match my workflow, or were too slow.

data/TODO

@@ -1,4 +1,6 @@
-- gemspec
-- start using it
 - help on the command line
 - better UI feedback
+- Why is load time slow?
+- Colour
+- Undo
+

data/lib/xtdo.rb

@@ -62,9 +62,14 @@ class Xtdo
   end
 
   def add(task)
-    number, period, task = /^(?:(\d+)([dwmy])? )?(.*)/.match(task).captures
-    @tasks[make_key task] = {:name => task}
-    @tasks[make_key task][:scheduled] = parse_relative_time(number.to_i, period) if number
+    match = /^(?:(\d+)([dwmy])? )?(.+)/.match(task)
+    if match
+      number, period, task = match.captures
+      @tasks[make_key task] = {:name => task}
+      @tasks[make_key task][:scheduled] = parse_relative_time(number.to_i, period) if number
+    else
+      "Invalid command"
+    end
   end
 
   def bump(task)
@@ -110,10 +115,10 @@ class Xtdo
       groups.map do |group|
         t = tasks.select {|name, opts| task_selector[group][opts[:scheduled]] }
         next if t.empty?
-        "===== #{group.to_s.upcase}\n" + t.map { |name, attrs|
-          attrs[:name]
+        "\n\e[43;30m===== #{group.to_s.upcase} =====\e[0m\n\n" + t.map { |name, attrs|
+          "  #{attrs[:name]}"
         }.join("\n")
-      end.join("\n")
+      end.join("\n") + "\n\n"
     end
   end
 
@@ -125,13 +130,17 @@ class Xtdo
     when 'a' then
       number, period, start, name = self.class.extract_recur_tokens(task)
 
-      period_string = "#{number}#{period}"
-      period_string += ",#{start}" if start
-      recurring[make_key name] = {
-        :name   => name,
-        :next   => Date.today + 1,
-        :period => period_string
-      }
+      if name
+        period_string = "#{number}#{period}"
+        period_string += ",#{start}" if start
+        recurring[make_key name] = {
+          :name   => name,
+          :next   => Date.today + 1,
+          :period => period_string
+        }
+      else
+        "Invalid command"
+      end
     when 'd' then
       if recurring.delete make_key(task)
         "Recurring task removed"
@@ -139,9 +148,9 @@ class Xtdo
         "No such recurring task"
       end
     when 'l' then
-      "===== RECURRING\n" + recurring.map do |name, task|
-        "%-6s%s" % [task[:period], task[:name]]
-      end.join("\n")
+      "\n\e[43;30m===== RECURRING =====\e[0m\n\n" + recurring.map do |name, task|
+        "  %-8s%s" % [task[:period], task[:name]]
+      end.join("\n") + "\n\n"
     when 'c' then
       recurring.keys.join "\n"
     end
@@ -187,8 +196,14 @@ class Xtdo
   end
 
   def self.extract_recur_tokens(task)
-    /^(\d+)([dwmy])?(?:,(#{days.join('|')}|\d{1,2}))? (.*)/.match(task).captures
+    match = /^(\d+)([dwmy])?(?:,(#{days.join('|')}|\d{1,2}))? (.*)/.match(task)
+    if match
+      match.captures
+    else
+      []
+    end
   end
+
   def self.days
     days = %w(sun mon tue wed thu fri sat)
   end

data/spec/add_spec.rb

@@ -15,4 +15,8 @@ feature 'add' do
     t('a 1w T1')
     t('l a').should have_task('T1', :in => :scheduled, :for => Date.today + 7)
   end
+
+  scenario 'error' do
+    t('a').should == "Invalid command"
+  end
 end

data/spec/recurring_spec.rb

@@ -26,7 +26,7 @@ feature 'recurring' do
 
   scenario 'list' do
     t('r a 1d T1')
-    t('r l').should have_task('1d    T1')
+    t('r l').should have_task('1d      T1')
   end
 
   scenario 'daily' do
@@ -90,4 +90,8 @@ feature 'recurring' do
     time_travel Date.new(2011,1,4)
     t('l').should have_task('T1')
   end
+
+  scenario 'error' do
+    t('r a').should == "Invalid command"
+  end
 end

data/spec/spec_helper.rb

@@ -75,12 +75,12 @@ RSpec::Matchers.define(:have_task) do |task, opts = {}|
   def parse(data)
     @parsed ||= begin
       group = nil
-      data.to_s.lines.inject({}) do |a, line|
-        if line =~ /^=+ (.+)/
-          group = line[/^=+ (.+)/, 1].downcase.to_sym
+      data.to_s.lines.reject {|x| x.chomp.length == 0 }.inject({}) do |a, line|
+        if line =~ /^[^\s]+=+ (.+) =/
+          group = line[/^[^\s]+=+ (.+) =/, 1].downcase.to_sym
         else
           a[group] ||= [] 
-          a[group] << line.chomp
+          a[group] << line.strip
         end
         a
       end

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  version: "0.2"
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Xavier Shay
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-28 00:00:00 +11:00
+date: 2010-12-03 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency