todo.txt 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7af738f5e615625d77dfdbeaba750c4dfb221041
-  data.tar.gz: f95e1617537229ccc074214a67170f1ec0587774
+  metadata.gz: cbbe3c577a2ed572182c84fc0529403187a78d76
+  data.tar.gz: 955a861d58cbabfccf886e2c9fd4ea8e9520a9da
 SHA512:
-  metadata.gz: bad651993def5ec3c2090e259a2b81c241cca0685124f47cb0fc9bdd799861c6062c99d1694a3f91093d64dab4fe0b4dc77fa4b24bce4f04927250f3c129e3ca
-  data.tar.gz: 42b1ae217b8cd11748206bcdd5042abe4ea84417fe49826e64babfb94a0e040e27783605a14cdae1d0e4113dfe96ef6be005ff5fdf14088cc3b0bd5690d129cb
+  metadata.gz: 52552da4e560a61f35007feab5dcab4c5962e5defb01792885adf71ab7170d8eac923173020d089133e56b71ee75b93e3540f81649169a1c6d0746af2d2a9a7b
+  data.tar.gz: 8bed646c7f788d9aa5a134fa271c05b8e887986371663da9b5030e6d7ad82162b57d3acf03a73547feff0693cee01d3518f67e2e47d8dd74ef48071fb63f8f84

data/lib/todo/cli/cmd.rb

@@ -18,8 +18,8 @@ module Todo
         opts[:file] ? Src::File.new(opts[:file]) : Src::Io.new(slice(opts, :in, :out))
       end
 
-      def render(list, cols = nil)
-        View.new(list, cols).render
+      def render(list, opts = {})
+        View.new(list, opts).render
       end
     end
   end

data/lib/todo/cli/list.rb

@@ -4,20 +4,37 @@ require 'todo/data/list'
 module Todo
   class Cli
     class List < Cmd
-      opt '-s', '--since DATE', 'Since date' do |date|
-        opts[:since] = normalize_date(date)
+      opt '-f', '--format FORMAT', 'Format' do |opts, format|
+        opts[:format] = format
       end
 
-      opt '-b', '--before DATE', 'Before date' do |date|
+      opt '-a', '--after DATE', 'After date' do |opts, date|
+        opts[:after] = normalize_date(date)
+      end
+
+      opt '-s', '--since DATE', 'Since date' do |opts, date|
+        opts[:after] = normalize_date(date)
+      end
+
+      opt '-b', '--before DATE', 'Before date' do |opts, date|
         opts[:before] = normalize_date(date)
       end
 
-      opt '--status STATUS', 'Status' do |status|
+      opt '--status STATUS', 'Status' do |opts, status|
         opts[:status] = status
       end
 
+      opt '-p', '--project PROJECT', 'Project' do |opts, project|
+        opts[:projects] ||= []
+        opts[:projects] << project
+      end
+
+      opt '-t', '--text TEXT', 'Text' do |opts, text|
+        opts[:text] = text
+      end
+
       def run
-        out.write(render(list.items, [:done_date, :text]))
+        out.write(render(list.items, format: opts[:format] || :short))
       end
 
       private
@@ -29,8 +46,8 @@ module Todo
         end
 
         def data
-          data = slice(opts, :status, :before, :since)
-          # data = data.merge(text: args.first)
+          data = slice(opts, :status, :before, :after, :projects, :text)
+          data = data.merge(text: args.first) if args.first
           data
         end
 

data/lib/todo/cli/push.rb

@@ -6,7 +6,7 @@ require 'todo/src/idonethis'
 module Todo
   class Cli
     class Push < Cmd
-      opt '-s', '--since DATE', 'Since date' do |date|
+      opt '-s', '--since DATE', 'Since date' do |opts, date|
         opts[:since] = normalize_date(date)
       end
 
@@ -17,7 +17,7 @@ module Todo
       }
 
       def run
-        lines = render(list.items, [:text, :tags, :id])
+        lines = render(list.items, format: [:text, :tags, :id])
         src.write(lines)
         io.write(lines)
       end

data/lib/todo/data/matcher.rb

@@ -1,6 +1,19 @@
+require 'todo/helpers/hash/slice'
+
 module Todo
   module Data
-    class Matcher < Struct.new(:item, :data)
+    class Matcher
+      ATTRS = [:id, :text, :projects, :status, :after, :before]
+
+      include Helpers::Hash::Slice
+
+      attr_reader :item, :data
+
+      def initialize(item, data)
+        @item = item
+        @data = slice(data, *ATTRS)
+      end
+
       def matches?
         return true if data.empty?
         data[:id] ? match_id : match_data
@@ -22,12 +35,16 @@ module Todo
           item.text.include?(data[:text])
         end
 
+        def match_projects
+          item.projects & data[:projects] == data[:projects]
+        end
+
         def match_status
           item.status && item.status.to_sym == normalize_status(data[:status].to_sym)
         end
 
-        def match_since
-          item.done_date.to_s >= data[:since].to_s
+        def match_after
+          item.done_date.to_s >= data[:after].to_s
         end
 
         def match_before

data/lib/todo/version.rb

@@ -1,3 +1,3 @@
 module Todo
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/todo/view.rb

@@ -3,8 +3,11 @@ require 'todo/helpers/hash/format'
 require 'todo/helpers/object/presence'
 
 module Todo
-  class View < Struct.new(:items, :cols)
-    COLS = [:status, :text, :tags, :id]
+  class View < Struct.new(:items, :opts)
+    FORMATS = {
+      full:  [:status, :text, :tags, :id],
+      short: [:status, :done_date, :text]
+    }
 
     include Helpers::Hash::Format, Helpers::Object::Presence
 
@@ -43,7 +46,12 @@ module Todo
       end
 
       def cols
-        super || COLS
+        format = opts[:format] || :full
+        FORMATS[format.to_sym] || parse_format(opts[:format])
+      end
+
+      def parse_format(format)
+        Array(format).join(':').split(/[:,]/).map(&:to_sym)
       end
   end
 end

data/spec/todo/cli/list_spec.rb

@@ -1,13 +1,67 @@
 require 'todo/cli/list'
 
 describe Todo::Cli::List do
-  let(:lines) { ['- foo [1]', 'x bar done:2015-12-01 [2]'] }
   let(:io)    { Support::Io.new(lines.join("\n")) }
   let(:out)   { Support::Io.new }
-  let(:opts)  { { in: io, out: out } }
 
-  subject     { described_class.new(nil, opts) }
+  subject     { described_class.new([], opts.merge(in: io, out: out)) }
   before      { subject.run }
 
-  it { expect(out.readlines).to eq ['foo', '2015-12-01 bar'] }
+  describe 'filtering' do
+    let(:lines) { ['- foo +abc [1]', 'x bar done:2015-10-01 [2]', 'x baz done:2015-11-01 [2]', 'x baz +abc done:2015-12-01 [2]'] }
+
+    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'] }
+    end
+
+    describe 'by done date' do
+      let(:opts)  { { after: '2015-11-31' } }
+      it { expect(out.readlines).to eq ['2015-12-01 baz +abc'] }
+    end
+
+    describe 'by status :pending' do
+      let(:opts)  { { status: :pending } }
+      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'] }
+    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'] }
+    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'] }
+    end
+
+    describe 'by project' do
+      let(:opts)  { { projects: ['abc'] } }
+      it { expect(out.readlines).to eq ['foo +abc', '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'] }
+    end
+  end
+
+  describe 'format' do
+    let(:lines) { ['- foo +abc [1]', 'x bar done:2015-12-01 [2]'] }
+
+    describe 'short' do
+      let(:opts)  { { format: 'short' } }
+      it { expect(out.readlines).to eq ['foo +abc', '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
+  end
 end

data/spec/todo/view_spec.rb

@@ -3,15 +3,20 @@ require 'todo/view'
 describe Todo::View 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, cols) }
+  subject     { described_class.new(items, format: format) }
 
   describe 'default columns' do
-    let(:cols) {}
+    let(:format) {}
     it { expect(subject.render).to eq(lines) }
   end
 
   describe 'selected columns' do
-    let(:cols) { [:done_date, :text] }
+    let(:format) { 'text:tags' }
+    it { expect(subject.render).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']) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: todo.txt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sven Fuchs