todo.txt 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9005f5878ad1e85af811526c8a82ad566d096ca2
-  data.tar.gz: 8874fd1b652471cb6476ecdb3e939c490b2f263a
+  metadata.gz: 8ae39ffb0c0aead27cdce011859dfd69b13e81d0
+  data.tar.gz: d2853360fc12bac16a22e4ad79ba622469dfe681
 SHA512:
-  metadata.gz: 9b55d6efd15701f7228361db0b20386d721872c077d461b1be734d5076344c1c813269f016f601ae9d39d4602d36ca47a8afe5fb7a59cff60b335f272485b54b
-  data.tar.gz: e8a653e2279bdf69eeaa4afd53f8d1447773970376fe10fefe5e4279ab1b58dd0f74d74c41c02fcef2618553533728f01b2a209c1b8edc87bcfa588df898df88
+  metadata.gz: af94d2d5bd8d9dcfc9545dab80e6363e45f06109eee1be28ef113a5cb9cae0f7d8641ec0498e7557a56e305631b60ec520e86c29c8491adb3045003f6aca9b10
+  data.tar.gz: 26d81779892440e92a5b77be756f6c20f554fe672ab6ad7c14785a95834653e9dba2a5c7b94c0d9317487fa0c1f31ed129b2bac30d230342bf0126327514c9b8

data/README.md

@@ -1,6 +1,6 @@
-# TODO.txt
+# TODO.txt [![Build Status](https://secure.travis-ci.org/svenfuchs/todo.txt.png?branch=master)](https://travis-ci.org/svenfuchs/todo.txt)
 
-- My personal flavor of the format. [Todo.txt](https://github.com/ginatrapani/todo.txt-cli/wiki/The-Todo.txt-Format)
+My personal flavor of the format. [Todo.txt](https://github.com/ginatrapani/todo.txt-cli/wiki/The-Todo.txt-Format)
 
 ## Assumptions
 
@@ -12,9 +12,9 @@ todo.txt file personally. Your mileage will most probably vary.
   etc) is a good thing. A tool must play nice with this and must not rewrite
   any custom formatting.
 * An item can belong to one or many projects.
-* The concept of "contexts" (phone, work, home) seems like a stale from the GTD
-  era. Does anybody actually use this? Also, the format `@name` indicates a
-  person in most contexts nowadays.
+* The concept of "contexts" (phone, work, home) seems like a stale relict from
+  the GTD era to me. Does anybody actually use this? Also, the format `@name`
+  indicates a person in most contexts nowadays.
 * Assigning explicit priorities don't really work well. Re-ordering items on
   the todo.txt list works better.
 * A concept of generic key/value pairs seems like a useful addition to make the
@@ -40,7 +40,6 @@ $ todo toggle foo                  # should assume ./TODO.txt but i can't figure
 
 # Filtering items
 
-$ todo list --since yesterday                      # by done date
 $ todo list --since 2015-12-01 --before 2015-11-01 # by done date
 $ todo list --status pending                       # by status
 $ todo list --status done                          # by status
@@ -50,13 +49,19 @@ $ todo list --text foo                             # by text
 $ todo list foo                                    # by text
 $ todo list foo --since 2015-12-01 --status done   # by text, done date, and status
 
-Named dates are: one_month_ago, two_weeks_ago, one_week_ago: two_days_ago,
-yesterday, today.
+# Named dates
+
+$ todo list --since yesterday
+$ todo list --since one.week.ago
+$ todo list --since 'two weeks ago'
+$ todo list --since 1_year_ago
+$ todo list --since 'last friday'
 
 # Formats
 
 $ todo list --format short
 $ todo list --format full
+$ todo list --format id,text,tags
 
 # Toggling
 

data/lib/todo/cli/archive.rb

@@ -1,4 +1,6 @@
 require 'todo/cli/cmd'
+require 'todo/data/list'
+require 'todo/src/file'
 
 module Todo
   class Cli
@@ -8,13 +10,13 @@ module Todo
       end
 
       opt '-b', '--before DATE', 'Before date' do |opts, date|
-        opts[:before] = normalize_date(date)
+        opts[:before] = date
       end
 
       def run
         items = list.select(status: :done, before: before).items
-        archive.write(render(items))
-        io.write(render(list.items - items))
+        archive.write(format(items))
+        io.write(format(list.items - items))
       end
 
       private
@@ -32,7 +34,7 @@ module Todo
         end
 
         def before
-          opts[:before] || DATES[:two_weeks_ago]
+          opts[:before] || Support::Date.new.format(:two_weeks_ago)
         end
     end
   end

data/lib/todo/cli/cmd.rb

@@ -2,7 +2,8 @@ require 'todo/helpers/hash/slice'
 require 'todo/src/file'
 require 'todo/src/io'
 require 'todo/support/options_parser'
-require 'todo/view'
+require 'todo/support/date'
+require 'todo/format'
 
 module Todo
   class Cli
@@ -10,14 +11,15 @@ module Todo
       extend Support::OptionsParser
       include Helpers::Hash::Slice
 
-      def self.normalize_date(date)
-        DATES[date.to_sym] ? DATES[date.to_sym] : date
-      end
-
       opt '-f', '--file FILENAME', 'Filename' do |opts, file|
         opts[:file] = file
       end
 
+      def initialize(args, opts)
+        opts = normalize_dates(opts)
+        super
+      end
+
       def io
         if opts[:file]
           Src::File.new(opts[:file])
@@ -26,8 +28,19 @@ module Todo
         end
       end
 
-      def render(list, opts = {})
-        View.new(list, opts).render
+      def format(list, opts = {})
+        Format.new(list, opts).apply
+      end
+
+      def normalize_dates(opts)
+        [:before, :after].inject(opts) do |opts, key|
+          opts[key] = normalize_date(opts[key]) if opts[key]
+          opts
+        end
+      end
+
+      def normalize_date(date)
+        Support::Date.new.apply(date)
       end
 
       # TODO how to test if stdin is attached?

data/lib/todo/cli/list.rb

@@ -9,15 +9,15 @@ module Todo
       end
 
       opt '-a', '--after DATE', 'After date' do |opts, date|
-        opts[:after] = normalize_date(date)
+        opts[:after] = date
       end
 
       opt '-s', '--since DATE', 'Since date' do |opts, date|
-        opts[:after] = normalize_date(date)
+        opts[:after] = date
       end
 
       opt '-b', '--before DATE', 'Before date' do |opts, date|
-        opts[:before] = normalize_date(date)
+        opts[:before] = date
       end
 
       opt '--status STATUS', 'Status' do |opts, status|
@@ -34,7 +34,7 @@ module Todo
       end
 
       def run
-        out.write(render(list.items, format: opts[:format] || :short))
+        out.write(format(list.items, format: opts[:format] || :short))
       end
 
       private

data/lib/todo/cli/push.rb

@@ -6,8 +6,12 @@ require 'todo/src/idonethis'
 module Todo
   class Cli
     class Push < Cmd
+      opt '-a', '--after DATE', 'After date' do |opts, date|
+        opts[:after] = date
+      end
+
       opt '-s', '--since DATE', 'Since date' do |opts, date|
-        opts[:since] = normalize_date(date)
+        opts[:after] = date
       end
 
       CONFIG = {
@@ -17,7 +21,7 @@ module Todo
       }
 
       def run
-        lines = render(list.items, format: [:text, :tags, :id])
+        lines = format(list.items, format: [:text, :tags, :id])
         src.write(lines)
         io.write(lines)
       end
@@ -35,7 +39,7 @@ module Todo
         end
 
         def since
-          opts[:since] || DATES[:yesterday]
+          opts[:since] || Support::Dates.new.format(:yesterday)
         end
     end
   end

data/lib/todo/cli/toggle.rb

@@ -16,7 +16,7 @@ module Todo
       def run
         list = Data::List.parse(io.read)
         list.toggle(data)
-        io.write(render(list.items))
+        io.write(format(list.items))
       end
 
       private

data/lib/todo/{view.rb → format.rb}

@@ -3,7 +3,7 @@ require 'todo/helpers/hash/format'
 require 'todo/helpers/object/presence'
 
 module Todo
-  class View < Struct.new(:items, :opts)
+  class Format < Struct.new(:items, :opts)
     FORMATS = {
       full:  [:status, :text, :tags, :id],
       short: [:status, :done_date, :text]
@@ -11,7 +11,7 @@ module Todo
 
     include Helpers::Hash::Format, Helpers::Object::Presence
 
-    def render
+    def apply
       items.map { |item| format(item) }
     end
 

data/lib/todo/src/idonethis.rb

@@ -45,7 +45,7 @@ module Todo
         end
 
         def params
-          { owner: config[:username], team: config[:team], done_date_after: opts[:since], page_size: 100 }
+          { owner: config[:username], team: config[:team], done_date_after: opts[:after], page_size: 100 }
         end
     end
   end

data/lib/todo/support/date.rb

@@ -0,0 +1,93 @@
+require 'date'
+
+module Todo
+  module Support
+    class Date
+      NUMS   = [:one, :two, :three, :four, :five, :six, :seven, :eight, :nine, :ten]
+      MONTHS = [:jan, :feb, :mar, :apr, :may, :jun, :jul, :aug, :sep, :oct, :nov, :dec]
+      WDAYS  = [:sun, :mon, :tue, :wed, :thu, :fri, :sat]
+      FORMAT = '%Y-%m-%d'
+      MSGS   = { unknown: 'Unrecognized identifier: %s' }
+
+      SEP    = '(?: |_|\-|\.)'
+      AGO    = /^(\d+|#{NUMS.join('|')})#{SEP}(days?|weeks?|months?|years?)#{SEP}ago$/
+      LAST   = /^last#{SEP}(#{MONTHS.join('|')}|#{WDAYS.join('|')})/
+      DATE   = /\d{4}-\d{2}-\d{2}/
+
+      attr_reader :date
+
+      def initialize(date = ::Date.today)
+        @date = date.to_date
+      end
+
+      def format(str, opts = {})
+        apply(str).strftime(opts[:format] || FORMAT)
+      end
+
+      private
+
+        def apply(str)
+          if str =~ DATE
+            str
+          elsif respond_to?(str, true)
+            send(str)
+          elsif str =~ AGO
+            ago(singularize($2).to_sym, to_number($1))
+          elsif str =~ LAST
+            last($1)
+          else
+            fail MSGS[:unknown] % str
+          end
+        end
+
+        def today
+          date
+        end
+
+        def yesterday
+          ago(:day, 1)
+        end
+
+        def ago(type, num)
+          type, num = :day, num * 7 if type == :week
+          1.upto(num).inject(date) { |date, _| date.send(:"prev_#{type}") }
+        end
+
+        def last(str)
+          key = str.to_s.downcase[0, 3].to_sym
+          last_wday(key) || last_month(key) || fail(MSGS[:unknown] % str)
+        end
+
+        def last_month(key)
+          return unless num = MONTHS.index(key)
+          date = self.date.prev_month
+          date = date.prev_month until date.month == num + 1
+          date
+        end
+
+        def last_wday(key)
+          return unless num = WDAYS.index(key)
+          date = self.date.prev_day
+          date = date.prev_day until date.wday == num
+          date
+        end
+
+        def wday_ix(day)
+          WDAYS.index(day.to_s.downcase[0, 3].to_sym)
+        end
+
+        def to_number(str)
+          ix = NUMS.index(str.to_sym)
+          ix ? ix + 1 : str.to_i
+        end
+
+        def pluralize(str)
+          "#{str}s".sub(/ss$/, 's')
+        end
+
+        def singularize(str)
+          str.sub(/s$/, '')
+        end
+    end
+  end
+end

data/lib/todo/version.rb

@@ -1,3 +1,3 @@
 module Todo
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/lib/todo.rb

@@ -5,15 +5,6 @@ module Todo
     multiple_items: 'Multiple items found for: %s'
   }
 
-  DATES = {
-    one_month_ago: (Time.now - 60 * 60 * 24 * 31).strftime('%Y-%m-%d'),
-    two_weeks_ago: (Time.now - 60 * 60 * 24 * 14).strftime('%Y-%m-%d'),
-    one_week_ago:  (Time.now - 60 * 60 * 24 * 7).strftime('%Y-%m-%d'),
-    two_days_ago:  (Time.now - 60 * 60 * 24 * 2).strftime('%Y-%m-%d'),
-    yesterday:     (Time.now - 60 * 60 * 24).strftime('%Y-%m-%d'),
-    today:         Time.now.strftime('%Y-%m-%d')
-  }
-
   STATUSES = {
     done: 'x',
     pend: '-'

data/spec/spec_helper.rb

@@ -6,4 +6,5 @@ NOW = Time.parse('2015-12-01 00:02:00 +0200')
 RSpec.configure do |c|
   c.mock_with :mocha
   c.before { Time.stubs(:now).returns(NOW) }
+  c.before { Date.stubs(:today).returns(NOW.to_date) }
 end

data/spec/todo/cli/list_spec.rb

@@ -12,42 +12,42 @@ describe Todo::Cli::List do
 
     describe 'unfiltered' do
       let(:opts)  { {} }
-      it { expect(out.readlines).to eq ['foo +abc', '2015-10-01 bar', '2015-11-01 baz', '2015-12-01 baz +abc'] }
+      it { expect(out.readlines).to eq ['- foo +abc', 'x 2015-10-01 bar', 'x 2015-11-01 baz', 'x 2015-12-01 baz +abc'] }
     end
 
     describe 'by done date' do
       let(:opts)  { { after: '2015-11-31' } }
-      it { expect(out.readlines).to eq ['2015-12-01 baz +abc'] }
+      it { expect(out.readlines).to eq ['x 2015-12-01 baz +abc'] }
     end
 
     describe 'by status :pending' do
       let(:opts)  { { status: :pending } }
-      it { expect(out.readlines).to eq ['foo +abc'] }
+      it { expect(out.readlines).to eq ['- foo +abc'] }
     end
 
     describe 'by status :done' do
       let(:opts)  { { status: :done } }
-      it { expect(out.readlines).to eq ['2015-10-01 bar', '2015-11-01 baz', '2015-12-01 baz +abc'] }
+      it { expect(out.readlines).to eq ['x 2015-10-01 bar', 'x 2015-11-01 baz', 'x 2015-12-01 baz +abc'] }
     end
 
     describe 'by status :done and :after' do
       let(:opts)  { { status: :done, after: '2015-11-31' } }
-      it { expect(out.readlines).to eq ['2015-12-01 baz +abc'] }
+      it { expect(out.readlines).to eq ['x 2015-12-01 baz +abc'] }
     end
 
     describe 'by status :done and :after' do
       let(:opts)  { { status: :done, after: '2015-11-01', before: '2015-11-07' } }
-      it { expect(out.readlines).to eq ['2015-11-01 baz'] }
+      it { expect(out.readlines).to eq ['x 2015-11-01 baz'] }
     end
 
     describe 'by project' do
       let(:opts)  { { projects: ['abc'] } }
-      it { expect(out.readlines).to eq ['foo +abc', '2015-12-01 baz +abc'] }
+      it { expect(out.readlines).to eq ['- foo +abc', 'x 2015-12-01 baz +abc'] }
     end
 
     describe 'by text' do
       let(:opts)  { { text: 'baz' } }
-      it { expect(out.readlines).to eq ['2015-11-01 baz', '2015-12-01 baz +abc'] }
+      it { expect(out.readlines).to eq ['x 2015-11-01 baz', 'x 2015-12-01 baz +abc'] }
     end
   end
 
@@ -56,12 +56,22 @@ describe Todo::Cli::List do
 
     describe 'short' do
       let(:opts)  { { format: 'short' } }
-      it { expect(out.readlines).to eq ['foo +abc', '2015-12-01 bar'] }
+      it { expect(out.readlines).to eq ['- foo +abc', 'x 2015-12-01 bar'] }
     end
 
     describe 'full' do
       let(:opts)  { { format: 'full' } }
       it { expect(out.readlines).to eq ['- foo +abc [1]', 'x bar done:2015-12-01 [2]'] }
     end
+
+    describe 'custom: text,tags' do
+      let(:opts)  { { format: 'text,tags' } }
+      it { expect(out.readlines).to eq ['foo +abc', 'bar done:2015-12-01'] }
+    end
+
+    describe 'custom: id:text' do
+      let(:opts)  { { format: 'id:text' } }
+      it { expect(out.readlines).to eq ['[1] foo +abc', '[2] bar'] }
+    end
   end
 end

data/spec/todo/{view_spec.rb → format_spec.rb}

@@ -1,22 +1,22 @@
-require 'todo/view'
+require 'todo/format'
 
-describe Todo::View do
+describe Todo::Format do
   let(:lines) { ['- foo [1]', 'x bar done:2015-12-01 [2]'] }
   let(:items) { Todo::Data::List.parse(lines).items }
   subject     { described_class.new(items, format: format) }
 
   describe 'default columns' do
     let(:format) {}
-    it { expect(subject.render).to eq(lines) }
+    it { expect(subject.apply).to eq(lines) }
   end
 
   describe 'selected columns' do
     let(:format) { 'text:tags' }
-    it { expect(subject.render).to eq(['foo', 'bar done:2015-12-01']) }
+    it { expect(subject.apply).to eq(['foo', 'bar done:2015-12-01']) }
   end
 
   describe 'format name' do
     let(:format) { :short }
-    it { expect(subject.render).to eq(['foo', '2015-12-01 bar']) }
+    it { expect(subject.apply).to eq(['- foo', 'x 2015-12-01 bar']) }
   end
 end

data/spec/todo/support/date_spec.rb

@@ -0,0 +1,24 @@
+require 'todo/support/date'
+
+describe Todo::Support::Date do
+  let(:now)  { Time.parse('2015-12-01') }
+  let(:date) { described_class.new(now) }
+
+  it { expect(date.format('yesterday')).to      eq '2015-11-30' }
+  it { expect(date.format('1_day_ago')).to      eq '2015-11-30' }
+  it { expect(date.format('3_days_ago')).to     eq '2015-11-28' }
+
+  it { expect(date.format('two weeks ago')).to  eq '2015-11-17' }
+  it { expect(date.format('3_weeks_ago')).to    eq '2015-11-10' }
+
+  it { expect(date.format('two months ago')).to eq '2015-10-01' }
+  it { expect(date.format('3_months_ago')).to   eq '2015-09-01' }
+
+  it { expect(date.format('one year ago')).to   eq '2014-12-01' }
+  it { expect(date.format('2_years_ago')).to    eq '2013-12-01' }
+
+  it { expect(date.format('last_tue')).to       eq '2015-11-24' }
+  it { expect(date.format('last_friday')).to    eq '2015-11-27' }
+  it { expect(date.format('last_sep')).to       eq '2015-09-01' }
+  it { expect(date.format('last_december')).to  eq '2014-12-01' }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: todo.txt
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Sven Fuchs
@@ -31,6 +31,7 @@ files:
 - lib/todo/data/list.rb
 - lib/todo/data/matcher.rb
 - lib/todo/data/parser.rb
+- lib/todo/format.rb
 - lib/todo/helpers/hash/compact.rb
 - lib/todo/helpers/hash/format.rb
 - lib/todo/helpers/hash/slice.rb
@@ -39,10 +40,10 @@ files:
 - lib/todo/src/file.rb
 - lib/todo/src/idonethis.rb
 - lib/todo/src/io.rb
+- lib/todo/support/date.rb
 - lib/todo/support/http.rb
 - lib/todo/support/options_parser.rb
 - lib/todo/version.rb
-- lib/todo/view.rb
 - spec/spec_helper.rb
 - spec/support/io.rb
 - spec/todo/cli/archive_spec.rb
@@ -51,13 +52,14 @@ files:
 - spec/todo/data/item_spec.rb
 - spec/todo/data/list_spec.rb
 - spec/todo/data/parser_spec.rb
+- spec/todo/format_spec.rb
 - spec/todo/helpers/hash/format_spec.rb
 - spec/todo/helpers/hash/slice_spec.rb
 - spec/todo/helpers/object/presence_spec.rb
 - spec/todo/helpers/string/string_spec.rb
 - spec/todo/src/file_spec.rb
 - spec/todo/src/io_spec.rb
-- spec/todo/view_spec.rb
+- spec/todo/support/date_spec.rb
 - todo.gemspec
 - todo.md
 homepage: https://github.com/svenfuchs/todo.txt