gyunyu 0.1.0 → 0.2.0

data/README.rdoc

@@ -7,14 +7,60 @@ simple RTM app for CLI made with Ruby
 * Ruby ( tested with Ruby 1.9.2 )
 * read permission of RTM API
 
+== Install
+
+ $ gem install gyunyu
+
+== How to use
+
+ $ gyunyu
+ Usage: gyunyu [options]
+     -l, --list LIST
+     -f, --filter FILTER
+     -d, --field FIELD
+     -o, --format FORMAT
+ $ gyunyu -f 'dueWithin:"1 week"'
+ list,task_id,name,due
+ 家,227119591,可燃ゴミ,2012-01-10 08:00:00 +0900
+ 家,226594887,可燃ゴミ,2012-01-06 08:00:00 +0900
+ 家,226034564,資源回収ゴミ,2012-01-08 00:00:00 +0900
+ ...
+
+== Filter Howto
+
+ $ gyunyu -l 仕事 -l 個人
+ # => list:仕事 and list:個人
+
+ $ gyunyu -l 仕事 -f due:today
+ # => list:仕事 and due:today
+
+On 2012-01-05,
+
+ $ gyunyu -l 個人 -c today
+ # => list:個人 and dueAfter:2012-01-04T23:59:59Z and dueBefore:2012-01-05T24:00:00Z
+
+Even if you live in a timezone other than UTC, you get true today's task list !
+
+== Field Howto
+
+ $ gyunyu -d name -d due
+ list,name,due
+ ...
+
+same above
+
+ $ gyunyu -d name,due
+ list,name,due
+ ...
+
 == Supported
 
 * store API token ( and reuse )
-* only `export' command. supported formats are CSV, JSON, YAML.
+* only `export' command. supported formats are CSV, JSON, YAML. ( default is CSV )
 
 == Not Supported
 
-* Tags and notes for csv exporting
+* Tags and notes for csv exporting ( dumped as YAML inline format )
 * Convert Date to (ISO 8601 + UTC) in search filter. Currently search results are out of alignment.
 * Default filter
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/gyunyu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gyunyu}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{wtnabe}]
-  s.date = %q{2012-01-04}
+  s.date = %q{2012-01-06}
   s.description = %q{now available export command}
   s.email = %q{wtnabe@gmail.com}
   s.executables = [%q{gyunyu}]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/gyunyu/app.rb",
     "lib/gyunyu/command.rb",
     "lib/gyunyu/command/export/app.rb",
+    "lib/gyunyu/command/export/custom_filter.rb",
     "lib/gyunyu/command/export/format/csv.rb",
     "lib/gyunyu/command/export/format/json.rb",
     "lib/gyunyu/command/export/format/yaml.rb",
@@ -38,6 +39,7 @@ Gem::Specification.new do |s|
     "lib/gyunyu/expander.rb",
     "lib/gyunyu/token.rb",
     "spec/app/.gitkeep",
+    "spec/app/command/export/custom_filter_spec.rb",
     "spec/app/command/export/option_spec.rb",
     "spec/app/command_spec.rb",
     "spec/app/expander_spec.rb",

data/lib/gyunyu/command/export/app.rb

@@ -33,7 +33,7 @@ module Gyunyu
         #
         def format_module
           format = option.format.to_s.capitalize
-          Module.nesting[1].const_get('Format').const_get(format)
+          Format.const_get(format)
         end
 
         #
@@ -46,7 +46,11 @@ module Gyunyu
 
         def run
           if @argv.size > 0
-            export( build_filter )
+            if option.show_filter_list
+              puts CustomFilter.filter.keys.sort
+            else
+              export( build_filter )
+            end
           else
             puts option.parser
           end
@@ -60,10 +64,13 @@ module Gyunyu
           filters = []
 
           filters << option.lists.map { |l| "list:#{l}" }.join(' and ') if option.lists.size > 0
+          filters << CustomFilter.filter[option.custom_filter] if option.custom_filter
           filters << option.filter if option.filter
           filters << filter if filter
 
-          '(' + filters.join(') and (') + ')'
+          f = '(' + filters.join(') and (') + ')'
+          STDERR.puts f
+          f
         end
 
         #
@@ -73,7 +80,7 @@ module Gyunyu
         def task_list( filter = nil )
           RTM::Tasks::GetList.new( token,
                                    nil,
-                                   build_filter( filter ) ).invoke
+                                   filter ).invoke
         end
 
         #
@@ -92,28 +99,33 @@ module Gyunyu
         #
         def pickup_fields( filter = nil )
           tasks = []
-          task_list( filter ).each { |l|
-            list_name = find_list( l['id'] ).name
-            tasks += Gyunyu::Expander.taskseries( l['taskseries'] ).map { |t|
-              record = {'list' => list_name}
-              option.fields.each { |f|
-                val = if TIME_FIELDS.include?( f )
-                        localtime( t[f] )
-                      else
-                        t[f]
-                      end
-                if f == 'estimate'
-                  e = split_estimate( t[f] )
-                  record['estimate(d)'] = e.day
-                  record['estimate(h)'] = e.hour
-                  record['estimate(m)'] = e.min
-                else
-                  record[f] = val
-                end
+
+          result = task_list( filter )
+          if result.respond_to? :each
+            result.each { |l|
+              list_name = find_list( l['id'] ).name
+              tasks += Gyunyu::Expander.taskseries( l['taskseries'] ).map { |t|
+                record = {'list' => list_name}
+                option.fields.each { |f|
+                  val = if TIME_FIELDS.include?( f )
+                          localtime( t[f] )
+                        else
+                          t[f]
+                        end
+                  if f == 'estimate'
+                    e = split_estimate( t[f] )
+                    record['estimate(d)'] = e.day
+                    record['estimate(h)'] = e.hour
+                    record['estimate(m)'] = e.min
+                  else
+                    record[f] = val
+                  end
+                }
+                record
               }
-              record
             }
-          }
+          end
+
           tasks
         end
 

data/lib/gyunyu/command/export/custom_filter.rb

@@ -0,0 +1,152 @@
+module Gyunyu
+  module Command
+    module Export
+      module CustomFilter
+        START_SECOND = 'T23:59:59Z'
+        LAST_SECOND  = 'T24:00:00Z'
+
+        class << self
+          def today
+            Date.today
+          end
+
+          def filter
+            filter = {}
+
+            %w( yesterday today tomorrow last_week this_week next_week
+                last_month this_month next_month ).each { |term|
+              due = [
+                "dueAfter:" + send("from_#{term}"),
+                "dueBefore:" + send("until_#{term}")
+              ].join( ' and ' )
+              filter[term] = due
+              filter["#{term}_yet"] = due + incomplete
+            }
+
+            filter
+          end
+
+          def last_sunday
+            if today.sunday?
+              today - 7
+            else
+              proc { |d|
+                until d.sunday?
+                  d -= 1
+                end
+                d
+              }.call(today)
+            end
+          end
+
+          def next_sunday
+            if today.sunday?
+              today + 7
+            else
+              proc { |d|
+                until d.sunday?
+                  d += 1
+                end
+                d
+              }.call(today)
+            end
+          end
+
+          def from_yesterday
+            (today - 2).to_s + START_SECOND
+          end
+
+          def until_yesterday
+            (today - 1).to_s + LAST_SECOND
+          end
+
+          def from_today
+            (today - 1).to_s + START_SECOND
+          end
+
+          def until_today
+            today.to_s + LAST_SECOND
+          end
+
+          def from_tomorrow
+            today.to_s + START_SECOND
+          end
+
+          def until_tomorrow
+            (today + 1).to_s + LAST_SECOND
+          end
+
+          def from_last_week
+            if today.sunday?
+              (last_sunday - 1).to_s + START_SECOND
+            else
+              (last_sunday - 8).to_s + START_SECOND
+            end
+          end
+
+          def until_last_week
+            if today.sunday?
+              (today - 1).to_s + LAST_SECOND
+            else
+              (last_sunday - 1).to_s + LAST_SECOND
+            end
+          end
+
+          def from_this_week
+            if today.sunday?
+              (today - 1).to_s + START_SECOND
+            else
+              (last_sunday - 1).to_s + START_SECOND
+            end
+          end
+
+          def until_this_week
+            (next_sunday - 1).to_s + LAST_SECOND
+          end
+
+          def from_next_week
+            (next_sunday - 1).to_s + START_SECOND
+          end
+
+          def until_next_week
+            (next_sunday + 6).to_s + LAST_SECOND
+          end
+
+          def from_last_month
+            d = today << 2
+            Date.new( d.year, d.mon, -1 ).to_s + START_SECOND
+          end
+
+          def until_last_month
+            d = today << 1
+            Date.new( d.year, d.mon, -1 ).to_s + LAST_SECOND
+          end
+
+          def from_this_month
+            d = today << 1
+            Date.new( d.year, d.mon, -1 ).to_s + START_SECOND
+          end
+
+          def until_this_month
+            d = today
+            Date.new( d.year, d.mon, -1 ).to_s + LAST_SECOND
+          end
+
+          def from_next_month
+            d = today
+            Date.new( d.year, d.mon, -1 ).to_s + START_SECOND
+          end
+
+          def until_next_month
+            d = today >> 1
+            Date.new( d.year, d.mon, -1 ).to_s + LAST_SECOND
+          end
+
+          def incomplete
+            ' and status:incomplete'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gyunyu/command/export/option.rb

@@ -6,18 +6,21 @@ module Gyunyu
     module Export
       class Option
         class FormatNotFound < StandardError; end
+        class CustomFilterNotFound < StandardError; end
 
         FIELD_SEP = ','
 
         def initialize( argv = [] )
-          @lists  = []
-          @filter = nil
-          @fields = []
-          @format = :csv
+          @lists         = []
+          @filter        = nil
+          @custom_filter = nil
+          @fields        = []
+          @format        = :csv
+          @show_filter_list = false
 
           parser.parse( argv )
         end
-        attr_reader :lists, :filter, :fields, :format
+        attr_reader :lists, :filter, :custom_filter, :fields, :format, :show_filter_list
 
         def fields
           if @fields.size > 0
@@ -37,6 +40,17 @@ module Gyunyu
             opt.on('-f', '--filter FILTER') { |filter|
               @filter = filter if filter.size > 0
             }
+            opt.on('-c', '--custom-filter FILTER') { |filter|
+              mod = Module.nesting[1].const_get('CustomFilter')
+              if mod.filter.has_key?( filter )
+                @custom_filter = filter
+              else
+                raise CustomFilterNotFound
+              end
+            }
+            opt.on('-s', '--custom-filter-list') { |c|
+              @show_filter_list = true
+            }
             opt.on('-d', '--field FIELD') { |field|
               if field.include?( FIELD_SEP )
                 @fields = field.split( FIELD_SEP )

data/spec/app/command/export/custom_filter_spec.rb

@@ -0,0 +1,319 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe Gyunyu::Command::Export::CustomFilter do
+  mod = Gyunyu::Command::Export::CustomFilter
+
+  define_method :force_weekday do
+    mod.class_eval {
+      def self.today
+        Date.parse('2012-01-05')
+      end
+    }
+  end
+
+  define_method :force_sunday do
+    mod.class_eval {
+      def self.today
+        Date.parse('2012-01-01')
+      end
+    }
+  end
+
+  before {
+    force_weekday
+  }
+
+  describe 'today' do
+    subject {
+      mod.today
+    }
+    it {
+      should == Date.parse('2012-01-05')
+    }
+  end
+
+  describe 'last_sunday' do
+    context 'weekdy 2012-01-05' do
+      subject {
+        mod.last_sunday
+      }
+      it {
+        should == Date.parse('2012-01-01')
+      }
+    end
+    context 'sunday 2012-01-01' do
+      before {
+        force_sunday
+      }
+      subject {
+        mod.last_sunday
+      }
+      it {
+        should == Date.parse('2011-12-25')
+      }
+    end
+  end
+
+  describe 'next_sunday' do
+    context 'weekday 2012-01-05' do
+      subject {
+        mod.next_sunday
+      }
+      it {
+        should == Date.parse('2012-01-08')
+      }
+    end
+    context 'sunday 2012-01-01' do
+      before {
+        force_sunday
+      }
+      subject {
+        mod.next_sunday
+      }
+      it {
+        should == Date.parse('2012-01-08')
+      }
+    end
+  end
+
+  describe 'from_yesterday' do
+    subject {
+      mod.from_yesterday
+    }
+    it {
+      should == '2012-01-03T23:59:59Z'
+    }
+  end
+
+  describe 'until_yesterday' do
+    subject {
+      mod.until_yesterday
+    }
+    it {
+      should == '2012-01-04T24:00:00Z'
+    }
+  end
+
+  describe 'from_today' do
+    subject {
+      mod.from_today
+    }
+    it {
+      should == '2012-01-04T23:59:59Z'
+    }
+  end
+
+  describe 'until_today' do
+    subject {
+      mod.until_today
+    }
+    it {
+      should == '2012-01-05T24:00:00Z'
+    }
+  end
+
+  describe 'from_tomorrow' do
+    subject {
+      mod.from_tomorrow
+    }
+    it {
+      should == '2012-01-05T23:59:59Z'
+    }
+  end
+
+  describe 'until_tomorrow' do
+    subject {
+      mod.until_tomorrow
+    }
+    it {
+      should == '2012-01-06T24:00:00Z'
+    }
+  end
+
+  describe 'from_last_week' do
+    context 'weekday 2012-01-05' do
+      subject {
+        mod.from_last_week
+      }
+      it {
+        should == '2011-12-24T23:59:59Z'
+      }
+    end
+    context 'sunday 2012-01-01' do
+      before {
+        force_sunday
+      }
+      subject {
+        mod.from_last_week
+      }
+      it {
+        should == '2011-12-24T23:59:59Z'
+      }
+    end
+  end
+
+  describe 'until_last_week' do
+    context 'weekday 2012-01-05' do
+      subject {
+        mod.until_last_week
+      }
+      it {
+        should == '2011-12-31T24:00:00Z'
+      }
+    end
+    context 'sunday 2011-01-01' do
+      before {
+        force_sunday
+      }
+      subject {
+        mod.until_last_week
+      }
+      it {
+        should == '2011-12-31T24:00:00Z'
+      }
+    end
+  end
+
+  describe 'from_this_week' do
+    context 'weekday 2012-01-05' do
+      subject {
+        mod.from_this_week
+      }
+      it {
+        should == '2011-12-31T23:59:59Z'
+      }
+    end
+    context 'sunday 2012-01-01' do
+      before {
+        force_sunday
+      }
+      subject {
+        mod.from_this_week
+      }
+      it {
+        should == '2011-12-31T23:59:59Z'
+      }
+    end
+  end
+
+  describe 'until_this_week' do
+    context 'weekday 2012-01-05' do
+      subject {
+        mod.until_this_week
+      }
+      it {
+        should == '2012-01-07T24:00:00Z'
+      }
+    end
+    context 'sunday 2012-01-01' do
+      before {
+        force_sunday
+      }
+      subject {
+        mod.until_this_week
+      }
+      it {
+        should == '2012-01-07T24:00:00Z'
+      }
+    end
+  end
+
+  describe 'from_next_week' do
+    context 'weekday 2012-01-05' do
+      subject {
+        mod.from_next_week
+      }
+      it {
+        should == '2012-01-07T23:59:59Z'
+      }
+    end
+    context 'sunday 2012-01-01' do
+      before {
+        force_sunday
+      }
+      subject {
+        mod.from_next_week
+      }
+      it {
+        should == '2012-01-07T23:59:59Z'
+      }
+    end
+  end
+
+  describe 'until_next_week' do
+    context 'weekday 2012-01-05' do
+      subject {
+        mod.until_next_week
+      }
+      it {
+        should == '2012-01-14T24:00:00Z'
+      }
+    end
+    context 'sunday 2012-01-01' do
+      before {
+        force_sunday
+      }
+      subject {
+        mod.until_next_week
+      }
+      it {
+        should == '2012-01-14T24:00:00Z'
+      }
+    end
+  end
+
+  describe 'from_last_month' do
+    subject {
+      mod.from_last_month
+    }
+    it {
+      should == '2011-11-30T23:59:59Z'
+    }
+  end
+
+  describe 'until_last_month' do
+    subject {
+      mod.until_last_month
+    }
+    it {
+      should == '2011-12-31T24:00:00Z'
+    }
+  end
+
+  describe 'from_this_month' do
+    subject {
+      mod.from_this_month
+    }
+    it {
+      should == '2011-12-31T23:59:59Z'
+    }
+  end
+
+  describe 'until_this_month' do
+    subject {
+      mod.until_this_month
+    }
+    it {
+      should == '2012-01-31T24:00:00Z'
+    }
+  end
+
+  describe 'from_next_month' do
+    subject {
+      mod.from_next_month
+    }
+    it {
+      should == '2012-01-31T23:59:59Z'
+    }
+  end
+
+  describe 'until_next_month' do
+    subject {
+      mod.until_next_month
+    }
+    it {
+      should == '2012-02-29T24:00:00Z'
+    }
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gyunyu
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000Z
+date: 2012-01-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtmilk
-  requirement: &3044910 !ruby/object:Gem::Requirement
+  requirement: &3042960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3044910
+  version_requirements: *3042960
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &3044640 !ruby/object:Gem::Requirement
+  requirement: &3042710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3044640
+  version_requirements: *3042710
 - !ruby/object:Gem::Dependency
   name: rtm-time
-  requirement: &3044090 !ruby/object:Gem::Requirement
+  requirement: &3042410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *3044090
+  version_requirements: *3042410
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &3043850 !ruby/object:Gem::Requirement
+  requirement: &3042170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *3043850
+  version_requirements: *3042170
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &3043570 !ruby/object:Gem::Requirement
+  requirement: &3041880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *3043570
+  version_requirements: *3041880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &3043300 !ruby/object:Gem::Requirement
+  requirement: &3041620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *3043300
+  version_requirements: *3041620
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &3043060 !ruby/object:Gem::Requirement
+  requirement: &3041380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3043060
+  version_requirements: *3041380
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &3042770 !ruby/object:Gem::Requirement
+  requirement: &3041140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3042770
+  version_requirements: *3041140
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &3042510 !ruby/object:Gem::Requirement
+  requirement: &3040840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3042510
+  version_requirements: *3040840
 description: now available export command
 email: wtnabe@gmail.com
 executables:
@@ -132,6 +132,7 @@ files:
 - lib/gyunyu/app.rb
 - lib/gyunyu/command.rb
 - lib/gyunyu/command/export/app.rb
+- lib/gyunyu/command/export/custom_filter.rb
 - lib/gyunyu/command/export/format/csv.rb
 - lib/gyunyu/command/export/format/json.rb
 - lib/gyunyu/command/export/format/yaml.rb
@@ -139,6 +140,7 @@ files:
 - lib/gyunyu/expander.rb
 - lib/gyunyu/token.rb
 - spec/app/.gitkeep
+- spec/app/command/export/custom_filter_spec.rb
 - spec/app/command/export/option_spec.rb
 - spec/app/command_spec.rb
 - spec/app/expander_spec.rb
@@ -162,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -70186575
+      hash: 1021094161
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: